diff --git a/PKGBUILD b/PKGBUILD index 34c3e44..1233d8d 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -5,23 +5,23 @@ 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') + '97d67d87054a12d5799e11d95c0133fc') build() { cd ${srcdir}/${pkgbase}-${_pkgver} @@ -30,7 +30,7 @@ build() { sed '/^CFLAGS="$CFLAGS/ s/INGS"/INGS -D_GNU_SOURCE"/' -i configure # Make not having ipv6 non-fatal. - patch -Np0 -i ${srcdir}/dhcp-4.1.1-missing-ipv6-not-fatal.patch +# patch -Np0 -i ${srcdir}/dhcp-4.1.1-missing-ipv6-not-fatal.patch ./configure --prefix=/usr --sysconfdir=/etc \ --with-srv-lease-file=/var/state/dhcp/dhcpd.leases \ @@ -48,7 +48,7 @@ package_dhcp(){ depends=('openssl>=0.9.8a') backup=('etc/dhcpd.conf' 'etc/conf.d/dhcp') install=dhcp.install - + cd ${srcdir}/${pkgbase}-${_pkgver} make DESTDIR=${pkgdir} install @@ -59,7 +59,7 @@ package_dhcp(){ # Remove dhclient make -C client DESTDIR=${pkgdir} uninstall - + # install license install -m644 -D LICENSE ${pkgdir}/usr/share/licenses/dhcp/LICENSE } @@ -73,7 +73,7 @@ package_dhclient(){ # move dhclient.conf to dhclient.conf.example mv ${pkgdir}/etc/dhclient.conf{,.example} - + mkdir -p ${pkgdir}/var/state/dhclient # install dhclient linux script diff --git a/dhclient-script-pathFixes.patch b/dhclient-script-pathFixes.patch index e19c328..95b427f 100644 --- a/dhclient-script-pathFixes.patch +++ b/dhclient-script-pathFixes.patch @@ -1,5 +1,7 @@ ---- linux 2009-04-21 16:21:09.000000000 +0200 -+++ linux_new 2010-06-30 19:06:20.000000000 +0200 +diff --git a/linux b/linux +index 14655f0..f779437 100755 +--- a/linux ++++ b/linux @@ -23,7 +23,7 @@ # of the $1 in its args. @@ -9,7 +11,7 @@ make_resolv_conf() { if [ x"$new_domain_name_servers" != x ]; then -@@ -112,9 +112,9 @@ +@@ -122,9 +122,9 @@ fi if [ x$reason = xPREINIT ]; then if [ x$alias_ip_address != x ]; then # Bring down alias interface. Its routes will disappear too. @@ -21,7 +23,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$reason = xBOUND ] || [ x$reason = xRENEW ] || \ 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 +52,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$reason = xBOUND ] || [ x$reason = xRENEW ] || \ + 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 +82,7 @@ fi make_resolv_conf exit_with_hooks 0 -@@ -176,42 +176,42 @@ +@@ -201,42 +201,42 @@ if [ x$reason = xEXPIRE ] || [ x$reason = xFAIL ] || [ x$reason = xRELEASE ] \ || [ x$reason = xSTOP ]; then if [ x$alias_ip_address != x ]; then # Turn off alias interface.