rpms/dhcp/devel dhclient-script,1.5,1.6 dhcp.spec,1.241,1.242

[David Cantrell]

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9890

Modified Files:
	dhclient-script dhcp.spec 
Log Message:
* Wed Feb 18 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-8
- Correct subsystem execution in dhclient-script (#486251)



Index: dhclient-script
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhclient-script,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dhclient-script	18 Feb 2009 04:12:59 -0000	1.5
+++ dhclient-script	19 Feb 2009 03:23:10 -0000	1.6
@@ -358,9 +358,8 @@
     if [ -d /etc/dhcp/dhclient.d ]; then
         for f in /etc/dhcp/dhclient.d/*.sh ; do
             if [ -x ${f} ]; then
-                subsystem="$(basename ${f} .sh)"
-                . ${f}
-                \${subsystem}_config
+                subsystem="${f%.sh}"
+                . ${f} "${subsystem}_config"
             fi
         done
     fi


Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -r1.241 -r1.242
--- dhcp.spec	18 Feb 2009 20:02:39 -0000	1.241
+++ dhcp.spec	19 Feb 2009 03:23:10 -0000	1.242
@@ -4,7 +4,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.1.0
-Release:  7%{?dist}
+Release:  8%{?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.
@@ -419,6 +419,9 @@
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Wed Feb 18 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-8
+- Correct subsystem execution in dhclient-script (#486251)
+
 * Wed Feb 18 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-7
 - Do not segfault if the ipv6 kernel module is not loaded (#486097)