diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2013-06-13 07:28:34 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-06-19 06:38:19 +0000 |
commit | 308a108d91e3b3310ca9175bf5663ff2c5f0e6ff (patch) | |
tree | f0ca69692021b7d018d23c2e5b3afdb58c961f9c | |
parent | f535ac0d0ba8351b98b4658280277391bf4e03c1 (diff) | |
download | alpine_aports-308a108d91e3b3310ca9175bf5663ff2c5f0e6ff.tar.bz2 alpine_aports-308a108d91e3b3310ca9175bf5663ff2c5f0e6ff.tar.xz alpine_aports-308a108d91e3b3310ca9175bf5663ff2c5f0e6ff.zip |
main/linux-grsec: upgrade to grsecurity-2.9.1-3.9.5-201306111850
(cherry picked from commit 08e5c47fa30c60652b2a3c71af9251f488bf1f03)
-rw-r--r-- | main/linux-grsec/APKBUILD | 10 | ||||
-rw-r--r-- | main/linux-grsec/grsecurity-2.9.1-3.9.5-201306111850.patch (renamed from main/linux-grsec/grsecurity-2.9.1-3.9.5-201306102218.patch) | 11 |
2 files changed, 15 insertions, 6 deletions
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD index 997d1d4726..bbaacff686 100644 --- a/main/linux-grsec/APKBUILD +++ b/main/linux-grsec/APKBUILD | |||
@@ -7,7 +7,7 @@ case $pkgver in | |||
7 | *.*.*) _kernver=${pkgver%.*};; | 7 | *.*.*) _kernver=${pkgver%.*};; |
8 | *.*) _kernver=${pkgver};; | 8 | *.*) _kernver=${pkgver};; |
9 | esac | 9 | esac |
10 | pkgrel=0 | 10 | pkgrel=1 |
11 | pkgdesc="Linux kernel with grsecurity" | 11 | pkgdesc="Linux kernel with grsecurity" |
12 | url=http://grsecurity.net | 12 | url=http://grsecurity.net |
13 | depends="mkinitfs linux-firmware" | 13 | depends="mkinitfs linux-firmware" |
@@ -17,7 +17,7 @@ _config=${config:-kernelconfig.${CARCH}} | |||
17 | install= | 17 | install= |
18 | source="http://ftp.kernel.org/pub/linux/kernel/v3.x/linux-$_kernver.tar.xz | 18 | source="http://ftp.kernel.org/pub/linux/kernel/v3.x/linux-$_kernver.tar.xz |
19 | http://ftp.kernel.org/pub/linux/kernel/v3.x/patch-$pkgver.xz | 19 | http://ftp.kernel.org/pub/linux/kernel/v3.x/patch-$pkgver.xz |
20 | grsecurity-2.9.1-3.9.5-201306102218.patch | 20 | grsecurity-2.9.1-3.9.5-201306111850.patch |
21 | 21 | ||
22 | 0001-net-inform-NETDEV_CHANGE-callbacks-which-flags-were-.patch | 22 | 0001-net-inform-NETDEV_CHANGE-callbacks-which-flags-were-.patch |
23 | 0002-arp-flush-arp-cache-on-IFF_NOARP-change.patch | 23 | 0002-arp-flush-arp-cache-on-IFF_NOARP-change.patch |
@@ -150,7 +150,7 @@ dev() { | |||
150 | 150 | ||
151 | md5sums="4348c9b6b2eb3144d601e87c19d5d909 linux-3.9.tar.xz | 151 | md5sums="4348c9b6b2eb3144d601e87c19d5d909 linux-3.9.tar.xz |
152 | aa22187ae5cd482a69097e9e59244491 patch-3.9.5.xz | 152 | aa22187ae5cd482a69097e9e59244491 patch-3.9.5.xz |
153 | 58dec4906c5abc6dc29355eb31816933 grsecurity-2.9.1-3.9.5-201306102218.patch | 153 | cbc169ce43edf201acb158ce7e468516 grsecurity-2.9.1-3.9.5-201306111850.patch |
154 | a16f11b12381efb3bec79b9bfb329836 0001-net-inform-NETDEV_CHANGE-callbacks-which-flags-were-.patch | 154 | a16f11b12381efb3bec79b9bfb329836 0001-net-inform-NETDEV_CHANGE-callbacks-which-flags-were-.patch |
155 | 656ae7b10dd2f18dbfa1011041d08d60 0002-arp-flush-arp-cache-on-IFF_NOARP-change.patch | 155 | 656ae7b10dd2f18dbfa1011041d08d60 0002-arp-flush-arp-cache-on-IFF_NOARP-change.patch |
156 | aa454ffb96428586447775c21449e284 0003-ipv4-properly-refresh-rtable-entries-on-pmtu-redirec.patch | 156 | aa454ffb96428586447775c21449e284 0003-ipv4-properly-refresh-rtable-entries-on-pmtu-redirec.patch |
@@ -161,7 +161,7 @@ aa454ffb96428586447775c21449e284 0003-ipv4-properly-refresh-rtable-entries-on-p | |||
161 | 1d057c89927a68e5f44896887ad3e379 kernelconfig.x86_64" | 161 | 1d057c89927a68e5f44896887ad3e379 kernelconfig.x86_64" |
162 | sha256sums="60bc3e64ee5dc778de2cd7cd7640abf518a4c9d4f31b8ed624e16fad53f54541 linux-3.9.tar.xz | 162 | sha256sums="60bc3e64ee5dc778de2cd7cd7640abf518a4c9d4f31b8ed624e16fad53f54541 linux-3.9.tar.xz |
163 | f25145ff6ddde7a633839aabfd97b0d8239e14c494fd16210871229a35c1c0de patch-3.9.5.xz | 163 | f25145ff6ddde7a633839aabfd97b0d8239e14c494fd16210871229a35c1c0de patch-3.9.5.xz |
164 | 196ee8f6b9fc368ac7c09dc6f929e947f4a02b7ef66c2f84f00fa7f682774604 grsecurity-2.9.1-3.9.5-201306102218.patch | 164 | 12ea825b5494c41529d1b3dda89fe592d6b4fc06d027b2e7f2e9a1ae41c3617c grsecurity-2.9.1-3.9.5-201306111850.patch |
165 | 6af3757ac36a6cd3cda7b0a71b08143726383b19261294a569ad7f4042c72df3 0001-net-inform-NETDEV_CHANGE-callbacks-which-flags-were-.patch | 165 | 6af3757ac36a6cd3cda7b0a71b08143726383b19261294a569ad7f4042c72df3 0001-net-inform-NETDEV_CHANGE-callbacks-which-flags-were-.patch |
166 | dc8e82108615657f1fb9d641efd42255a5761c06edde1b00a41ae0d314d548f0 0002-arp-flush-arp-cache-on-IFF_NOARP-change.patch | 166 | dc8e82108615657f1fb9d641efd42255a5761c06edde1b00a41ae0d314d548f0 0002-arp-flush-arp-cache-on-IFF_NOARP-change.patch |
167 | 0985caa0f3ee8ed0959aeaa4214f5f8057ae8e61d50dcae39194912d31e14892 0003-ipv4-properly-refresh-rtable-entries-on-pmtu-redirec.patch | 167 | 0985caa0f3ee8ed0959aeaa4214f5f8057ae8e61d50dcae39194912d31e14892 0003-ipv4-properly-refresh-rtable-entries-on-pmtu-redirec.patch |
@@ -172,7 +172,7 @@ cc3bd3d23f6a73ea6488c158de9d195ad5e3d87859ce02d92a04f0e08c9503d3 kernelconfig.x | |||
172 | b780ef646b3b30a5b0307102367e17d45bb3a0ab7e37cf92a1ce783c3149243a kernelconfig.x86_64" | 172 | b780ef646b3b30a5b0307102367e17d45bb3a0ab7e37cf92a1ce783c3149243a kernelconfig.x86_64" |
173 | sha512sums="77fa521f42380409f8ab400c26f7b00e225cb075ef40834bb263325cfdcc3e65aef8511ec2fc2b50bbf4f50e226fb5ab07d7a479aaf09162adbbf318325d0790 linux-3.9.tar.xz | 173 | sha512sums="77fa521f42380409f8ab400c26f7b00e225cb075ef40834bb263325cfdcc3e65aef8511ec2fc2b50bbf4f50e226fb5ab07d7a479aaf09162adbbf318325d0790 linux-3.9.tar.xz |
174 | 8e9a064adadd062c7ca52c44de19dfd46b029e60f2832988a606e086b669ea699861ec57732d4abfb16e486f767d123fcfd66da7c2ddde380b7c13582bb44983 patch-3.9.5.xz | 174 | 8e9a064adadd062c7ca52c44de19dfd46b029e60f2832988a606e086b669ea699861ec57732d4abfb16e486f767d123fcfd66da7c2ddde380b7c13582bb44983 patch-3.9.5.xz |
175 | 704f65e048888c64aa02214e80103745f16f2ddebe9e8304331208436481ca6b1fcadc2e862203142ac98b6d5f7c409ba542b68c11775c4e7ba765a63b3ab2a6 grsecurity-2.9.1-3.9.5-201306102218.patch | 175 | e52a55753c0821c08578924abe2d6ccc02743050e71c827fefd21e616a887e45459f3a7eb56b22b6ec0d25555cbb37f0df5cd1fe695b2277dfd7109f4f84ae8a grsecurity-2.9.1-3.9.5-201306111850.patch |
176 | 81e78593288e8b0fd2c03ea9fc1450323887707f087e911f172450a122bc9b591ee83394836789730d951aeec13d0b75a64e1c05f04364abf8f80d883ddc4a02 0001-net-inform-NETDEV_CHANGE-callbacks-which-flags-were-.patch | 176 | 81e78593288e8b0fd2c03ea9fc1450323887707f087e911f172450a122bc9b591ee83394836789730d951aeec13d0b75a64e1c05f04364abf8f80d883ddc4a02 0001-net-inform-NETDEV_CHANGE-callbacks-which-flags-were-.patch |
177 | 51ecb15b669f6a82940a13a38939116e003bf5dfd24496771c8279e907b72adcc63d607f0340a2940d757e12ddadb7d45c7af78ae311d284935a6296dbcac00c 0002-arp-flush-arp-cache-on-IFF_NOARP-change.patch | 177 | 51ecb15b669f6a82940a13a38939116e003bf5dfd24496771c8279e907b72adcc63d607f0340a2940d757e12ddadb7d45c7af78ae311d284935a6296dbcac00c 0002-arp-flush-arp-cache-on-IFF_NOARP-change.patch |
178 | 57d0a8bd35d19cf657ded58efe24517d2252aec6984040713ba173a34edb5887ececaa2985076bc6a149eaa57639fd98a042c1c2d226ed4ad8dd5ed0e230717e 0003-ipv4-properly-refresh-rtable-entries-on-pmtu-redirec.patch | 178 | 57d0a8bd35d19cf657ded58efe24517d2252aec6984040713ba173a34edb5887ececaa2985076bc6a149eaa57639fd98a042c1c2d226ed4ad8dd5ed0e230717e 0003-ipv4-properly-refresh-rtable-entries-on-pmtu-redirec.patch |
diff --git a/main/linux-grsec/grsecurity-2.9.1-3.9.5-201306102218.patch b/main/linux-grsec/grsecurity-2.9.1-3.9.5-201306111850.patch index 49e438f1bb..183d9f7a54 100644 --- a/main/linux-grsec/grsecurity-2.9.1-3.9.5-201306102218.patch +++ b/main/linux-grsec/grsecurity-2.9.1-3.9.5-201306111850.patch | |||
@@ -22507,7 +22507,7 @@ index 7a6f3b3..bed145d7 100644 | |||
22507 | 22507 | ||
22508 | 1: | 22508 | 1: |
22509 | diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c | 22509 | diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c |
22510 | index fae9134..b7d4a57 100644 | 22510 | index fae9134..f8e4a47 100644 |
22511 | --- a/arch/x86/kernel/setup.c | 22511 | --- a/arch/x86/kernel/setup.c |
22512 | +++ b/arch/x86/kernel/setup.c | 22512 | +++ b/arch/x86/kernel/setup.c |
22513 | @@ -111,6 +111,7 @@ | 22513 | @@ -111,6 +111,7 @@ |
@@ -22536,6 +22536,15 @@ index fae9134..b7d4a57 100644 | |||
22536 | 22536 | ||
22537 | sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map); | 22537 | sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map); |
22538 | } | 22538 | } |
22539 | @@ -782,7 +783,7 @@ static void __init trim_bios_range(void) | ||
22540 | /* called before trim_bios_range() to spare extra sanitize */ | ||
22541 | static void __init e820_add_kernel_range(void) | ||
22542 | { | ||
22543 | - u64 start = __pa_symbol(_text); | ||
22544 | + u64 start = __pa_symbol(ktla_ktva(_text)); | ||
22545 | u64 size = __pa_symbol(_end) - start; | ||
22546 | |||
22547 | /* | ||
22539 | @@ -844,8 +845,12 @@ static void __init trim_low_memory_range(void) | 22548 | @@ -844,8 +845,12 @@ static void __init trim_low_memory_range(void) |
22540 | 22549 | ||
22541 | void __init setup_arch(char **cmdline_p) | 22550 | void __init setup_arch(char **cmdline_p) |