[arch-commits] Commit in dhcp/trunk (3 files)

Daniel Isenmann daniel at archlinux.org
Wed Jun 30 13:48:48 EDT 2010


    Date: Wednesday, June 30, 2010 @ 13:48:47
  Author: daniel
Revision: 84525

upgpkg: dhcp 4.1.1.p1-1
New upstream release and fix for FS#18015 and FS#18701

Added:
  dhcp/trunk/dhcp-4.1.1-missing-ipv6-not-fatal.patch
Modified:
  dhcp/trunk/PKGBUILD
  dhcp/trunk/dhclient-script-pathFixes.patch

-----------------------------------------+
 PKGBUILD                                |   16 +++----
 dhclient-script-pathFixes.patch         |   65 ++++++++++--------------------
 dhcp-4.1.1-missing-ipv6-not-fatal.patch |   39 ++++++++++++++++++
 3 files changed, 69 insertions(+), 51 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-06-30 17:48:41 UTC (rev 84524)
+++ PKGBUILD	2010-06-30 17:48:47 UTC (rev 84525)
@@ -4,26 +4,26 @@
 pkgname=('dhcp'
          'dhclient')
 # separate patch levels with a period to maintain proper versioning.
-pkgver=4.1.0.p1
-_pkgver=4.1.0p1
-pkgrel=3
+pkgver=4.1.1.p1
+_pkgver=4.1.1-P1
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('custom:isc-dhcp')
 url="https://www.isc.org/software/dhcp"
 source=(http://ftp.isc.org/isc/${pkgname}/${pkgname}-${_pkgver}.tar.gz
-dhcpd dhcp.conf.d dhcp-4.1.0-missing-ipv6-not-fatal.patch dhclient-script-pathFixes.patch)
-md5sums=('325ff8338c5a21f89d5304ac13ffebdf'
+dhcpd dhcp.conf.d dhcp-4.1.1-missing-ipv6-not-fatal.patch dhclient-script-pathFixes.patch)
+md5sums=('ee390a35687dd75dbfc32c856c0938d1'
          'df22cffa7d7415ece7bb025b7bf774dd'
          '49da3192e5c885e3c7d02f447c2dea5e'
-         'edf327eabb82e54b1e9d80b2750134ed'
-         '4dbce386a6cb4fd7c8cebd4fb432b5db')
+         'fd64aeb4f399dcc41ea43089a3811094'
+         'ddcc5cd576ec631ade6c4da21952b50b')
 
 build() {
   cd ${srcdir}/${pkgname}-${_pkgver}
   # Define _GNU_SOURCE to fix IPV6.
   sed '/^CFLAGS="$CFLAGS/ s/INGS"/INGS -D_GNU_SOURCE"/' -i configure
   # Make not having ipv6 non-fatal.
-  patch -Np0 -i ${srcdir}/dhcp-4.1.0-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 \
       --with-srv6-lease-file=/var/state/dhcp/dhcpd6.leases

Modified: dhclient-script-pathFixes.patch
===================================================================
--- dhclient-script-pathFixes.patch	2010-06-30 17:48:41 UTC (rev 84524)
+++ dhclient-script-pathFixes.patch	2010-06-30 17:48:47 UTC (rev 84525)
@@ -1,37 +1,27 @@
---- linux	2008-05-23 15:56:07.000000000 +0200
-+++ linux_new	2010-01-17 15:40:45.000000000 +0100
-@@ -8,7 +8,7 @@
+--- linux	2009-04-21 16:21:09.000000000 +0200
++++ linux_new	2010-06-30 19:06:20.000000000 +0200
+@@ -23,7 +23,7 @@
+ # of the $1 in its args.
  
- # 0. This script is based on the netbsd script supplied with dhcp-970306.
+ # 'ip' just looks too weird.  /sbin/ip looks less weird.
+-ip=/sbin/ip
++ip=/usr/sbin/ip
  
--# 1. ifconfig down apparently deletes all relevant routes and flushes
-+# 1. /sbin/ifconfig down apparently deletes all relevant routes and flushes
- # the arp cache, so this doesn't need to be done explicitly.
- 
- # 2. The alias address handling here has not been tested AT ALL.
-@@ -111,16 +111,16 @@
+ make_resolv_conf() {
+   if [ x"$new_domain_name_servers" != x ]; then
+@@ -112,9 +112,9 @@
  if [ x$reason = xPREINIT ]; then
    if [ x$alias_ip_address != x ]; then
      # Bring down alias interface. Its routes will disappear too.
 -    ifconfig $interface:0- inet 0
 +    /sbin/ifconfig $interface:0- inet 0
    fi
-   if [ $relmajor -lt 2 ] || ( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] )
-    then
--    ifconfig $interface inet 0.0.0.0 netmask 0.0.0.0 \
-+    /sbin/ifconfig $interface inet 0.0.0.0 netmask 0.0.0.0 \
- 		broadcast 255.255.255.255 up
--    # Add route to make broadcast work. Do not omit netmask.
--    route add default dev $interface netmask 0.0.0.0
-+    # Add /sbin/route to make broadcast work. Do not omit netmask.
-+    /sbin/route add default dev $interface netmask 0.0.0.0
-   else
--    ifconfig $interface 0 up
-+    /sbin/ifconfig $interface 0 up
-   fi
+-  ifconfig $interface 0 up
++  /sbin/ifconfig $interface 0 up
  
    # We need to give the kernel some time to get the interface up.
-@@ -147,36 +147,36 @@
+   sleep 1
+@@ -141,32 +141,32 @@
    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,21 +40,15 @@
  
 -    ifconfig $interface inet $new_ip_address $new_subnet_arg \
 +    /sbin/ifconfig $interface inet $new_ip_address $new_subnet_arg \
- 							$new_broadcast_arg
--    # Add a network route to the computed network address.
-+    # Add a network /sbin/route to the computed network address.
-     if [ $relmajor -lt 2 ] || \
- 		( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] ); then
--      route add -net $new_network_number $new_subnet_arg dev $interface
-+      /sbin/route add -net $new_network_number $new_subnet_arg dev $interface
-     fi
+ 					$new_broadcast_arg $mtu_arg
+     # Add a network route to the computed network address.
      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
