main/linux-grsec: upgrade to 4.9.9

disable CONFIG_WAN

1 files changed, 20 insertions, 51 deletions

diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD
index 887681a2aa..cbe547ff4a 100644
--- a/main/linux-grsec/APKBUILD
+++ b/main/linux-grsec/APKBUILD
@@ -2,7 +2,7 @@
 
 _mainflavor=grsec
 pkgname=linux-$_mainflavor
-pkgver=4.4.47
+pkgver=4.9.9
 case $pkgver in
 *.*.*)	_kernver=${pkgver%.*};;
 *.*)	_kernver=${pkgver};;
@@ -12,17 +12,12 @@ pkgdesc="Linux kernel with grsecurity"
 url=http://grsecurity.net
 depends="mkinitfs"
 makedepends="perl sed installkernel bash gmp-dev bc linux-headers mpfr-dev
-	mpc1-dev"
+	mpc1-dev elfutils-dev"
 options="!strip"
 install=
 source="https://kernel.org/pub/linux/kernel/v4.x/linux-$_kernver.tar.xz
 	https://kernel.org/pub/linux/kernel/v4.x/patch-$pkgver.xz
-	http://dev.alpinelinux.org/~ncopa/grsec/grsecurity-3.1-$pkgver-201604252206-alpine.patch
-
-	fix-spi-nor-namespace-clash.patch
-	imx6q-no-unclocked-sleep.patch
-	gcc6.patch
-
+	http://dev.alpinelinux.org/~ncopa/grsec/grsecurity-3.1-4.9.9-201702122044.patch
 	config-grsec.x86
 	config-grsec.x86_64
 	config-grsec.armhf
