rpms/dhcp/devel dhclient-script,1.7,1.8 dhcp.spec,1.245,1.246

[David Cantrell]

Author: dcantrel

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

Modified Files:
	dhclient-script dhcp.spec 
Log Message:
* Wed Mar 11 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-12
- Fix problems with dhclient.d script execution (#488864)



Index: dhclient-script
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhclient-script,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dhclient-script	6 Mar 2009 00:57:04 -0000	1.7
+++ dhclient-script	11 Mar 2009 19:12:56 -0000	1.8
@@ -364,7 +364,9 @@
         for f in /etc/dhcp/dhclient.d/*.sh ; do
             if [ -x ${f} ]; then
                 subsystem="${f%.sh}"
-                . ${f} "${subsystem}_config"
+                subsystem="${subsystem##*/}"
+                . ${f}
+                "${subsystem}_config"
             fi
         done
     fi
@@ -490,7 +492,9 @@
             for f in /etc/dhcp/dhclient.d/*.sh ; do
                 if [ -x ${f} ]; then
                     subsystem="${f%.sh}"
-                    . ${f} "${subsystem}_restore"
+                    subsystem="${subsystem##*/}"
+                    . ${f}
+                    "${subsystem}_restore"
                 fi
             done
         fi


Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -r1.245 -r1.246
--- dhcp.spec	9 Mar 2009 23:01:07 -0000	1.245
+++ dhcp.spec	11 Mar 2009 19:12:56 -0000	1.246
@@ -4,7 +4,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.1.0
-Release:  11%{?dist}
+Release:  12%{?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.
@@ -413,6 +413,9 @@
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Wed Mar 11 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-12
+- Fix problems with dhclient.d script execution (#488864)
+
 * Mon Mar 09 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-11
 - Use LDAP configuration patch from upstream tarball