main/linux-virt-grsec: upgrade to 3.14.36

5 files changed, 18 insertions, 16 deletions

diff --git a/main/linux-virt-grsec/APKBUILD b/main/linux-virt-grsec/APKBUILD
index 21dfbb298..6e01ed086 100644
--- a/main/linux-virt-grsec/APKBUILD
+++ b/main/linux-virt-grsec/APKBUILD
@@ -3,12 +3,12 @@
 
 _flavor=virt-grsec
 pkgname=linux-${_flavor}
-pkgver=3.14.30
+pkgver=3.14.36
 case $pkgver in
 *.*.*)	_kernver=${pkgver%.*};;
 *.*)	_kernver=${pkgver};;
 esac
-pkgrel=1
+pkgrel=0
 pkgdesc="Linux kernel for virtual guests with grsecurity"
 url="http://grsecurity.net"
 depends="mkinitfs linux-firmware"
@@ -18,7 +18,7 @@ _config=${config:-kernelconfig.${CARCH}}
 install=
 source="http://ftp.kernel.org/pub/linux/kernel/v3.x/linux-$_kernver.tar.xz
 	http://ftp.kernel.org/pub/linux/kernel/v3.x/patch-$pkgver.xz
-	grsecurity-3.0-$pkgver-201501272307.patch
+	grsecurity-3.1-3.14.36-201503182218.patch
 	fix-memory-map-for-PIE-applications.patch
 	imx6q-no-unclocked-sleep.patch
 
@@ -146,23 +146,23 @@ dev() {
 }
 
 md5sums="b621207b3f6ecbb67db18b13258f8ea8  linux-3.14.tar.xz
-d4e6b893a18953a9a908e0559d2b32e0  patch-3.14.30.xz
-679bd4b74910bda35e0f5d5bacbd76eb  grsecurity-3.0-3.14.30-201501272307.patch
+85d1d459cb9bcedcfbdb03dd9df83d23  patch-3.14.36.xz
+44594b78075024e23fe9b588dd4a7a10  grsecurity-3.1-3.14.36-201503182218.patch
 c6a4ae7e8ca6159e1631545515805216  fix-memory-map-for-PIE-applications.patch
 1a307fc1d63231bf01d22493a4f14378  imx6q-no-unclocked-sleep.patch
-59a8359a6f125ca8f77bb044066c343b  kernelconfig.x86
-a87cf3ba5e98939212d2bb9fc34ccfe8  kernelconfig.x86_64"
+d41e4093a7dcb678fefd0b4a183334c9  kernelconfig.x86
+5bc509e905862a1ca463c8f9313ad453  kernelconfig.x86_64"
 sha256sums="61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa  linux-3.14.tar.xz
-d49803d1d4d99f8b984d8512d4413b7f03cc140be62de29c8cb7b10e40ae0a66  patch-3.14.30.xz
-8da6bbf7eb97012e27875e0b19075bde4c5c23baff1272e7a97b449c53e5475f  grsecurity-3.0-3.14.30-201501272307.patch
+af2e5b01b4d771e9818271d6023bdc1ca8668bdb0fe081ab9373ee58c29795bf  patch-3.14.36.xz
+2892787071815cf8b1b8cf282c063826e2ab5a3f3df303ad43630f18fb60d292  grsecurity-3.1-3.14.36-201503182218.patch
 500f3577310be52e87b9fecdc2e9c4ca43210fd97d69089f9005d484563f74c7  fix-memory-map-for-PIE-applications.patch
 21179fbb22a5b74af0a609350ae1a170e232908572b201d02e791d2ce0a685d3  imx6q-no-unclocked-sleep.patch
-69ea3e8830b7b2bdfbfb0c408fb2489fd2a9518be452bb25e47052556dcaea6b  kernelconfig.x86
-a8e1738a545cf42a60398ed6851578ced637bda91bea8d30a9ab3c40d9652e08  kernelconfig.x86_64"
+526d54979f7041c55f988ee440f68959fe354e19d5fb76fd7c31309a0cb799e8  kernelconfig.x86
+a93810bbb436a58cc197be4240d5e7f6d753856c8afad16ff6564406e65b535a  kernelconfig.x86_64"
 sha512sums="5730d83a7a81134c1e77c0bf89e42dee4f8251ad56c1ac2be20c59e26fdfaa7bea55f277e7af156b637f22e1584914a46089af85039177cb43485089c74ac26e  linux-3.14.tar.xz
