SPECS (LINUX_2_6): kernel.spec - added apparmor patch to build with grsec_f...

[zbyniu]

Author: zbyniu                       Date: Wed Oct 29 22:45:35 2008 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- added apparmor patch to build with grsec_full, and with common aa changes
- linux-2.6-apparmor-caps.patch obsoleted

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1991 -> 1.441.2.1992) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1991 SPECS/kernel.spec:1.441.2.1992
--- SPECS/kernel.spec:1.441.2.1991	Wed Oct 29 01:46:16 2008
+++ SPECS/kernel.spec	Wed Oct 29 23:45:28 2008
@@ -37,7 +37,7 @@
 
 %bcond_without	vserver		# support for VServer (enabled by default)
 %bcond_without	tuxonice	# support for tuxonice (ex-suspend2) (enabled by default)
-%bcond_with	apparmor	# build kernel with apparmor (very exerimental mix)
+%bcond_with	apparmor	# build kernel with apparmor (exerimental mix)
 
 %bcond_with	rescuecd	# build kernel for our rescue
 
@@ -302,10 +302,12 @@
 # (only warnings, so just remove parts of this patch if conflics)
 Patch2500:	linux-2.6-warnings.patch
 
-# based on https://forgesvn1.novell.com/svn/apparmor/trunk/kernel-patches/2.6.25 rev 1266
-# repatched and adapted for vserver/grsec changes in vfs API, very experimental
+# based on https://forgesvn1.novell.com/svn/apparmor/trunk/kernel-patches/2.6.27 rev 1303
+# repatched and adapted for vserver/grsec changes in vfs API, experimental
 Patch5000:	kernel-apparmor.patch
-#Patch5001:	linux-2.6-apparmor-caps.patch
+# with grsec_full version
+Patch5001:	kernel-apparmor-after-grsec_full.patch
+Patch5002:	kernel-apparmor-common.patch
 
 # for rescuecd
 # based on http://ftp.leg.uct.ac.za/pub/linux/rip/inittmpfs-2.6.14.diff.gz
@@ -880,8 +882,13 @@
 
 # apparmor
 %if %{with apparmor}
+%if %{with grsec_full} || %{with pax_full}
+%patch5001 -p1
+%patch5002 -p1
+%else
 %patch5000 -p1
-# %patch5001 -p1
+%patch5002 -p1
+%endif
 %endif
 
 %ifarch ppc ppc64
@@ -1632,6 +1639,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1992  2008/10/29 22:45:28  zbyniu
+- added apparmor patch to build with grsec_full, and with common aa changes
+- linux-2.6-apparmor-caps.patch obsoleted
+
 Revision 1.441.2.1991  2008/10/29 00:46:16  zbyniu
 - kernel-grsec_fixes.patch is back
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel.spec?r1=1.441.2.1991&r2=1.441.2.1992&f=u