diff options
Diffstat (limited to 'extra/dhcp')
| -rw-r--r-- | extra/dhcp/PKGBUILD | 14 | ||||
| -rw-r--r-- | extra/dhcp/dhclient-script-pathFixes.patch | 28 |
2 files changed, 30 insertions, 12 deletions
diff --git a/extra/dhcp/PKGBUILD b/extra/dhcp/PKGBUILD index 34c3e4448..3af4f8303 100644 --- a/extra/dhcp/PKGBUILD +++ b/extra/dhcp/PKGBUILD @@ -1,27 +1,27 @@ -# $Id: PKGBUILD 119729 2011-04-14 10:22:18Z daniel $ +# $Id: PKGBUILD 145313 2011-12-21 18:57:01Z daniel $ # Maintainer: Daniel Isenmann <daniel @archlinux.org> pkgbase=dhcp pkgname=('dhcp' 'dhclient') # separate patch levels with a period to maintain proper versioning. -pkgver=4.2.1.1 -_pkgver=4.2.1-P1 +pkgver=4.2.3.2 +_pkgver=4.2.3-P1 pkgrel=1 arch=('i686' 'x86_64') license=('custom:isc-dhcp') url="https://www.isc.org/software/dhcp" -source=(http://ftp.isc.org/isc/${pkgbase}/${pkgbase}-${_pkgver}.tar.gz +source=(ftp://ftp.isc.org/isc/${pkgbase}/${_pkgver}/${pkgbase}-${_pkgver}.tar.gz dhcp4 dhcp6 dhcp dhcp-4.1.1-missing-ipv6-not-fatal.patch dhclient-script-pathFixes.patch) -md5sums=('22e6f1eff6d5cfe2621a06cc62ba5b70' +md5sums=('04599f1557a5cafd10d7745267a68c8b' 'c49b1497837ba56c54e401a66e1bab9b' '12c2f3ae47ed23eb698eb7f1bfd80f20' '8f357e46e1efcbb746f38737a3f977a2' 'fd64aeb4f399dcc41ea43089a3811094' - 'ddcc5cd576ec631ade6c4da21952b50b') + '541b415a25a169eaf64b681405f79a80') build() { cd ${srcdir}/${pkgbase}-${_pkgver} @@ -66,7 +66,7 @@ package_dhcp(){ package_dhclient(){ pkgdesc="dhclient is standalone client from the dhcp package" - depends=('bash' 'iproute2') + depends=('bash' 'iproute2' 'net-tools') cd ${srcdir}/${pkgbase}-${_pkgver} make -C client DESTDIR=${pkgdir} install diff --git a/extra/dhcp/dhclient-script-pathFixes.patch b/extra/dhcp/dhclient-script-pathFixes.patch index e19c328d2..a4143ddde 100644 --- a/extra/dhcp/dhclient-script-pathFixes.patch +++ b/extra/dhcp/dhclient-script-pathFixes.patch @@ -1,5 +1,5 @@ ---- linux 2009-04-21 16:21:09.000000000 +0200 -+++ linux_new 2010-06-30 19:06:20.000000000 +0200 +--- linux 2011-05-18 20:01:54.000000000 +0000 ++++ linux_new 2011-12-21 18:45:41.487171012 +0000 @@ -23,7 +23,7 @@ # of the $1 in its args. @@ -9,7 +9,7 @@ make_resolv_conf() { if [ x"$new_domain_name_servers" != x ]; then -@@ -112,9 +112,9 @@ +@@ -122,9 +122,9 @@ if [ x$reason = xPREINIT ]; then if [ x$alias_ip_address != x ]; then # Bring down alias interface. Its routes will disappear too. @@ -21,7 +21,7 @@ # We need to give the kernel some time to get the interface up. sleep 1 -@@ -141,32 +141,32 @@ +@@ -151,25 +151,25 @@ if [ x$old_ip_address != x ] && [ x$alias_ip_address != x ] && \ [ x$alias_ip_address != x$old_ip_address ]; then # Possible new alias. Remove old alias. @@ -50,6 +50,24 @@ - route add default gw $router $metric_arg dev $interface + /sbin/route add default gw $router $metric_arg dev $interface done + else + # we haven't changed the address, have we changed other options +@@ -177,21 +177,21 @@ + if [ x$new_routers != x ] && [ x$new_routers != x$old_routers ] ; then + # if we've changed routers delete the old and add the new. + for router in $old_routers; do +- route del default gw $router ++ /sbin/route del default gw $router + done + for router in $new_routers; do + if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then +- route add -host $router dev $interface ++ /sbin/route add -host $router dev $interface + fi +- route add default gw $router $metric_arg dev $interface ++ /sbin/route add default gw $router $metric_arg dev $interface + done + fi fi if [ x$new_ip_address != x$alias_ip_address ] && [ x$alias_ip_address != x ]; then @@ -62,7 +80,7 @@ fi make_resolv_conf exit_with_hooks 0 -@@ -176,42 +176,42 @@ +@@ -201,42 +201,42 @@ || [ x$reason = xSTOP ]; then if [ x$alias_ip_address != x ]; then # Turn off alias interface. |