Author: havner Date: Tue Aug 8 08:37:43 2006 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- make them FBSPLASH independent
---- Files affected:
SOURCES:
grsecurity-2.1.9-2.6.16.14.patch (1.1.2.2 -> 1.1.2.3) ,
linux-2.6-grsec-minimal.patch (1.1.2.9 -> 1.1.2.10)
---- Diffs:
================================================================
Index: SOURCES/grsecurity-2.1.9-2.6.16.14.patch
diff -u SOURCES/grsecurity-2.1.9-2.6.16.14.patch:1.1.2.2
SOURCES/grsecurity-2.1.9-2.6.16.14.patch:1.1.2.3
--- SOURCES/grsecurity-2.1.9-2.6.16.14.patch:1.1.2.2 Fri May 19 12:49:26 2006
+++ SOURCES/grsecurity-2.1.9-2.6.16.14.patch Tue Aug 8 10:37:38 2006
@@ -20442,17 +20442,8 @@
diff -urNp linux-2.6.16.12/include/linux/sysctl.h
linux-2.6.16.12/include/linux/sysctl.h
--- linux-2.6.16.12/include/linux/sysctl.h 2006-05-01 15:14:26.000000000
-0400
+++ linux-2.6.16.12/include/linux/sysctl.h 2006-05-01 20:17:34.000000000
-0400
-@@ -150,8 +150,20 @@ 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,21 @@
+ INOTIFY_MAX_QUEUED_EVENTS=3 /* max queued events per instance */
};
+#ifdef CONFIG_PAX_SOFTMODE
@@ -20460,9 +20451,19 @@
+ 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.16.12/init/Kconfig linux-2.6.16.12/init/Kconfig
--- linux-2.6.16.12/init/Kconfig 2006-05-01 15:14:26.000000000 -0400
+++ linux-2.6.16.12/init/Kconfig 2006-05-01 20:17:34.000000000 -0400
================================================================
Index: SOURCES/linux-2.6-grsec-minimal.patch
diff -u SOURCES/linux-2.6-grsec-minimal.patch:1.1.2.9
SOURCES/linux-2.6-grsec-minimal.patch:1.1.2.10
--- SOURCES/linux-2.6-grsec-minimal.patch:1.1.2.9 Thu Jun 22 23:10:27 2006
+++ SOURCES/linux-2.6-grsec-minimal.patch Tue Aug 8 10:37:38 2006
@@ -1076,16 +1076,16 @@
diff -urN linux-2.6.16.2/include/linux/sysctl.h
linux-2.6.16.2-grsec/include/linux/sysctl.h
--- linux-2.6.16.2/include/linux/sysctl.h 2006-04-07 18:56:47.000000000
+0200
+++ linux-2.6.16.2-grsec/include/linux/sysctl.h 2006-04-11
18:09:09.244033250 +0200
-@@ -148,6 +148,9 @@
- 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 */
+@@ -155,6 +155,9 @@
+ /* CTL_VM names: */
+ enum
+ {
+#ifdef CONFIG_GRKERNSEC
+ KERN_GRSECURITY=98, /* grsecurity */
+#endif
- };
-
-
+ VM_UNUSED1=1, /* was: struct: Set vm swapping control */
+ VM_UNUSED2=2, /* was; int: Linear or sqrt() swapout for hogs
*/
+ VM_UNUSED3=3, /* was: struct: Set free page thresholds */
diff -urN linux-2.6.16.2/ipc/shm.c linux-2.6.16.2-grsec/ipc/shm.c
--- linux-2.6.16.2/ipc/shm.c 2006-04-07 18:56:47.000000000 +0200
+++ linux-2.6.16.2-grsec/ipc/shm.c 2006-04-11 17:44:40.121710250 +0200
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/grsecurity-2.1.9-2.6.16.14.patch?r1=1.1.2.2&r2=1.1.2.3&f=u
http://cvs.pld-linux.org/SOURCES/linux-2.6-grsec-minimal.patch?r1=1.1.2.9&r2=1.1.2.10&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
