Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/hardened-patchset:master commit in: 3.13.0/
Date: Tue, 28 Jan 2014 21:19:19
Message-Id: 1390943968.4d33233ba8743fba659ebf5ba5277e562fd0aabe.blueness@gentoo
1 commit: 4d33233ba8743fba659ebf5ba5277e562fd0aabe
2 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 28 21:19:28 2014 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 28 21:19:28 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-patchset.git;a=commit;h=4d33233b
7
8 3.13.0: clean up line numbers
9
10 ---
11 3.13.0/4435_grsec-mute-warnings.patch | 2 +-
12 3.13.0/4450_grsec-kconfig-default-gids.patch | 12 ++++++------
13 3.13.0/4465_selinux-avc_audit-log-curr_ip.patch | 2 +-
14 3.13.0/4470_disable-compat_vdso.patch | 2 +-
15 4 files changed, 9 insertions(+), 9 deletions(-)
16
17 diff --git a/3.13.0/4435_grsec-mute-warnings.patch b/3.13.0/4435_grsec-mute-warnings.patch
18 index ed941d5..cb51a05 100644
19 --- a/3.13.0/4435_grsec-mute-warnings.patch
20 +++ b/3.13.0/4435_grsec-mute-warnings.patch
21 @@ -31,7 +31,7 @@ Acked-by: Christian Heim <phreak@g.o>
22
23 --- a/Makefile 2011-11-18 17:50:11.000000000 -0500
24 +++ b/Makefile 2011-11-18 17:50:48.000000000 -0500
25 -@@ -241,7 +241,7 @@
26 +@@ -244,7 +244,7 @@
27
28 HOSTCC = gcc
29 HOSTCXX = g++
30
31 diff --git a/3.13.0/4450_grsec-kconfig-default-gids.patch b/3.13.0/4450_grsec-kconfig-default-gids.patch
32 index cdd1703..207c450 100644
33 --- a/3.13.0/4450_grsec-kconfig-default-gids.patch
34 +++ b/3.13.0/4450_grsec-kconfig-default-gids.patch
35 @@ -16,7 +16,7 @@ from shooting themselves in the foot.
36 diff -Naur a/grsecurity/Kconfig b/grsecurity/Kconfig
37 --- a/grsecurity/Kconfig 2012-10-13 09:51:35.000000000 -0400
38 +++ b/grsecurity/Kconfig 2012-10-13 09:52:32.000000000 -0400
39 -@@ -626,7 +626,7 @@
40 +@@ -656,7 +656,7 @@
41 config GRKERNSEC_AUDIT_GID
42 int "GID for auditing"
43 depends on GRKERNSEC_AUDIT_GROUP
44 @@ -25,7 +25,7 @@ diff -Naur a/grsecurity/Kconfig b/grsecurity/Kconfig
45
46 config GRKERNSEC_EXECLOG
47 bool "Exec logging"
48 -@@ -857,7 +857,7 @@
49 +@@ -887,7 +887,7 @@
50 config GRKERNSEC_TPE_UNTRUSTED_GID
51 int "GID for TPE-untrusted users"
52 depends on GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT
53 @@ -34,7 +34,7 @@ diff -Naur a/grsecurity/Kconfig b/grsecurity/Kconfig
54 help
55 Setting this GID determines what group TPE restrictions will be
56 *enabled* for. If the sysctl option is enabled, a sysctl option
57 -@@ -866,7 +866,7 @@
58 +@@ -896,7 +896,7 @@
59 config GRKERNSEC_TPE_TRUSTED_GID
60 int "GID for TPE-trusted users"
61 depends on GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT
62 @@ -43,7 +43,7 @@ diff -Naur a/grsecurity/Kconfig b/grsecurity/Kconfig
63 help
64 Setting this GID determines what group TPE restrictions will be
65 *disabled* for. If the sysctl option is enabled, a sysctl option
66 -@@ -959,7 +959,7 @@
67 +@@ -989,7 +989,7 @@
68 config GRKERNSEC_SOCKET_ALL_GID
69 int "GID to deny all sockets for"
70 depends on GRKERNSEC_SOCKET_ALL
71 @@ -52,7 +52,7 @@ diff -Naur a/grsecurity/Kconfig b/grsecurity/Kconfig
72 help
73 Here you can choose the GID to disable socket access for. Remember to
74 add the users you want socket access disabled for to the GID
75 -@@ -980,7 +980,7 @@
76 +@@ -1010,7 +1010,7 @@
77 config GRKERNSEC_SOCKET_CLIENT_GID
78 int "GID to deny client sockets for"
79 depends on GRKERNSEC_SOCKET_CLIENT
80 @@ -61,7 +61,7 @@ diff -Naur a/grsecurity/Kconfig b/grsecurity/Kconfig
81 help
82 Here you can choose the GID to disable client socket access for.
83 Remember to add the users you want client socket access disabled for to
84 -@@ -998,7 +998,7 @@
85 +@@ -1028,7 +1028,7 @@
86 config GRKERNSEC_SOCKET_SERVER_GID
87 int "GID to deny server sockets for"
88 depends on GRKERNSEC_SOCKET_SERVER
89
90 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
91 index 04ec3fb..ddabda7 100644
92 --- a/3.13.0/4465_selinux-avc_audit-log-curr_ip.patch
93 +++ b/3.13.0/4465_selinux-avc_audit-log-curr_ip.patch
94 @@ -28,7 +28,7 @@ Signed-off-by: Lorenzo Hernandez Garcia-Hierro <lorenzo@×××.org>
95 diff -Naur a/grsecurity/Kconfig b/grsecurity/Kconfig
96 --- a/grsecurity/Kconfig 2011-04-17 19:25:54.000000000 -0400
97 +++ b/grsecurity/Kconfig 2011-04-17 19:32:53.000000000 -0400
98 -@@ -1093,6 +1093,27 @@
99 +@@ -1123,6 +1123,27 @@
100 menu "Logging Options"
101 depends on GRKERNSEC
102
103
104 diff --git a/3.13.0/4470_disable-compat_vdso.patch b/3.13.0/4470_disable-compat_vdso.patch
105 index 209dfae..a25c029 100644
106 --- a/3.13.0/4470_disable-compat_vdso.patch
107 +++ b/3.13.0/4470_disable-compat_vdso.patch
108 @@ -26,7 +26,7 @@ Closes bug: http://bugs.gentoo.org/show_bug.cgi?id=210138
109 diff -urp a/arch/x86/Kconfig b/arch/x86/Kconfig
110 --- a/arch/x86/Kconfig 2009-07-31 01:36:57.323857684 +0100
111 +++ b/arch/x86/Kconfig 2009-07-31 01:51:39.395749681 +0100
112 -@@ -1818,17 +1818,8 @@
113 +@@ -1823,17 +1823,8 @@
114
115 config COMPAT_VDSO
116 def_bool n