[gentoo-commits] proj/hardened-patchset:XT_PAX commit in: 3.1.1/

[Anthony G. Basile]

commit:     db7feee5792d0b67a0754e213dd86c41eaa46466
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 20 23:53:09 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Nov 20 23:53:09 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-patchset.git;a=commit;h=db7feee5

Cleanup patchset line numbers for XT_PAX 3.1.1

---
 3.1.1/4490_grsec-kconfig-default-gids.patch    |    6 +++---
 3.1.1/4500_grsec-kconfig-gentoo.patch          |   16 ++++++++--------
 3.1.1/4510-grsec-kconfig-proc-user.patch       |    6 +++---
 3.1.1/4520_selinux-avc_audit-log-curr_ip.patch |   14 +++++++-------
 3.1.1/4530_disable-compat_vdso.patch           |    2 +-
 5 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/3.1.1/4490_grsec-kconfig-default-gids.patch b/3.1.1/4490_grsec-kconfig-default-gids.patch
index 671636e..8efaa57 100644
--- a/3.1.1/4490_grsec-kconfig-default-gids.patch
+++ b/3.1.1/4490_grsec-kconfig-default-gids.patch
@@ -9,9 +9,9 @@ attention to the finer points of kernel configuration, it is probably
 wise to specify some reasonable defaults so as to stop careless users
 from shooting themselves in the foot.
 
-diff -Naur linux-2.6.32-hardened-r44.orig/grsecurity/Kconfig linux-2.6.32-hardened-r44/grsecurity/Kconfig
---- linux-2.6.32-hardened-r44.orig/grsecurity/Kconfig	2011-04-17 18:15:55.000000000 -0400
-+++ linux-2.6.32-hardened-r44/grsecurity/Kconfig	2011-04-17 18:37:33.000000000 -0400
+diff -Naur a/grsecurity/Kconfig b/grsecurity/Kconfig
+--- a/grsecurity/Kconfig	2011-04-17 18:15:55.000000000 -0400
++++ b/grsecurity/Kconfig	2011-04-17 18:37:33.000000000 -0400
 @@ -430,7 +430,7 @@
  config GRKERNSEC_PROC_GID
  	int "GID for special group"

diff --git a/3.1.1/4500_grsec-kconfig-gentoo.patch b/3.1.1/4500_grsec-kconfig-gentoo.patch
index 6d94033..5fad5b9 100644
--- a/3.1.1/4500_grsec-kconfig-gentoo.patch
+++ b/3.1.1/4500_grsec-kconfig-gentoo.patch
@@ -16,8 +16,8 @@ The original version of this patch was conceived and created by:
 Ned Ludd <solar@g.o>
 
 diff -Naur a/grsecurity/Kconfig b/grsecurity/Kconfig
---- a/grsecurity/Kconfig	2011-04-17 19:25:54.000000000 -0400
-+++ b/grsecurity/Kconfig	2011-04-17 19:27:46.000000000 -0400
+--- a/grsecurity/Kconfig	2011-11-20 18:21:40.000000000 -0500
++++ b/grsecurity/Kconfig	2011-11-20 18:22:27.000000000 -0500
 @@ -18,7 +18,7 @@
  choice
  	prompt "Security Level"
@@ -27,7 +27,7 @@ diff -Naur a/grsecurity/Kconfig b/grsecurity/Kconfig
  
  config GRKERNSEC_LOW
  	bool "Low"
-@@ -191,6 +191,255 @@
+@@ -188,6 +188,255 @@
  	  - Restricted sysfs/debugfs
  	  - Active kernel exploit response
  
@@ -283,9 +283,10 @@ diff -Naur a/grsecurity/Kconfig b/grsecurity/Kconfig
  config GRKERNSEC_CUSTOM
  	bool "Custom"
  	help
---- a/security/Kconfig	2011-09-21 07:20:02.000000000 -0400
-+++ b/security/Kconfig	2011-09-21 07:25:50.000000000 -0400
-@@ -322,9 +322,10 @@
+diff -Naur a/security/Kconfig b/security/Kconfig
+--- a/security/Kconfig	2011-11-20 18:21:39.000000000 -0500
++++ b/security/Kconfig	2011-11-20 18:22:27.000000000 -0500
+@@ -296,9 +296,10 @@
  
  config PAX_KERNEXEC
  	bool "Enforce non-executable kernel pages"
@@ -297,7 +298,7 @@ diff -Naur a/grsecurity/Kconfig b/grsecurity/Kconfig
  	help
  	  This is the kernel land equivalent of PAGEEXEC and MPROTECT,
  	  that is, enabling this option will make it harder to inject
-@@ -487,8 +488,9 @@
+@@ -461,8 +462,9 @@
  
  config PAX_MEMORY_UDEREF
  	bool "Prevent invalid userland pointer dereference"
@@ -308,4 +309,3 @@ diff -Naur a/grsecurity/Kconfig b/grsecurity/Kconfig
  	help
  	  By saying Y here the kernel will be prevented from dereferencing
  	  userland pointers in contexts where the kernel expects only kernel
-

