[Devil-linux-commit] build/scripts/configuration exec-shield.config,1.1,1.2 grsecurity.config,1.4,1.5 pax.config,1.1,1.2

[<smi...@us...>]

Update of /cvsroot/devil-linux/build/scripts/configuration
In directory sc8-pr-cvs1:/tmp/cvs-serv14731/scripts/configuration

Modified Files:
	exec-shield.config grsecurity.config pax.config 
Log Message:
checked in more fixes from Oliver (ipsec-tools, typos)
added pax support for kernel 2.4
added some more exclusions to the menuconfig, so user can't set incompatible
options


Index: exec-shield.config
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/configuration/exec-shield.config,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- exec-shield.config	16 Jan 2004 01:47:55 -0000	1.1
+++ exec-shield.config	16 Jan 2004 19:16:56 -0000	1.2
@@ -5,5 +5,7 @@
 #
 # http://www.devil-linux.org
 
-menu_add "Build Configuration|Security" bool "Exec Shield Patch (enhances system security see http://people.redhat.com/mingo/exec-shield/)" CONFIG_EXEC_SHIELD
+if [ ! "$CONFIG_PAX" == "y" ] && [ ! "$CONFIG_GRSECURITY" == "y" ]; then
+    menu_add "Build Configuration|Security" bool "Exec Shield Patch (enhances system security see http://people.redhat.com/mingo/exec-shield/)" CONFIG_EXEC_SHIELD
+fi
 

Index: grsecurity.config
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/configuration/grsecurity.config,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- grsecurity.config	11 Jan 2004 14:43:05 -0000	1.4
+++ grsecurity.config	16 Jan 2004 19:16:56 -0000	1.5
@@ -6,7 +6,7 @@
 # http://www.devil-linux.org
 
 if [ "$CONFIG_LINUX_VERSION" = "2.4" ]; then
-    if [ ! "$CONFIG_XFS" = "y" ]; then
+    if [ ! "$CONFIG_XFS" = "y" ] && [ ! "$CONFIG_EXEC_SHIELD" = "y" ] && [ ! "$CONFIG_PAX" = "y" ] ; then
 	menu_add "Build Configuration|Security" bool "GRSecurity Patch (enhances system security and will break XFS)" CONFIG_GRSECURITY
     fi
 fi

Index: pax.config
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/configuration/pax.config,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pax.config	15 Jan 2004 01:52:22 -0000	1.1
+++ pax.config	16 Jan 2004 19:16:56 -0000	1.2
@@ -5,7 +5,7 @@
 #
 # http://www.devil-linux.org
 
-if [ "$CONFIG_LINUX_VERSION" = "2.6" ]; then
-    menu_add "Build Configuration|Security" bool "PAX" CONFIG_PAX
+if [ ! "$CONFIG_GRSECURITY" = "y" ] && [ ! "$CONFIG_EXEC_SHIELD" == "y" ]; then
+     menu_add "Build Configuration|Security" bool "PAX" CONFIG_PAX
 fi