From 91ae67bfa89beb6e8600fa430ffce341ef5bfab4 Mon Sep 17 00:00:00 2001
From: David Cantrell <dcantrel@fedoraproject.org>
Date: Mar 11 2009 19:12:56 +0000
Subject: - Fix problems with dhclient.d script execution (#488864)


---

diff --git a/dhclient-script b/dhclient-script
index 9a2bea0..5d7ffe1 100755
--- a/dhclient-script
+++ b/dhclient-script
@@ -364,7 +364,9 @@ dhconfig() {
         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 @@ case "${reason}" in
             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
diff --git a/dhcp.spec b/dhcp.spec
index 37b442b..ca7ed99 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -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 @@ fi
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Wed Mar 11 2009 David Cantrell <dcantrell@redhat.com> - 12:4.1.0-12
+- Fix problems with dhclient.d script execution (#488864)
+
 * Mon Mar 09 2009 David Cantrell <dcantrell@redhat.com> - 12:4.1.0-11
 - Use LDAP configuration patch from upstream tarball