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

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

[Anthony G. Basile]

commit:     4d33233ba8743fba659ebf5ba5277e562fd0aabe
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 28 21:19:28 2014 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Jan 28 21:19:28 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-patchset.git;a=commit;h=4d33233b

3.13.0: clean up line numbers

---
 3.13.0/4435_grsec-mute-warnings.patch           |  2 +-
 3.13.0/4450_grsec-kconfig-default-gids.patch    | 12 ++++++------
 3.13.0/4465_selinux-avc_audit-log-curr_ip.patch |  2 +-
 3.13.0/4470_disable-compat_vdso.patch           |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/3.13.0/4435_grsec-mute-warnings.patch b/3.13.0/4435_grsec-mute-warnings.patch
index ed941d5..cb51a05 100644
--- a/3.13.0/4435_grsec-mute-warnings.patch
+++ b/3.13.0/4435_grsec-mute-warnings.patch
@@ -31,7 +31,7 @@ Acked-by: Christian Heim <phreak@gentoo.org>
 
 --- a/Makefile	2011-11-18 17:50:11.000000000 -0500
 +++ b/Makefile	2011-11-18 17:50:48.000000000 -0500
-@@ -241,7 +241,7 @@
+@@ -244,7 +244,7 @@
  
  HOSTCC       = gcc
  HOSTCXX      = g++

diff --git a/3.13.0/4450_grsec-kconfig-default-gids.patch b/3.13.0/4450_grsec-kconfig-default-gids.patch
index cdd1703..207c450 100644
--- a/3.13.0/4450_grsec-kconfig-default-gids.patch
+++ b/3.13.0/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
-@@ -626,7 +626,7 @@
+@@ -656,7 +656,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"
-@@ -857,7 +857,7 @@
+@@ -887,7 +887,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
-@@ -866,7 +866,7 @@
+@@ -896,7 +896,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
-@@ -959,7 +959,7 @@
+@@ -989,7 +989,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
-@@ -980,7 +980,7 @@
+@@ -1010,7 +1010,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
-@@ -998,7 +998,7 @@
+@@ -1028,7 +1028,7 @@
  config GRKERNSEC_SOCKET_SERVER_GID
  	int "GID to deny server sockets for"
  	depends on GRKERNSEC_SOCKET_SERVER

diff --git a/3.13.0/4465_selinux-avc_audit-log-curr_ip.patch b/3.13.0/4465_selinux-avc_audit-log-curr_ip.patch
index 04ec3fb..ddabda7 100644
--- a/3.13.0/4465_selinux-avc_audit-log-curr_ip.patch
+++ b/3.13.0/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
-@@ -1093,6 +1093,27 @@
+@@ -1123,6 +1123,27 @@
  menu "Logging Options"
  depends on GRKERNSEC
  

diff --git a/3.13.0/4470_disable-compat_vdso.patch b/3.13.0/4470_disable-compat_vdso.patch
index 209dfae..a25c029 100644
--- a/3.13.0/4470_disable-compat_vdso.patch
+++ b/3.13.0/4470_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
-@@ -1818,17 +1818,8 @@
+@@ -1823,17 +1823,8 @@
  
  config COMPAT_VDSO
  	def_bool n