testing/zfs-grsec: rebase upstream patches and fix install_if

12 files changed, 467 insertions, 330 deletions

diff --git a/testing/zfs-grsec/0001-Add-missing-fcntl.h-to-includes-in-mount_zfs.c.patch b/testing/zfs-grsec/0001-Add-missing-fcntl.h-to-includes-in-mount_zfs.c.patch
deleted file mode 100644
index ca8909c425..0000000000
--- a/testing/zfs-grsec/0001-Add-missing-fcntl.h-to-includes-in-mount_zfs.c.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./cmd/mount_zfs/mount_zfs.c.orig
-+++ ./cmd/mount_zfs/mount_zfs.c
-@@ -32,6 +32,7 @@
- #include <sys/stat.h>
- #include <libzfs.h>
- #include <locale.h>
- #include <getopt.h>
-+#include <fcntl.h>
- 
- #define	ZS_COMMENT	0x00000000	/* comment */
- #define	ZS_ZFSUTIL	0x00000001	/* caller is zfs(8) */
diff --git a/testing/zfs-grsec/0003-Use-the-correct-macro-to-include-backtrace.patch b/testing/zfs-grsec/0001-Use-the-correct-macro-to-include-backtrace.patch
index 9be8757535..aaae11f58a 100644
--- a/testing/zfs-grsec/0003-Use-the-correct-macro-to-include-backtrace.patch
+++ b/testing/zfs-grsec/0001-Use-the-correct-macro-to-include-backtrace.patch
@@ -1,14 +1,22 @@
-From d8eadaf30347d1d67e8125ae7c299239d3b730dc Mon Sep 17 00:00:00 2001
+From b8fd863517ae6dba1f4bdf225f45b97eb913e09e Mon Sep 17 00:00:00 2001
 From: Carlo Landmeter <clandmeter@gmail.com>
 Date: Tue, 1 Mar 2016 15:23:09 +0100
-Subject: [PATCH 3/8] Use the correct macro to include backtrace
+Subject: [PATCH 1/8] Use the correct macro to include backtrace
 
+execinfo.h and backtrace() are GNU extensions provided by glibc
+and not by gcc, see:
+
+http://www.gnu.org/software/libc/manual/html_mono/libc.html#Backtraces
+
+Signed-off-by: Carlo Landmeter <clandmeter@gmail.com>
+Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
+Closes #4453
 ---
  cmd/ztest/ztest.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/cmd/ztest/ztest.c b/cmd/ztest/ztest.c
-index 42643ef..a824da9 100644
+index afe6faa..40524ed 100644
 --- a/cmd/ztest/ztest.c
 +++ b/cmd/ztest/ztest.c
 @@ -123,7 +123,7 @@
@@ -30,5 +38,5 @@ index 42643ef..a824da9 100644
  	void *buffer[BACKTRACE_SZ];
  
 -- 
-2.7.2
+2.7.4
 
