testing/spl-grsec: update to 0.6.0-rc14 and kernel 3.8

2 files changed, 62 insertions, 9 deletions

diff --git a/testing/spl-grsec/APKBUILD b/testing/spl-grsec/APKBUILD
index 7b3e1fc92f..5abbb228ca 100644
--- a/testing/spl-grsec/APKBUILD
+++ b/testing/spl-grsec/APKBUILD
@@ -5,10 +5,10 @@ _realname=spl
 _name=$_realname-$_flavor
 
 _kpkg=linux-$_flavor
-_kver=3.6.11
-_kpkgrel=17
+_kver=3.8.2
+_kpkgrel=0
 
-_realver=0.6.0-rc13
+_realver=0.6.0-rc14
 _mypkgrel=0
 
 # source the kernel version
@@ -19,21 +19,22 @@ if [ -f ../../main/linux-$_flavor/APKBUILD ]; then
 fi
 
 _kernelver=$_kver-r$_kpkgrel
-_abi_release=$_kver-${_flavor}
+_abi_release=${_kver}-${_kpkgrel}-${_flavor}
 
 pkgname=$_name
 pkgver=$_kver
 pkgrel=$(($_kpkgrel + $_mypkgrel))
 pkgdesc="Solaris Porting Layer"
 url="http://zfsonlinux.org"
-arch="x86_64"
+arch="x86 x86_64"
 license="GPL"
 depends=""
 depends_dev="linux-grsec-dev=$_kernelver"
 makedepends="$depends_dev perl automake autoconf libtool"
 install=""
 subpackages="$pkgname-dev $pkgname-utils"
-source="http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-$_realver.tar.gz"
+source="http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-$_realver.tar.gz
+	constify.patch"
 _builddir="$srcdir"/spl-$_realver
 
 prepare() {
@@ -83,6 +84,9 @@ utils() {
                 "$pkgdir"/lib/ || return 1
 }
 
-md5sums="257c3373f40e190743e78fdf65368d2a  spl-0.6.0-rc13.tar.gz"
-sha256sums="2be5b9b707b32b050182e869b52525bdaa72a39e51630da9fdf7341fa48b2bbb  spl-0.6.0-rc13.tar.gz"
-sha512sums="05d1a0ce0beebe91440b7ec54e12936048acf6a92c8452492b5ee2a8ec8a3cda74fe97e2739252c697ad6990aab8fd440d14f1987e04f4646d7b54d38a162f98  spl-0.6.0-rc13.tar.gz"
+md5sums="07b6cf56659a95bc22ac45dbdd8344a0  spl-0.6.0-rc14.tar.gz
+19c02cd34e2b36cf3ae9c71ee9c443fe  constify.patch"
+sha256sums="0fa92ecb72b19739343c2157820027df4907c702ae93a089b611fd115c559e03  spl-0.6.0-rc14.tar.gz
+b0b856a073f7b55b1bb49be927fac7900d28cea8208aca2c02bac529c7316cf7  constify.patch"
+sha512sums="2e4b7e74859a064d77faf27c80a6609ba47e6ebd6d2ac2cca3f9a7675f9074d284a31c3f86f248e1af4a402d84dfc1ccd52d982c21e7cb42662e5bb86f0feb6f  spl-0.6.0-rc14.tar.gz
+6aab408f2e5dcca0bcaa0f4713d93d49068a11fa35d9f2f7a15bb0eef6c1eb8613c89769bb3b054ca70be359e109fef81ae1cd3166920c4df183363ee5309af3  constify.patch"
diff --git a/testing/spl-grsec/constify.patch b/testing/spl-grsec/constify.patch
new file mode 100644
index 0000000000..92d0bf5683
--- /dev/null
+++ b/testing/spl-grsec/constify.patch
@@ -0,0 +1,49 @@
+diff --git a/module/spl/spl-proc.c b/module/spl/spl-proc.c
+index cd4fa1b..1ba7d2f 100644
+--- a/module/spl/spl-proc.c
++++ b/module/spl/spl-proc.c
+@@ -323,7 +323,7 @@ SPL_PROC_HANDLER(proc_force_bug)
+ SPL_PROC_HANDLER(proc_console_max_delay_cs)
+ {
+         int rc, max_delay_cs;
+-        struct ctl_table dummy = *table;
++        ctl_table_no_const dummy = *table;
+         long d;
+ 	SENTRY;
+ 
+@@ -355,7 +355,7 @@ SPL_PROC_HANDLER(proc_console_max_delay_cs)
+ SPL_PROC_HANDLER(proc_console_min_delay_cs)
+ {
+         int rc, min_delay_cs;
+-        struct ctl_table dummy = *table;
++        ctl_table_no_const dummy = *table;
+         long d;
+ 	SENTRY;
+ 
+@@ -387,7 +387,7 @@ SPL_PROC_HANDLER(proc_console_min_delay_cs)
+ SPL_PROC_HANDLER(proc_console_backoff)
+ {
+         int rc, backoff;
+-        struct ctl_table dummy = *table;
++        ctl_table_no_const dummy = *table;
+ 	SENTRY;
+ 
+         dummy.data = &backoff;
+@@ -417,7 +417,7 @@ SPL_PROC_HANDLER(proc_domemused)
+ {
+         int rc = 0;
+         unsigned long min = 0, max = ~0, val;
+-        struct ctl_table dummy = *table;
++        ctl_table_no_const dummy = *table;
+ 	SENTRY;
+ 
+         dummy.data = &val;
+@@ -444,7 +444,7 @@ SPL_PROC_HANDLER(proc_doslab)
+ {
+         int rc = 0;
+         unsigned long min = 0, max = ~0, val = 0, mask;
+-        struct ctl_table dummy = *table;
++        ctl_table_no_const dummy = *table;
+         spl_kmem_cache_t *skc;
+         SENTRY;
+