diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2016-02-29 08:49:27 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-02-29 10:03:06 +0000 |
| commit | 3ae25b59de594e4dcc6cc8032c1fbb00a386bc70 (patch) | |
| tree | 48f9b833c5928c095cf813a4df75eceec31f80bc /main/linux-grsec | |
| parent | 569c7b9cf59ca30a67f0de79a9947cd84765574a (diff) | |
| download | aports-3ae25b59de594e4dcc6cc8032c1fbb00a386bc70.tar.bz2 aports-3ae25b59de594e4dcc6cc8032c1fbb00a386bc70.tar.xz | |
main/linux-grsec: upgrade to 4.1.18
Diffstat (limited to 'main/linux-grsec')
| -rw-r--r-- | main/linux-grsec/APKBUILD | 22 | ||||
| -rw-r--r-- | main/linux-grsec/fix-grsec-mm-slub.patch | 13 |
2 files changed, 9 insertions, 26 deletions
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD index 8209e9e7ef..8a3c626821 100644 --- a/main/linux-grsec/APKBUILD +++ b/main/linux-grsec/APKBUILD @@ -2,12 +2,12 @@ _mainflavor=grsec pkgname=linux-$_mainflavor -pkgver=4.1.17 +pkgver=4.1.18 case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=${pkgver};; esac -pkgrel=3 +pkgrel=0 pkgdesc="Linux kernel with grsecurity" url=http://grsecurity.net depends="mkinitfs" @@ -17,9 +17,8 @@ options="!strip" install= source="http://ftp.kernel.org/pub/linux/kernel/v4.x/linux-$_kernver.tar.xz http://ftp.kernel.org/pub/linux/kernel/v4.x/patch-$pkgver.xz - grsecurity-4.1.17-3.1-201509201149-tld.patch::http://git.tld-linux.org/?p=packages/kernel-grsecurity.git;a=blob_plain;f=grsecurity.patch;hb=2e7f40eae5385d264ca30ef9d730d99d833f23b5 + http://dev.alpinelinux.org/~tteras/grsec/grsec-4.1.18-3.1-201509201149-alpine.patch - fix-grsec-mm-slub.patch fix-spi-nor-namespace-clash.patch imx6q-no-unclocked-sleep.patch keys-fixes.patch @@ -221,9 +220,8 @@ dev() { } md5sums="fe9dc0f6729f36400ea81aa41d614c37 linux-4.1.tar.xz -49c68f18968fa809e20a7b20423fd1d2 patch-4.1.17.xz -cadb807b168b455f10b26baf749a8c00 grsecurity-4.1.17-3.1-201509201149-tld.patch -aa7d644860b1424a2223d19ecdf650ae fix-grsec-mm-slub.patch +cf5048c86823ee6182f0856ac5a3fa7d patch-4.1.18.xz +b6c95ca850d6e31fd15c6dbbff9ade38 grsec-4.1.18-3.1-201509201149-alpine.patch b0337a2a9abed17c37eae5db332522d2 fix-spi-nor-namespace-clash.patch 1a307fc1d63231bf01d22493a4f14378 imx6q-no-unclocked-sleep.patch 04f93023c13c5cf3d9d5cbdf5c2a3ab3 keys-fixes.patch @@ -249,9 +247,8 @@ c4c15b3ba79bb557a67cd9356b56d7c4 config-grsec.armhf 28754e558f94f3b3e0b0fcc27c1c955f config-virtgrsec.x86 ae802ba9bdf0dfa50e7506a08bbf929d config-virtgrsec.x86_64" sha256sums="caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f linux-4.1.tar.xz -60e5c4fb93705a1e7d075d528975661303d3a87c522f731b69da2e00f3170b10 patch-4.1.17.xz -beb4a3343667b045b4680536f765719d1198086f5d57508f16a31fa18f8cbb41 grsecurity-4.1.17-3.1-201509201149-tld.patch -76561d103feb35f4b5ce368f3bf690a085c0a322dbd0d160ecd5e91758df7978 fix-grsec-mm-slub.patch +c69cbff479740d6bbd452d2264ba0afefa99ae51bb7ae52bfbde348ea8d8b20c patch-4.1.18.xz +2d24b3a6234feb5a2a02c14061a6b769b46e07907604d9b43c60cb5145609125 grsec-4.1.18-3.1-201509201149-alpine.patch 01279cfb93273d99670c56e2465957ecde3d03693beeb929a743f03afa0b7bdc fix-spi-nor-namespace-clash.patch 21179fbb22a5b74af0a609350ae1a170e232908572b201d02e791d2ce0a685d3 imx6q-no-unclocked-sleep.patch 246119a70831c0c01aabdbb31f75d0476883cfbc172e2a749655ec569569440f keys-fixes.patch @@ -277,9 +274,8 @@ fbc303521afbecbe2dccbe9955d108af53aaaa3388f2ca0962fc93f26a535a56 config-grsec.x fcfeedde29606b94f79f79ceb9351bd5d018aca6a76bba04459d85e4ad94939f config-virtgrsec.x86 91bb0c7e6ad7b438daba3be79117007ecd68afb89857381034467837247edd56 config-virtgrsec.x86_64" sha512sums="168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0 linux-4.1.tar.xz -fa8675bac395ad7255693728ee601cd84a02aeee660ee5f2bf5684a6af053c9cf07afb0abb3324b1eb149305701a0bb9252053e840edc2aebb6499139dc12edd patch-4.1.17.xz -929d0e7b73c988c76b6131adf5d2ec28c95736022e3f198c7f37eb0acd18f3784bd622bc050d88bc553bf297cbed6686aca113465c6b5b2fef13867edf596369 grsecurity-4.1.17-3.1-201509201149-tld.patch -33bd075f38f69a583586883cdbea8970b8ba54c91c3f8389db675a9ad5fc56b903645e1c029ba4d040c8ea4ceb16fdeffc2635805eb983c14a213ea699854cd1 fix-grsec-mm-slub.patch +b95b82452206c2ef19e9fb1b01dcd6880c74f1b1fb9d8e1f209add734ba342d7c65401f3a4a2101eaa6b20b653b265ebc863052de71e01fa886ff7d7b1c1ad17 patch-4.1.18.xz +21bb5c3b4d92852652bc2cc75c85c312f183f221b5c116404f0cde570f48ffc592cc9c4b251f8e5ad74a8c9f3990915bbdcd9795b6e1e273492e7f500631301d grsec-4.1.18-3.1-201509201149-alpine.patch 4e3aeb70712f9838afea75fe9e6c1389414d833a89286ea55441d6a8d54ce74b0e39b565721e3153443af0a614bff57c767251b7e5b81faa5e0784eddfcd2164 fix-spi-nor-namespace-clash.patch 87d1ad59732f265a5b0db54490dc1762c14ea4b868e7eb1aedc3ce57b48046de7bbc08cf5cfcf6f1380fa84063b0edb16ba3d5e3c5670be9bbb229275c88b221 imx6q-no-unclocked-sleep.patch 8d4646d564e6beb60925724ca4cdef06ac08a4909629330f0e3c5cf1701dc82ca4bc9b809cdbf1f2229a30cc700106733cb77fea12885a44a0c4a65a1d5656d5 keys-fixes.patch diff --git a/main/linux-grsec/fix-grsec-mm-slub.patch b/main/linux-grsec/fix-grsec-mm-slub.patch deleted file mode 100644 index 7612f48c6e..0000000000 --- a/main/linux-grsec/fix-grsec-mm-slub.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/mm/slub.c b/mm/slub.c -index 61847f8..ef6e5be 100644 ---- a/mm/slub.c -+++ b/mm/slub.c -@@ -34,6 +34,7 @@ - #include <linux/stacktrace.h> - #include <linux/prefetch.h> - #include <linux/memcontrol.h> -+#include <linux/vmalloc.h> - - #include <trace/events/kmem.h> - - |