diff --git a/3.1.1/4510-grsec-kconfig-proc-user.patch b/3.1.1/4510-grsec-kconfig-proc-user.patch
index c588683..3c09754 100644
--- a/3.1.1/4510-grsec-kconfig-proc-user.patch
+++ b/3.1.1/4510-grsec-kconfig-proc-user.patch
@@ -3,10 +3,10 @@ From: Anthony G. Basile <blueness@g.o>
 Address the mutually exclusive options GRKERNSEC_PROC_USER and GRKERNSEC_PROC_USERGROUP
 in a different way to avoid bug #366019.  This patch should eventually go upstream.
 
-diff -Naur linux-2.6.39-hardened-r4.orig//grsecurity/Kconfig linux-2.6.39-hardened-r4/grsecurity/Kconfig
+diff -Naur a/grsecurity/Kconfig b/grsecurity/Kconfig
 --- a/grsecurity/Kconfig	2011-06-29 10:02:56.000000000 -0400
 +++ b/grsecurity/Kconfig	2011-06-29 10:08:07.000000000 -0400
-@@ -666,7 +666,7 @@
+@@ -660,7 +660,7 @@
  
  config GRKERNSEC_PROC_USER
  	bool "Restrict /proc to user only"
@@ -15,7 +15,7 @@ diff -Naur linux-2.6.39-hardened-r4.orig//grsecurity/Kconfig linux-2.6.39-harden
  	help
  	  If you say Y here, non-root users will only be able to view their own
  	  processes, and restricts them from viewing network-related information,
-@@ -674,7 +674,7 @@
+@@ -668,7 +668,7 @@
  
  config GRKERNSEC_PROC_USERGROUP
  	bool "Allow special group"

diff --git a/3.1.1/4520_selinux-avc_audit-log-curr_ip.patch b/3.1.1/4520_selinux-avc_audit-log-curr_ip.patch
index 0fd5d2d..a96f6f2 100644
--- a/3.1.1/4520_selinux-avc_audit-log-curr_ip.patch
+++ b/3.1.1/4520_selinux-avc_audit-log-curr_ip.patch
@@ -25,10 +25,10 @@ provided by grSecurity patch to be applied before.
 Signed-off-by: Lorenzo Hernandez Garcia-Hierro <lorenzo@×××.org>
 ---
 
-diff -Naur linux-2.6.38-hardened-r1.orig/grsecurity/Kconfig linux-2.6.38-hardened-r1/grsecurity/Kconfig
---- linux-2.6.38-hardened-r1.orig/grsecurity/Kconfig	2011-04-17 19:25:54.000000000 -0400
-+++ linux-2.6.38-hardened-r1/grsecurity/Kconfig	2011-04-17 19:32:53.000000000 -0400
-@@ -1265,6 +1265,27 @@
+diff -Naur a/grsecurity/Kconfig b/grsecurity/Kconfig
+--- a/grsecurity/Kconfig	2011-04-17 19:25:54.000000000 -0400
++++ b/grsecurity/Kconfig	2011-04-17 19:32:53.000000000 -0400
+@@ -1259,6 +1259,27 @@
  menu "Logging Options"
  depends on GRKERNSEC
  
@@ -56,9 +56,9 @@ diff -Naur linux-2.6.38-hardened-r1.orig/grsecurity/Kconfig linux-2.6.38-hardene
  config GRKERNSEC_FLOODTIME
  	int "Seconds in between log messages (minimum)"
  	default 10
-diff -Naur linux-2.6.38-hardened-r1.orig/security/selinux/avc.c linux-2.6.38-hardened-r1/security/selinux/avc.c
---- linux-2.6.38-hardened-r1.orig/security/selinux/avc.c	2011-04-17 19:04:47.000000000 -0400
-+++ linux-2.6.38-hardened-r1/security/selinux/avc.c	2011-04-17 19:32:53.000000000 -0400
+diff -Naur a/security/selinux/avc.c b/security/selinux/avc.c
+--- a/security/selinux/avc.c	2011-04-17 19:04:47.000000000 -0400
++++ b/security/selinux/avc.c	2011-04-17 19:32:53.000000000 -0400
 @@ -139,6 +139,11 @@
  	char *scontext;
  	u32 scontext_len;

diff --git a/3.1.1/4530_disable-compat_vdso.patch b/3.1.1/4530_disable-compat_vdso.patch
index 3b76b6c..737dcca 100644
--- a/3.1.1/4530_disable-compat_vdso.patch
+++ b/3.1.1/4530_disable-compat_vdso.patch
@@ -26,7 +26,7 @@ Closes bug: http://bugs.gentoo.org/show_bug.cgi?id=210138
 diff -urp a/arch/x86/Kconfig b/arch/x86/Kconfig
 --- a/arch/x86/Kconfig	2009-07-31 01:36:57.323857684 +0100
 +++ b/arch/x86/Kconfig	2009-07-31 01:51:39.395749681 +0100
-@@ -1638,17 +1638,8 @@
+@@ -1639,17 +1639,8 @@
  
  config COMPAT_VDSO
  	def_bool n