[gentoo-commits] proj/hardened-patchset:master commit in: 3.11.8/

[gentoo-commits] proj/hardened-patchset:master commit in: 3.11.8/

[Anthony G. Basile]

commit:     09c20ec9e1220cb8b5fff3b79b7a8c1c86a978d5
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 17 01:22:53 2013 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Nov 17 01:22:53 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-patchset.git;a=commit;h=09c20ec9

Clean up line numbers for 3.11.8

---
 3.11.8/4450_grsec-kconfig-default-gids.patch    | 12 ++++++------
 3.11.8/4465_selinux-avc_audit-log-curr_ip.patch |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/3.11.8/4450_grsec-kconfig-default-gids.patch b/3.11.8/4450_grsec-kconfig-default-gids.patch
index c928378..b50114e 100644
--- a/3.11.8/4450_grsec-kconfig-default-gids.patch
+++ b/3.11.8/4450_grsec-kconfig-default-gids.patch
@@ -16,7 +16,7 @@ from shooting themselves in the foot.
 diff -Naur a/grsecurity/Kconfig b/grsecurity/Kconfig
 --- a/grsecurity/Kconfig	2012-10-13 09:51:35.000000000 -0400
 +++ b/grsecurity/Kconfig	2012-10-13 09:52:32.000000000 -0400
-@@ -612,7 +612,7 @@
+@@ -626,7 +626,7 @@
  config GRKERNSEC_AUDIT_GID
  	int "GID for auditing"
  	depends on GRKERNSEC_AUDIT_GROUP
@@ -25,7 +25,7 @@ diff -Naur a/grsecurity/Kconfig b/grsecurity/Kconfig
  
  config GRKERNSEC_EXECLOG
  	bool "Exec logging"
-@@ -821,7 +821,7 @@
+@@ -853,7 +853,7 @@
  config GRKERNSEC_TPE_UNTRUSTED_GID
  	int "GID for TPE-untrusted users"
  	depends on GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT
@@ -34,7 +34,7 @@ diff -Naur a/grsecurity/Kconfig b/grsecurity/Kconfig
  	help
  	  Setting this GID determines what group TPE restrictions will be
  	  *enabled* for.  If the sysctl option is enabled, a sysctl option
-@@ -830,7 +830,7 @@
+@@ -862,7 +862,7 @@
  config GRKERNSEC_TPE_TRUSTED_GID
  	int "GID for TPE-trusted users"
  	depends on GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT
@@ -43,7 +43,7 @@ diff -Naur a/grsecurity/Kconfig b/grsecurity/Kconfig
  	help
  	  Setting this GID determines what group TPE restrictions will be
  	  *disabled* for.  If the sysctl option is enabled, a sysctl option
-@@ -923,7 +923,7 @@
+@@ -955,7 +955,7 @@
  config GRKERNSEC_SOCKET_ALL_GID
  	int "GID to deny all sockets for"
  	depends on GRKERNSEC_SOCKET_ALL
@@ -52,7 +52,7 @@ diff -Naur a/grsecurity/Kconfig b/grsecurity/Kconfig
  	help
  	  Here you can choose the GID to disable socket access for. Remember to
  	  add the users you want socket access disabled for to the GID
-@@ -944,7 +944,7 @@
+@@ -976,7 +976,7 @@
  config GRKERNSEC_SOCKET_CLIENT_GID
  	int "GID to deny client sockets for"
  	depends on GRKERNSEC_SOCKET_CLIENT
@@ -61,7 +61,7 @@ diff -Naur a/grsecurity/Kconfig b/grsecurity/Kconfig
  	help
  	  Here you can choose the GID to disable client socket access for.
  	  Remember to add the users you want client socket access disabled for to
-@@ -962,7 +962,7 @@
+@@ -994,7 +994,7 @@
  config GRKERNSEC_SOCKET_SERVER_GID
  	int "GID to deny server sockets for"
  	depends on GRKERNSEC_SOCKET_SERVER

diff --git a/3.11.8/4465_selinux-avc_audit-log-curr_ip.patch b/3.11.8/4465_selinux-avc_audit-log-curr_ip.patch
index fea3943..b26c0b4 100644
--- a/3.11.8/4465_selinux-avc_audit-log-curr_ip.patch
+++ b/3.11.8/4465_selinux-avc_audit-log-curr_ip.patch
@@ -28,7 +28,7 @@ Signed-off-by: Lorenzo Hernandez Garcia-Hierro <lorenzo@gnu.org>
 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
-@@ -1057,6 +1057,27 @@
+@@ -1089,6 +1089,27 @@
  menu "Logging Options"
  depends on GRKERNSEC