rpms/dhcp/F-11 dhclient-script,1.12,1.13 dhcp.spec,1.256,1.257

[David Cantrell]

Author: dcantrel

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

Modified Files:
	dhclient-script dhcp.spec 
Log Message:
* Fri Jun 26 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-22
- Fix SELinux denials in dhclient-script when the script makes backup
  configuration files and restores them later (#483747)



Index: dhclient-script
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-11/dhclient-script,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- dhclient-script	21 Apr 2009 21:14:51 -0000	1.12
+++ dhclient-script	27 Jun 2009 03:04:47 -0000	1.13
@@ -57,7 +57,9 @@ save_previous() {
     fi
 
     if [ -e ${origfile} ]; then
-        mv ${origfile} ${savefile}
+        contents="$(< ${origfile})"
+        echo "${contents}" > ${savefile}
+        rm -f ${origfile}
     else
         echo > ${savefile}
     fi
@@ -483,7 +485,9 @@ case "${reason}" in
                [[ "${DHCP_TIME_OFFSET_SETS_TIMEZONE}" = [yY1]* ]]; then
                 if [ -e ${SAVEDIR}/localtime.predhclient.${interface} ]; then
                     rm -f /etc/localtime
-                    mv ${SAVEDIR}/localtime.predhclient.${interface} /etc/localtime
+                    contents="$(< ${SAVEDIR}/localtime.predhclient.${interface})"
+                    echo "${contents}" > /etc/localtime
+                    rm -f ${SAVEDIR}/localtime.predhclient.${interface}
                     touch /etc/localtime
                     fix_context /etc/localtime
                 fi


Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-11/dhcp.spec,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -p -r1.256 -r1.257
--- dhcp.spec	27 Jun 2009 00:12:32 -0000	1.256
+++ dhcp.spec	27 Jun 2009 03:04:47 -0000	1.257
@@ -10,7 +10,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.1.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.
@@ -429,6 +429,10 @@ fi
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Fri Jun 26 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-22
+- Fix SELinux denials in dhclient-script when the script makes backup
+  configuration files and restores them later (#483747)
+
 * Fri Jun 26 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-21
 - Handle cases in add_timeout() where the function is called with a NULL
   value for the 'when' parameter (#506626)