-3f68a2131bbd8b91f13974c8c70453c0a3cece930e91a942d175d080be97cf917b85ab3552b39bd480aa803feedd3838717e262e698c555507be92c4d9144a9c  patch-3.14.30.xz
-fcb17d4fb3118a406ad9cbb7e412a244e837cb60a3e0b065deef4a39121db7d1b28efba50cd5cd6ed8ea64338e1e69863da10d0077555f4d54094c68e34a9aa5  grsecurity-3.0-3.14.30-201501272307.patch
+971273437b29810db5931ccc58db7dbcad23895a8907b01dd3aca0fa3a3beb889c9e916cb3e5214a8753165ed952d79267b6923d4442837dfb66d53d1884e5c2  patch-3.14.36.xz
+4243784e6db8902667605f8681b9e710d26c142459721331bfa109135f530c095a1b0532bd7e916ab10f23b07041f35c0eec821d382b5aa801c2573b394773d5  grsecurity-3.1-3.14.36-201503182218.patch
 4665c56ae1bbac311f9205d64918e84ee8b01d47d6e2396ff6b8adfb10aada7f7254531ce62e31edbb65c2a54a830f09ad05d314dfcd75d6272f4068945ad7c7  fix-memory-map-for-PIE-applications.patch
 87d1ad59732f265a5b0db54490dc1762c14ea4b868e7eb1aedc3ce57b48046de7bbc08cf5cfcf6f1380fa84063b0edb16ba3d5e3c5670be9bbb229275c88b221  imx6q-no-unclocked-sleep.patch
-39381133fb961028d089dd25307fc2f0e5f68eaa40edcd270ff69e2498c5675c3f3366ce61eca9d5e103bef3597035fcbb71e747f3a7f054f9ab282487c0fca0  kernelconfig.x86
-06ec6c04d44e2584d20eeffed4a70211163e374569f29c369d128ae47ca23332d48b5cdc170a348279641d550965ac7ae94261f9c575fb976d95ca4101b8c982  kernelconfig.x86_64"
+2f8fe54774694e2374cb831a886e28e30dd4d351c495d6e9d9a098cf980c9a49dd098901a3ac4c3ad1e70d48e7178032816bd009f1ebe692744f1807d2f671bc  kernelconfig.x86
+edbe80ced5f7a74238bab992158180491ed750759d05efa51bda8e349dade08a0723b56b355839c88e6269fad91df2d89626e998e53cd13f471a905d28472e46  kernelconfig.x86_64"
diff --git a/main/linux-virt-grsec/grsecurity-3.0-3.14.30-201501272307.patch b/main/linux-virt-grsec/grsecurity-3.0-3.14.30-201501272307.patch
deleted file mode 120000
index a61448d05..000000000
--- a/main/linux-virt-grsec/grsecurity-3.0-3.14.30-201501272307.patch
+++ /dev/null
@@ -1 +0,0 @@
-../linux-grsec/grsecurity-3.0-3.14.30-201501272307.patch
\ No newline at end of file
diff --git a/main/linux-virt-grsec/grsecurity-3.1-3.14.36-201503182218.patch b/main/linux-virt-grsec/grsecurity-3.1-3.14.36-201503182218.patch
new file mode 120000
index 000000000..b04d12f00
--- /dev/null
+++ b/main/linux-virt-grsec/grsecurity-3.1-3.14.36-201503182218.patch
@@ -0,0 +1 @@
+../linux-grsec/grsecurity-3.1-3.14.36-201503182218.patch
\ No newline at end of file
diff --git a/main/linux-virt-grsec/kernelconfig.x86 b/main/linux-virt-grsec/kernelconfig.x86
index 2fa8f12a1..3325bd34f 100644
--- a/main/linux-virt-grsec/kernelconfig.x86
+++ b/main/linux-virt-grsec/kernelconfig.x86
@@ -3723,6 +3723,7 @@ CONFIG_GRKERNSEC_CHROOT_UNIX=y
 CONFIG_GRKERNSEC_CHROOT_FINDTASK=y
 CONFIG_GRKERNSEC_CHROOT_NICE=y
 CONFIG_GRKERNSEC_CHROOT_SYSCTL=y
+CONFIG_GRKERNSEC_CHROOT_RENAME=y
 CONFIG_GRKERNSEC_CHROOT_CAPS=y
 # CONFIG_GRKERNSEC_CHROOT_INITRD is not set
 
diff --git a/main/linux-virt-grsec/kernelconfig.x86_64 b/main/linux-virt-grsec/kernelconfig.x86_64
index a001b83ac..f842eb1b4 100644
--- a/main/linux-virt-grsec/kernelconfig.x86_64
+++ b/main/linux-virt-grsec/kernelconfig.x86_64
@@ -3722,6 +3722,7 @@ CONFIG_GRKERNSEC_CHROOT_UNIX=y
 CONFIG_GRKERNSEC_CHROOT_FINDTASK=y
 CONFIG_GRKERNSEC_CHROOT_NICE=y
 CONFIG_GRKERNSEC_CHROOT_SYSCTL=y
+CONFIG_GRKERNSEC_CHROOT_RENAME=y
 CONFIG_GRKERNSEC_CHROOT_CAPS=y
 # CONFIG_GRKERNSEC_CHROOT_INITRD is not set