fixed bug #78679 sys_errlist converted to strerror in the dhcp module, now we can compile/use it also in a uclibc env

5 files changed, 141 insertions, 16 deletions

diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index d70973c5f23e..dc19bbf3e942 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -1,12 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 d4cba6212f6526b6a28eea4fc61f4c14 ppp-2.4.3.ebuild 5688
+MD5 250bdb9c2830fdc1cced36b92e672325 ppp-2.4.3.ebuild 5748
 MD5 8be5cef0a99f9053f520bc5b413fd3d2 ppp-2.4.1-r14.ebuild 4698
-MD5 26331d523315de3c668aab6a32c27c9a ppp-2.4.3-r1.ebuild 5769
+MD5 44d330279fe7f2f6242cbb09f64713c0 ppp-2.4.3-r1.ebuild 5829
 MD5 e47f2b9b2be66a0a00d188a79e83e9e7 ChangeLog 16581
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
-MD5 89271c1d6f6dad5fa67c1593b2328baa ppp-2.4.2-r10.ebuild 5800
+MD5 a2993ee1a4230933cdab21e679965ec0 ppp-2.4.2-r10.ebuild 5860
 MD5 4e62cdeb360ca0a22becbd2deb6f2dac files/pon 957
 MD5 86cdaf133f7a79fb464f02d83afc7734 files/plog 146
 MD5 05b7394b35a2342033b52134568bf6b8 files/poff 2723
@@ -24,6 +21,7 @@ MD5 01ed8667e00028ff1c6a8ac4a0d7e1dc files/digest-ppp-2.4.3-r1 194
 MD5 5d83af7b897082a0b1ecd70a2cc2a0c7 files/modules.ppp 268
 MD5 0713ffc9ae6e3ee4ef0f5c3cb752b3ea files/ip-down 285
 MD5 f0ad3e0c62aec1771536caf00e28b9c6 files/pppoe.html 7605
+MD5 c032ff6a0c137f4996b7a5bf60e19a0a files/ppp-sys_error_to_strerror.patch 4920
 MD5 927fc5dafad76c9c1ee7f0259e9244b7 files/2.4.2/mpls.patch.gz 3151
 MD5 2890b47660f967a07ac5b211850e46c5 files/2.4.2/options-pptp 238
 MD5 f7a8c95af55d9cca703c15cdf9386ad4 files/2.4.2/control_c.patch 402
