main/linux-grsec: upgrade to 4.1.15, fix armhf config

2 files changed, 20 insertions, 24 deletions

diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD
index a0c0525e28..7ccfe6e8e7 100644
--- a/main/linux-grsec/APKBUILD
+++ b/main/linux-grsec/APKBUILD
@@ -2,7 +2,7 @@
 
 _mainflavor=grsec
 pkgname=linux-$_mainflavor
-pkgver=4.1.13
+pkgver=4.1.15
 case $pkgver in
 *.*.*)	_kernver=${pkgver%.*};;
 *.*)	_kernver=${pkgver};;
@@ -17,8 +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
-	http://dev.alpinelinux.org/~ncopa/grsec/pax-linux-4.1.13-test24-alpine.patch
-	http://dev.alpinelinux.org/~ncopa/grsec/grsec-4.1.13-3.1-201509112213-alpine.patch
+	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
 
 	fix-spi-nor-namespace-clash.patch
 	imx6q-no-unclocked-sleep.patch
@@ -203,35 +203,35 @@ dev() {
 }
 
 md5sums="fe9dc0f6729f36400ea81aa41d614c37  linux-4.1.tar.xz
-e1005015404c53692e8aa6dd14efff74  patch-4.1.13.xz
-60472958af5339402061fce591d4bda6  pax-linux-4.1.13-test24-alpine.patch
-0400a58a7adea38a1db7c05b4b3fea0d  grsec-4.1.13-3.1-201509112213-alpine.patch
+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
 b0337a2a9abed17c37eae5db332522d2  fix-spi-nor-namespace-clash.patch
 1a307fc1d63231bf01d22493a4f14378  imx6q-no-unclocked-sleep.patch
 f8eec4df8fcd64f5f4810a2840e8cee7  config-grsec.x86
 dcccfa220ed2b2041971492d1dfa9440  config-grsec.x86_64
-41dc69b5f5ceb6224a4d50e3837eaa6f  config-grsec.armhf
+cf395fd923139074f3f1095c29a63e2b  config-grsec.armhf
 28754e558f94f3b3e0b0fcc27c1c955f  config-virtgrsec.x86
 e1ee16152cd6b92aef67466e1710cf87  config-virtgrsec.x86_64"
 sha256sums="caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f  linux-4.1.tar.xz
-1c3ba78cbaa1a260798d6d0d2aa319ff41ae676b443e5bf06ab441436dcdd171  patch-4.1.13.xz
-ed1f9bda75ea85c19f14c287dcf806edbaa4dd2b61b454bc1c1d1989302cf266  pax-linux-4.1.13-test24-alpine.patch
-42072c95e94ecb22ee41901ddab0d07be1fb718e1032e32b263b3725f2f1d862  grsec-4.1.13-3.1-201509112213-alpine.patch
+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
 01279cfb93273d99670c56e2465957ecde3d03693beeb929a743f03afa0b7bdc  fix-spi-nor-namespace-clash.patch
 21179fbb22a5b74af0a609350ae1a170e232908572b201d02e791d2ce0a685d3  imx6q-no-unclocked-sleep.patch
 b179db21c31861da5da8a49307994e11e6a6b83d88fb3dffcf20b369ab32f8e6  config-grsec.x86
 f2c3a2b565346baa29bdf48bab6da6fcfa1723b505237ef33a0655bf80ef2e18  config-grsec.x86_64
-450fed9f9573bed167d34d2f00d71563cba131d3b4eac9c0348ae3e7692fb30d  config-grsec.armhf
+b996d6fc9eb8bd453826fb9c0ae573ef42a6fff3193adf33c2bf14480924ca16  config-grsec.armhf
 fcfeedde29606b94f79f79ceb9351bd5d018aca6a76bba04459d85e4ad94939f  config-virtgrsec.x86
 a3f09fc1092ecf4456980a6e2e723a9ea95746e0da5bf4a7363046614dc6ffd8  config-virtgrsec.x86_64"
 sha512sums="168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0  linux-4.1.tar.xz
-0fa60b9fceb6103c11ed1df8d4f264d1c4efcd75da258709f1d0a6813f8117977fa2279b36da22bd69cc2bc808b092207a438c2e80a65a988f4c72363a605832  patch-4.1.13.xz
-e4a3dda981c5171155dc796e7d44756231fb7eb3f0adb233a264cb1a83058c5f075fc6e9cd1dd34823f62d308925e9536841a8f5b30c6be41a3228363e33e8e5  pax-linux-4.1.13-test24-alpine.patch
-d0ff6f83f6c8e57335028ecc503ec54deb58e893eea9d409b4ffa0e99dde0fd7b2eff02dc6dcb606f42a71b05245ba4f67ce5d29c36628fa06f4238fdf3c33f9  grsec-4.1.13-3.1-201509112213-alpine.patch
+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
 4e3aeb70712f9838afea75fe9e6c1389414d833a89286ea55441d6a8d54ce74b0e39b565721e3153443af0a614bff57c767251b7e5b81faa5e0784eddfcd2164  fix-spi-nor-namespace-clash.patch
 87d1ad59732f265a5b0db54490dc1762c14ea4b868e7eb1aedc3ce57b48046de7bbc08cf5cfcf6f1380fa84063b0edb16ba3d5e3c5670be9bbb229275c88b221  imx6q-no-unclocked-sleep.patch
 b31862d0998cbe72882f2db3ab9452051bb5202a3921f5f4aebb24727a187227792af88c6b6ceef8ff28ab34123d1321bb8d06656f37c844afcf566571ba8865  config-grsec.x86
 87c4c3be53f03ee6e7c4fa1853b43c506ee5d35d4c156b5030424b7712e469521898a56c0b6a4562e31ea2bca855dae7429ea9048f9d2fa8b29db2d14211d230  config-grsec.x86_64
