[pm-utils] Removed restorecon hack from init_logfile, it is now correctly handled by selinux
Jaroslav Škarvada
jskarvad at fedoraproject.org
Wed Nov 30 14:58:13 UTC 2011
commit 71e6e49cd20a29f5e0dbfd20cc760da3d087fe31
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date: Wed Nov 30 15:58:08 2011 +0100
Removed restorecon hack from init_logfile, it is now correctly handled by selinux
pm-utils-1.4.1-init-logfile-append.patch | 3 +--
pm-utils.spec | 5 ++++-
2 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/pm-utils-1.4.1-init-logfile-append.patch b/pm-utils-1.4.1-init-logfile-append.patch
index 6c758af..0797826 100644
--- a/pm-utils-1.4.1-init-logfile-append.patch
+++ b/pm-utils-1.4.1-init-logfile-append.patch
@@ -1,13 +1,12 @@
--- pm-utils-1.4.1/pm/pm-functions.in.old 2010-07-04 16:50:13.000000000 +0200
+++ pm-utils-1.4.1/pm/pm-functions.in 2010-12-07 16:48:39.555074652 +0100
-@@ -271,7 +271,10 @@
+@@ -271,7 +271,9 @@
return 1
fi
export LOGGING=true
- exec > "$1" 2>&1
+ rm -f "$1"
+ touch "$1"
-+ [ -x /sbin/restorecon ] && /sbin/restorecon "$1"
+ exec >> "$1" 2>&1
}
diff --git a/pm-utils.spec b/pm-utils.spec
index 1485eec..b163177 100644
--- a/pm-utils.spec
+++ b/pm-utils.spec
@@ -3,7 +3,7 @@ Name: pm-utils
Summary: Power management utilities and scripts for Fedora
License: GPLv2
Version: 1.4.1
-Release: 13%{?dist}
+Release: 14%{?dist}
Group: System Environment/Base
URL: http://pm-utils.freedesktop.org
%ifnarch s390 s390x
@@ -110,6 +110,9 @@ rm -rf %{_localstatedir}/run/pm-utils/{pm-suspend,pm-powersave}/storage/*
%{_libdir}/pkgconfig/pm-utils.pc
%changelog
+* Wed Nov 30 2011 Jaroslav Škarvada <jskarvad at redhat.com> - 1.4.1-14
+- Removed restorecon hack from init_logfile, it is now correctly handled by selinux
+
* Wed Nov 02 2011 Jaroslav Škarvada <jskarvad at redhat.com> - 1.4.1-13
- Fixed line spacing in logs to be easier to read (log-line-spacing-fix patch)
Resolves: rhbz#750755
More information about the scm-commits
mailing list