From 04a40d1acf901c271b355171c53ae8ad025dd243 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= <arekm@maven.pl>
Date: Wed, 17 Mar 2010 20:11:49 +0000
Subject: [PATCH] - rel 3; init function fixes

Changed files:
    apparmor-parser-rc.patch -> 1.1
    apparmor-parser.spec -> 1.28
---
 apparmor-parser-rc.patch | 31 +++++++++++++++++++++++++++++++
 apparmor-parser.spec     |  4 +++-
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 apparmor-parser-rc.patch

diff --git a/apparmor-parser-rc.patch b/apparmor-parser-rc.patch
new file mode 100644
index 0000000..866c98c
--- /dev/null
+++ b/apparmor-parser-rc.patch
@@ -0,0 +1,31 @@
+--- rc.apparmor.functions.org	2010-03-17 21:06:13.768595265 +0100
++++ rc.apparmor.functions	2010-03-17 21:08:34.122087900 +0100
+@@ -173,7 +173,7 @@
+ 			exit 1
+ 			;;
+ 	esac
+-	aa_log_action_begin "$PARSER_MSG"
++	aa_log_action_start "$PARSER_MSG"
+ 	# run the parser on all of the apparmor profiles
+ 	if [ ! -f "$PARSER" ]; then
+ 		aa_log_failure_msg "AppArmor parser not found"
+@@ -412,9 +412,9 @@
+ 
+ 	retval=0
+ 	#the list of profiles isn't stable once we start adding or removing
+-	#them so stor to tmp first
++	#them so store to tmp first (in reverse order so hat profiles are removed first)
+ 	MODULE_PLIST=$(mktemp ${APPARMOR_TMPDIR}/tmp.XXXXXXXX)
+-	sed -e "s/ (\(enforce\|complain\))$//" "$SFS_MOUNTPOINT/profiles" | sort >"$MODULE_PLIST"
++	sed -e "s/ (\(enforce\|complain\))$//" "$SFS_MOUNTPOINT/profiles" | sort -r > "$MODULE_PLIST"
+ 	cat "$MODULE_PLIST" | while read profile ; do
+ 		echo -n "$profile" > "$SFS_MOUNTPOINT/.remove"
+ 		rc=$?
+@@ -430,7 +430,7 @@
+ 	aa_log_daemon_msg "Unloading AppArmor profiles "
+ 	remove_profiles
+ 	rc=$?
+-	log_end_msg $rc
++	aa_log_end_msg $rc
+ 	return $rc
+ }
\ No newline at end of file
diff --git a/apparmor-parser.spec b/apparmor-parser.spec
index 57a9812..51aeaf7 100644
--- a/apparmor-parser.spec
+++ b/apparmor-parser.spec
@@ -5,7 +5,7 @@ Summary:	AppArmor userlevel parser utility
 Summary(pl.UTF-8):	Narzędzie przestrzeni użytkownika do przetwarzania AppArmor
 Name:		apparmor-parser
 Version:	2.5
-Release:	2
+Release:	3
 Epoch:		1
 License:	GPL
 Group:		Applications/System
@@ -13,6 +13,7 @@ Source0:	http://kernel.org/pub/linux/security/apparmor/AppArmor-%{version}/AppAr
 # Source0-md5:	4a747d1a1f85cb272d55b52c7e8a4a02
 Source1:	%{name}.init
 Patch0:		%{name}-make.patch
+Patch1:		%{name}-rc.patch
 URL:		http://apparmor.wiki.kernel.org/
 BuildRequires:	bison
 BuildRequires:	flex
@@ -38,6 +39,7 @@ SubDomain.
 %setup -q -n AppArmor-%{version}
 cd parser
 %patch0 -p1
+%patch1 -p0
 
 %build
 %{__make} -C parser main manpages \
-- 
2.44.0