rpms/dhcp/F-9 dhcp-4.0.0-inherit-leases.patch, 1.1, 1.2 dhcp.spec, 1.215, 1.216 linux, 1.17, 1.18

[David Cantrell]

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25029

Modified Files:
	dhcp-4.0.0-inherit-leases.patch dhcp.spec linux 
Log Message:
* Tue Nov 11 2008 David Cantrell <dcantrell at redhat.com> - 12:4.0.0-22
- Correctly source ifcfg-DEVICE files (#471126)
- Honor $keep_old_ip in dhclient-script (#453982)


dhcp-4.0.0-inherit-leases.patch:

Index: dhcp-4.0.0-inherit-leases.patch
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-9/dhcp-4.0.0-inherit-leases.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dhcp-4.0.0-inherit-leases.patch	1 Aug 2008 22:23:11 -0000	1.1
+++ dhcp-4.0.0-inherit-leases.patch	11 Nov 2008 21:46:30 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up dhcp-4.0.0/client/dhclient.c.inherit dhcp-4.0.0/client/dhclient.c
---- dhcp-4.0.0/client/dhclient.c.inherit	2008-08-01 11:34:29.000000000 -1000
-+++ dhcp-4.0.0/client/dhclient.c	2008-08-01 11:34:42.000000000 -1000
+--- dhcp-4.0.0/client/dhclient.c.inherit	2008-11-11 11:33:43.000000000 -1000
++++ dhcp-4.0.0/client/dhclient.c	2008-11-11 11:34:27.000000000 -1000
 @@ -2296,6 +2296,7 @@ void send_request (cpp)
  {
  	struct client_state *client = cpp;
@@ -18,11 +18,11 @@
 +		if (client -> interface -> addresses != NULL) {
 +			for (i = 0; i < client -> interface -> address_count; i++) {
 +				if (client -> active &&
-+				    client -> active -> is_bootp &&
++				    !client -> active -> is_bootp &&
 +				    client -> active -> expiry > cur_time &&
 +				    client -> interface -> addresses[i].s_addr != 0 &&
 +				    client -> active -> address.len == 4 &&
-+				    memcpy (client -> active -> address.iabuf, &(client -> interface -> addresses[i]), 4) == 0) {
++				    memcmp (client -> active -> address.iabuf, &(client -> interface -> addresses[i]), 4) == 0) {
 +					client_envadd (client, "", "keep_old_ip", "%s", "yes");
 +					break;
 +				}


Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-9/dhcp.spec,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -r1.215 -r1.216
--- dhcp.spec	29 Oct 2008 23:53:15 -0000	1.215
+++ dhcp.spec	11 Nov 2008 21:46:30 -0000	1.216
@@ -4,7 +4,7 @@
 Summary:  DHCP (Dynamic Host Configuration Protocol) server and relay agent
 Name:     dhcp
 Version:  4.0.0
-Release:  21%{?dist}
+Release:  22%{?dist}
 # NEVER CHANGE THE EPOCH on this package.  The previous maintainer (prior to
 # dcantrell maintaining the package) made incorrect use of the epoch and
 # that's why it is at 12 now.  It should have never been used, but it was.
@@ -430,6 +430,10 @@
 %{_libdir}/libdhcp4client.so
 
 %changelog
+* Tue Nov 11 2008 David Cantrell <dcantrell at redhat.com> - 12:4.0.0-22
+- Correctly source ifcfg-DEVICE files (#471126)
+- Honor $keep_old_ip in dhclient-script (#453982)
+
 * Wed Oct 29 2008 David Cantrell <dcantrell at redhat.com> - 12:4.0.0-21
 - Use O_CLOEXEC in open(2) calls and "e" mode in fopen(3) calls, build
   with -D_GNU_SOURCE so we pick up O_CLOEXEC (#468938)


Index: linux
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-9/linux,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- linux	29 Oct 2008 23:53:15 -0000	1.17
+++ linux	11 Nov 2008 21:46:30 -0000	1.18
@@ -112,17 +112,12 @@
 [ -f ../networking/network ] && . ../networking/network
 
 CONFIG=$interface
-
-need_config ${CONFIG}
-
-if [ -f "${CONFIG}" ]; then 
-    source_config
-else
-    echo $"$0: configuration for $interface not found. Continuing with defaults." >&2
+if [ -d /etc/sysconfig/network-scripts ]; then
+    cd /etc/sysconfig/network-scripts
+    need_config ${CONFIG}
+    source_config >/dev/null 2>&1
 fi
 
-source_config
-
 release=$(uname -r)
 relmajor=$(echo $release | cut -f1 -d'.')
 relminor=$(echo $release | cut -f2 -d'.')