@@ -174,23 +169,22 @@ _dev() {
 	make -j1 -C "$srcdir"/linux-$_kernver O="$dir" HOSTCC="${CC:-gcc}" \
 		silentoldconfig prepare modules_prepare scripts
 
-	# remove the stuff that poits to real sources. we want 3rd party
+	# remove the stuff that points to real sources. we want 3rd party
 	# modules to believe this is the soruces
 	rm "$dir"/Makefile "$dir"/source
 
 	# copy the needed stuff from real sources
 	#
 	# this is taken from ubuntu kernel build script
-	# http://kernel.ubuntu.com/git?p=ubuntu/ubuntu-jaunty.git;a=blob;f=debian/rules.d/3-binary-indep.mk;hb=HEAD
+	# http://kernel.ubuntu.com/git/ubuntu/ubuntu-zesty.git/tree/debian/rules.d/3-binary-indep.mk
 	cd "$srcdir"/linux-$_kernver
-	find . -path './include/*' -prune -o -path './scripts/*' -prune \
-		-o -type f \( -name 'Makefile*' -o -name 'Kconfig*' \
-		-o -name 'Kbuild*' -o -name '*.sh' -o -name '*.pl' \
-		-o -name '*.lds' \) | cpio -pdm "$dir"
-	cp -a drivers/media/dvb/dvb-core/*.h "$dir"/drivers/media/dvb/dvb-core
-	cp -a drivers/media/video/*.h "$dir"/drivers/media/video
-	cp -a drivers/media/dvb/frontends/*.h "$dir"/drivers/media/dvb/frontends
-	cp -a scripts include "$dir"
+	find .  -path './include/*' -prune \
+		-o -path './scripts/*' -prune -o -type f \
+		\( -name 'Makefile*' -o -name 'Kconfig*' -o -name 'Kbuild*' -o \
+		   -name '*.sh' -o -name '*.pl' -o -name '*.lds' \) \
+		-print | cpio -pdm "$dir" || return 1
+
+	cp -a scripts include "$dir" || return 1
 	find $(find arch -name include -type d -print) -type f \
 		| cpio -pdm "$dir"
 
@@ -202,36 +196,11 @@ _dev() {
 		"$subpkgdir"/lib/modules/${_abi_release}/build
 }
 
-md5sums="9a78fa2eb6c68ca5a40ed5af08142599  linux-4.4.tar.xz
-4140c092d355a837ccab1707c8ad0d33  patch-4.4.47.xz
-35f420e24cf50afe01cd8919bffce06d  grsecurity-3.1-4.4.47-201604252206-alpine.patch
-c32f1d7517a095a2645fc1c7dec5db8f  fix-spi-nor-namespace-clash.patch
-b11c29ee88f7f537973191036d48bee7  imx6q-no-unclocked-sleep.patch
-90e0fca6cb7bca277394b0db7f605098  gcc6.patch
-0220ccde4e102bd54ad334a23347a432  config-grsec.x86
-e1b185c3baea29a66dfa8f90967c1120  config-grsec.x86_64
-35d10d9444978dc8009e9da5e33b0f43  config-grsec.armhf
-9b89c4ec614023e20f8e905ec2bad212  config-virtgrsec.x86
-87243f2790108ca568192169d3ca7408  config-virtgrsec.x86_64"
-sha256sums="401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2  linux-4.4.tar.xz
-21fd72caa322800b4668b4464d6ac4d8d66faa0056e08a5925d5911dab438c18  patch-4.4.47.xz
-f1b361ea77ceb67f9281ec5f8b0dd0f369293744e1f07d1707a08c6cecf1459a  grsecurity-3.1-4.4.47-201604252206-alpine.patch
-b8ce28c61663dbd92f7e1c862c042c88c4d0459ce15f6e6ea121e20705b66212  fix-spi-nor-namespace-clash.patch
-7e8a954750139a421a76e414e19a3b57645c9ec70e6c14a6b7708a3fa0cfd5e4  imx6q-no-unclocked-sleep.patch
-21640b417cb9a389bf7be6a11dc71a481ec76fcfcc758992a9be158ab6a643e8  gcc6.patch
-8ca6e71c3b0e0013a05dd95655de733f533055bdcdaade52667789c578b9bebc  config-grsec.x86
-588fb21febe695a7724ec00cb1576913cdb5ad12e12d00b3a0f73342c46cfe0c  config-grsec.x86_64
-d975df937d5a82b48bba790bd50bf7ed04782d92755a6eeacedc9e2796633e7a  config-grsec.armhf
-09e5db637018516a2216c9a45a47a471af69fdf94218e6ea016ec8261cd899d3  config-virtgrsec.x86
-7b38853b6d83223242832413669d7818ef1218c6b9e565e11dcc8b08f64a26e3  config-virtgrsec.x86_64"
-sha512sums="13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e  linux-4.4.tar.xz
-f52936ab1dc91314a3cede35f9116332ce999b6442bdb575eda68dd2e57cd96517abc18b3bb05a2492e6cd13f849a09cece13463dfaa2d81ad390f8127b62813  patch-4.4.47.xz
-ba8771ffaf3919238d1e1d2d553949a29f5a7b6b416ab5621d9f6eeb2fffcd8e71288f8122258452838d293e92a9669425ebbdc31815923d69547256a5e7659c  grsecurity-3.1-4.4.47-201604252206-alpine.patch
-410fe7dae27cb4998d17a441a5b2a19dd350636ead2de97d4ef5317501d9e82e2550bfca0f022c9be6296907c076c381e1e13060d1900ff26ee7d47f234fb104  fix-spi-nor-namespace-clash.patch
-9980eb10f529bc5ce482ab0a0037febbc982b528c3e4d02fc4547e6dd45dc529a7b1711d0c89f942b1ae27842c3794b68a6b8959ef80f6fd00183d3a591cea07  imx6q-no-unclocked-sleep.patch
-edcebc229956a05621ec1c89039b56aa61b468c74b54420ff72bd08658b65d29d6af385a7d78d1ce4b39889b407106b99efe7309f8a82974a74eb9edb9e89b64  gcc6.patch
-2d41ef3629dc4c2b71d2bd9707ecf1883bd9a264168425d56b35bb49cfd7b0a73b154501cf54c9f9df1848f3c564e502f276985b38a1dab3a067d5485874fcc6  config-grsec.x86
-c064ba25b0cb28d2f9c20da77899c6df6844b2538225011a063094c527a5ba59de5fbf619494dfb5c45fae91b637876493cc839095a9fc559d2f8cf9aa8003d3  config-grsec.x86_64
-a19b8179cce90e5cfe0ee30c85c0e9fd67274290d7556a5f2cb530ba9ee5f6e941ff96f20cebbd0223f3febfe8b0e3f30c7c2696dd9184c1d3ca9dcb0eca6f4a  config-grsec.armhf
-8c92f68afcf483ce203c8117d9459c3db0363a69b2112a2f1b67474532250d1ec9350aab555e69794709a045f8bf121ded9441f0cffc018b5a38746f9b908eee  config-virtgrsec.x86
-eb8d9d51dcbb762c954b41fa5e4d34d0a2da2fe6bd36a009db4fbf9513d07846ecbc648108cc93c1b6029b94f8a3dc703ab1d5f601fe8a70a369a3685fcb6260  config-virtgrsec.x86_64"
+sha512sums="bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a  linux-4.9.tar.xz
+a7a2d44b83b00b20f1424d12af0f42e1c576d3053feacd13491ef185661fb1c789b9265c500b62f5ede39f57b72f358820000fa6c852a5f035e566ee1dfcd5d9  patch-4.9.9.xz
+ba7396e1f69e89335cecd47db52c8855c993c13c9b2b9e805a0742fa1bd3a9092ae0459adb06f07a5233ff208ad9b6ced0fa68cacfe1a99b498c43ad953d5388  grsecurity-3.1-4.9.9-201702122044.patch
+de080dc463af81f60e142c4ed52f294f523759710ac6d5dc227e6dc26c4bd53c61d94480a9af3e377a658360c16cab86060afd68694545cbe501d8bb0915ef36  config-grsec.x86
+de5ad64e86bda944c1e6e7ae0eb77463fb0165e89c8ec23d9af12fddb79c0b566e8f3079b7bed1de8b27cef9bf1539f479e7114070772c078cb4288c45df1ff6  config-grsec.x86_64
+274116a39ef092524ad85cef2e88d0e7555dfd3c6e5c15c1ec22c28776c509a6040a5221b066e96c6d18807e518ae98f03c9c1059c73b60e8d45f2a9482bd77b  config-grsec.armhf
+1de874523eee031c2efadfb6f7ddb86bb303b9f61d1a022e4e922f6365c3a667c2a1fdb61570a95a05c6c45689796e355eae9579e567790b757ae2a09f6be8c4  config-virtgrsec.x86
+0570f4ad5af0d6e3cbf50d9e3a7d6dab8d7cba85693037e70dbee73aa1e4fc66cb217e1ef8e4a0ceb4073ffb6ada8201775bafe8401dc6dff5c07ac3bbe0f8f0  config-virtgrsec.x86_64"