[arch-commits] Commit in dhclient/repos (3 files)

[daniel at archlinux.org]

    Date: Monday, July 20, 2009 @ 12:29:27
  Author: daniel
Revision: 46875

Merged revisions 46873 via svnmerge from 
svn+ssh://daniel@svn.archlinux.org/srv/svn-packages/dhclient/trunk

........
  r46873 | daniel | 2009-07-20 18:28:46 +0200 (Mon, 20 Jul 2009) | 2 lines
  
  upgpkg: dhclient 3.1.2p1-2
      new pkgrel which fixes the file conflicts and adding fix-mac80211-wireless.patch again
........

Modified:
  dhclient/repos/testing-x86_64/	(properties)
  dhclient/repos/testing-x86_64/PKGBUILD
  dhclient/repos/testing-x86_64/fix-mac80211-wireless.patch

-----------------------------+
 PKGBUILD                    |   10 ++++++++--
 fix-mac80211-wireless.patch |   19 +++++++++----------
 2 files changed, 17 insertions(+), 12 deletions(-)


Property changes on: dhclient/repos/testing-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /dhclient/trunk:1-46695
   + /dhclient/trunk:1-46874

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2009-07-20 16:28:47 UTC (rev 46874)
+++ testing-x86_64/PKGBUILD	2009-07-20 16:29:27 UTC (rev 46875)
@@ -1,9 +1,9 @@
 #$Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Maintainer: Daniel Isenmann <daniel at archlinux.org>
 # Contributor: Mirko Messer <mirk at chao.ch>
 pkgname=dhclient 
 pkgver=3.1.2p1
-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,15 @@
 depends=('bash')
 options=('!makeflags')
 source=(ftp://ftp.isc.org/isc/dhcp/dhcp-${pkgver}.tar.gz \
+	fix-mac80211-wireless.patch
 	site.conf)
 md5sums=('787b2924a1965f0d8558521b36dca73d'
+         'c7b3e5e4e7a5ece9b4f351f00092e240'
          '2e6a845b18bcd188caeead3e47e91151')
 
 build() {
   cd ${startdir}/src/dhcp-${pkgver}
+  patch -Np1 -i ${startdir}/src/fix-mac80211-wireless.patch || return 1
 
   cp ${srcdir}/site.conf .
   ./configure
@@ -34,4 +37,7 @@
 
   #not needed after fresh install
   rm -f ${pkgdir}/var/lib/dhclient/dhcpd.leases
+  #deleting file conflicts to dhcpd
+  rm -rf ${pkgdir}/usr/include
+  rm -rf ${pkgdir}/usr/lib
 }

Modified: testing-x86_64/fix-mac80211-wireless.patch
===================================================================
--- testing-x86_64/fix-mac80211-wireless.patch	2009-07-20 16:28:47 UTC (rev 46874)
+++ testing-x86_64/fix-mac80211-wireless.patch	2009-07-20 16:29:27 UTC (rev 46875)
@@ -1,17 +1,16 @@
-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 @@
+--- dhcp-3.1.2p1/client/scripts/linux_orig	2006-07-22 04:24:16.000000000 +0200
++++ dhcp-3.1.2p1/client/scripts/linux	2009-07-20 18:20:54.000000000 +0200
+@@ -133,7 +133,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 ] || [ x$old_ip_address != x$new_ip_address ] || \
+@@ -168,7 +168,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
@@ -19,12 +18,12 @@
    fi
    if [ x$alias_ip_address != x ]; then
      ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
-@@ -228,7 +228,7 @@
+@@ -201,7 +201,7 @@
+     make_resolv_conf
      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
+