SPECS (LINUX_2_6): kernel.spec - grsecurity reenabled.

[pluto]

Author: pluto                        Date: Mon Sep 19 03:08:15 2005 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- grsecurity reenabled.

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1208 -> 1.441.2.1209) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1208 SPECS/kernel.spec:1.441.2.1209
--- SPECS/kernel.spec:1.441.2.1208	Mon Sep 19 03:14:32 2005
+++ SPECS/kernel.spec	Mon Sep 19 05:08:09 2005
@@ -9,8 +9,7 @@
 %bcond_without	up		# don't build UP kernel
 %bcond_without	source		# don't build kernel-source package
 %bcond_without	pcmcia		# don't build pcmcia
-%bcond_with	grsecurity	# enable grsecurity
-%bcond_without	grsec_basic	# disable basic grsecurity functionality (proc,link,fifo)
+%bcond_without	grsecurity	# disable grsecurity
 %bcond_with	pax		# enable PaX (depends on grsecurity)
 %bcond_with	omosix		# enable openMosix (conflicts with grsecurity/vserver)
 %bcond_with	vserver		# enable vserver (conflicts with grsecurity/omosix)
@@ -85,10 +84,6 @@
 %undefine	with_smp
 %endif
 
-%if %{with grsecurity}
-%undefine grsecurity
-%endif
-
 ## Program required by kernel to work.
 %define		_binutils_ver		2.12
 %define		_util_linux_ver		2.10o
@@ -751,10 +746,7 @@
 %endif
 
 %if %{with grsecurity}
-echo Grsecurity not implemented
 %patch200 -p1
-%else
-%{?with_grsec_basic:%patch199 -p1}
 %endif
 %if %{with omosix}
 %{__patch} -p1 -F3 < %{PATCH201}
@@ -896,10 +888,6 @@
 
 %if %{with grsecurity}
 	cat %{!?with_pax:%{SOURCE90}}%{?with_pax:%{SOURCE91}} >> arch/%{_target_base_arch}/defconfig
-%else
-%if %{with grsec_basic}
-	cat %{SOURCE90} >> arch/%{_target_base_arch}/defconfig
-%endif
 %endif
 %if %{with omosix}
 	cat %{SOURCE92} >> arch/%{_target_base_arch}/defconfig
@@ -1548,10 +1536,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1209  2005/09/19 03:08:09  pluto
+- grsecurity reenabled.
+
 Revision 1.441.2.1208  2005/09/19 01:14:32  pluto
 - utf8 patch added. it allows you to enter any Unicode value using
-Â  the Alt-nnnn mechanism. previously, it was restricted to the BMP,
-Â  i.e. the first 65536 Unicode characters
+  the Alt-nnnn mechanism. previously, it was restricted to the BMP,
+  i.e. the first 65536 Unicode characters
 - default NLS changed to utf8.
 - release 0.2.
 
================================================================

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