testing/zfs-grsec: rebuild against kernel 3.12.4-r0

2 files changed, 82 insertions, 5 deletions

diff --git a/testing/zfs-grsec/APKBUILD b/testing/zfs-grsec/APKBUILD
index 1c325eaa1e7..6586b1160ab 100644
--- a/testing/zfs-grsec/APKBUILD
+++ b/testing/zfs-grsec/APKBUILD
@@ -6,7 +6,7 @@ _realname=zfs
 _name=$_realname-$_flavor
 
 _kpkg=linux-$_flavor
-_kver=3.10.23
+_kver=3.12.4
 _kpkgrel=0
 
 _realver=0.6.2
@@ -36,7 +36,9 @@ makedepends="$depends_dev automake autoconf libtool"
 install=""
 subpackages="$pkgname-dev $pkgname-utils"
 source="http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-$_realver.tar.gz
-	timestamp.patch"
+	timestamp.patch
+	linux-3.11-lz4-compat.patch
+	"
 
 _builddir="$srcdir/$_realname-$_realver"
 
@@ -100,8 +102,11 @@ utils() {
 }
 
 md5sums="0b183b0abdd5be287046ad9ce4f899fd  zfs-0.6.2.tar.gz
-9621735b802e34d792b03ef89727f6ea  timestamp.patch"
+9621735b802e34d792b03ef89727f6ea  timestamp.patch
+6b7ba7ef84f80e3ea18d5bbc7006f15d  linux-3.11-lz4-compat.patch"
 sha256sums="6b8cd79486b3a51204fac07297b8c45aa8702b8dfade58f2098b5734517065a1  zfs-0.6.2.tar.gz
-74924b471c2a83831f274b876c1d4f293f1e142089f34fccd19ae60b59066661  timestamp.patch"
+74924b471c2a83831f274b876c1d4f293f1e142089f34fccd19ae60b59066661  timestamp.patch
+2c1b9c509b8cbf71cc28b77758b290ddef547e0499876cb3103f0b2331409ec3  linux-3.11-lz4-compat.patch"
 sha512sums="bb0615ce3407bf3457bdc6843d444bb38dea978709b10dae892279a9608ca964c4f8f37a18c21b059c84b67973f2be9a41b1dac2e3c6b0cdbbd577b62d3e9916  zfs-0.6.2.tar.gz
-2cb675e4603ea4aa951c7da2c57374bb404d52ee4fd04c719479ff07a3cf50c1d6f4b7cd2398c20327127fe81d47fcfa2ed95d18f05acd59f1ee8115334aabd2  timestamp.patch"
+2cb675e4603ea4aa951c7da2c57374bb404d52ee4fd04c719479ff07a3cf50c1d6f4b7cd2398c20327127fe81d47fcfa2ed95d18f05acd59f1ee8115334aabd2  timestamp.patch
+59569dd5cdc04a2aa9cb48a8533cf63b0e07ff348cb6a1291a8acd03a75058ca0af23837416d0cfb214edc4fde40ed2e3d0bea2e1b94dad1457e86e95cec6b11  linux-3.11-lz4-compat.patch"
diff --git a/testing/zfs-grsec/linux-3.11-lz4-compat.patch b/testing/zfs-grsec/linux-3.11-lz4-compat.patch
new file mode 100644
index 00000000000..88d415e885e
--- /dev/null
+++ b/testing/zfs-grsec/linux-3.11-lz4-compat.patch
@@ -0,0 +1,72 @@
+From b3c49d3df82466646bde9beebce7bbf0b3c41853 Mon Sep 17 00:00:00 2001
+From: Richard Yao <ryao@gentoo.org>
+Date: Sat, 5 Oct 2013 17:55:24 -0400
+Subject: [PATCH] Linux 3.11 compat: Rename LZ4 symbols
+
+Linus Torvalds merged LZ4 into Linux 3.11. This causes a conflict
+whenever CONFIG_LZ4_DECOMPRESS=y or CONFIG_LZ4_COMPRESS=y are set in the
+kernel's .config. We rename the symbols to avoid the conflict.
+
+Signed-off-by: Richard Yao <ryao@gentoo.org>
+Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
+Closes #1789
+---
+ include/sys/zio_compress.h | 4 ++--
+ module/zfs/lz4.c           | 4 ++--
+ module/zfs/zio_compress.c  | 2 +-
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/include/sys/zio_compress.h b/include/sys/zio_compress.h
+index bd051f1..e4b565d 100644
+--- a/include/sys/zio_compress.h
++++ b/include/sys/zio_compress.h
+@@ -74,9 +74,9 @@ extern size_t zle_compress(void *src, void *dst, size_t s_len, size_t d_len,
+     int level);
+ extern int zle_decompress(void *src, void *dst, size_t s_len, size_t d_len,
+     int level);
+-extern size_t lz4_compress(void *src, void *dst, size_t s_len, size_t d_len,
++extern size_t lz4_compress_zfs(void *src, void *dst, size_t s_len, size_t d_len,
+     int level);
+-extern int lz4_decompress(void *src, void *dst, size_t s_len, size_t d_len,
++extern int lz4_decompress_zfs(void *src, void *dst, size_t s_len, size_t d_len,
+     int level);
+ 
+ /*
+diff --git a/module/zfs/lz4.c b/module/zfs/lz4.c
+index 8afaad1..ae5d5a2 100644
+--- a/module/zfs/lz4.c
++++ b/module/zfs/lz4.c
+@@ -47,7 +47,7 @@ static int LZ4_compress64kCtx(void *ctx, const char *source, char *dest,
+ 
+ /*ARGSUSED*/
+ size_t
+-lz4_compress(void *s_start, void *d_start, size_t s_len, size_t d_len, int n)
++lz4_compress_zfs(void *s_start, void *d_start, size_t s_len, size_t d_len, int n)
+ {
+ 	uint32_t bufsiz;
+ 	char *dest = d_start;
+@@ -74,7 +74,7 @@ static int LZ4_compress64kCtx(void *ctx, const char *source, char *dest,
+ 
+ /*ARGSUSED*/
+ int
+-lz4_decompress(void *s_start, void *d_start, size_t s_len, size_t d_len, int n)
++lz4_decompress_zfs(void *s_start, void *d_start, size_t s_len, size_t d_len, int n)
+ {
+ 	const char *src = s_start;
+ 	uint32_t bufsiz = BE_IN32(src);
+diff --git a/module/zfs/zio_compress.c b/module/zfs/zio_compress.c
+index 1dc780d..5864d5c 100644
+--- a/module/zfs/zio_compress.c
++++ b/module/zfs/zio_compress.c
+@@ -53,7 +53,7 @@
+ 	{gzip_compress,		gzip_decompress,	8,	"gzip-8"},
+ 	{gzip_compress,		gzip_decompress,	9,	"gzip-9"},
+ 	{zle_compress,		zle_decompress,		64,	"zle"},
+-	{lz4_compress,		lz4_decompress,		0,	"lz4"},
++	{lz4_compress_zfs,	lz4_decompress_zfs,	0,	"lz4"},
+ };
+ 
+ enum zio_compress
+-- 
+1.8.5.1
+