[arch-commits] CVS update of arch/build/network/dhclient (PKGBUILD arch-nm.patch)

[Jan de Groot]

    Date: Saturday, July 7, 2007 @ 05:00:35
  Author: jgc
    Path: /home/cvs-arch/arch/build/network/dhclient

Modified: PKGBUILD (1.4 -> 1.5) arch-nm.patch (1.1 -> 1.2)

upgpkg: dhclient 3.0.6-1
Remove part of patch that has been fixed upstream


---------------+
 PKGBUILD      |   13 +++++++------
 arch-nm.patch |   14 --------------
 2 files changed, 7 insertions(+), 20 deletions(-)


Index: arch/build/network/dhclient/PKGBUILD
diff -u arch/build/network/dhclient/PKGBUILD:1.4 arch/build/network/dhclient/PKGBUILD:1.5
--- arch/build/network/dhclient/PKGBUILD:1.4	Thu May 31 08:39:31 2007
+++ arch/build/network/dhclient/PKGBUILD	Sat Jul  7 05:00:35 2007
@@ -1,22 +1,23 @@
-#$Id: PKGBUILD,v 1.4 2007/05/31 12:39:31 jgc Exp $
+#$Id: PKGBUILD,v 1.5 2007/07/07 09:00:35 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: Mirko Messer <mirk at chao.ch>
 pkgname=dhclient 
-pkgver=3.0.5
-pkgrel=2
+pkgver=3.0.6
+pkgrel=1
 pkgdesc="dhclient is standalone client from the dhcp package"
 arch=(i686 x86_64)
 url="http://www.isc.org/index.pl?/sw/dhcp/"
 license=('custom')
 depends=('bash')
+options=('!makeflags')
 source=(ftp://ftp.isc.org/isc/dhcp/dhcp-${pkgver}.tar.gz \
 	arch-nm.patch)
-md5sums=('ce5d30d4645e4eab1f54561b487d1ec7' '68e968789f577e12fa596500c9ae8fc9')
+md5sums=('724bad21ad8b638abadd5fcc07df1a0f'
+         'c3ad862567cb63ae6589a0754aa685b3')
 
 build() {
-  export MAKEFLAGS="-j1"
   cd ${startdir}/src/dhcp-${pkgver}
-  patch -Np1 -i ${startdir}/src/arch-nm.patch
+  patch -Np1 -i ${startdir}/src/arch-nm.patch || return 1
   ./configure
   cd work*/minires && make
   cd ../omapip && make
Index: arch/build/network/dhclient/arch-nm.patch
diff -u arch/build/network/dhclient/arch-nm.patch:1.1 arch/build/network/dhclient/arch-nm.patch:1.2
--- arch/build/network/dhclient/arch-nm.patch:1.1	Thu Jun 29 03:23:50 2006
+++ arch/build/network/dhclient/arch-nm.patch	Sat Jul  7 05:00:35 2007
@@ -156,20 +156,6 @@
  
  	client_envadd (client,
  		       prefix, "ip_address", "%s", piaddr (lease -> address));
-@@ -2607,6 +2670,13 @@
- 			wstatus = 0;
- 		}
- 	} else {
-+		/*
-+		   We don't want to pass an open file descriptor for
-+		   dhclient.leases when executing dhclient-script.
-+		   Debian bug #147582
-+		*/
-+		if (leaseFile)
-+			fclose (leaseFile);
- 		execve (scriptName, argv, envp);
- 		log_error ("execve (%s, ...): %m", scriptName);
- 		exit (0);
 @@ -2690,7 +2760,14 @@
  			s = option -> name;
  			if (j + 1 == buflen)