rpms/dhcp/devel dhclient-script,1.12,1.13 dhcp.spec,1.258,1.259

[David Cantrell]

Author: dcantrel

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

Modified Files:
	dhclient-script dhcp.spec 
Log Message:
* 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)
- 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/devel/dhclient-script,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- dhclient-script	21 Apr 2009 20:41:30 -0000	1.12
+++ dhclient-script	27 Jun 2009 03:17:04 -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/devel/dhcp.spec,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -p -r1.258 -r1.259
--- dhcp.spec	27 Jun 2009 00:09:13 -0000	1.258
+++ dhcp.spec	27 Jun 2009 03:17:04 -0000	1.259
@@ -432,6 +432,8 @@ fi
 * 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)
+- Fix SELinux denials in dhclient-script when the script makes backup
+  configuration files and restores them later (#483747)
 
 * Wed May 06 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-20
 - Obsolete libdhcp4client <= 12:4.0.0-34.fc10 (#499290)