summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2012-08-09 07:03:00 -0400
committerAnthony G. Basile <blueness@gentoo.org>2012-08-09 07:03:00 -0400
commiteafaa85203b7344d737d5563bddf2341cecad232 (patch)
treef6300297b7b23fa6b8c06085c5c643c2031435ca
parentGrsec/PaX: 2.9.1-3.5.0-201208081934 (diff)
downloadhardened-patchset-eafaa85203b7344d737d5563bddf2341cecad232.tar.gz
hardened-patchset-eafaa85203b7344d737d5563bddf2341cecad232.tar.bz2
hardened-patchset-eafaa85203b7344d737d5563bddf2341cecad232.zip
3.5.0: clean up line numbers20120808
-rw-r--r--3.5.0/4435_grsec-mute-warnings.patch2
-rw-r--r--3.5.0/4450_grsec-kconfig-default-gids.patch2
-rw-r--r--3.5.0/4465_selinux-avc_audit-log-curr_ip.patch2
-rw-r--r--3.5.0/4470_disable-compat_vdso.patch2
4 files changed, 4 insertions, 4 deletions
diff --git a/3.5.0/4435_grsec-mute-warnings.patch b/3.5.0/4435_grsec-mute-warnings.patch
index e85abd6..e1a7a3c 100644
--- a/3.5.0/4435_grsec-mute-warnings.patch
+++ b/3.5.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
-@@ -245,7 +245,7 @@
+@@ -241,7 +241,7 @@
HOSTCC = gcc
HOSTCXX = g++
diff --git a/3.5.0/4450_grsec-kconfig-default-gids.patch b/3.5.0/4450_grsec-kconfig-default-gids.patch
index a2e6f84..eb5154a 100644
--- a/3.5.0/4450_grsec-kconfig-default-gids.patch
+++ b/3.5.0/4450_grsec-kconfig-default-gids.patch
@@ -73,7 +73,7 @@ diff -Nuar a/grsecurity/Kconfig b/Kconfig
diff -Nuar a/security/Kconfig b/security/Kconfig
--- a/security/Kconfig 2012-07-01 12:51:41.000000000 -0400
+++ b/security/Kconfig 2012-07-01 13:00:23.000000000 -0400
-@@ -190,7 +190,7 @@
+@@ -191,7 +191,7 @@
config GRKERNSEC_PROC_GID
int "GID exempted from /proc restrictions"
diff --git a/3.5.0/4465_selinux-avc_audit-log-curr_ip.patch b/3.5.0/4465_selinux-avc_audit-log-curr_ip.patch
index 2548df6..fd7ab67 100644
--- a/3.5.0/4465_selinux-avc_audit-log-curr_ip.patch
+++ b/3.5.0/4465_selinux-avc_audit-log-curr_ip.patch
@@ -59,7 +59,7 @@ diff -Naur a/grsecurity/Kconfig b/grsecurity/Kconfig
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 @@
+@@ -133,6 +133,11 @@
char *scontext;
u32 scontext_len;
diff --git a/3.5.0/4470_disable-compat_vdso.patch b/3.5.0/4470_disable-compat_vdso.patch
index 2a637c1..68af025 100644
--- a/3.5.0/4470_disable-compat_vdso.patch
+++ b/3.5.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
-@@ -1678,17 +1678,8 @@
+@@ -1681,17 +1681,8 @@
config COMPAT_VDSO
def_bool n