@@ -57,10 +55,3 @@ MD5 d166dfb51a6e7fa6a5a05120817dbccd files/2.4.3/fixes-from-upstream-cvs.patch 2
 MD5 5d83af7b897082a0b1ecd70a2cc2a0c7 files/2.4.3/modules.ppp 268
 MD5 05cb3f055d11109381811e26568a9b30 files/2.4.3/ip-down 734
 MD5 f0ad3e0c62aec1771536caf00e28b9c6 files/2.4.3/pppoe.html 7605
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFB4cufjiC39V7gKu0RAhOKAJ9Kuy5r3lCpIUEBhQKcXBamTXX2BwCfSLTH
-oWF3XACH+q1iZ/Xvz4N8d1A=
-=9OOg
------END PGP SIGNATURE-----
diff --git a/net-dialup/ppp/files/ppp-sys_error_to_strerror.patch b/net-dialup/ppp/files/ppp-sys_error_to_strerror.patch
new file mode 100644
index 000000000000..12cc7d4508a1
--- /dev/null
+++ b/net-dialup/ppp/files/ppp-sys_error_to_strerror.patch
@@ -0,0 +1,131 @@
+diff -uNr ppp-2.4.2.old/pppd/plugins/dhcp/dhcpc.c ppp-2.4.2/pppd/plugins/dhcp/dhcpc.c
+--- ppp-2.4.2.old/pppd/plugins/dhcp/dhcpc.c	2002-09-30 10:27:08 +0000
++++ ppp-2.4.2/pppd/plugins/dhcp/dhcpc.c	2005-01-22 03:58:47 +0000
+@@ -144,7 +144,7 @@
+     fd = raw_socket(client_config.ifindex);
+   
+   if (listen_mode != LISTEN_NONE && fd < 0) {
+-    fatal("DHCPC: couldn't listen on socket, %s", sys_errlist[errno]);
++    fatal("DHCPC: couldn't listen on socket, %s", strerror(errno));
+   }
+   
+ }
+@@ -208,7 +208,7 @@
+     len = get_packet(&packet, fd);
+     
+     if (len == -1 && errno != EINTR) {
+-      dbglog("DHCPC: error on read, %s, reopening socket", sys_errlist[errno]);
++      dbglog("DHCPC: error on read, %s, reopening socket", strerror(errno));
+       change_mode(LISTEN_KERNEL);
+     }
+     if (len < 0) continue;
+@@ -380,7 +380,7 @@
+       else len = get_raw_packet(&packet, fd);
+       
+       if (len == -1 && errno != EINTR) {
+-	dbglog("DHCPC: error on read, %s, reopening socket", sys_errlist[errno]);
++	dbglog("DHCPC: error on read, %s, reopening socket", strerror(errno));
+ 	change_mode(listen_mode); /* just close and reopen */
+       }
+       if (len < 0) continue;
+@@ -445,7 +445,7 @@
+       
+     } else {
+       /* An error occured */
+-        dbglog("DHCPC: error on select, %s, reopening socket", sys_errlist[errno]);
++        dbglog("DHCPC: error on select, %s, reopening socket", strerror(errno));
+         change_mode(listen_mode); /* just close and reopen */
+     }
+     
+diff -uNr ppp-2.4.2.old/pppd/plugins/dhcp/packet.c ppp-2.4.2/pppd/plugins/dhcp/packet.c
+--- ppp-2.4.2.old/pppd/plugins/dhcp/packet.c	2002-08-27 11:58:49 +0000
++++ ppp-2.4.2/pppd/plugins/dhcp/packet.c	2005-01-22 03:58:47 +0000
+@@ -125,7 +125,7 @@
+ 	    return kernel_packet(payload,payload->giaddr,CLIENT_PORT,dest_ip,dest_port);
+ 	
+ 	if ((fd = socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_IP))) < 0) {
+-		DEBUG(LOG_ERR, "socket call failed: %s", sys_errlist[errno]);
++		DEBUG(LOG_ERR, "socket call failed: %s", strerror(errno));
+ 		return -1;
+ 	}
+ 	
+@@ -138,7 +138,7 @@
+ 	dest.sll_halen = 6;
+ 	memcpy(dest.sll_addr, dest_arp, 6);
+ 	if (bind(fd, (struct sockaddr *)&dest, sizeof(struct sockaddr_ll)) < 0) {
+-		DEBUG(LOG_ERR, "bind call failed: %s", sys_errlist[errno]);
++		DEBUG(LOG_ERR, "bind call failed: %s", strerror(errno));
+ 		close(fd);
+ 		return -1;
+ 	}
+@@ -161,7 +161,7 @@
+ 
+ 	result = sendto(fd, &packet, sizeof(struct udp_dhcp_packet), 0, (struct sockaddr *) &dest, sizeof(dest));
+ 	if (result <= 0) {
+-		DEBUG(LOG_ERR, "write on socket failed: %s", sys_errlist[errno]);
++		DEBUG(LOG_ERR, "write on socket failed: %s", strerror(errno));
+ 	}
+ 	close(fd);
+ 	return result;
+diff -uNr ppp-2.4.2.old/pppd/plugins/dhcp/socket.c ppp-2.4.2/pppd/plugins/dhcp/socket.c
+--- ppp-2.4.2.old/pppd/plugins/dhcp/socket.c	2002-08-31 11:23:38 +0000
++++ ppp-2.4.2/pppd/plugins/dhcp/socket.c	2005-01-22 03:58:47 +0000
+@@ -60,7 +60,7 @@
+ 				*addr = sin->sin_addr.s_addr;
+ 				DEBUG(LOG_INFO, "%s (our ip) = %s", ifr.ifr_name, inet_ntoa(sin->sin_addr));
+ 			} else {
+-				LOG(LOG_ERR, "SIOCGIFADDR failed!: %s", sys_errlist[errno]);
++				LOG(LOG_ERR, "SIOCGIFADDR failed!: %s", strerror(errno));
+ 				return -1;
+ 			}
+ 		}
+@@ -69,7 +69,7 @@
+ 			DEBUG(LOG_INFO, "adapter index %d", ifr.ifr_ifindex);
+ 			*ifindex = ifr.ifr_ifindex;
+ 		} else {
+-			LOG(LOG_ERR, "SIOCGIFINDEX failed!: %s", sys_errlist[errno]);
++			LOG(LOG_ERR, "SIOCGIFINDEX failed!: %s", strerror(errno));
+ 			return -1;
+ 		}
+ 		if (ioctl(fd, SIOCGIFHWADDR, &ifr) == 0) {
+@@ -77,11 +77,11 @@
+ 			DEBUG(LOG_INFO, "adapter hardware address %02x:%02x:%02x:%02x:%02x:%02x",
+ 				arp[0], arp[1], arp[2], arp[3], arp[4], arp[5]);
+ 		} else {
+-			LOG(LOG_ERR, "SIOCGIFHWADDR failed!: %s", sys_errlist[errno]);
++			LOG(LOG_ERR, "SIOCGIFHWADDR failed!: %s", strerror(errno));
+ 			return -1;
+ 		}
+ 	} else {
+-		LOG(LOG_ERR, "socket failed!: %s", sys_errlist[errno]);
++		LOG(LOG_ERR, "socket failed!: %s", strerror(errno));
+ 		return -1;
+ 	}
+ 	close(fd);
+@@ -98,7 +98,7 @@
+ 
+ 	DEBUG(LOG_INFO, "Opening listen socket on 0x%08x:%d %s\n", ip, port, inf ? inf : "*");
+ 	if ((fd = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0) {
+-		DEBUG(LOG_ERR, "socket call failed: %s", sys_errlist[errno]);
++		DEBUG(LOG_ERR, "socket call failed: %s", strerror(errno));
+ 		return -1;
+ 	}
+ 
+@@ -144,7 +144,7 @@
+ 
+ 	DEBUG(LOG_INFO, "Opening raw socket on ifindex %d\n", ifindex);
+ 	if ((fd = socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_IP))) < 0) {
+-		DEBUG(LOG_ERR, "socket call failed: %s", sys_errlist[errno]);
++		DEBUG(LOG_ERR, "socket call failed: %s", strerror(errno));
+ 		return -1;
+ 	}
+ 	
+@@ -152,7 +152,7 @@
+ 	sock.sll_protocol = htons(ETH_P_IP);
+ 	sock.sll_ifindex = ifindex;
+ 	if (bind(fd, (struct sockaddr *) &sock, sizeof(sock)) < 0) {
+-		DEBUG(LOG_ERR, "bind call failed: %s", sys_errlist[errno]);
++		DEBUG(LOG_ERR, "bind call failed: %s", strerror(errno));
+ 		close(fd);
+ 		return -1;
+ 	}
diff --git a/net-dialup/ppp/ppp-2.4.2-r10.ebuild b/net-dialup/ppp/ppp-2.4.2-r10.ebuild
index 3ff776c27b9e..6ed1075e8ee6 100644
--- a/net-dialup/ppp/ppp-2.4.2-r10.ebuild
+++ b/net-dialup/ppp/ppp-2.4.2-r10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.2-r10.ebuild,v 1.4 2005/01/06 07:12:39 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.2-r10.ebuild,v 1.5 2005/01/21 00:58:15 xmerlin Exp $
 
 inherit eutils gnuconfig flag-o-matic
 
