packages: kernel/kernel.spec, kernel/kernel-multiarch.config - drop apparmo...

[arekm]

Author: arekm                        Date: Fri Oct 22 08:46:05 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- drop apparmor bcond (apparmor is in mainline)

---- Files affected:
packages/kernel:
   kernel.spec (1.844 -> 1.845) , kernel-multiarch.config (1.45 -> 1.46) 

---- Diffs:

================================================================
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.844 packages/kernel/kernel.spec:1.845
--- packages/kernel/kernel.spec:1.844	Thu Oct 21 21:39:04 2010
+++ packages/kernel/kernel.spec	Fri Oct 22 10:46:00 2010
@@ -3,7 +3,6 @@
 # NOTE:
 # the following bcond combos will not work
 # - without_vserver and any of the following
-#   - with_apparmor
 #   - with_grsec_minimal
 #   - with_grsec_full
 #
@@ -49,7 +48,6 @@
 
 %bcond_without	vserver		# support for VServer (enabled by default)
 %bcond_without	tuxonice	# support for tuxonice (ex-suspend2) (enabled by default)
-%bcond_without	apparmor	# build kernel with apparmor (exerimental mix)
 
 %bcond_with	rescuecd	# build kernel for our rescue
 
@@ -87,7 +85,6 @@
 %define		have_pcmcia	1
 
 %if %{with rescuecd}
-%unglobal	with_apparmor
 %unglobal	with_tuxonice
 %unglobal	with_grsecurity
 %unglobal	with_grsec_full
@@ -130,7 +127,7 @@
 %endif
 %else
 %if %{without rescuecd}
-%define		__alt_kernel	%{?with_pax:pax}%{!?with_grsec_full:nogrsecurity}%{!?with_apparmor:noaa}%{?with_pae:pae}
+%define		__alt_kernel	%{?with_pax:pax}%{!?with_grsec_full:nogrsecurity}%{?with_pae:pae}
 %if "%{__alt_kernel}" != ""
 %define		alt_kernel	%{__alt_kernel}
 %endif
@@ -475,7 +472,6 @@
 %{?with_pax:PaX support - enabled}\
 %{?with_fbcondecor:Fbsplash/fbcondecor - enabled }\
 %{?with_nfsroot:Root on NFS - enabled}\
-%{?with_apparmor:apparmor support - enabled}\
 
 %define Features %(echo "%{__features}" | sed '/^$/d')
 
@@ -844,9 +840,7 @@
 # end of grsecurity & pax stuff
 
 # apparmor
-%if %{with apparmor}
 %patch5000 -p1
-%endif
 
 # FIXME
 #%patch150 -p1
@@ -989,16 +983,6 @@
 		CONFIG_RT_DEADLOCK_DETECT=y
 %endif
 
-# apparmor, will be moved to external file if works
-%if %{with apparmor}
-		CONFIG_SECURITY_APPARMOR=y
-		CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1
-		CONFIG_SECURITY_APPARMOR_DISABLE=n
-		CONFIG_SECURITY_APPARMOR_NETWORK=y
-		CONFIG_SECURITY_APPARMOR_COMPAT_24=y
-		CONFIG_DEFAULT_SECURITY_APPARMOR=n
-%endif
-
 %if %{without ipv6}
 		CONFIG_IPV6=n
 %endif
@@ -1600,6 +1584,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.845  2010/10/22 08:46:00  arekm
+- drop apparmor bcond (apparmor is in mainline)
+
 Revision 1.844  2010/10/21 19:39:04  arekm
 - patch-2.6.36-vs2.3.0.36.36.diff
 

================================================================
Index: packages/kernel/kernel-multiarch.config
diff -u packages/kernel/kernel-multiarch.config:1.45 packages/kernel/kernel-multiarch.config:1.46
--- packages/kernel/kernel-multiarch.config:1.45	Thu Oct 21 20:45:11 2010
+++ packages/kernel/kernel-multiarch.config	Fri Oct 22 10:46:00 2010
@@ -6630,10 +6630,17 @@
 DEFAULT_SECURITY_SELINUX all=y
 DEFAULT_SECURITY_SMACK all=n
 DEFAULT_SECURITY_TOMOYO all=n
+DEFAULT_SECURITY_APPARMOR=n
 DEFAULT_SECURITY_DAC all=n
 CONFIG_DEFAULT_SECURITY all="selinux"
 
 #-
+#- *** FILE: security/apparmor/Kconfig ***
+#-
+SECURITY_APPARMOR=y
+SECURITY_APPARMOR_BOOTPARAM_VALUE=1
+
+#-
 #- *** FILE: security/integrity/ima/Kconfig ***
 #-
 IMA all=n
@@ -7076,6 +7083,9 @@
 RAMZSWAP_STATS all=y
 RT3090 all=m
 RTL8187SE all=m
+SECURITY_APPARMOR_COMPAT_24=y
+SECURITY_APPARMOR_DISABLE=n
+SECURITY_APPARMOR_NETWORK=y
 SECURITY_FILE_CAPABILITIES all=y
 SENSORS_ADT7473 all=m
 SLOW_WORK_DEBUG all=n
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.844&r2=1.845&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-multiarch.config?r1=1.45&r2=1.46&f=u