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

[arekm]

Author: arekm                        Date: Thu Jul 14 07:02:57 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2; fix skipping unwanted profiles; allow to pass own options to parser

---- Files affected:
packages/apparmor-parser:
   apparmor-parser.spec (1.34 -> 1.35) , apparmor-parser-pld.patch (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: packages/apparmor-parser/apparmor-parser.spec
diff -u packages/apparmor-parser/apparmor-parser.spec:1.34 packages/apparmor-parser/apparmor-parser.spec:1.35
--- packages/apparmor-parser/apparmor-parser.spec:1.34	Fri Apr  1 09:31:36 2011
+++ packages/apparmor-parser/apparmor-parser.spec	Thu Jul 14 09:02:52 2011
@@ -6,7 +6,7 @@
 Summary(pl.UTF-8):	Narzędzie przestrzeni użytkownika do przetwarzania AppArmor
 Name:		apparmor-parser
 Version:	2.6.1
-Release:	1
+Release:	2
 Epoch:		1
 License:	GPL
 Group:		Applications/System
@@ -14,6 +14,7 @@
 # Source0-md5:	e2dabce946cb8258834f90f0a6c87726
 Source1:	%{name}.init
 Patch0:		%{name}-bzr.patch
+Patch1:		%{name}-pld.patch
 URL:		http://apparmor.wiki.kernel.org/
 BuildRequires:	bison
 BuildRequires:	flex
@@ -40,6 +41,7 @@
 %setup -q -n apparmor-%{version}
 # reenable when needed
 #%patch0 -p0
+%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.35  2011/07/14 07:02:52  arekm
+- rel 2; fix skipping unwanted profiles; allow to pass own options to parser
+
 Revision 1.34  2011/04/01 07:31:36  arekm
 - up to 2.6.1
 

================================================================
Index: packages/apparmor-parser/apparmor-parser-pld.patch
diff -u /dev/null packages/apparmor-parser/apparmor-parser-pld.patch:1.5
--- /dev/null	Thu Jul 14 09:02:57 2011
+++ packages/apparmor-parser/apparmor-parser-pld.patch	Thu Jul 14 09:02:52 2011
@@ -0,0 +1,37 @@
+=== modified file 'parser/rc.apparmor.functions'
+--- parser/rc.apparmor.functions	2011-06-01 14:52:35 +0000
++++ parser/rc.apparmor.functions	2011-07-14 06:56:45 +0000
+@@ -198,6 +198,7 @@
+ 			aa_log_skipped_msg "$profile"
+ 			logger -t "AppArmor(init)" -p daemon.warn "Skipping profile $profile"
+ 			STATUS=2
++			continue
+ 		elif [ "$skip" -ne 0 ]; then
+ 			continue
+ 		fi
+@@ -206,7 +207,7 @@
+ 			if force_complain "${profile}" ; then
+ 				COMPLAIN="-C"
+ 			fi
+-			$PARSER $ABSTRACTIONS $PARSER_ARGS $COMPLAIN "$profile" > /dev/null
++			$PARSER $ABSTRACTIONS $PARSER_ARGS $PARSER_CUSTOM_ARGS $COMPLAIN "$profile" > /dev/null
+ 			if [ $? -ne 0 ]; then
+ 				aa_log_failure_msg "$profile failed to load"
+ 				STATUS=1
+
+=== modified file 'parser/subdomain.conf'
+--- parser/subdomain.conf	2011-01-13 21:58:26 +0000
++++ parser/subdomain.conf	2011-07-14 06:59:27 +0000
+@@ -23,6 +23,11 @@
+ # Enable the AppArmor event daemon for reporting?
+ APPARMOR_ENABLE_AAEVENTD="no"
+ 
++## Path:	System/AppArmor
++## Description: Custom user flags for apparmor profile parser
++#
++PARSER_CUSTOM_ARGS=""
++
+ #SUBDOMAIN_MODULE_PANIC=XXX
+ #This option controls how subdomain behaves when the init script attempts
+ #to load the AppArmor module and fails.  There are 4 options
+
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apparmor-parser/apparmor-parser.spec?r1=1.34&r2=1.35&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apparmor-parser/apparmor-parser-pld.patch?r1=1.4&r2=1.5&f=u