[arch-commits] CVS update of extra/network/dhclient (3 files)

[Thomas Baechler]

    Date: Sunday, March 30, 2008 @ 10:18:34
  Author: thomas
    Path: /home/cvs-extra/extra/network/dhclient

   Added: fix-broken-resolvconf.patch (1.1) fix-mac80211-wireless.patch (1.1)
Modified: PKGBUILD (1.6 -> 1.7)

upgpkg: dhclient 3.0.6-2


-----------------------------+
 PKGBUILD                    |   16 ++++++++++++----
 fix-broken-resolvconf.patch |   15 +++++++++++++++
 fix-mac80211-wireless.patch |   30 ++++++++++++++++++++++++++++++
 3 files changed, 57 insertions(+), 4 deletions(-)


Index: extra/network/dhclient/PKGBUILD
diff -u extra/network/dhclient/PKGBUILD:1.6 extra/network/dhclient/PKGBUILD:1.7
--- extra/network/dhclient/PKGBUILD:1.6	Sat Jul  7 19:38:18 2007
+++ extra/network/dhclient/PKGBUILD	Sun Mar 30 10:18:33 2008
@@ -1,9 +1,9 @@
-#$Id: PKGBUILD,v 1.6 2007/07/07 17:38:18 eric Exp $
+#$Id: PKGBUILD,v 1.7 2008/03/30 08:18:33 thomas Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: Mirko Messer <mirk at chao.ch>
 pkgname=dhclient 
 pkgver=3.0.6
-pkgrel=1
+pkgrel=2
 pkgdesc="dhclient is standalone client from the dhcp package"
 arch=(i686 x86_64)
 url="http://www.isc.org/index.pl?/sw/dhcp/"
@@ -11,12 +11,20 @@
 depends=('bash')
 options=('!makeflags')
 source=(ftp://ftp.isc.org/isc/dhcp/dhcp-${pkgver}.tar.gz \
-	arch-nm.patch)
-md5sums=('724bad21ad8b638abadd5fcc07df1a0f' 'c3ad862567cb63ae6589a0754aa685b3')
+	arch-nm.patch
+	fix-broken-resolvconf.patch
+	fix-mac80211-wireless.patch)
+md5sums=('724bad21ad8b638abadd5fcc07df1a0f'
+         'c3ad862567cb63ae6589a0754aa685b3'
+         '115ce66ffe0acda2042905612a2680a7'
+         'c64dfcbb0f0f1a3328ec6a907c0239eb')
+                           
 
 build() {
   cd ${startdir}/src/dhcp-${pkgver}
   patch -Np1 -i ${startdir}/src/arch-nm.patch || return 1
+  patch -Np1 -i ${startdir}/src/fix-broken-resolvconf.patch || return 1
+  patch -Np1 -i ${startdir}/src/fix-mac80211-wireless.patch || return 1
   ./configure
   cd work*/minires && make || return 1
   cd ../dst && make || return 1
Index: extra/network/dhclient/fix-broken-resolvconf.patch
diff -u /dev/null extra/network/dhclient/fix-broken-resolvconf.patch:1.1
--- /dev/null	Sun Mar 30 10:18:34 2008
+++ extra/network/dhclient/fix-broken-resolvconf.patch	Sun Mar 30 10:18:33 2008
@@ -0,0 +1,15 @@
+diff -Nur dhcp-3.0.6.orig/client/scripts/linux dhcp-3.0.6/client/scripts/linux
+--- dhcp-3.0.6.orig/client/scripts/linux	2008-03-29 18:44:07.000000000 +0100
++++ dhcp-3.0.6/client/scripts/linux	2008-03-29 18:45:06.000000000 +0100
+@@ -36,8 +36,9 @@
+ fi;
+ 
+ make_resolv_conf() {
+-  if [ "x$new_domain_name" != x ] && [ x"$new_domain_name_servers" != x ]; then
+-    echo search $new_domain_name >/etc/resolv.conf
++  if [ -n "$new_domain_name_servers" ]; then
++    : > /etc/resolv.conf
++    [ -n "$new_domain_name" ] && echo search $new_domain_name >/etc/resolv.conf
+     chmod 644 /etc/resolv.conf
+     for nameserver in $new_domain_name_servers; do
+       echo nameserver $nameserver >>/etc/resolv.conf
Index: extra/network/dhclient/fix-mac80211-wireless.patch
diff -u /dev/null extra/network/dhclient/fix-mac80211-wireless.patch:1.1
--- /dev/null	Sun Mar 30 10:18:34 2008
+++ extra/network/dhclient/fix-mac80211-wireless.patch	Sun Mar 30 10:18:33 2008
@@ -0,0 +1,30 @@
+diff -Nur dhcp-3.0.6.orig/client/scripts/linux dhcp-3.0.6/client/scripts/linux
+--- dhcp-3.0.6.orig/client/scripts/linux	2008-03-29 18:59:39.000000000 +0100
++++ dhcp-3.0.6/client/scripts/linux	2008-03-29 19:00:16.000000000 +0100
+@@ -140,7 +140,7 @@
+   if [ x$old_ip_address != x ] && [ x$old_ip_address != x$new_ip_address ]; then
+     # IP address changed. Bringing down the interface will delete all routes,
+     # and clear the ARP cache.
+-    ifconfig $interface inet 0 down
++    ifconfig $interface inet 0
+   fi
+  fi
+ 
+@@ -185,7 +185,7 @@
+   fi
+   if [ x$old_ip_address != x ]; then
+     # Shut down interface, which will delete routes and clear arp cache.
+-    ifconfig $interface inet 0 down
++    ifconfig $interface inet 0
+   fi
+   if [ x$alias_ip_address != x ]; then
+     ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
+@@ -228,7 +228,7 @@
+     exit_with_hooks 0
+   fi
+  if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 2 ) != 2 )); then
+-  ifconfig $interface inet 0 down
++  ifconfig $interface inet 0
+  fi
+   exit_with_hooks 1
+ fi