-+      /sbin/route add default gw $router
+-      route add default gw $router $metric_arg dev $interface
++      /sbin/route add default gw $router $metric_arg dev $interface
      done
    fi
    if [ x$new_ip_address != x$alias_ip_address ] && [ x$alias_ip_address != x ];
@@ -78,7 +62,7 @@
    fi
    make_resolv_conf
    exit_with_hooks 0
-@@ -186,46 +186,46 @@
+@@ -176,42 +176,42 @@
     || [ x$reason = xSTOP ]; then
    if [ x$alias_ip_address != x ]; then
      # Turn off alias interface.
@@ -106,7 +90,7 @@
    fi
 -  ifconfig $interface inet $new_ip_address $new_subnet_arg \
 +  /sbin/ifconfig $interface inet $new_ip_address $new_subnet_arg \
- 					$new_broadcast_arg
+ 					$new_broadcast_arg $mtu_arg
    set $new_routers
    if ping -q -c 1 $1; then
      if [ x$new_ip_address != x$alias_ip_address ] && \
@@ -116,18 +100,13 @@
 +      /sbin/ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
 +      /sbin/route add -host $alias_ip_address dev $interface:0
      fi
-     if [ $relmajor -lt 2 ] || \
- 		( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] ); then
--      route add -net $new_network_number
-+      /sbin/route add -net $new_network_number
-     fi
      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
-+      /sbin/route add default gw $router
+-      route add default gw $router $metric_arg dev $interface
++      /sbin/route add default gw $router $metric_arg dev $interface
      done
      make_resolv_conf
      exit_with_hooks 0

Added: dhcp-4.1.1-missing-ipv6-not-fatal.patch
===================================================================
--- dhcp-4.1.1-missing-ipv6-not-fatal.patch	                        (rev 0)
+++ dhcp-4.1.1-missing-ipv6-not-fatal.patch	2010-06-30 17:48:47 UTC (rev 84525)
@@ -0,0 +1,39 @@
+--- common/discover.c	2009-09-29 21:44:49.000000000 +0200
++++ common/discover.c_new	2010-06-30 19:40:02.000000000 +0200
+@@ -443,7 +443,7 @@
+ 	}
+ 
+ #ifdef DHCPv6
+-	if (local_family == AF_INET6) {
++	if ((local_family == AF_INET6) && !access("/proc/net/if_inet6", R_OK)) {
+ 		ifaces->fp6 = fopen("/proc/net/if_inet6", "r");
+ 		if (ifaces->fp6 == NULL) {
+ 			log_error("Error opening '/proc/net/if_inet6' to "
+@@ -454,6 +454,8 @@
+ 			ifaces->fp = NULL;
+ 			return 0;
+ 		}
++	} else {
++		ifaces->fp6 = NULL;
+ 	}
+ #endif
+ 
+@@ -721,7 +723,7 @@
+ 		return 1;
+ 	}
+ #ifdef DHCPv6
+-	if (!(*err)) {
++	if (!(*err) && ifaces->fp6) {
+ 		if (local_family == AF_INET6)
+ 			return next_iface6(info, err, ifaces);
+ 	}
+@@ -740,7 +742,8 @@
+ 	ifaces->sock = -1;
+ #ifdef DHCPv6
+ 	if (local_family == AF_INET6) {
+-		fclose(ifaces->fp6);
++		if(ifaces->fp6)
++			fclose(ifaces->fp6);
+ 		ifaces->fp6 = NULL;
+ 	}
+ #endif



More information about the arch-commits mailing list