- rel 2; fix skipping unwanted profiles; allow to pass own options to parser

Changed files:
    apparmor-parser-pld.patch -> 1.5
    apparmor-parser.spec -> 1.35

diff --git a/apparmor-parser-pld.patch b/apparmor-parser-pld.patch
new file mode 100644 (file)
index 0000000..1da5490
--- /dev/null
+++ b/apparmor-parser-pld.patch
@@ -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
+

diff --git a/apparmor-parser.spec b/apparmor-parser.spec
index dca2fcfde23c836644df3c27106aa7777f4f8967..8a7e28b5e936a5a2d459e1f76ec254de2968fa26 100644 (file)
--- 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.6.1
-Release:       1
+Release:       2
 Epoch:         1
 License:       GPL
 Group:         Applications/System
@@ -13,6 +13,7 @@ Source0:      http://launchpad.net/apparmor/2.6/%{version}/+download/apparmor-%{versi
 # Source0-md5: e2dabce946cb8258834f90f0a6c87726
 Source1:       %{name}.init
 Patch0:                %{name}-bzr.patch
+Patch1:                %{name}-pld.patch
 URL:           http://apparmor.wiki.kernel.org/
 BuildRequires: bison
 BuildRequires: flex
@@ -39,6 +40,7 @@ SubDomain.
 %setup -q -n apparmor-%{version}
 # reenable when needed
 #%patch0 -p0
+%patch1 -p0
 
 %build
 %{__make} -C parser main manpages \