SOURCES (LINUX_2_6): grsecurity-2.1.9-2.6.17.7.patch - merged havn...

[hawk]

Author: hawk                         Date: Tue Aug  8 09:53:53 2006 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- merged havners changes from previous version of patch (make grsecurity
  patch FBSPLASH independent)

---- Files affected:
SOURCES:
   grsecurity-2.1.9-2.6.17.7.patch (1.1.2.3 -> 1.1.2.4) 

---- Diffs:

================================================================
Index: SOURCES/grsecurity-2.1.9-2.6.17.7.patch
diff -u SOURCES/grsecurity-2.1.9-2.6.17.7.patch:1.1.2.3 SOURCES/grsecurity-2.1.9-2.6.17.7.patch:1.1.2.4
--- SOURCES/grsecurity-2.1.9-2.6.17.7.patch:1.1.2.3	Tue Aug  8 10:52:10 2006
+++ SOURCES/grsecurity-2.1.9-2.6.17.7.patch	Tue Aug  8 11:53:48 2006
@@ -22042,18 +22042,8 @@
 diff -urNp linux-2.6.17.7/include/linux/sysctl.h linux-2.6.17.7/include/linux/sysctl.h
 --- linux-2.6.17.7/include/linux/sysctl.h	2006-07-24 23:36:01.000000000 -0400
 +++ linux-2.6.17.7/include/linux/sysctl.h	2006-08-01 20:29:48.000000000 -0400
-@@ -148,8 +148,21 @@ enum
- 	KERN_ACPI_VIDEO_FLAGS=71, /* int: flags for setting up video after ACPI sleep */
- 	KERN_IA64_UNALIGNED=72, /* int: ia64 unaligned userland trap enable */
- 	KERN_FBSPLASH=73,	/* string: path to fbsplash helper */
-+#ifdef CONFIG_GRKERNSEC
-+	KERN_GRSECURITY=98,	/* grsecurity */
-+#endif
-+
-+#ifdef CONFIG_PAX_SOFTMODE
-+	KERN_PAX=99,		/* PaX control */
-+#endif
-+
+@@ -78,9 +78,22 @@
+ 	INOTIFY_MAX_QUEUED_EVENTS=3	/* max queued events per instance */
  };
  
 +#ifdef CONFIG_PAX_SOFTMODE
@@ -22061,9 +22051,20 @@
 +	PAX_SOFTMODE=1		/* PaX: disable/enable soft mode */
 +};
 +#endif
- 
- /* CTL_VM names: */
++
+ /* CTL_KERN names: */
  enum
+ {
++#ifdef CONFIG_GRKERNSEC
++	KERN_GRSECURITY=98,	/* grsecurity */
++#endif
++
++#ifdef CONFIG_PAX_SOFTMODE
++	KERN_PAX=99,		/* PaX control */
++#endif
+ 	KERN_OSTYPE=1,		/* string: system version */
+ 	KERN_OSRELEASE=2,	/* string: system release */
+ 	KERN_OSREV=3,		/* int: system revision */
 diff -urNp linux-2.6.17.7/init/Kconfig linux-2.6.17.7/init/Kconfig
 --- linux-2.6.17.7/init/Kconfig	2006-07-24 23:36:01.000000000 -0400
 +++ linux-2.6.17.7/init/Kconfig	2006-08-01 20:29:48.000000000 -0400
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/grsecurity-2.1.9-2.6.17.7.patch?r1=1.1.2.3&r2=1.1.2.4&f=u