[dhcp/f17] dhclient-script: fixed CONFIG variable value passed to need_config (#848858)

[Tomas Hozza]

commit 55e7ba0d5c532ba39649b4f9ddab4d56229b0b7f
Author: Tomas Hozza <thozza at redhat.com>
Date:   Mon Aug 20 12:27:52 2012 +0200

    dhclient-script: fixed CONFIG variable value passed to need_config (#848858)

 dhclient-script |    2 +-
 dhcp.spec       |   11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/dhclient-script b/dhclient-script
index d6a4d68..f43f4eb 100644
--- a/dhclient-script
+++ b/dhclient-script
@@ -643,7 +643,7 @@ if [ -f /etc/sysconfig/networking/network ]; then
 fi
 
 cd /etc/sysconfig/network-scripts
-CONFIG="ifcfg-${interface}"
+CONFIG="${interface}"
 need_config ${CONFIG}
 source_config >/dev/null 2>&1
 
diff --git a/dhcp.spec b/dhcp.spec
index 40140c2..76b6db4 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -18,7 +18,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.2.4
-Release:  9.%{patchver}%{?dist}
+Release:  10.%{patchver}%{?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.
@@ -258,6 +258,7 @@ rm bind/bind.tar.gz
 %patch23 -p1 -b .retransmission
 
 # RFC 3442 - Classless Static Route Option for DHCPv4 (#516325)
+# (Submitted to dhcp-bugs at isc.org - [ISC-Bugs #24572])
 %patch25 -p1 -b .rfc3442
 
 # check whether there is any unexpired address in previous lease
@@ -298,20 +299,25 @@ rm bind/bind.tar.gz
 %patch39 -p1 -b .getifaddrs
 
 # Don't use fallback_interface when releasing lease (#800561)
+# (Submitted to dhcp-bugs at isc.org - [ISC-Bugs #30544])
 %patch40 -p1 -b .send_release
 
 # RFC5970 - DHCPv6 Options for Network Boot (#798735)
 %patch41 -p1 -b .rfc5970
 
 # Dhcpd does not correctly follow DhcpFailOverPeerDN (#838400)
+# (Submitted to dhcp-bugs at isc.org - [ISC-Bugs #30402])
 %patch42 -p1 -b .failOverPeer
 
 # Dhclient does not correctly parse zero-length options in dhclient6.leases (#633318)
+# (Submitted to dhcp-bugs at isc.org - [ISC-Bugs #27314])
 %patch43 -p1 -b .dhclient6-leases_semicolon
 
 # isc_time_nowplusinterval() is not safe with 64-bit time_t (#662254, #789601)
+# (Submitted to dhcp-bugs at isc.org - [ISC-Bugs #28038])
 %patch44 -p1 -b .interval
 
+
 pushd contrib
 %{__chmod} -x 3.0b1-lease-convert dhclient-tz-exithook.sh ldap/dhcpd-conf-to-ldap
 %{__chmod} -x sethostname.sh solaris.init
@@ -579,6 +585,9 @@ fi
 
 
 %changelog
+* Mon Aug 20 2012 Tomas Hozza <thozza at redhat.com> - 12:4.2.4-10.P1
+- dhclient-script: fixed CONFIG variable value passed to need_config (#848858)
+
 * Fri Jul 27 2012 Jiri Popelka <jpopelka at redhat.com> - 12:4.2.4-9.P1
 - isc_time_nowplusinterval() is not safe with 64-bit time_t (#662254, #789601)