reenable dhcp stuff, remove some old prototypes

r17216

debian/changelog

@@ -5,6 +5,10 @@ netcfg (0.71) UNRELEASED; urgency=low
     - Evaluate argv[0] after calling basename on it so that we can strcmp it
       against "ptom". It somehow didn't happen in the internal dhclient-script
       context, but appeared during testing in the shell.
+    - Add Thomas Hood to Uploaders.
+    - Re-enable broadcast stuff in dhclient-script, fixing a Sparc (at least)
+      regression.
+    - Remove kill_dhcp_client prototype from netcfg.h because it's now static.
   * Thomas Hood
     - Change interfaces options that use underscore to hyphens. No loss
       of functionality. (Closes: #255185)

debian/control

@@ -2,7 +2,7 @@ Source: netcfg
 Section: debian-installer
 Priority: optional
 Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
-Uploaders: David Kimdon <dwhedon@debian.org>, Tollef Fog Heen <tfheen@debian.org>, Matt Kraai <kraai@debian.org>, Joey Hess <joeyh@debian.org>, Joshua Kwan <joshk@triplehelix.org>
+Uploaders: David Kimdon <dwhedon@debian.org>, Tollef Fog Heen <tfheen@debian.org>, Matt Kraai <kraai@debian.org>, Joey Hess <joeyh@debian.org>, Joshua Kwan <joshk@triplehelix.org>, Thomas Hood <jdthood@yahoo.co.uk>
 Build-Depends: debhelper (>= 4.2.0), dpkg-dev (>= 1.9.0), libdebconfclient0-dev (>= 0.46), libdebian-installer4-dev, po-debconf (>= 0.5.0), libiw-dev
 Standards-Version: 3.6.1.0
 

dhclient-script

@@ -38,6 +38,13 @@ if [ -n "$old_subnet_mask" ]; then
     old_mask="/$(ptom $old_subnet_mask)"
 fi
 
+if [ -n "$new_broadcast_address" ]; then
+    new_broadcast_arg="broadcast $new_broadcast_address"
+fi
+if [ -n "$old_broadcast_address" ]; then
+    old_broadcast_arg="broadcast $old_broadcast_address"
+fi
+    
 # Execute the operation
 case "$reason" in
     MEDIUM|ARPCHECK|ARPSEND)
@@ -57,7 +64,7 @@ case "$reason" in
              [ "$old_ip_address" != "$new_ip_address" ]; then
             # IP address changed. Bringing down the interface will delete all routes,
             # and clear the ARP cache.
-            ip addr del $old_ip_address$old_mask dev $interface
+            ip addr del $old_ip_address$old_mask $old_broadcast_arg dev $interface
             ip link set $interface down
         fi
 
@@ -70,7 +77,7 @@ case "$reason" in
 
             ip link set $interface up
 	    ip addr flush dev $interface
-            ip addr add $new_ip_address$new_mask dev $interface
+            ip addr add $new_ip_address$new_mask $new_broadcast_arg dev $interface
 
             for router in $new_routers; do
                 ip route add default via $router

netcfg.h

@@ -92,7 +92,6 @@ extern int netcfg_get_static(struct debconfclient *client);
 
 extern int netcfg_activate_dhcp(struct debconfclient *client);
 
-extern int kill_dhcp_client(void);
 extern int ask_dhcp_retry (struct debconfclient *client);
 extern int netcfg_activate_static(struct debconfclient *client);