packages: apparmor-parser/apparmor-parser.spec, apparmor-parser/apparmor-pa...

[arekm]

Author: arekm                        Date: Wed Mar 17 20:11:54 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 3; init function fixes

---- Files affected:
packages/apparmor-parser:
   apparmor-parser.spec (1.27 -> 1.28) , apparmor-parser-rc.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/apparmor-parser/apparmor-parser.spec
diff -u packages/apparmor-parser/apparmor-parser.spec:1.27 packages/apparmor-parser/apparmor-parser.spec:1.28
--- packages/apparmor-parser/apparmor-parser.spec:1.27	Wed Mar 17 20:59:01 2010
+++ packages/apparmor-parser/apparmor-parser.spec	Wed Mar 17 21:11:49 2010
@@ -6,7 +6,7 @@
 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
@@ -14,6 +14,7 @@
 # Source0-md5:	4a747d1a1f85cb272d55b52c7e8a4a02
 Source1:	%{name}.init
 Patch0:		%{name}-make.patch
+Patch1:		%{name}-rc.patch
 URL:		http://apparmor.wiki.kernel.org/
 BuildRequires:	bison
 BuildRequires:	flex
@@ -39,6 +40,7 @@
 %setup -q -n AppArmor-%{version}
 cd parser
 %patch0 -p1
+%patch1 -p0
 
 %build
 %{__make} -C parser main manpages \
@@ -99,6 +101,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.28  2010/03/17 20:11:49  arekm
+- rel 3; init function fixes
+
 Revision 1.27  2010/03/17 19:59:01  arekm
 - rel 2; better init script (still needs work I guess)
 

================================================================
Index: packages/apparmor-parser/apparmor-parser-rc.patch
diff -u /dev/null packages/apparmor-parser/apparmor-parser-rc.patch:1.1
--- /dev/null	Wed Mar 17 21:11:55 2010
+++ packages/apparmor-parser/apparmor-parser-rc.patch	Wed Mar 17 21:11:49 2010
@@ -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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apparmor-parser/apparmor-parser.spec?r1=1.27&r2=1.28&f=u