testing/zfs-grsec: disable does not build

1 files changed, 28 insertions, 66 deletions

diff --git a/testing/zfs-grsec/musl-fixes.patch b/testing/zfs-grsec/musl-fixes.patch
index 538274ee5b..60a5893487 100644
--- a/testing/zfs-grsec/musl-fixes.patch
+++ b/testing/zfs-grsec/musl-fixes.patch
@@ -28,19 +28,6 @@ diff -urw src/zfs-0.6.3/cmd/zdb/Makefile.am src.new/cmd/zdb/Makefile.am
  
 -zdb_LDADD += $(ZLIB)
 +zdb_LDADD += $(ZLIB) $(TIRPC_LIBS)
-diff -urw src/zfs-0.6.3/cmd/zed/Makefile.am src.new/cmd/zed/Makefile.am
---- src/zfs-0.6.3/cmd/zed/Makefile.am	2014-06-12 20:58:09.000000000 +0000
-+++ src.new/cmd/zed/Makefile.am	2014-09-13 18:40:03.585455839 +0000
-@@ -26,7 +26,8 @@
- 	$(top_builddir)/lib/libavl/libavl.la \
- 	$(top_builddir)/lib/libnvpair/libnvpair.la \
- 	$(top_builddir)/lib/libspl/libspl.la \
--	$(top_builddir)/lib/libzfs/libzfs.la
-+	$(top_builddir)/lib/libzfs/libzfs.la \
-+	$(TIRPC_LIBS)
- 
- zedconfdir = $(sysconfdir)/zfs/zed.d
- 
 diff -urw src/zfs-0.6.3/cmd/zfs/Makefile.am src.new/cmd/zfs/Makefile.am
 --- src/zfs-0.6.3/cmd/zfs/Makefile.am	2014-06-12 20:58:09.000000000 +0000
 +++ src.new/cmd/zfs/Makefile.am	2014-09-13 18:40:03.701013827 +0000
@@ -108,18 +95,6 @@ diff -urw src/zfs-0.6.3/config/user.m4 src.new/config/user.m4
  dnl #
  dnl #	Checks for library functions
  	AC_CHECK_FUNCS([mlockall])
-diff -urw src/zfs-0.6.3/include/sys/nvpair.h src.new/include/sys/nvpair.h
---- src/zfs-0.6.3/include/sys/nvpair.h	2014-06-12 20:58:09.000000000 +0000
-+++ src.new/include/sys/nvpair.h	2014-09-13 18:40:03.802127067 +0000
-@@ -132,7 +132,7 @@
- } nv_alloc_t;
- 
- struct nv_alloc_ops {
--	int (*nv_ao_init)(nv_alloc_t *, __va_list);
-+	int (*nv_ao_init)(nv_alloc_t *, va_list);
- 	void (*nv_ao_fini)(nv_alloc_t *);
- 	void *(*nv_ao_alloc)(nv_alloc_t *, size_t);
- 	void (*nv_ao_free)(nv_alloc_t *, void *, size_t);
 diff -urw src/zfs-0.6.3/include/sys/zfs_context.h src.new/include/sys/zfs_context.h
 --- src/zfs-0.6.3/include/sys/zfs_context.h	2014-06-12 20:58:09.000000000 +0000
 +++ src.new/include/sys/zfs_context.h	2014-09-13 18:40:03.809349441 +0000
@@ -134,18 +109,6 @@ diff -urw src/zfs-0.6.3/include/sys/zfs_context.h src.new/include/sys/zfs_contex
  /*
   * Stack
   */
-@@ -148,9 +152,9 @@
- extern void __dprintf(const char *file, const char *func,
-     int line, const char *fmt, ...);
- extern void cmn_err(int, const char *, ...);
--extern void vcmn_err(int, const char *, __va_list);
-+extern void vcmn_err(int, const char *, va_list);
- extern void panic(const char *, ...);
--extern void vpanic(const char *, __va_list);
-+extern void vpanic(const char *, va_list);
- 
- #define	fm_panic	panic
- 
 @@ -614,7 +618,11 @@
  #define	minclsyspri	60
  #define	maxclsyspri	99
@@ -253,23 +216,6 @@ diff -urw src/zfs-0.6.3/lib/libspl/include/sys/inttypes.h src.new/lib/libspl/inc
 +#endif
 +
  #endif
-diff -urw src/zfs-0.6.3/lib/libspl/include/sys/param.h src.new/lib/libspl/include/sys/param.h
---- src/zfs-0.6.3/lib/libspl/include/sys/param.h	2014-06-12 20:58:09.000000000 +0000
-+++ src.new/lib/libspl/include/sys/param.h	2014-09-13 18:40:03.755181634 +0000
-@@ -57,6 +57,12 @@
- #define	MAXUID		UINT32_MAX	/* max user id */
- #define	MAXPROJID	MAXUID		/* max project id */
- 
--#define	PAGESIZE	(sysconf(_SC_PAGESIZE))
-+#ifndef	PAGESIZE
-+#define	PAGESIZE	PAGE_SIZE
-+#endif
-+
-+#ifndef HZ
-+#define HZ 100
-+#endif
- 
- #endif
 diff -urw src/zfs-0.6.3/lib/libspl/include/sys/time.h src.new/lib/libspl/include/sys/time.h
 --- src/zfs-0.6.3/lib/libspl/include/sys/time.h	2014-06-12 20:58:09.000000000 +0000
 +++ src.new/lib/libspl/include/sys/time.h	2014-09-13 18:40:03.755181634 +0000
@@ -311,18 +257,6 @@ diff -urw src/zfs-0.6.3/lib/libspl/include/sys/types.h src.new/lib/libspl/includ
 +#include <sys/param.h> /* for NBBY */
 +
  #endif
-diff -urw src/zfs-0.6.3/lib/libspl/include/sys/va_list.h src.new/lib/libspl/include/sys/va_list.h
---- src/zfs-0.6.3/lib/libspl/include/sys/va_list.h	2014-06-12 20:58:09.000000000 +0000
-+++ src.new/lib/libspl/include/sys/va_list.h	2014-09-13 18:40:03.751570447 +0000
-@@ -29,8 +29,4 @@
- 
- #include <stdarg.h>
- 
--#ifndef __va_list
--typedef __gnuc_va_list __va_list;
--#endif
--
- #endif
 diff -urw src/zfs-0.6.3/lib/libspl/timestamp.c src.new/lib/libspl/timestamp.c
 --- src/zfs-0.6.3/lib/libspl/timestamp.c	2014-06-12 20:58:09.000000000 +0000
 +++ src.new/lib/libspl/timestamp.c	2014-09-13 18:40:03.722680950 +0000
@@ -405,3 +339,31 @@ index 0000000..fb4d2c4
 +  AC_SUBST(TIRPC_LIBS)
 +fi])
 +])
+--- ./cmd/zed/Makefile.am.orig
++++ ./cmd/zed/Makefile.am
+@@ -28,7 +28,8 @@
+ 	$(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
+ 
+--- ./lib/libspl/include/sys/param.h.orig
++++ ./lib/libspl/include/sys/param.h
+@@ -58,7 +58,12 @@
+ #define	MAXPROJID	MAXUID		/* max project id */
+ 
+ #ifndef	PAGESIZE
+-#define	PAGESIZE	(sysconf(_SC_PAGESIZE))
++#define PAGESIZE        PAGE_SIZE
+ #endif /* PAGESIZE */
++
++#ifndef HZ
++#define HZ 100
++#endif
++
+ 
+ #endif