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

[Ronald van Haren]

    Date: Sunday, May 24, 2009 @ 17:32:54
  Author: ronald
Revision: 40046

upgpkg: dhcpcd 5.0.4-1

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-05-24 21:21:28 UTC (rev 40045)
+++ PKGBUILD	2009-05-24 21:32:54 UTC (rev 40046)
@@ -4,7 +4,7 @@
 # Contributor: Judd Vinet <jvinet.zeroflux.org>
 
 pkgname=dhcpcd
-pkgver=5.0.2
+pkgver=5.0.4
 pkgrel=1
 pkgdesc="RFC2131 compliant DHCP client daemon"
 url="http://roy.marples.name/dhcpcd/"
@@ -15,17 +15,13 @@
 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' 'glibc-segfault.patch')
-md5sums=('0a51f2e4bb6f4a1b188bda8390ff504a'
-         '372d33485556982b64a97f301e17c5dd'
-         'f3526cdcd7abfe18435963950161b5cd')
+        'dhcpcd.conf.d')
+md5sums=('0b920a8094ee3a8c16c973794561feef'
+         '372d33485556982b64a97f301e17c5dd')
 
 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
@@ -56,3 +52,6 @@
   # Set Options in /etc/dhcpcd.conf
   echo noipv4ll >> ${pkgdir}/etc/dhcpcd.conf || return 1 # Disable ip4vall
 }
+md5sums=('0b920a8094ee3a8c16c973794561feef'
+         '372d33485556982b64a97f301e17c5dd'
+         'f3526cdcd7abfe18435963950161b5cd')

Deleted: glibc-segfault.patch
===================================================================
--- glibc-segfault.patch	2009-05-24 21:21:28 UTC (rev 40045)
+++ glibc-segfault.patch	2009-05-24 21:32:54 UTC (rev 40046)
@@ -1,18 +0,0 @@
-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)