diff options
Diffstat (limited to 'main/linux-grsec')
| -rw-r--r-- | main/linux-grsec/APKBUILD | 20 | ||||
| -rw-r--r-- | main/linux-grsec/fix-xen-ssp.patch | 36 |
2 files changed, 8 insertions, 48 deletions
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD index 77af6a445b..69f0a955ab 100644 --- a/main/linux-grsec/APKBUILD +++ b/main/linux-grsec/APKBUILD @@ -2,12 +2,12 @@ _mainflavor=grsec pkgname=linux-$_mainflavor -pkgver=4.4.20 +pkgver=4.4.21 case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=${pkgver};; esac -pkgrel=1 +pkgrel=0 pkgdesc="Linux kernel with grsecurity" url=http://grsecurity.net depends="mkinitfs" @@ -21,7 +21,6 @@ source="http://ftp.kernel.org/pub/linux/kernel/v4.x/linux-$_kernver.tar.xz fix-spi-nor-namespace-clash.patch imx6q-no-unclocked-sleep.patch - fix-xen-ssp.patch gcc6.patch config-grsec.x86 @@ -215,11 +214,10 @@ virtgrsec_dev() { } md5sums="9a78fa2eb6c68ca5a40ed5af08142599 linux-4.4.tar.xz -335c5874b26a814987960b9170547a64 patch-4.4.20.xz -64062fa71e77623c3164b47ee6fa92f2 grsecurity-3.1-4.4.20-201604252206-alpine.patch +39ab4f8a069ed5bc3b07b7e7c89926a8 patch-4.4.21.xz +19d63739e4524275171164f6f3820b31 grsecurity-3.1-4.4.21-201604252206-alpine.patch c32f1d7517a095a2645fc1c7dec5db8f fix-spi-nor-namespace-clash.patch b11c29ee88f7f537973191036d48bee7 imx6q-no-unclocked-sleep.patch -8f4b55a9172cf886675c8161c97da6e1 fix-xen-ssp.patch 90e0fca6cb7bca277394b0db7f605098 gcc6.patch 2da05cb44c4f954f05f58734f4e16760 config-grsec.x86 8d86b346ae0a68fea58f3eab2338641b config-grsec.x86_64 @@ -227,11 +225,10 @@ b11c29ee88f7f537973191036d48bee7 imx6q-no-unclocked-sleep.patch 429e5174e3cbbacff55d8055df37719e config-virtgrsec.x86 1106a5fdbf270683d91e7f20abd5fa1f config-virtgrsec.x86_64" sha256sums="401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2 linux-4.4.tar.xz -da9d7d3548070bc4a333786778f628eaa2a76e10f21a34567f591834a9e87d27 patch-4.4.20.xz -0fe119716bc047ae2221e760bf3023c27ccfde2cfd040d405c462a315548154c grsecurity-3.1-4.4.20-201604252206-alpine.patch +278c4ea17ef539e81cb597f0e7e84750649d0f7fddcb27d99abfcb46da9db737 patch-4.4.21.xz +a03cd444d3db410e67b52b59876e56e30b7c138751e9787ffcfef16ba9aae5e6 grsecurity-3.1-4.4.21-201604252206-alpine.patch b8ce28c61663dbd92f7e1c862c042c88c4d0459ce15f6e6ea121e20705b66212 fix-spi-nor-namespace-clash.patch 7e8a954750139a421a76e414e19a3b57645c9ec70e6c14a6b7708a3fa0cfd5e4 imx6q-no-unclocked-sleep.patch -baf5e43ceb3c5958026da57b1da594d0d82cbd82d964c90c86c80efed6ee8744 fix-xen-ssp.patch 21640b417cb9a389bf7be6a11dc71a481ec76fcfcc758992a9be158ab6a643e8 gcc6.patch 4098706e52e79c99b56e74c5aea53ba157c561c794819c130656d92a7b452210 config-grsec.x86 7a332837c3d63bf90bbab1df759801834393894e13f8a0647976dcec9d87a376 config-grsec.x86_64 @@ -239,11 +236,10 @@ baf5e43ceb3c5958026da57b1da594d0d82cbd82d964c90c86c80efed6ee8744 fix-xen-ssp.pa 67814690ece448328e4004a979f27d14a2b2eef5f5ec5a0f9fa0cc9b42157967 config-virtgrsec.x86 166c6cec181cb1e4db38b3d5b34c5db561ec78b38b40112cde916267c3a75260 config-virtgrsec.x86_64" sha512sums="13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e linux-4.4.tar.xz -551c375ce851304edbf8969e104e4d5b570b280a90ef5502f560dc482f6d8140256baba057ce4ffeea1a9338b2775cc1dbdc9a5f2acdf630c78fce32932deadb patch-4.4.20.xz -d5367618ea58a63fa1014522adb64574bdda5c959f829ba284015b0ff99cfd8c9500383cb900e959ef4b5967d0f7b35c4c4b94a944a4aa84fa342ecd1ccbd7a8 grsecurity-3.1-4.4.20-201604252206-alpine.patch +284f3f43942001429fbb55a71e74521d85109d8402add25fe4160b515733741af47a181fffb0bdc44a825b42812a92f8d2cb27bff603fa353d76341d420fd85e patch-4.4.21.xz +f7619d6b26a1022b4c7b72c22acbbb50ed3c1ec34186ee9008f336f382ef40d4f43f5e83da50cae816148302dd2285682fca74013835ea47bd443c840f937107 grsecurity-3.1-4.4.21-201604252206-alpine.patch 410fe7dae27cb4998d17a441a5b2a19dd350636ead2de97d4ef5317501d9e82e2550bfca0f022c9be6296907c076c381e1e13060d1900ff26ee7d47f234fb104 fix-spi-nor-namespace-clash.patch 9980eb10f529bc5ce482ab0a0037febbc982b528c3e4d02fc4547e6dd45dc529a7b1711d0c89f942b1ae27842c3794b68a6b8959ef80f6fd00183d3a591cea07 imx6q-no-unclocked-sleep.patch -d398cd45e06ab587ebf83b06417d368c54c3d260ad0f8bc8659367df25c8eef1a56ef24cc81291d79d8daf6bc34415a3af6036e9361b9ab15d911145a8fa9e8b fix-xen-ssp.patch edcebc229956a05621ec1c89039b56aa61b468c74b54420ff72bd08658b65d29d6af385a7d78d1ce4b39889b407106b99efe7309f8a82974a74eb9edb9e89b64 gcc6.patch 0ba45dc80b9070a18bd31155eb2e658efdf8106fb331978d0b32bea68c9a401990b681df834319c9fa8599a78583bd4c45c274aa3d251aabc740d06141c5beb6 config-grsec.x86 65c8a18d3107be8766060eb7d7c89f2b865b38dc7e93f4110bffd98ef009f9cc192b3c9ad6fecbe412208c8efa93a526e81d4362bd207e6a585f30cc22ee8603 config-grsec.x86_64 diff --git a/main/linux-grsec/fix-xen-ssp.patch b/main/linux-grsec/fix-xen-ssp.patch deleted file mode 100644 index ebe352ed19..0000000000 --- a/main/linux-grsec/fix-xen-ssp.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c -index de1c6d4..25cf7f8 100644 ---- a/arch/x86/xen/enlighten.c -+++ b/arch/x86/xen/enlighten.c -@@ -1566,6 +1566,15 @@ asmlinkage __visible void __init xen_start_kernel(void) - */ - __userpte_alloc_gfp &= ~__GFP_HIGHMEM; - -+ /* Get mfn list */ -+ xen_build_dynamic_phys_to_machine(); -+ -+ /* -+ * Set up kernel GDT and segment registers, mainly so that -+ * -fstack-protector code can be executed. -+ */ -+ xen_setup_gdt(0); -+ - /* Work out if we support NX */ - #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE) - if ((cpuid_eax(0x80000000) & 0xffff0000) == 0x80000000 && -@@ -1579,15 +1588,6 @@ asmlinkage __visible void __init xen_start_kernel(void) - } - #endif - -- /* Get mfn list */ -- xen_build_dynamic_phys_to_machine(); -- -- /* -- * Set up kernel GDT and segment registers, mainly so that -- * -fstack-protector code can be executed. -- */ -- xen_setup_gdt(0); -- - xen_init_irq_ops(); - xen_init_cpuid_mask(); - |