-7cf01405de57b195799395298e76aae9857aef180dd92e08dafbfe8a957d98821032b1c34db3d287430b9b8d4a9e9d0fe9e8f1fc46fd6f2e94b969faf41d2aab  config-grsec.armhf
+aecd465ceb265355ef71c213ee589cc18c7695589e3410fb8762669d5f728a7e071e1b05e3864a8c621dec870a472a0e1075b2b335fafabfe62891c7d746161d  config-grsec.armhf
 caec0c97bfd25c9cc6921addc8b39941284a38746d5b9c5f19c0f1fe679d9f4c6ee7881a2eb95a16dcfbb082486435f467d27d539405ee6094b70d13b3bf2276  config-virtgrsec.x86
 36f4cb73009cb5cf9f8e52ceae3537e8d84f4eaa1a7aa3850c893472cc661ce76b65b88403a3d7fa0bf31b179ac030bf0b8a1188214c771ebbc1c92c95d398a2  config-virtgrsec.x86_64"
diff --git a/main/linux-grsec/config-grsec.armhf b/main/linux-grsec/config-grsec.armhf
index 851d66560a..3ca6d2a410 100644
--- a/main/linux-grsec/config-grsec.armhf
+++ b/main/linux-grsec/config-grsec.armhf
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.1.10 Kernel Configuration
+# Linux/arm 4.1.13 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -71,7 +71,6 @@ CONFIG_HANDLE_DOMAIN_IRQ=y
 # CONFIG_IRQ_DOMAIN_DEBUG is not set
 CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_SPARSE_IRQ=y
-CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_ARCH_HAS_TICK_BROADCAST=y
 CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
@@ -539,7 +538,7 @@ CONFIG_SWP_EMULATE=y
 # CONFIG_CPU_ICACHE_DISABLE is not set
 # CONFIG_CPU_BPREDICT_DISABLE is not set
 CONFIG_KUSER_HELPERS=y
-CONFIG_VDSO=y
+# CONFIG_VDSO is not set
 CONFIG_OUTER_CACHE=y
 CONFIG_OUTER_CACHE_SYNC=y
 CONFIG_MIGHT_HAVE_CACHE_L2X0=y
@@ -5833,10 +5832,10 @@ CONFIG_HAVE_ARCH_KGDB=y
 CONFIG_STRICT_DEVMEM=y
 CONFIG_ARM_UNWIND=y
 # CONFIG_DEBUG_USER is not set
-CONFIG_DEBUG_LL=y
+# CONFIG_DEBUG_LL is not set
 # CONFIG_DEBUG_IMX51_UART is not set
 # CONFIG_DEBUG_IMX53_UART is not set
-CONFIG_DEBUG_IMX6Q_UART=y
+# CONFIG_DEBUG_IMX6Q_UART is not set
 # CONFIG_DEBUG_IMX6SL_UART is not set
 # CONFIG_DEBUG_IMX6SX_UART is not set
 # CONFIG_DEBUG_QCOM_UARTDM is not set
@@ -5868,12 +5867,10 @@ CONFIG_DEBUG_IMX6Q_UART=y
 # CONFIG_DEBUG_LL_UART_8250 is not set
 # CONFIG_DEBUG_LL_UART_PL01X is not set
 CONFIG_DEBUG_IMX_UART_PORT=1
-CONFIG_DEBUG_LL_INCLUDE="debug/imx.S"
+CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
 # CONFIG_DEBUG_UART_8250 is not set
 # CONFIG_DEBUG_UART_BCM63XX is not set
-CONFIG_DEBUG_UNCOMPRESS=y
 CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
-# CONFIG_EARLY_PRINTK is not set
 # CONFIG_ARM_KPROBES_TEST is not set
 # CONFIG_PID_IN_CONTEXTIDR is not set
 # CONFIG_DEBUG_SET_MODULE_RONX is not set
@@ -6282,4 +6279,3 @@ CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y
 CONFIG_ARCH_HAS_SG_CHAIN=y
 CONFIG_VIRTUALIZATION=y
-