rpms/pm-utils/F-7 pm-utils-0.99.3-selinux.patch, NONE, 1.1 pm-utils.spec, 1.61, 1.62

Peter Jones (pjones) fedora-extras-commits at redhat.com
Mon May 21 19:12:00 UTC 2007


Author: pjones

Update of /cvs/extras/rpms/pm-utils/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1718

Modified Files:
	pm-utils.spec 
Added Files:
	pm-utils-0.99.3-selinux.patch 
Log Message:
- don't remove logfile, just truncate, so we don't screw up the selinux context


pm-utils-0.99.3-selinux.patch:

--- NEW FILE pm-utils-0.99.3-selinux.patch ---
--- pm-utils-0.99.3/pm/functions.selinux	2007-05-21 15:08:10.000000000 -0400
+++ pm-utils-0.99.3/pm/functions	2007-05-21 15:08:41.000000000 -0400
@@ -141,7 +141,6 @@
 pm_main()
 {
 	if [ -n "$PM_LOGFILE" ]; then
-		[ -f "$PM_LOGFILE" ] && rm -f "$PM_LOGFILE"
 		exec > "$PM_LOGFILE" 2>&1
 	fi
 	take_suspend_lock || exit 1


Index: pm-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/pm-utils/F-7/pm-utils.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- pm-utils.spec	16 May 2007 21:50:55 -0000	1.61
+++ pm-utils.spec	21 May 2007 19:11:25 -0000	1.62
@@ -2,7 +2,7 @@
 Summary: Power management utilities and scripts for Fedora Core
 License: GPL
 Version: 0.99.3
-Release: 5%{?dist}
+Release: 6%{?dist}
 Group: System Environment/Base
 ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64
 Requires: usermode kbd pciutils >= 2.2.1
@@ -35,6 +35,7 @@
 Patch0: pm-utils-0.99.3-disable.patch
 #Patch1: pm-utils-0.19-vidhooks.patch
 Patch2: pm-utils-0.99.3-vbe-redirect.patch
+Patch3: pm-utils-0.99.3-selinux.patch
 
 Patch10: vbetool-0.3-fix-gcc4bug.patch
 Patch11: vbetool-libz.patch
@@ -53,6 +54,7 @@
 %patch0 -p1 -b .disable
 #%patch1 -p1 -b .vidhooks
 %patch2 -p1 -b .vbe-redirect
+%patch3 -p1 -b .selinux
 
 %patch10 -p0 -b .gcc4
 %patch11 -p0 -b .zlib
@@ -171,6 +173,9 @@
 %ghost %verify(not md5 size mtime) /var/log/pm-suspend.log
 
 %changelog
+* Mon May 21 2007 Peter Jones <pjones at redhat.com> - 0.99.3-6
+- Don't remove the logfile before creating it.
+
 * Wed May 16 2007 Peter Jones <pjones at redhat.com> - 0.99.3-5
 - ... and create the directory the logfile goes in.
 




More information about the fedora-extras-commits mailing list