main/linux-grsec: upgrade to 4.1.17

1 files changed, 30 insertions, 61 deletions

diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD
index bf11f823b7..08426096fd 100644
--- a/main/linux-grsec/APKBUILD
+++ b/main/linux-grsec/APKBUILD
@@ -2,12 +2,12 @@
 
 _mainflavor=grsec
 pkgname=linux-$_mainflavor
-pkgver=4.1.15
+pkgver=4.1.17
 case $pkgver in
 *.*.*)	_kernver=${pkgver%.*};;
 *.*)	_kernver=${pkgver};;
 esac
-pkgrel=5
+pkgrel=0
 pkgdesc="Linux kernel with grsecurity"
 url=http://grsecurity.net
 depends="mkinitfs"
@@ -17,23 +17,15 @@ 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
-	http://dev.alpinelinux.org/~tteras/grsec/pax-linux-4.1.15-test24-alpine.patch
-	http://dev.alpinelinux.org/~tteras/grsec/grsec-4.1.15-3.1-201509112213-alpine.patch
+	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
 
 	fix-spi-nor-namespace-clash.patch
 	imx6q-no-unclocked-sleep.patch
-	add-checks-for-allocation-failure-isdn_ppp_open.patch
-	validate-vj-compression-slot-parameters-completely.patch
-	kvm-svm-unconditionally-intercept-#db.patch
-	vivid-osd-fix-info-leak-in-ioctl.patch
-	staging-dgnc-fix-info-leak-in-ioctl.patch
-	net-add-validation-socket-syscall-protocol-argument.patch
-	pptp-verify-sockaddr_len.patch
-	ovl-fix-permission-checking-for-setattr.patch
-	0001-ovl-fix-getcwd-failure-after-unsuccessful-rmdir.patch
-	keys-fix-race-between-destruction-and-finding-keyring-by-name.patch
 	keys-fixes.patch
-	keys-fix-keyring-ref-leak-in-join_session_keyring.patch
+	ovl-fix-getcwd-failure-after-unsuccessful-rmdir.patch
+	ovl-fix-permission-checking-for-setattr.patch
+	staging-dgnc-fix-info-leak-in-ioctl.patch
+	via-velocity-length-check.patch
 
 	config-grsec.x86
 	config-grsec.x86_64
@@ -70,11 +62,12 @@ prepare() {
 
 	# first apply patches in specified order
 	for i in $source; do
-		case $i in
+		local file=${i%::*}
+		case $file in
 		*.patch)