diff --git a/testing/zfs-grsec/0002-Add-support-for-libtirpc.patch b/testing/zfs-grsec/0002-Add-support-for-libtirpc.patch
deleted file mode 100644
index 1a44c757b4..0000000000
--- a/testing/zfs-grsec/0002-Add-support-for-libtirpc.patch
+++ /dev/null
@@ -1,250 +0,0 @@
-From 0f29fd8ac81a166103f311c180fd06d956dc6dc4 Mon Sep 17 00:00:00 2001
-From: Carlo Landmeter <clandmeter@gmail.com>
-Date: Tue, 1 Mar 2016 15:13:44 +0100
-Subject: [PATCH 2/8] Add support for libtirpc
-
-This introduces the --with-tirpc configure switch to compile with libtirpc.
-This is needed for libc's which do not have their own RPC libary (ie musl libc).
----
- cmd/mount_zfs/Makefile.am    |  3 ++-
- cmd/zdb/Makefile.am          |  2 +-
- cmd/zed/Makefile.am          |  3 ++-
- cmd/zfs/Makefile.am          |  2 +-
- cmd/zhack/Makefile.am        |  2 +-
- cmd/zinject/Makefile.am      |  3 ++-
- cmd/zpool/Makefile.am        |  2 +-
- cmd/zstreamdump/Makefile.am  |  2 +-
- cmd/ztest/Makefile.am        |  2 +-
- config/tirpc.m4              | 17 +++++++++++++++++
- config/user.m4               |  1 +
- lib/libnvpair/Makefile.am    |  2 +-
- lib/libspl/Makefile.am       |  6 +++---
- lib/libspl/include/rpc/xdr.h |  2 ++
- lib/libspl/xdr.c             |  2 ++
- module/nvpair/nvpair.c       |  4 ++++
- 16 files changed, 42 insertions(+), 13 deletions(-)
- create mode 100644 config/tirpc.m4
-
-diff --git a/cmd/mount_zfs/Makefile.am b/cmd/mount_zfs/Makefile.am
-index b1d9389..4be1135 100644
---- a/cmd/mount_zfs/Makefile.am
-+++ b/cmd/mount_zfs/Makefile.am
-@@ -19,4 +19,5 @@ mount_zfs_LDADD = \
- 	$(top_builddir)/lib/libuutil/libuutil.la \
- 	$(top_builddir)/lib/libzpool/libzpool.la \
- 	$(top_builddir)/lib/libzfs/libzfs.la \
--	$(top_builddir)/lib/libzfs_core/libzfs_core.la
-+	$(top_builddir)/lib/libzfs_core/libzfs_core.la \
-+	$(TIRPC_LIBS)
-diff --git a/cmd/zdb/Makefile.am b/cmd/zdb/Makefile.am
-index c22186a..181a821 100644
---- a/cmd/zdb/Makefile.am
-+++ b/cmd/zdb/Makefile.am
-@@ -19,4 +19,4 @@ zdb_LDADD = \
- 	$(top_builddir)/lib/libzfs/libzfs.la \
- 	$(top_builddir)/lib/libzfs_core/libzfs_core.la
- 
--zdb_LDADD += $(ZLIB)
-+zdb_LDADD += $(ZLIB) $(TIRPC_LIBS)
-diff --git a/cmd/zed/Makefile.am b/cmd/zed/Makefile.am
-index 70e4f7f..ce16ceb 100644
---- a/cmd/zed/Makefile.am
-+++ b/cmd/zed/Makefile.am
-@@ -30,7 +30,8 @@ zed_LDADD = \
- 	$(top_builddir)/lib/libspl/libspl.la \
- 	$(top_builddir)/lib/libzpool/libzpool.la \
- 	$(top_builddir)/lib/libzfs/libzfs.la \
--	$(top_builddir)/lib/libzfs_core/libzfs_core.la
-+	$(top_builddir)/lib/libzfs_core/libzfs_core.la \
-+	$(TIRPC_LIBS)
- 
- zedconfdir = $(sysconfdir)/zfs/zed.d
- 
-diff --git a/cmd/zfs/Makefile.am b/cmd/zfs/Makefile.am
-index 3cac73d..ea35555 100644
---- a/cmd/zfs/Makefile.am
-+++ b/cmd/zfs/Makefile.am
-@@ -19,5 +19,5 @@ zfs_LDADD = \
- 	$(top_builddir)/lib/libzfs/libzfs.la \
- 	$(top_builddir)/lib/libzfs_core/libzfs_core.la
- 
--zfs_LDADD += $(ZLIB)
-+zfs_LDADD += $(ZLIB) $(TIRPC_LIBS)
- zfs_LDFLAGS = -pthread
-diff --git a/cmd/zhack/Makefile.am b/cmd/zhack/Makefile.am
-index 53e3241..07b5fab 100644
---- a/cmd/zhack/Makefile.am
-+++ b/cmd/zhack/Makefile.am
-@@ -16,4 +16,4 @@ zhack_LDADD = \
- 	$(top_builddir)/lib/libzfs/libzfs.la \
- 	$(top_builddir)/lib/libzfs_core/libzfs_core.la
- 
--zhack_LDADD += $(ZLIB)
-+zhack_LDADD += $(ZLIB) $(TIRPC_LIBS)
-diff --git a/cmd/zinject/Makefile.am b/cmd/zinject/Makefile.am
-index 2500bee..2d069d3 100644
---- a/cmd/zinject/Makefile.am
-+++ b/cmd/zinject/Makefile.am
-@@ -16,4 +16,5 @@ zinject_LDADD = \
- 	$(top_builddir)/lib/libuutil/libuutil.la \
- 	$(top_builddir)/lib/libzpool/libzpool.la \
- 	$(top_builddir)/lib/libzfs/libzfs.la \
--	$(top_builddir)/lib/libzfs_core/libzfs_core.la
-+	$(top_builddir)/lib/libzfs_core/libzfs_core.la \
-+	$(TIRPC_LIBS)
-diff --git a/cmd/zpool/Makefile.am b/cmd/zpool/Makefile.am
-index c11951b..a59bf32 100644
---- a/cmd/zpool/Makefile.am
-+++ b/cmd/zpool/Makefile.am
-@@ -19,4 +19,4 @@ zpool_LDADD = \
- 	$(top_builddir)/lib/libzpool/libzpool.la \
- 	$(top_builddir)/lib/libzfs/libzfs.la \
- 	$(top_builddir)/lib/libzfs_core/libzfs_core.la \
--	$(LIBBLKID)
-+	$(LIBBLKID) $(TIRPC_LIBS)
-diff --git a/cmd/zstreamdump/Makefile.am b/cmd/zstreamdump/Makefile.am
-index 654863a..f800a8e 100644
---- a/cmd/zstreamdump/Makefile.am
-+++ b/cmd/zstreamdump/Makefile.am
-@@ -16,4 +16,4 @@ zstreamdump_LDADD = \
- 	$(top_builddir)/lib/libzfs/libzfs.la \
- 	$(top_builddir)/lib/libzfs_core/libzfs_core.la
- 
--zstreamdump_LDADD += $(ZLIB)
-+zstreamdump_LDADD += $(ZLIB) $(TIRPC_LIBS)
-diff --git a/cmd/ztest/Makefile.am b/cmd/ztest/Makefile.am
-index e3be39a..1953fe8 100644
---- a/cmd/ztest/Makefile.am
-+++ b/cmd/ztest/Makefile.am
-@@ -19,4 +19,4 @@ ztest_LDADD = \
- 	$(top_builddir)/lib/libzfs/libzfs.la \
- 	$(top_builddir)/lib/libzfs_core/libzfs_core.la
- 
--ztest_LDADD += -lm -ldl
-+ztest_LDADD += -lm -ldl $(TIRPC_LIBS)
-diff --git a/config/tirpc.m4 b/config/tirpc.m4
-new file mode 100644
-index 0000000..ec15785
---- /dev/null
-+++ b/config/tirpc.m4
-@@ -0,0 +1,17 @@
-+dnl
-+dnl musl support
-+dnl
-+
-+AC_DEFUN([ZFS_AC_CONFIG_USER_TIRPC], [
-+AH_TEMPLATE([WITH_TIRPC],
-+  [Define to 1 if libtirpc is being used as the RPC library])
-+AC_ARG_WITH(tirpc,
-+AC_HELP_STRING([--with-tirpc], [compile with libtirpc]),
-+[if test x$withval = xyes; then
-+  AC_DEFINE([WITH_TIRPC], 1, [Define if you have musl])
-+  PKG_CHECK_MODULES([TIRPC],[libtirpc])
-+  AC_DEFINE([WITH_TIRPC], 1, [Define if you have libtirpc])
-+  AC_SUBST(TIRPC_CFLAGS)
-+  AC_SUBST(TIRPC_LIBS)
-+fi])
-+])
-diff --git a/config/user.m4 b/config/user.m4
-index 7f79420..820b8d3 100644
---- a/config/user.m4
-+++ b/config/user.m4
-@@ -13,6 +13,7 @@ AC_DEFUN([ZFS_AC_CONFIG_USER], [
- 	ZFS_AC_CONFIG_USER_LIBBLKID
- 	ZFS_AC_CONFIG_USER_FRAME_LARGER_THAN
- 	ZFS_AC_CONFIG_USER_RUNSTATEDIR
-+	ZFS_AC_CONFIG_USER_TIRPC
- dnl #
- dnl #	Checks for library functions
- 	AC_CHECK_FUNCS([mlockall])
-diff --git a/lib/libnvpair/Makefile.am b/lib/libnvpair/Makefile.am
-index c9ac1f1..985285a 100644
---- a/lib/libnvpair/Makefile.am
-+++ b/lib/libnvpair/Makefile.am
-@@ -4,7 +4,7 @@ VPATH = \
- 	$(top_srcdir)/module/nvpair \
- 	$(top_srcdir)/lib/libnvpair
- 
--AM_CFLAGS += $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN)
-+AM_CFLAGS += $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN) $(TIRPC_CFLAGS)
- 
- DEFAULT_INCLUDES += \
- 	-I$(top_srcdir)/include \
-diff --git a/lib/libspl/Makefile.am b/lib/libspl/Makefile.am
-index a569446..9cedfaa 100644
---- a/lib/libspl/Makefile.am
-+++ b/lib/libspl/Makefile.am
-@@ -4,13 +4,13 @@ VPATH = \
- 	$(top_srcdir)/lib/libspl \
- 	$(top_srcdir)/lib/libspl/$(TARGET_ASM_DIR)
- 
--AM_CFLAGS += $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN)
-+AM_CFLAGS += $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN) $(TIRPC_CFLAGS)
- 
- SUBDIRS = include $(TARGET_ASM_DIR)
- DIST_SUBDIRS = include asm-generic asm-i386 asm-x86_64
- 
- DEFAULT_INCLUDES += \
--	-I$(top_srcdir)/lib/libspl/include
-+	-I$(top_srcdir)/lib/libspl/include $(TIRPC_CFLAGS)
- 
- AM_CCASFLAGS = \
- 	-I$(top_srcdir)/lib/libspl/include
-@@ -42,6 +42,6 @@ nodist_libspl_la_SOURCES = \
- 	$(USER_ASM) \
- 	$(KERNEL_C)
- 
--libspl_la_LIBADD = -lrt
-+libspl_la_LIBADD = -lrt $(TIRPC_LDFLAGS)
- 
- EXTRA_DIST = $(USER_C)
-diff --git a/lib/libspl/include/rpc/xdr.h b/lib/libspl/include/rpc/xdr.h
-index 99500d6..cd2d17a 100644
---- a/lib/libspl/include/rpc/xdr.h
-+++ b/lib/libspl/include/rpc/xdr.h
-@@ -60,6 +60,8 @@ typedef struct xdr_bytesrec {
- #define	XDR_RDMAGET	4
- #define	XDR_RDMASET	5
- 
-+#ifndef WITH_TIRPC
- extern bool_t xdr_control(XDR *xdrs, int request, void *info);
-+#endif
- 
- #endif
-diff --git a/lib/libspl/xdr.c b/lib/libspl/xdr.c
-index 288a338..f122496 100644
---- a/lib/libspl/xdr.c
-+++ b/lib/libspl/xdr.c
-@@ -29,6 +29,7 @@
-  * under license from the Regents of the University of California.
-  */
- 
-+#ifndef WITH_TIRPC
- #include <rpc/xdr.h>
- 
- /*
-@@ -76,3 +77,4 @@ xdr_control(XDR *xdrs, int request, void *info)
- 	}
- 	return (FALSE);
- }
-+#endif
-diff --git a/module/nvpair/nvpair.c b/module/nvpair/nvpair.c
-index 1eca0fe..efd6287 100644
---- a/module/nvpair/nvpair.c
-+++ b/module/nvpair/nvpair.c
-@@ -3251,8 +3251,12 @@ nvs_xdr_nvpair(nvstream_t *nvs, nvpair_t *nvp, size_t *size)
- 			return (0);
- 
- 		/* sanity check the size parameter */
-+#ifndef WITH_TIRPC
- 		if (!xdr_control(xdr, XDR_GET_BYTES_AVAIL, &bytesrec))
- 			return (EFAULT);
-+#else
-+		xdr_control(xdr, XDR_GET_BYTES_AVAIL, &bytesrec);
-+#endif
- 
- 		if (*size > NVS_XDR_MAX_LEN(bytesrec.xc_num_avail))
- 			return (EFAULT);
--- 
-2.7.2
-
diff --git a/testing/zfs-grsec/0006-Include-sys-types.h-in-devid.h.patch b/testing/zfs-grsec/0002-Include-sys-types.h-in-devid.h.patch
index 9301c52f1c..350d2cb6ba 100644
--- a/testing/zfs-grsec/0006-Include-sys-types.h-in-devid.h.patch
+++ b/testing/zfs-grsec/0002-Include-sys-types.h-in-devid.h.patch
@@ -1,9 +1,13 @@
-From 9104430ec34fe257ccb6e199771c804d38f0003a Mon Sep 17 00:00:00 2001
+From 38cab4ba7bdeee22a114bcb09665be980a5b1f39 Mon Sep 17 00:00:00 2001
 From: Carlo Landmeter <clandmeter@gmail.com>
 Date: Tue, 1 Mar 2016 15:56:26 +0100
-Subject: [PATCH 6/8] Include sys/types.h in devid.h
+Subject: [PATCH 2/8] Include sys/types.h in devid.h
 
 This is needed for musl libc
+
+Signed-off-by: Carlo Landmeter <clandmeter@gmail.com>
+Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
+Closes #4454
 ---
  lib/libspl/include/devid.h | 1 +
  1 file changed, 1 insertion(+)
@@ -21,5 +25,5 @@ index 5406c33..4b346da 100644
  
  typedef int ddi_devid_t;
 -- 
-2.7.2
+2.7.4
 
diff --git a/testing/zfs-grsec/0003-Add-missing-fcntl.h-to-includes-in-mount_zfs.c.patch b/testing/zfs-grsec/0003-Add-missing-fcntl.h-to-includes-in-mount_zfs.c.patch
new file mode 100644
index 0000000000..87ccb78874
--- /dev/null
+++ b/testing/zfs-grsec/0003-Add-missing-fcntl.h-to-includes-in-mount_zfs.c.patch
@@ -0,0 +1,29 @@
+From 401951765dcf49c5a993280bf6a93b89c7f01bb8 Mon Sep 17 00:00:00 2001
+From: Carlo Landmeter <clandmeter@gmail.com>
+Date: Fri, 25 Mar 2016 20:47:03 +0100
+Subject: [PATCH 3/8] Add missing fcntl.h to includes in mount_zfs.c
+
+This is needed for musl libc
+
+Signed-off-by: Carlo Landmeter <clandmeter@gmail.com>
+Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
+Closes #4456
+---
+ cmd/mount_zfs/mount_zfs.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/cmd/mount_zfs/mount_zfs.c b/cmd/mount_zfs/mount_zfs.c
+index bd860cb..a939744 100644
+--- a/cmd/mount_zfs/mount_zfs.c
++++ b/cmd/mount_zfs/mount_zfs.c
+@@ -33,6 +33,7 @@
+ #include <libzfs.h>
+ #include <locale.h>
+ #include <getopt.h>
++#include <fcntl.h>
+ 
+ #define	ZS_COMMENT	0x00000000	/* comment */
+ #define	ZS_ZFSUTIL	0x00000001	/* caller is zfs(8) */
+-- 
+2.7.4
+
diff --git a/testing/zfs-grsec/0004-Ensure-correct-return-value-type.patch b/testing/zfs-grsec/0004-Ensure-correct-return-value-type.patch
index 7e801f2aa5..9897864c02 100644
--- a/testing/zfs-grsec/0004-Ensure-correct-return-value-type.patch
+++ b/testing/zfs-grsec/0004-Ensure-correct-return-value-type.patch
@@ -1,18 +1,22 @@
-From b2197a57c1261591e34d92a6ad7444ea97819db6 Mon Sep 17 00:00:00 2001
+From 8fb2f7092f5188d6ad42f0f66049568e49c8e7c8 Mon Sep 17 00:00:00 2001
 From: Carlo Landmeter <clandmeter@gmail.com>
 Date: Tue, 1 Mar 2016 15:32:52 +0100
 Subject: [PATCH 4/8] Ensure correct return value type
 
 When compiling with musl libc the return type will be incorrect.
+
+Signed-off-by: Carlo Landmeter <clandmeter@gmail.com>
+Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
+Closes #4454
 ---
  include/sys/zfs_context.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/include/sys/zfs_context.h b/include/sys/zfs_context.h
-index cc626fd..e68223e 100644
+index 4f7e328..78e33e1 100644
 --- a/include/sys/zfs_context.h
 +++ b/include/sys/zfs_context.h
-@@ -637,7 +637,7 @@ extern void delay(clock_t ticks);
+@@ -623,7 +623,7 @@ extern void delay(clock_t ticks);
  #define	maxclsyspri	-20
  #define	defclsyspri	0
  
@@ -22,5 +26,5 @@ index cc626fd..e68223e 100644
  #define	kcred		NULL
  #define	CRED()		NULL
 -- 
-2.7.2
+2.7.4
 
diff --git a/testing/zfs-grsec/0008-Set-_DATE_FMT-to-if-not-defined-in-libspl-timestamp..patch b/testing/zfs-grsec/0005-Set-_DATE_FMT-to-if-not-defined-in-libspl-timestamp..patch
index 81cf4387f0..37c5a33ffd 100644
--- a/testing/zfs-grsec/0008-Set-_DATE_FMT-to-if-not-defined-in-libspl-timestamp..patch
+++ b/testing/zfs-grsec/0005-Set-_DATE_FMT-to-if-not-defined-in-libspl-timestamp..patch
@@ -1,15 +1,18 @@
-From b49e2287871f612167dc40eb0d86e1c8b2d6311e Mon Sep 17 00:00:00 2001
+From f8c3aff70bbea57527ee301c16b94dcc8adc4cc9 Mon Sep 17 00:00:00 2001
 From: Carlo Landmeter <clandmeter@gmail.com>
 Date: Tue, 1 Mar 2016 16:23:12 +0100
-Subject: [PATCH 8/8] Set _DATE_FMT to '%+' if not defined in
+Subject: [PATCH 5/8] Set _DATE_FMT to '%+' if not defined in
  libspl/timestamp.c
 
+Signed-off-by: Carlo Landmeter <clandmeter@gmail.com>
+Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
+Closes #4458
 ---
  lib/libspl/timestamp.c | 4 ++++
  1 file changed, 4 insertions(+)
 
 diff --git a/lib/libspl/timestamp.c b/lib/libspl/timestamp.c
-index a4f4cf4..85b7ecf 100644
+index a4f4cf4..e2838da 100644
 --- a/lib/libspl/timestamp.c
 +++ b/lib/libspl/timestamp.c
 @@ -28,6 +28,10 @@
@@ -17,12 +20,12 @@ index a4f4cf4..85b7ecf 100644
  #include "statcommon.h"
  
 +#ifndef _DATE_FMT
-+#define _DATE_FMT "%+"
++#define	_DATE_FMT "%+"
 +#endif
 +
  /*
   * Print timestamp as decimal reprentation of time_t value (-T u was specified)
   * or in date(1) format (-T d was specified).
 -- 
-2.7.2
+2.7.4
 
diff --git a/testing/zfs-grsec/3bca72de3c30598c585c910208459a0cf05b9f0d.patch b/testing/zfs-grsec/0006-Move-hrtime_t-timestruc_t-and-timespec_t.patch
index a3ce7a6a6a..ac844dda62 100644
--- a/testing/zfs-grsec/3bca72de3c30598c585c910208459a0cf05b9f0d.patch
+++ b/testing/zfs-grsec/0006-Move-hrtime_t-timestruc_t-and-timespec_t.patch
@@ -1,13 +1,16 @@
-From 3bca72de3c30598c585c910208459a0cf05b9f0d Mon Sep 17 00:00:00 2001
+From d4ad14173906db278937a8779dc608a3e155727e Mon Sep 17 00:00:00 2001
 From: Carlo Landmeter <clandmeter@gmail.com>
 Date: Fri, 25 Mar 2016 13:21:53 +0100
-Subject: [PATCH] Move hrtime_t timestruc_t and timespec_t and change
- longlong_t to long long
+Subject: [PATCH 6/8] Move hrtime_t timestruc_t and timespec_t
 
-hrtime_t timestruc_t and timespec_t should have originally be included in
-sys/time.h so lets move them.
+hrtime_t timestruc_t and timespec_t should have originally been
+included in sys/time.h so lets move them.
 
 longlong_t is not defined by any standard so change it to long long
+
+Signed-off-by: Carlo Landmeter <clandmeter@gmail.com>
+Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
+Closes #4459
 ---
  lib/libspl/include/sys/time.h  | 5 +++++
  lib/libspl/include/sys/types.h | 4 ----
@@ -44,3 +47,6 @@ index 25d56be..8996af9 100644
  typedef short		pri_t;
  
  typedef int		zoneid_t;
+-- 
+2.7.4
+
diff --git a/testing/zfs-grsec/468e0c54b8d34d93043c9631cab954fb88fff8cb.patch b/testing/zfs-grsec/0007-Remove-complicated-libspl-assert-wrappers.patch
index 040f1251ad..74e8a747c6 100644
--- a/testing/zfs-grsec/468e0c54b8d34d93043c9631cab954fb88fff8cb.patch
+++ b/testing/zfs-grsec/0007-Remove-complicated-libspl-assert-wrappers.patch
@@ -1,18 +1,19 @@
-From 468e0c54b8d34d93043c9631cab954fb88fff8cb Mon Sep 17 00:00:00 2001
+From bd123ed53786910cfdcfa7f3a983a268a5951fb0 Mon Sep 17 00:00:00 2001
 From: Brian Behlendorf <behlendorf1@llnl.gov>
 Date: Tue, 1 Mar 2016 15:45:43 +0100
-Subject: [PATCH] Remove complicated libspl assert wrappers
+Subject: [PATCH 7/8] Remove complicated libspl assert wrappers
 
 Effectively provide our own version of assert()/verify() for use
 in user space.  This minimizes our dependencies and aligns the
-user space assertion error messages with those from the kernel.
-spl.ko module.
+user space assertion handling with what's used in the kernel.
 
+Signed-off-by: Carlo Landmeter <clandmeter@gmail.com>
 Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
+Closes #4449
 ---
  include/libzfs_impl.h       |  5 ---
- lib/libspl/include/assert.h | 76 +++++++++++++++++++--------------------------
- 2 files changed, 32 insertions(+), 49 deletions(-)
+ lib/libspl/include/assert.h | 82 ++++++++++++++++++++-------------------------
+ 2 files changed, 36 insertions(+), 51 deletions(-)
 
 diff --git a/include/libzfs_impl.h b/include/libzfs_impl.h
 index e805e3e..ff02fa7 100644
@@ -31,7 +32,7 @@ index e805e3e..ff02fa7 100644
  	char *zf_device;
  	char *zf_fru;
 diff --git a/lib/libspl/include/assert.h b/lib/libspl/include/assert.h
-index 52924e8..b30626e 100644
+index 52924e8..6226872 100644
 --- a/lib/libspl/include/assert.h
 +++ b/lib/libspl/include/assert.h
 @@ -32,68 +32,54 @@
@@ -133,7 +134,7 @@ index 52924e8..b30626e 100644
  #define	ASSERTV(x)
  #define	IMPLY(A, B)		((void)0)
  #define	EQUIV(A, B)		((void)0)
-@@ -102,6 +88,8 @@ assfail(const char *buf, const char *file, int line)
+@@ -102,13 +88,17 @@ assfail(const char *buf, const char *file, int line)
  #define	ASSERT3U(x, y, z)	VERIFY3U(x, y, z)
  #define	ASSERT3P(x, y, z)	VERIFY3P(x, y, z)
  #define	ASSERT0(x)		VERIFY0(x)
@@ -142,3 +143,17 @@ index 52924e8..b30626e 100644
  #define	ASSERTV(x)		x
  #define	IMPLY(A, B) \
  	((void)(((!(A)) || (B)) || \
+-	    assfail("(" #A ") implies (" #B ")", __FILE__, __LINE__)))
++	    libspl_assert("(" #A ") implies (" #B ")", \
++	    __FILE__, __FUNCTION__, __LINE__)))
+ #define	EQUIV(A, B) \
+ 	((void)((!!(A) == !!(B)) || \
+-	    assfail("(" #A ") is equivalent to (" #B ")", __FILE__, __LINE__)))
++	    libspl_assert("(" #A ") is equivalent to (" #B ")", \
++	    __FILE__, __FUNCTION__, __LINE__)))
+ 
+ #endif  /* NDEBUG */
+ 
+-- 
+2.7.4
+
diff --git a/testing/zfs-grsec/0008-Add-support-for-libtirpc.patch b/testing/zfs-grsec/0008-Add-support-for-libtirpc.patch
new file mode 100644
index 0000000000..4849871483
--- /dev/null
+++ b/testing/zfs-grsec/0008-Add-support-for-libtirpc.patch
@@ -0,0 +1,331 @@
+From 6f8aad51a7ef24ea614184f8ef801852b25357a1 Mon Sep 17 00:00:00 2001
+From: Brian Behlendorf <behlendorf1@llnl.gov>
+Date: Tue, 26 Apr 2016 17:24:41 -0700
+Subject: [PATCH 8/8] Add support for libtirpc
+
+While OpenSolaris libc and glibc both include XDR support, the musl libc
+does not in favor of depending on the BSD-licensed libtirpc library.
+
+Adding support is a simple matter of detecting the library, including
+the headers and linking against it.  By default libtirpc will be checked
+for and if available used.  Otherwise, configure will fall back to using
+the xdr implementation provided by libc if available.  The options
+--with-tirpc/--without-tirpc can be used to disable this checking.
+
+In addition, the xdr_control() function has been simplied to only
+handle ZFSs specific use case.
+
+Original-patch-by: stf <s@ctrlc.hu>
+Original-patch-by: Richard Yao <ryao@gentoo.org>
+Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
+Signed-off-by: Signed-off-by: Carlo Landmeter <clandmeter@gmail.com>
+Closes #2254
+Closes #4559
+---
+ config/user-libtirpc.m4             | 30 ++++++++++++++
+ config/user.m4                      |  1 +
+ lib/libnvpair/Makefile.am           |  6 +--
+ lib/libnvpair/nvpair_alloc_system.c |  1 +
+ lib/libspl/Makefile.am              |  1 -
+ lib/libspl/include/rpc/Makefile.am  |  1 -
+ lib/libspl/include/rpc/types.h      | 32 ---------------
+ lib/libspl/include/rpc/xdr.h        | 43 ++++++++++++--------
+ lib/libspl/xdr.c                    | 78 -------------------------------------
+ 9 files changed, 61 insertions(+), 132 deletions(-)
+ create mode 100644 config/user-libtirpc.m4
+ delete mode 100644 lib/libspl/include/rpc/types.h
+ delete mode 100644 lib/libspl/xdr.c
+
+diff --git a/config/user-libtirpc.m4 b/config/user-libtirpc.m4
+new file mode 100644
+index 0000000..5f92906
+--- /dev/null
++++ b/config/user-libtirpc.m4
+@@ -0,0 +1,30 @@
++dnl #
++dnl # Check for libtirpc - may be needed for xdr functionality
++dnl #
++AC_DEFUN([ZFS_AC_CONFIG_USER_LIBTIRPC], [
++	AC_ARG_WITH([tirpc],
++	    [AS_HELP_STRING([--with-tirpc],
++	        [use tirpc for xdr encoding @<:@default=check@:>@])],
++	    [],
++	    [with_tirpc=check])
++
++	LIBTIRPC=
++	LIBTIRPC_CFLAGS=
++
++	AS_IF([test "x$with_tirpc" != xno],
++	    [AC_CHECK_LIB([tirpc], [xdrmem_create],
++		[AC_SUBST([LIBTIRPC], [-ltirpc])
++		 AC_SUBST([LIBTIRPC_CFLAGS], [-I/usr/include/tirpc])
++		 AC_DEFINE([HAVE_LIBTIRPC], [1], [Define if you have libtirpc])
++		],
++		[if test "x$with_tirpc" != xcheck; then
++		    AC_MSG_FAILURE(
++			[--with-tirpc was given, but test for tirpc failed])
++		 fi
++		AC_SEARCH_LIBS([xdrmem_create], [tirpc], [], [
++		    AC_MSG_FAILURE([xdrmem_create() requires tirpc or libc])])
++		])],
++	    [AC_SEARCH_LIBS([xdrmem_create], [tirpc], [], [
++		AC_MSG_FAILURE([xdrmem_create() requires libc])])
++	    ])
++])
+diff --git a/config/user.m4 b/config/user.m4
+index 7f79420..7213e61 100644
+--- a/config/user.m4
++++ b/config/user.m4
+@@ -10,6 +10,7 @@ AC_DEFUN([ZFS_AC_CONFIG_USER], [
+ 	ZFS_AC_CONFIG_USER_ARCH
+ 	ZFS_AC_CONFIG_USER_ZLIB
+ 	ZFS_AC_CONFIG_USER_LIBUUID
++	ZFS_AC_CONFIG_USER_LIBTIRPC
+ 	ZFS_AC_CONFIG_USER_LIBBLKID
+ 	ZFS_AC_CONFIG_USER_FRAME_LARGER_THAN
+ 	ZFS_AC_CONFIG_USER_RUNSTATEDIR
+diff --git a/lib/libnvpair/Makefile.am b/lib/libnvpair/Makefile.am
+index c9ac1f1..2833557 100644
+--- a/lib/libnvpair/Makefile.am
++++ b/lib/libnvpair/Makefile.am
+@@ -4,7 +4,7 @@ VPATH = \
+ 	$(top_srcdir)/module/nvpair \
+ 	$(top_srcdir)/lib/libnvpair
+ 
+-AM_CFLAGS += $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN)
++AM_CFLAGS += $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN) $(LIBTIRPC_CFLAGS)
+ 
+ DEFAULT_INCLUDES += \
+ 	-I$(top_srcdir)/include \
+@@ -26,8 +26,8 @@ nodist_libnvpair_la_SOURCES = \
+ 	$(KERNEL_C)
+ 
+ libnvpair_la_LIBADD = \
+-        $(top_builddir)/lib/libuutil/libuutil.la
+-
++	$(top_builddir)/lib/libuutil/libuutil.la \
++	$(LIBTIRPC)
+ libnvpair_la_LDFLAGS = -version-info 1:1:0
+ 
+ EXTRA_DIST = $(USER_C)
+diff --git a/lib/libnvpair/nvpair_alloc_system.c b/lib/libnvpair/nvpair_alloc_system.c
+index f45dc5f..54dde1e 100644
+--- a/lib/libnvpair/nvpair_alloc_system.c
++++ b/lib/libnvpair/nvpair_alloc_system.c
+@@ -27,6 +27,7 @@
+ 
+ 
+ #include <rpc/types.h>
++#include <sys/kmem.h>
+ #include <sys/nvpair.h>
+ 
+ static void *
+diff --git a/lib/libspl/Makefile.am b/lib/libspl/Makefile.am
+index a569446..afd64fc 100644
+--- a/lib/libspl/Makefile.am
++++ b/lib/libspl/Makefile.am
+@@ -29,7 +29,6 @@ USER_C = \
+ 	strnlen.c \
+ 	timestamp.c \
+ 	zone.c \
+-	xdr.c \
+ 	include/sys/list.h \
+ 	include/sys/list_impl.h
+ 
+diff --git a/lib/libspl/include/rpc/Makefile.am b/lib/libspl/include/rpc/Makefile.am
+index 7a29aba..78ee5a2 100644
+--- a/lib/libspl/include/rpc/Makefile.am
++++ b/lib/libspl/include/rpc/Makefile.am
+@@ -1,4 +1,3 @@
+ libspldir = $(includedir)/libspl/rpc
+ libspl_HEADERS = \
+-	$(top_srcdir)/lib/libspl/include/rpc/types.h \
+ 	$(top_srcdir)/lib/libspl/include/rpc/xdr.h
+diff --git a/lib/libspl/include/rpc/types.h b/lib/libspl/include/rpc/types.h
+deleted file mode 100644
+index aa9901f..0000000
+--- a/lib/libspl/include/rpc/types.h
++++ /dev/null
+@@ -1,32 +0,0 @@
+-/*
+- * CDDL HEADER START
+- *
+- * The contents of this file are subject to the terms of the
+- * Common Development and Distribution License (the "License").
+- * You may not use this file except in compliance with the License.
+- *
+- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+- * or http://www.opensolaris.org/os/licensing.
+- * See the License for the specific language governing permissions
+- * and limitations under the License.
+- *
+- * When distributing Covered Code, include this CDDL HEADER in each
+- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+- * If applicable, add the following below this CDDL HEADER, with the
+- * fields enclosed by brackets "[]" replaced with your own identifying
+- * information: Portions Copyright [yyyy] [name of copyright owner]
+- *
+- * CDDL HEADER END
+- */
+-/*
+- * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+- * Use is subject to license terms.
+- */
+-
+-#ifndef LIBSPL_RPC_TYPES_H
+-#define	LIBSPL_RPC_TYPES_H
+-
+-#include_next <rpc/types.h>
+-#include <sys/kmem.h>
+-
+-#endif /* LIBSPL_RPC_TYPES_H */
+diff --git a/lib/libspl/include/rpc/xdr.h b/lib/libspl/include/rpc/xdr.h
+index 99500d6..3c7c53f 100644
+--- a/lib/libspl/include/rpc/xdr.h
++++ b/lib/libspl/include/rpc/xdr.h
+@@ -32,11 +32,20 @@
+ #ifndef LIBSPL_RPC_XDR_H
+ #define	LIBSPL_RPC_XDR_H
+ 
+-#include_next <rpc/xdr.h>
+-
+ /*
+- * These are XDR control operators
++ * When available prefer libtirpc for xdr functionality.  This library is
++ * mandatory when compiling with musl libc because it does not provide xdr.
+  */
++#if defined(HAVE_LIBTIRPC)
++
++#include <tirpc/rpc/xdr.h>
++#ifdef xdr_control
++#undef xdr_control
++#endif
++
++#else
++#include_next <rpc/xdr.h>
++#endif /* HAVE_LIBTIRPC */
+ 
+ #define	XDR_GET_BYTES_AVAIL 1
+ 
+@@ -46,20 +55,20 @@ typedef struct xdr_bytesrec {
+ } xdr_bytesrec_t;
+ 
+ /*
+- * These are the request arguments to XDR_CONTROL.
+- *
+- * XDR_PEEK - returns the contents of the next XDR unit on the XDR stream.
+- * XDR_SKIPBYTES - skips the next N bytes in the XDR stream.
+- * XDR_RDMAGET - for xdr implementation over RDMA, gets private flags from
+- *		 the XDR stream being moved over RDMA
+- * XDR_RDMANOCHUNK - for xdr implementaion over RDMA, sets private flags in
+- *                   the XDR stream moving over RDMA.
++ * This functionality is not required and is disabled in user space.
+  */
+-#define	XDR_PEEK	2
+-#define	XDR_SKIPBYTES	3
+-#define	XDR_RDMAGET	4
+-#define	XDR_RDMASET	5
++static inline bool_t
++xdr_control(XDR *xdrs, int request, void *info)
++{
++	xdr_bytesrec_t *xptr;
+ 
+-extern bool_t xdr_control(XDR *xdrs, int request, void *info);
++	ASSERT3U(request, ==, XDR_GET_BYTES_AVAIL);
+ 
+-#endif
++	xptr = (xdr_bytesrec_t *)info;
++	xptr->xc_is_last_record = TRUE;
++	xptr->xc_num_avail = xdrs->x_handy;
++
++	return (TRUE);
++}
++
++#endif /* LIBSPL_RPC_XDR_H */
+diff --git a/lib/libspl/xdr.c b/lib/libspl/xdr.c
+deleted file mode 100644
+index 288a338..0000000
+--- a/lib/libspl/xdr.c
++++ /dev/null
+@@ -1,78 +0,0 @@
+-/*
+- * CDDL HEADER START
+- *
+- * The contents of this file are subject to the terms of the
+- * Common Development and Distribution License, Version 1.0 only
+- * (the "License").  You may not use this file except in compliance
+- * with the License.
+- *
+- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+- * or http://www.opensolaris.org/os/licensing.
+- * See the License for the specific language governing permissions
+- * and limitations under the License.
+- *
+- * When distributing Covered Code, include this CDDL HEADER in each
+- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+- * If applicable, add the following below this CDDL HEADER, with the
+- * fields enclosed by brackets "[]" replaced with your own identifying
+- * information: Portions Copyright [yyyy] [name of copyright owner]
+- *
+- * CDDL HEADER END
+- *
+- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+- * Use is subject to license terms.
+- *
+- *	Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T
+- *	  All Rights Reserved
+- *
+- * Portions of this source code were derived from Berkeley 4.3 BSD
+- * under license from the Regents of the University of California.
+- */
+-
+-#include <rpc/xdr.h>
+-
+-/*
+- * As of glibc-2.5-25 there is not support for xdr_control().  The
+- * xdrmem implementation from OpenSolaris is used here.
+- *
+- * FIXME: Not well tested it may not work as expected.
+- */
+-bool_t
+-xdr_control(XDR *xdrs, int request, void *info)
+-{
+-	xdr_bytesrec_t *xptr;
+-	int32_t *int32p;
+-	int len;
+-
+-	switch (request) {
+-	case XDR_GET_BYTES_AVAIL:
+-		xptr = (xdr_bytesrec_t *)info;
+-		xptr->xc_is_last_record = TRUE;
+-		xptr->xc_num_avail = xdrs->x_handy;
+-		return (TRUE);
+-
+-	case XDR_PEEK:
+-		/*
+-		 * Return the next 4 byte unit in the XDR stream.
+-		 */
+-		if (xdrs->x_handy < sizeof (int32_t))
+-			return (FALSE);
+-		int32p = (int32_t *)info;
+-		*int32p = (int32_t)ntohl((uint32_t)
+-		    (*((int32_t *)(xdrs->x_private))));
+-		return (TRUE);
+-
+-	case XDR_SKIPBYTES:
+-		/*
+-		 * Skip the next N bytes in the XDR stream.
+-		 */
+-		int32p = (int32_t *)info;
+-		len = RNDUP((int)(*int32p));
+-		if ((xdrs->x_handy -= len) < 0)
+-			return (FALSE);
+-		xdrs->x_private += len;
+-		return (TRUE);
+-
+-	}
+-	return (FALSE);
+-}
+-- 
+2.7.4
+
diff --git a/testing/zfs-grsec/0001-Add-support-for-alpine-linux.patch b/testing/zfs-grsec/0009-Add-support-for-alpine-linux.patch
index 54d55e6ea5..54d55e6ea5 100644
--- a/testing/zfs-grsec/0001-Add-support-for-alpine-linux.patch
+++ b/testing/zfs-grsec/0009-Add-support-for-alpine-linux.patch
diff --git a/testing/zfs-grsec/APKBUILD b/testing/zfs-grsec/APKBUILD
index 6b7d28ed0f..7fe6ad0b50 100644
--- a/testing/zfs-grsec/APKBUILD
+++ b/testing/zfs-grsec/APKBUILD
@@ -10,7 +10,7 @@ _kver=4.4.12
 _kpkgrel=0
 
 _realver=0.6.5.7
-_mypkgrel=0
+_mypkgrel=1
 
 # source the kernel version
 if [ -f ../../main/linux-$_flavor/APKBUILD ]; then
@@ -33,21 +33,19 @@ depends="spl-$_flavor"
 depends_dev="glib-dev e2fsprogs-dev util-linux-dev libtirpc-dev
 	linux-$_flavor-dev=$_kernelver spl-$_flavor-dev"
 makedepends="$depends_dev automake autoconf libtool linux-headers"
-install_if="zfs linux-grsec-$_kernelver"
+install_if="zfs linux-grsec-$_kver"
 install=""
 subpackages="$pkgname-dev"
 source="http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-$_realver.tar.gz
-	0001-Add-support-for-alpine-linux.patch
-
-	0001-Add-missing-fcntl.h-to-includes-in-mount_zfs.c.patch
-	0002-Add-support-for-libtirpc.patch
-	0003-Use-the-correct-macro-to-include-backtrace.patch
-	0004-Ensure-correct-return-value-type.patch
-	0006-Include-sys-types.h-in-devid.h.patch
-	0008-Set-_DATE_FMT-to-if-not-defined-in-libspl-timestamp..patch
-
-	468e0c54b8d34d93043c9631cab954fb88fff8cb.patch
-	3bca72de3c30598c585c910208459a0cf05b9f0d.patch
+        0001-Use-the-correct-macro-to-include-backtrace.patch
+        0002-Include-sys-types.h-in-devid.h.patch
+        0003-Add-missing-fcntl.h-to-includes-in-mount_zfs.c.patch
+        0004-Ensure-correct-return-value-type.patch
+        0005-Set-_DATE_FMT-to-if-not-defined-in-libspl-timestamp..patch
+        0006-Move-hrtime_t-timestruc_t-and-timespec_t.patch
+        0007-Remove-complicated-libspl-assert-wrappers.patch
+        0008-Add-support-for-libtirpc.patch
+        0009-Add-support-for-alpine-linux.patch
 	"
 
 
@@ -86,32 +84,32 @@ dev() {
 }
 
 md5sums="b470c0426da6e1e3513f5166c907218d  zfs-0.6.5.7.tar.gz
-ce98b83e44621e99e686cb384b36aaeb  0001-Add-support-for-alpine-linux.patch
-7b4ee1de2404c0baa9848de309819fc9  0001-Add-missing-fcntl.h-to-includes-in-mount_zfs.c.patch
-8633a50fa103f91b7c08cba35c38fffd  0002-Add-support-for-libtirpc.patch
-51f8e000510747abc1610779820c90e2  0003-Use-the-correct-macro-to-include-backtrace.patch
-f380fed6034db74b1b1d80d717e51ad2  0004-Ensure-correct-return-value-type.patch
-3853a26f7a7a14607c99020373c9691e  0006-Include-sys-types.h-in-devid.h.patch
-5050558e710d4c763dc4dddcad89b153  0008-Set-_DATE_FMT-to-if-not-defined-in-libspl-timestamp..patch
-6388b1fbd8a335db158b8c84d023c8a2  468e0c54b8d34d93043c9631cab954fb88fff8cb.patch
-7522a01aa31d474fe148945dd4de5329  3bca72de3c30598c585c910208459a0cf05b9f0d.patch"
+f6ec48b9b5c441a1f54949370144fda5  0001-Use-the-correct-macro-to-include-backtrace.patch
+9bad71efa929c9cde4521878250d85d3  0002-Include-sys-types.h-in-devid.h.patch
+20e8a315dd63c6846f6391da1b72a733  0003-Add-missing-fcntl.h-to-includes-in-mount_zfs.c.patch
+00fdcfb201ea5dae99b545830b594282  0004-Ensure-correct-return-value-type.patch
+2799a289044ff300d22884d3e97742d7  0005-Set-_DATE_FMT-to-if-not-defined-in-libspl-timestamp..patch
+53c86d3f6d17e9b13adc6c2d3e59039b  0006-Move-hrtime_t-timestruc_t-and-timespec_t.patch
+a1138f272d993474b51951ae4d14e242  0007-Remove-complicated-libspl-assert-wrappers.patch
+36d1338fc76c999441506f674a85d9fc  0008-Add-support-for-libtirpc.patch
+ce98b83e44621e99e686cb384b36aaeb  0009-Add-support-for-alpine-linux.patch"
 sha256sums="4a9e271bb9a6af8d564e4d5800e4fff36224f1697b923a7253659bdda80dc590  zfs-0.6.5.7.tar.gz
-f06e42db7c7e41481dfb068d80c9b763d7c9aead4c8f017e9398f88d58424092  0001-Add-support-for-alpine-linux.patch
-2166987d985fc1e9058943e75642177178a2c140d3a261a97378696205f0d77d  0001-Add-missing-fcntl.h-to-includes-in-mount_zfs.c.patch
-88535d0c974ac7d878958dc835f27a5d1090a3cb0c90234f5f1cede65f7fdc83  0002-Add-support-for-libtirpc.patch
-3ee3d49a5f6ed0df37cdbe60330ee4ff9e6feb9ac0872250482ddfc039617eef  0003-Use-the-correct-macro-to-include-backtrace.patch
-03695ab8313cf4e30289bdfa9a611f7538ce712253e7163de755fbe2fed9d1d8  0004-Ensure-correct-return-value-type.patch
-7d26389c31c2720fde8865fee8a1613a92d264a3a3c8aec5f9dea4426f19221d  0006-Include-sys-types.h-in-devid.h.patch
-2c8bda14b9de33ccae073c3738fc76136818fc60702c96a03229b210b6985d6b  0008-Set-_DATE_FMT-to-if-not-defined-in-libspl-timestamp..patch
-c8e2d08023fbd7c754fda6432f663fd04a8b4f4a96d7d83fb5575bbffe8ca7b8  468e0c54b8d34d93043c9631cab954fb88fff8cb.patch
-d372afa34cc4a76de326788c5017a9f5741511f3760b64f207991d80788e5605  3bca72de3c30598c585c910208459a0cf05b9f0d.patch"
+c30273c9874e8ab13f3eb8612dd7af6b7916b5b358060a1afee7c9b0af68f307  0001-Use-the-correct-macro-to-include-backtrace.patch
+3898613e9ee3f46e7048a4a74ee2584979bd7b258e6831c9aeb46e6862ec3371  0002-Include-sys-types.h-in-devid.h.patch
+f0153d3ebc2b58d6f0e0a7b4a705c6728cb18bfcff568f0eac917a21aba78324  0003-Add-missing-fcntl.h-to-includes-in-mount_zfs.c.patch
+fa840bf91e0fd44677b7d180c72687f8caad36f673f0c01bf6bf6d29836530a5  0004-Ensure-correct-return-value-type.patch
+8a6d9b6fa6edf57a7f91b1204099a7a8fc1f604b5edf8dc28f21681cdc56699c  0005-Set-_DATE_FMT-to-if-not-defined-in-libspl-timestamp..patch
+96adc58dd0955b0dfe99321ae32fb07289836d2390a4492e6daa4911d3b638c4  0006-Move-hrtime_t-timestruc_t-and-timespec_t.patch
+48167b51bdaac8d0cac4c534d5b01afc3bd6b416aceddc7e8bea705b30b6dc7e  0007-Remove-complicated-libspl-assert-wrappers.patch
+259ab7271776e4034ab36f7cff06d8b9aa9fb74756f8ca1e1b933ddf93030f8e  0008-Add-support-for-libtirpc.patch
+f06e42db7c7e41481dfb068d80c9b763d7c9aead4c8f017e9398f88d58424092  0009-Add-support-for-alpine-linux.patch"
 sha512sums="559b826ae1a176217b92d8407729e2c5feeffb117dc9affaa8c9c2134d996b6c3cbe095f7a0c4666c9b131742491f1304eeb292e13e0df0b6d001fa620568af2  zfs-0.6.5.7.tar.gz
-d2efb627f493bab06f8049dc4bcb7c39269ff9dcd66879a0f96fa5040e1c7468f9e684277ec3e54841b3a5f8734d9470f2c6a1af470e3f1a71f759f9155b7ede  0001-Add-support-for-alpine-linux.patch
-549a15c393806176e1640ee5c47d76fb142b40d96a68be854379fa96c987e86ff29dac5172cc619b33bb2ebb1f9eb3bc1e92bceced3f25e63c16ddc9ef2ac578  0001-Add-missing-fcntl.h-to-includes-in-mount_zfs.c.patch
-bab158b4f32e34d346f5a97406ba1d58783e5965906e60cae1ef40d1a7a78f505558d0eaaff62f03f4965ae3b4168b5b469636556f6393553cf8540ec400a9b5  0002-Add-support-for-libtirpc.patch
-94ecaeb8ec16c1af3b40eb44081e4db4f5dd5f8c0c3edece2b6bdec7ac2be993f041066c41c0b94cb75f9413681be0c846249413956712096f8181aa0f26736b  0003-Use-the-correct-macro-to-include-backtrace.patch
-12c0d3d81e788c6f13aa0435b72ae64af32170ae30b98bb2b112984a82231f67ec5f46d7867264eba27b22d899f3132bf9687c9a7973eb43055597a994e1bf73  0004-Ensure-correct-return-value-type.patch
-d5de48b1206583543f0f324e41abaea3ee3628f513cdb059e17758943ed1d97fcd685f463d9f8a52f5d85ac9b94630b9332e849cf2466852a83279acec4ca977  0006-Include-sys-types.h-in-devid.h.patch
-4b6638ee3dde6c92f93208434b831076542437a7552a4d779c6bd104195be2cf01e09716e08ab7fd231ae2297f8f427a4e3985c1fa85e7f4becea281b923da4a  0008-Set-_DATE_FMT-to-if-not-defined-in-libspl-timestamp..patch
-5707e8e7957e0e849ef68fb126fea61f4f2d54b8a8f29f1bad2aeefb851fc4f8cffaf5a1f1e8c02ca7d47471bc97ac364b864c1f9a4d03c7c552eab86484e368  468e0c54b8d34d93043c9631cab954fb88fff8cb.patch
-2227fa9906741ba335ee94abeb1db29f39a885d791f8455bae6e3f63392c55923ad8d01a2163fbcf85dcd473312aeeba8e13462feb3c099559fdc35623d45797  3bca72de3c30598c585c910208459a0cf05b9f0d.patch"
+1e9f3c753b5bbe50ea6c953fec4200ae3a2de63abaa0dbcc2fb558a92716c27545ef773b3d0dc7bb1248622073a0db4c194d008bc83af7de7f90111169ffe31a  0001-Use-the-correct-macro-to-include-backtrace.patch
+244f143c3cca0102ee98aed122b70d9e255a68645d90f927d67fe19e89c4678839b91fbb560c4e55306510e8aec4762c4afc671317df153940f17e905c17b928  0002-Include-sys-types.h-in-devid.h.patch
+413cf13db3d390714fcd20c4150d3b0dbddcff031572117fcd4f015d929fde642381ab98f0b796dc4001472b2ee13dbf69261f4b83e990c2b0a080223667193c  0003-Add-missing-fcntl.h-to-includes-in-mount_zfs.c.patch
+c26793c4ada197584d5829a6d31fd826333416a73ac1fa1d8f84277ba99312db72608d6d13171131cdf61b20e1c6c1ada51027361d48cc7b2863fd5b23df8083  0004-Ensure-correct-return-value-type.patch
+fbd44839a422925a54710e8425405d24ca2428b78aa54b9a77492e5882a3e21aa4a5e53656466c5af79460fde75ac6aeb6f1f3fe85a1f26333d5acd36c6c9013  0005-Set-_DATE_FMT-to-if-not-defined-in-libspl-timestamp..patch
+e20fb3004af9e6454513d7df09292465e5bc4101a558538cf794ef41b56a30713e1868dcda251e6b3ed10c5f0178e86068bcb113bd8228eedb626cb73bb19ecd  0006-Move-hrtime_t-timestruc_t-and-timespec_t.patch
+9843aca713021772435cfa68fde5d9aa2de0387de0da6c48045db0348f2a24d2c2e968d3eb1921923170c9e2fd6514e31c5f0a7bacbf8510b53c2c625c4737d1  0007-Remove-complicated-libspl-assert-wrappers.patch
+fa752b3ed04f05ec4fac257cbd2c581a57a792e12165d8f135a77b894445cdefb0da1753922e3e59c9fbaed20ca1dc6d19b5436745c8fa588a42304f6561f1a2  0008-Add-support-for-libtirpc.patch
+d2efb627f493bab06f8049dc4bcb7c39269ff9dcd66879a0f96fa5040e1c7468f9e684277ec3e54841b3a5f8734d9470f2c6a1af470e3f1a71f759f9155b7ede  0009-Add-support-for-alpine-linux.patch"