lol

spl: Fix compilation with grsecurity's constify plugin and kernels < 3.8

+15 -2
+13
pkgs/os-specific/linux/spl/const.patch
··· 1 + diff --git a/module/spl/spl-proc.c b/module/spl/spl-proc.c 2 + index f25239a..b731123 100644 3 + --- a/module/spl/spl-proc.c 4 + +++ b/module/spl/spl-proc.c 5 + @@ -38,7 +38,7 @@ 6 + 7 + #define SS_DEBUG_SUBSYS SS_PROC 8 + 9 + -#if defined(CONSTIFY_PLUGIN) && LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0) 10 + +#if defined(CONSTIFY_PLUGIN) 11 + typedef struct ctl_table __no_const spl_ctl_table; 12 + #else 13 + typedef struct ctl_table spl_ctl_table;
+2 -2
pkgs/os-specific/linux/spl/default.nix
··· 7 7 sha256 = "196scl8q0bkkak6m0p1l1fz254cgsizqm73bf9wk3iynamq7qmrw"; 8 8 }; 9 9 10 - patches = [ ./install_prefix.patch ./3_12-compat.patch ./3_13-compat-1.patch ./3_13-compat-2.patch ]; 10 + patches = [ ./install_prefix.patch ./3_12-compat.patch ./3_13-compat-1.patch ./3_13-compat-2.patch ./const.patch ]; 11 11 12 12 buildInputs = [ perl autoconf automake libtool ]; 13 13 ··· 34 34 35 35 longDescription = '' 36 36 This kernel module is a porting layer for ZFS to work inside the linux 37 - kernel. 37 + kernel. 38 38 ''; 39 39 40 40 homepage = http://zfsonlinux.org/;