-			msg "Applying $i..."
-			if ! patch -s -p1 -N -i "$srcdir"/${i##*/}; then
-				echo $i >>failed
+			msg "Applying $file..."
+			if ! patch -s -p1 -N -i "$srcdir"/${file##*/}; then
+				echo $file >>failed
 				_patch_failed=1
 			fi
 			;;
@@ -215,69 +208,45 @@ dev() {
 }
 
 md5sums="fe9dc0f6729f36400ea81aa41d614c37  linux-4.1.tar.xz
-5ec05841161a172f8ae1a7f38bb382b0  patch-4.1.15.xz
-d23ac8110941baf0f37f9e3a011e3720  pax-linux-4.1.15-test24-alpine.patch
-ba5670790e9ee117227024cb4b187756  grsec-4.1.15-3.1-201509112213-alpine.patch
+49c68f18968fa809e20a7b20423fd1d2  patch-4.1.17.xz
+cadb807b168b455f10b26baf749a8c00  grsecurity-4.1.17-3.1-201509201149-tld.patch
 b0337a2a9abed17c37eae5db332522d2  fix-spi-nor-namespace-clash.patch
 1a307fc1d63231bf01d22493a4f14378  imx6q-no-unclocked-sleep.patch
-4bf3d4e28a3318ea7251f862aa35dc95  add-checks-for-allocation-failure-isdn_ppp_open.patch
-9b150b8017a25fb6c9e9e29b1f1e791f  validate-vj-compression-slot-parameters-completely.patch
-c02b7d642341d3b82cff47d801813254  kvm-svm-unconditionally-intercept-#db.patch
-b52be7e646d3572687e4d26d4291233e  vivid-osd-fix-info-leak-in-ioctl.patch
-6c48221dbad6928f2b9f6c1f521c5844  staging-dgnc-fix-info-leak-in-ioctl.patch
-730439fc2751795dc00f1fb3ec810b12  net-add-validation-socket-syscall-protocol-argument.patch
-e4590e034252bb838220d2bedc19be2e  pptp-verify-sockaddr_len.patch
+04f93023c13c5cf3d9d5cbdf5c2a3ab3  keys-fixes.patch
+0ac0bfd35d8d857b790f3cf55028d967  ovl-fix-getcwd-failure-after-unsuccessful-rmdir.patch
 5f27a173424a42db509b46372c200e85  ovl-fix-permission-checking-for-setattr.patch
-0ac0bfd35d8d857b790f3cf55028d967  0001-ovl-fix-getcwd-failure-after-unsuccessful-rmdir.patch
-0526ef5b0cb5c8b697ab8fcd337d303e  keys-fix-race-between-destruction-and-finding-keyring-by-name.patch
-370b4498d0dc52eb8a85a23a5973bebf  keys-fixes.patch
-6470e9783bd1c7a8feddc2d67f07afd5  keys-fix-keyring-ref-leak-in-join_session_keyring.patch
+6c48221dbad6928f2b9f6c1f521c5844  staging-dgnc-fix-info-leak-in-ioctl.patch
+073d3b8947c33abf715a0e505f144a7e  via-velocity-length-check.patch
 8592323596689e3ef967ff96d1190d1b  config-grsec.x86
 81aab21a18c16cf96d0fa719564281ec  config-grsec.x86_64
 c4c15b3ba79bb557a67cd9356b56d7c4  config-grsec.armhf
 28754e558f94f3b3e0b0fcc27c1c955f  config-virtgrsec.x86
 ae802ba9bdf0dfa50e7506a08bbf929d  config-virtgrsec.x86_64"
 sha256sums="caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f  linux-4.1.tar.xz
-0ffca8557f1aa191da2f2260ad279c9cc858e6308a8af8a76f7ca3d3c0540344  patch-4.1.15.xz
-5cb29b9a0ffb72c11ff17a0c68a9bb6452ca15b79eb1fc00c179cdf1748f2d48  pax-linux-4.1.15-test24-alpine.patch
-a92b81dbd4fa4fbee28cebad93b0bd623820c809e98e8841151842341b9626eb  grsec-4.1.15-3.1-201509112213-alpine.patch
+60e5c4fb93705a1e7d075d528975661303d3a87c522f731b69da2e00f3170b10  patch-4.1.17.xz
+beb4a3343667b045b4680536f765719d1198086f5d57508f16a31fa18f8cbb41  grsecurity-4.1.17-3.1-201509201149-tld.patch
 01279cfb93273d99670c56e2465957ecde3d03693beeb929a743f03afa0b7bdc  fix-spi-nor-namespace-clash.patch
 21179fbb22a5b74af0a609350ae1a170e232908572b201d02e791d2ce0a685d3  imx6q-no-unclocked-sleep.patch
-78ca4ba9863d43ba498db628f2dfc2cf00427236745636025bd24513bdf05189  add-checks-for-allocation-failure-isdn_ppp_open.patch
-d2670dc40c47de365d36ba1e1bbef0ea3e6381f5d4c38e88a4c5db2eb4383925  validate-vj-compression-slot-parameters-completely.patch
-eb787ea2e4637708475569f7498c1ef0fa5e4e80ae22df5c5f44092615f86ebd  kvm-svm-unconditionally-intercept-#db.patch
-4070f46003fb5e1a16474f682da78d989809272a7aa209f794caa8d0b941e2c0  vivid-osd-fix-info-leak-in-ioctl.patch
-144886917b2c5ff880c4beb11ca8743b98ea5ed49bbd10a54a98e1d76cfe23b5  staging-dgnc-fix-info-leak-in-ioctl.patch
-180af96ce8310913f6662be50ca69c9737af250ef8dd3fdefdc58bef5f55ca9e  net-add-validation-socket-syscall-protocol-argument.patch
-5d3f0311176addb6cbbe0739736962cdb3826816e5cc0384f52d34cbd7c2c2a0  pptp-verify-sockaddr_len.patch
+246119a70831c0c01aabdbb31f75d0476883cfbc172e2a749655ec569569440f  keys-fixes.patch
+464fbfe582c2b841c629c78508d117108505aafdcc6fec8a2ae0b34193d04bbe  ovl-fix-getcwd-failure-after-unsuccessful-rmdir.patch
 79fa593d628d740c7bc2b68398ab381ad978293102d1f282919ee69aeab6a17d  ovl-fix-permission-checking-for-setattr.patch
-464fbfe582c2b841c629c78508d117108505aafdcc6fec8a2ae0b34193d04bbe  0001-ovl-fix-getcwd-failure-after-unsuccessful-rmdir.patch
-c3a7a6d1ca5c23c98ea703c716144dc88b5bcf5052416a7ff3c766beed78d7db  keys-fix-race-between-destruction-and-finding-keyring-by-name.patch
-653bdfac4fdac0fed19b60c8ae34afe97a699bbabe0e00888584c1ef52a626e1  keys-fixes.patch
-c11bf7442041f2ddaf6aea62b897c0753200aa64ca0e7b9f2c9700ea16326997  keys-fix-keyring-ref-leak-in-join_session_keyring.patch
+144886917b2c5ff880c4beb11ca8743b98ea5ed49bbd10a54a98e1d76cfe23b5  staging-dgnc-fix-info-leak-in-ioctl.patch
+25f174ca77217399a82e59740f60ea75db31a624578cba9ee501b5b7b7ae4cc7  via-velocity-length-check.patch
 fbc303521afbecbe2dccbe9955d108af53aaaa3388f2ca0962fc93f26a535a56  config-grsec.x86
 0d770dbef70ec200e9f0341f7840847c228ac5e5061401614aaa27db59922614  config-grsec.x86_64
 01b4f4e7eae350d40749f34e916e69c101f2fb5b3b7c2bd1917c29b8df3c2668  config-grsec.armhf
 fcfeedde29606b94f79f79ceb9351bd5d018aca6a76bba04459d85e4ad94939f  config-virtgrsec.x86
 91bb0c7e6ad7b438daba3be79117007ecd68afb89857381034467837247edd56  config-virtgrsec.x86_64"
 sha512sums="168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0  linux-4.1.tar.xz
-646daf16c01fb8c3013c7c9919c18c3635eb6bd37560623cb56cc7a6d0b22fb13290cee8865dfbcc435cd8544cc3ecb6f3aae538d10c9e0b1098806f233155a3  patch-4.1.15.xz
-e5bb53ac77a4b285fa4dd52cf50856669cb932669c2c8b1b9cd14d2384375d1ce9e997a760848c2c2e2c428e5d3c1c41aad890ee4009c9c4653d3a13721eab7a  pax-linux-4.1.15-test24-alpine.patch
-c737219a382206894889ddf8e807836a6fd08bb983b5e2327fae9f8427a0fa591c17f896b6e3f8dab4e356ae2d5f2aaa1cb642dea162eddc0c53c3a494928d52  grsec-4.1.15-3.1-201509112213-alpine.patch
+fa8675bac395ad7255693728ee601cd84a02aeee660ee5f2bf5684a6af053c9cf07afb0abb3324b1eb149305701a0bb9252053e840edc2aebb6499139dc12edd  patch-4.1.17.xz
+929d0e7b73c988c76b6131adf5d2ec28c95736022e3f198c7f37eb0acd18f3784bd622bc050d88bc553bf297cbed6686aca113465c6b5b2fef13867edf596369  grsecurity-4.1.17-3.1-201509201149-tld.patch
 4e3aeb70712f9838afea75fe9e6c1389414d833a89286ea55441d6a8d54ce74b0e39b565721e3153443af0a614bff57c767251b7e5b81faa5e0784eddfcd2164  fix-spi-nor-namespace-clash.patch
 87d1ad59732f265a5b0db54490dc1762c14ea4b868e7eb1aedc3ce57b48046de7bbc08cf5cfcf6f1380fa84063b0edb16ba3d5e3c5670be9bbb229275c88b221  imx6q-no-unclocked-sleep.patch
-2fac663732ec9f5d0089b7bfdc31e4166028b381da328aef405f4a2c9102486139bc759dccc704293d9fbc0d4a19d9682e31e62f913bfa5fd22a4ef77e4b2255  add-checks-for-allocation-failure-isdn_ppp_open.patch
-528604f2296bd1a67e32b465b4885ddba8ccf50925909e80cc523186ab03439c47eb5c016c133f3e3f27b0666f234f88a9c33399d7550867a448e12c73f878c2  validate-vj-compression-slot-parameters-completely.patch
-5d9628e59117b9b0e464bfdac4249663a8c46f8c0ac5f521e19bbb1d59ad3a0dc0d97de34a1f011033d31c792452e6b20a70081ec8cc208bf0671fb50017ab6c  kvm-svm-unconditionally-intercept-#db.patch
-98bd4ef55ce0b7c4b4fee638ba079555a7363f1b34bc415135bd2fcbd12957ef45d569d7bf85edcbf322638f9951e01951807279279e729bbc13bee3be5d2b45  vivid-osd-fix-info-leak-in-ioctl.patch
-51bdf43837e0bc24771b6dd67e4f5f49ae77716a49155b2b04ca17aa84a7aea65f858733795a91d8c5c3221a77c576370c0ccc7e711c32edaa87210cf55974ec  staging-dgnc-fix-info-leak-in-ioctl.patch
-d41f3b7c30d59a0fb43f877fff5a311c7fad8e12dfb51c519af368e8d1511202e6cceace3e051620a90e30f3c4b170847172764db045c9a5777663e2e9f2116c  net-add-validation-socket-syscall-protocol-argument.patch
-9454738454abee92200c7025a5b19e6870056ee71faf7e78dc10c0e7317e2d27c940ab031e2e53db856e1bea3b3fe5e32ce5aaa7c29dc833aa0f75d35bbf7a79  pptp-verify-sockaddr_len.patch
+8d4646d564e6beb60925724ca4cdef06ac08a4909629330f0e3c5cf1701dc82ca4bc9b809cdbf1f2229a30cc700106733cb77fea12885a44a0c4a65a1d5656d5  keys-fixes.patch
+928492c522cc376abc244f9aec25b10abf0efc4cf19e5f3b7130ed8efed904e674975a05b70f3f46343dba5aa324c46981cb98eea7a619defbb7235742a3333e  ovl-fix-getcwd-failure-after-unsuccessful-rmdir.patch
 061d58353e8d8eb83a10ae1cdfd16ff5d982ee594decd115d42f438293747b9f4ea3cb16ce242685b34d52ca57feb3b8e9f344adc425e1894f0283abe47ef355  ovl-fix-permission-checking-for-setattr.patch
-928492c522cc376abc244f9aec25b10abf0efc4cf19e5f3b7130ed8efed904e674975a05b70f3f46343dba5aa324c46981cb98eea7a619defbb7235742a3333e  0001-ovl-fix-getcwd-failure-after-unsuccessful-rmdir.patch
-d4d65eacdac1d9baed2ddf926f09a6d66b4dc42ea40ac9b118ad69dfd8dcc06052afb742aaf906fad54d70182d2243bdc1f0649eea7754a2402fc94447d568b1  keys-fix-race-between-destruction-and-finding-keyring-by-name.patch
-2611db9cca53ac6851beb9f48e51651090e6b97a644d260671d6f4aa2b2d75ff71276b6d14d0b2e5908bc261c86fc6c2dc4bd88e093fdd74e144983c720f0a2b  keys-fixes.patch
-89ba4dd5bc12bc188a63d370f815573885e91f9e856c57eab4410d41033d443554a20e417b72a810024ff8b3195300edb35a2d1f4c5a9feec036b387ad1f8fe5  keys-fix-keyring-ref-leak-in-join_session_keyring.patch
+51bdf43837e0bc24771b6dd67e4f5f49ae77716a49155b2b04ca17aa84a7aea65f858733795a91d8c5c3221a77c576370c0ccc7e711c32edaa87210cf55974ec  staging-dgnc-fix-info-leak-in-ioctl.patch
+0be40b94b99f0fa0ab975c833e50a121e45b057c812e229a3d175a7bc8b03472eb6ab4a1273988971db89625f55b9fc4a35b7696acb21709887294fcf8a7c48d  via-velocity-length-check.patch
 819ff2d16b5c15399de9b3c254d4ed6b7ef580a5b7cdacb209d90d35d178e93e34a5d6159b0edfab4afec9decf404901a7504f7b106c62c3dba0cdb4f0951a61  config-grsec.x86
 61b2f6b1264e51548c657b337a23592d7bdf0fe730f71e9039af098dd9ebd1b2bd7dbff1811ccb36c7c50b4cfef4cf19534a1f25ef05048a404fd6a6c3120a59  config-grsec.x86_64
 3be2587ca157eff3910ad1cd4dd9013c699e08d6f8fdde22458caa423f17591a7b386aad5f592f79baac4da6b32f5965483c3080c1cf2bc906fdffbe33a16bf7  config-grsec.armhf