[arch-commits] Commit in dhcpcd/trunk (PKGBUILD glibc-segfault.patch)

[Ronald van Haren]

    Date: Monday, May 11, 2009 @ 02:30:13
  Author: ronald
Revision: 38997

upgpkg: dhcpcd 5.0.2-1

Added:
  dhcpcd/trunk/glibc-segfault.patch
Modified:
  dhcpcd/trunk/PKGBUILD

----------------------+
 PKGBUILD             |   12 ++++++++----
 glibc-segfault.patch |   18 ++++++++++++++++++
 2 files changed, 26 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-05-11 06:29:16 UTC (rev 38996)
+++ PKGBUILD	2009-05-11 06:30:13 UTC (rev 38997)
@@ -4,7 +4,7 @@
 # Contributor: Judd Vinet <jvinet.zeroflux.org>
 
 pkgname=dhcpcd
-pkgver=5.0.1
+pkgver=5.0.2
 pkgrel=1
 pkgdesc="RFC2131 compliant DHCP client daemon"
 url="http://roy.marples.name/dhcpcd/"
@@ -15,13 +15,17 @@
 backup=('etc/conf.d/dhcpcd' 'etc/dhcpcd.conf')
 options=('emptydirs')  # We Need the Empty /var/lib/dhcpcd Directory
 source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2" \
-        'dhcpcd.conf.d')
-md5sums=('79a886e0814e665cb4e29d9d914b3bcb'
-         '372d33485556982b64a97f301e17c5dd')
+        'dhcpcd.conf.d' 'glibc-segfault.patch')
+md5sums=('0a51f2e4bb6f4a1b188bda8390ff504a'
+         '372d33485556982b64a97f301e17c5dd'
+         'f3526cdcd7abfe18435963950161b5cd')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
+  # Fix glibc incompatibility
+  patch -Np0 -i ${srcdir}/glibc-segfault.patch || return 1
+  
   # Fix Installation Locations
   export PREFIX=/usr
   sed -i 's/${PREFIX}\/etc/\/etc/' Makefile || return 1

Added: glibc-segfault.patch
===================================================================
--- glibc-segfault.patch	                        (rev 0)
+++ glibc-segfault.patch	2009-05-11 06:30:13 UTC (rev 38997)
@@ -0,0 +1,18 @@
+Index: net.c
+===================================================================
+--- net.c (revision 9a55b4faafd865e491200640133177269c4d91fd)
++++ net.c (revision f6c275e9610384bb326db341a221b142d26fc5f6)
+@@ -273,4 +273,6 @@
+ 	ifs = ifl = NULL;
+ 	for (ifa = ifaddrs; ifa; ifa = ifa->ifa_next) {
++		if (ifa->ifa_addr == NULL) /* should not happen */
++			continue;
+ #ifdef AF_LINK
+ 		if (ifa->ifa_addr->sa_family != AF_LINK)
+@@ -373,4 +375,6 @@
+ 	retval = 0;
+ 	for (ifa = ifaddrs; ifa; ifa = ifa->ifa_next) {
++		if (ifa->ifa_addr == NULL) /* should not happen */
++			continue;
+ 		if (ifa->ifa_addr->sa_family != AF_INET ||
+ 		    strcmp(ifa->ifa_name, ifname) != 0)