From f6cc437735972afa2694f761419ab9b946a9514b Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Fri, 21 Aug 2009 19:30:00 +0000 Subject: [PATCH] =?UTF-8?q?*=20Fri=20Aug=2021=202009=20Ville=20Skytt=C3=A4?= =?UTF-8?q?=20=20-=202.0.71-9=20-=20Don't=20try=20to?= =?UTF-8?q?=20remove=20restorecond=20after=20last=20erase=20(done=20alread?= =?UTF-8?q?y=20in=20%preun).=20-=20Ensure=20scriptlets=20exit=20with=20sta?= =?UTF-8?q?tus=200.=20-=20Fix=20%post=20and=20%pr?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- policycoreutils.spec | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/policycoreutils.spec b/policycoreutils.spec index 45d53b1..b8f3940 100644 --- a/policycoreutils.spec +++ b/policycoreutils.spec @@ -6,7 +6,7 @@ Summary: SELinux policy core utilities Name: policycoreutils Version: 2.0.71 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2+ Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -29,7 +29,8 @@ BuildRequires: pam-devel libsepol-static >= %{libsepolver} libsemanage-devel >= BuildRequires: desktop-file-utils dbus-devel dbus-glib-devel Requires: /bin/mount /bin/egrep /bin/awk /usr/bin/diff rpm /bin/sed Requires: libsepol >= %{libsepolver} coreutils checkpolicy libselinux-utils >= %{libselinuxver} -Requires(post): /sbin/service /sbin/chkconfig +Requires(post): /sbin/chkconfig +Requires(preun): /sbin/service /sbin/chkconfig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -251,6 +252,7 @@ if [ $1 -eq 0 ]; then /sbin/service restorecond stop > /dev/null 2>&1 /sbin/chkconfig --del restorecond fi +exit 0 %post /sbin/chkconfig --add restorecond @@ -259,12 +261,15 @@ exit 0 %postun if [ "$1" -ge "1" ]; then [ -x /sbin/service ] && /sbin/service restorecond condrestart > /dev/null -else - [ -x /sbin/service ] && /sbin/service restorecond stop > /dev/null - /sbin/chkconfig --del restorecond fi +exit 0 %changelog +* Fri Aug 21 2009 Ville Skyttä - 2.0.71-9 +- Don't try to remove restorecond after last erase (done already in %%preun). +- Ensure scriptlets exit with status 0. +- Fix %%post and %%pr + * Fri Aug 21 2009 Tomas Mraz - 2.0.71-8 - rebuilt with new audit