SPECS (LINUX_2_6_20): kernel.spec - linux-2.6-apparmor-caps.patch ...

[zbyniu]

Author: zbyniu                       Date: Sun Mar 25 23:02:47 2007 GMT
Module: SPECS                         Tag: LINUX_2_6_20
---- Log message:
- linux-2.6-apparmor-caps.patch readded

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1698.2.92 -> 1.441.2.1698.2.93) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1698.2.92 SPECS/kernel.spec:1.441.2.1698.2.93
--- SPECS/kernel.spec:1.441.2.1698.2.92	Mon Mar 26 00:30:38 2007
+++ SPECS/kernel.spec	Mon Mar 26 01:02:42 2007
@@ -26,7 +26,6 @@
 # - test non default bconds for 2.6.20.3
 # - test build --with pax --with reiser4 for alpha
 # - test build on sparc, sparc64
-# - grsec_full
 # - pax hooks for selinux (experimental)
 # - spec cleanup
 # - test external modules
@@ -395,6 +394,7 @@
 #Patch3000: wanpipe-beta7-2.3.4.patch
 
 Patch5000:	apparmor-2.6.20.3-v405-fullseries.diff
+Patch5001:	linux-2.6-apparmor-caps.patch
 
 # not ready yet
 Patch9997:	pax_selinux_hooks-2.6.20.patch
@@ -925,6 +925,7 @@
 %endif
 
 %patch5000 -p1
+%patch5001 -p1
 
 # grsecurity & pax stuff - temporary - work in progress
 #
@@ -1687,6 +1688,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1698.2.93  2007/03/25 23:02:42  zbyniu
+- linux-2.6-apparmor-caps.patch readded
+
 Revision 1.441.2.1698.2.92  2007/03/25 22:30:38  arekm
 - add apparmor (again; previously seen in pld 2.6.16)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1698.2.92&r2=1.441.2.1698.2.93&f=u