rpms/dhcp/devel dhcp.spec, 1.76, 1.77 dhcp-3.0.3-bz173619.patch, 1.1, 1.2

[fedora-cvs-commits at redhat.com]

Author: jvdias

Update of /cvs/dist/rpms/dhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29670

Modified Files:
	dhcp.spec dhcp-3.0.3-bz173619.patch 
Log Message:
fix bugs 173619 171312 167028


Index: dhcp.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- dhcp.spec	18 Nov 2005 20:39:34 -0000	1.76
+++ dhcp.spec	21 Nov 2005 18:14:26 -0000	1.77
@@ -2,7 +2,7 @@
 Summary: A DHCP (Dynamic Host Configuration Protocol) server and relay agent.
 Name:    dhcp
 Version: 3.0.3
-Release: 12
+Release: 14
 Epoch:   11
 License: distributable
 Group: System Environment/Daemons

dhcp-3.0.3-bz173619.patch:
 linux |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

Index: dhcp-3.0.3-bz173619.patch
===================================================================
RCS file: /cvs/dist/rpms/dhcp/devel/dhcp-3.0.3-bz173619.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dhcp-3.0.3-bz173619.patch	18 Nov 2005 20:38:14 -0000	1.1
+++ dhcp-3.0.3-bz173619.patch	21 Nov 2005 18:14:26 -0000	1.2
@@ -1,19 +1,19 @@
---- dhcp-3.0.3/client/scripts/linux.bz173619	2005-11-18 13:55:07.000000000 -0500
-+++ dhcp-3.0.3/client/scripts/linux	2005-11-18 14:24:44.000000000 -0500
-@@ -240,8 +240,14 @@
+--- dhcp-3.0.3/client/scripts/linux.bz173619	2005-11-21 12:44:46.000000000 -0500
++++ dhcp-3.0.3/client/scripts/linux	2005-11-21 12:47:31.000000000 -0500
+@@ -240,9 +240,13 @@
  	    ifconfig $interface inet 0 down
  	fi
      fi
 -    if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \
 -	    [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
-+    if [ x$reason = xBOUND ] || [ x$reason = xREBOOT ] || \    
-+       [ x$old_ip_address  != x$new_ip_address ] || \
-+       [ x$old_subnet_mask != x$new_subnet_mask ] || \
-+       [ x$new_network_number != x$new_network_number ] || \
-+       [ x$old_broadcast_address != x$new_broadcast_address ] || \
-+       [ "x$old_routers" != "x$new_routers" ] || \
-+       [ x$old_interface_mtu != x$new_interface_mtu ] ; \
-+    then
- 
+-
++    if [ x$reason = xBOUND ] || [ x$reason = xREBOOT ] ||
++       [ x$old_ip_address  != x$new_ip_address ] ||
++       [ x$old_subnet_mask != x$new_subnet_mask ] ||
++       [ x$new_network_number != x$new_network_number ] ||
++       [ x$old_broadcast_address != x$new_broadcast_address ] ||
++       [ "x$old_routers" != "x$new_routers" ] ||
++       [ x$old_interface_mtu != x$new_interface_mtu ] ; then
  	if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 2 ) != 2 )); then
  	    ifconfig $interface inet $new_ip_address $new_subnet_arg \
+ 		$new_broadcast_arg