@@ -71,6 +71,7 @@ src_unpack() {
 		tar -xzf ${DISTDIR}/ppp-dhcpc.tgz -C ${S}/pppd/plugins/
 		sed -i -e 's/SUBDIRS := rp-pppoe/SUBDIRS := rp-pppoe dhcp/' pppd/plugins/Makefile.linux || die
 		sed -i -e "s/-O2/${CFLAGS}/" pppd/plugins/dhcp/Makefile.linux
+		epatch ${FILESDIR}/ppp-sys_error_to_strerror.patch || die
 	}
 
 	#epatch ${FILESDIR}/${PV}/pcap.patch
diff --git a/net-dialup/ppp/ppp-2.4.3-r1.ebuild b/net-dialup/ppp/ppp-2.4.3-r1.ebuild
index a126ee015810..577430076d22 100644
--- a/net-dialup/ppp/ppp-2.4.3-r1.ebuild
+++ b/net-dialup/ppp/ppp-2.4.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.3-r1.ebuild,v 1.1 2005/01/09 13:54:23 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.3-r1.ebuild,v 1.2 2005/01/21 00:58:15 xmerlin Exp $
 
 inherit eutils gnuconfig flag-o-matic
 
@@ -67,6 +67,7 @@ src_unpack() {
 		tar -xzf ${DISTDIR}/ppp-dhcpc.tgz -C ${S}/pppd/plugins/
 		sed -i 's/SUBDIRS := rp-pppoe/SUBDIRS := rp-pppoe dhcp/' ${S}/pppd/plugins/Makefile.linux
 		sed -i "s/-O2/${CFLAGS} -fPIC/" ${S}/pppd/plugins/dhcp/Makefile.linux
+		epatch ${FILESDIR}/ppp-sys_error_to_strerror.patch || die
 	}
 }
 
diff --git a/net-dialup/ppp/ppp-2.4.3.ebuild b/net-dialup/ppp/ppp-2.4.3.ebuild
index 239b3070f57b..fcc967dc2d8a 100644
--- a/net-dialup/ppp/ppp-2.4.3.ebuild
+++ b/net-dialup/ppp/ppp-2.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.3.ebuild,v 1.3 2005/01/06 07:12:39 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.3.ebuild,v 1.4 2005/01/21 00:58:15 xmerlin Exp $
 
 inherit eutils gnuconfig flag-o-matic
 
@@ -66,6 +66,7 @@ src_unpack() {
 		tar -xzf ${DISTDIR}/ppp-dhcpc.tgz -C ${S}/pppd/plugins/
 		sed -i 's/SUBDIRS := rp-pppoe/SUBDIRS := rp-pppoe dhcp/' ${S}/pppd/plugins/Makefile.linux
 		sed -i "s/-O2/${CFLAGS} -fPIC/" ${S}/pppd/plugins/dhcp/Makefile.linux
+		epatch ${FILESDIR}/ppp-sys_error_to_strerror.patch || die
 	}
 }