main/zfs: move zfs and deps to main

1 files changed, 122 insertions, 0 deletions

diff --git a/main/zfs-grsec/0009-Add-support-for-alpine-linux.patch b/main/zfs-grsec/0009-Add-support-for-alpine-linux.patch
new file mode 100644
index 0000000000..54d55e6ea5
--- /dev/null
+++ b/main/zfs-grsec/0009-Add-support-for-alpine-linux.patch
@@ -0,0 +1,122 @@
+From 00aa1a096d2c9ecaf28faa51aca5feb9d406aab0 Mon Sep 17 00:00:00 2001
+From: Carlo Landmeter <clandmeter@gmail.com>
+Date: Tue, 1 Mar 2016 16:36:28 +0100
+Subject: [PATCH] Add support for alpine linux
+
+Both Alpine Linux and Gentoo use OpenRC so we share its logic
+---
+ config/zfs-build.m4      | 7 ++++++-
+ etc/init.d/Makefile.am   | 2 +-
+ etc/init.d/zfs-import.in | 2 +-
+ etc/init.d/zfs-mount.in  | 2 +-
+ etc/init.d/zfs-share.in  | 2 +-
+ etc/init.d/zfs-zed.in    | 2 +-
+ 6 files changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/config/zfs-build.m4 b/config/zfs-build.m4
+index f93c5b5..9d3f0a6 100644
+--- a/config/zfs-build.m4
++++ b/config/zfs-build.m4
+@@ -266,6 +266,8 @@ AC_DEFUN([ZFS_AC_DEFAULT_PACKAGE], [
+ 		VENDOR=ubuntu ;
+ 	elif test -f /etc/debian_version ; then
+ 		VENDOR=debian ;
++	elif test -f /etc/alpine-release ; then
++		VENDOR=alpine ;
+ 	else
+ 		VENDOR= ;
+ 	fi
+@@ -278,6 +280,7 @@ AC_DEFUN([ZFS_AC_DEFAULT_PACKAGE], [
+ 		redhat)     DEFAULT_PACKAGE=rpm  ;;
+ 		fedora)     DEFAULT_PACKAGE=rpm  ;;
+ 		gentoo)     DEFAULT_PACKAGE=tgz  ;;
++		alpine)     DEFAULT_PACKAGE=tgz  ;;
+ 		arch)       DEFAULT_PACKAGE=tgz  ;;
+ 		sles)       DEFAULT_PACKAGE=rpm  ;;
+ 		slackware)  DEFAULT_PACKAGE=tgz  ;;
+@@ -299,7 +302,8 @@ AC_DEFUN([ZFS_AC_DEFAULT_PACKAGE], [
+ 		toss)       DEFAULT_INIT_SCRIPT=redhat ;;
+ 		redhat)     DEFAULT_INIT_SCRIPT=redhat ;;
+ 		fedora)     DEFAULT_INIT_SCRIPT=fedora ;;
+-		gentoo)     DEFAULT_INIT_SCRIPT=gentoo ;;
++		gentoo)     DEFAULT_INIT_SCRIPT=openrc ;;
++		alpine)     DEFAULT_INIT_SCRIPT=openrc ;;
+ 		arch)       DEFAULT_INIT_SCRIPT=lsb    ;;
+ 		sles)       DEFAULT_INIT_SCRIPT=lsb    ;;
+ 		slackware)  DEFAULT_INIT_SCRIPT=lsb    ;;
+@@ -313,6 +317,7 @@ AC_DEFUN([ZFS_AC_DEFAULT_PACKAGE], [
+ 
+ 	AC_MSG_CHECKING([default init config direectory])
+ 	case "$VENDOR" in
++		alpine)     DEFAULT_INITCONF_DIR=/etc/conf.d    ;;
+ 		gentoo)     DEFAULT_INITCONF_DIR=/etc/conf.d    ;;
+ 		toss)       DEFAULT_INITCONF_DIR=/etc/sysconfig ;;
+ 		redhat)     DEFAULT_INITCONF_DIR=/etc/sysconfig ;;
+diff --git a/etc/init.d/Makefile.am b/etc/init.d/Makefile.am
+index 5f70fc6..c6e29d1 100644
+--- a/etc/init.d/Makefile.am
++++ b/etc/init.d/Makefile.am
+@@ -21,7 +21,7 @@ $(init_SCRIPTS) $(initconf_SCRIPTS) $(initcommon_SCRIPTS): $(EXTRA_DIST)
+ 	  else \
+ 		NFS_SRV=nfs; \
+ 	  fi; \
+-	  if [ -e /etc/gentoo-release ]; then \
++	  if [ -e /sbin/openrc-run ]; then \
+ 		SHELL=/sbin/runscript; \
+ 	  else \
+ 		SHELL=/bin/sh; \
+diff --git a/etc/init.d/zfs-import.in b/etc/init.d/zfs-import.in
+index 2258638..354bbc6 100755
+--- a/etc/init.d/zfs-import.in
++++ b/etc/init.d/zfs-import.in
+@@ -308,7 +308,7 @@ do_start()
+ 
+ # ----------------------------------------------------
+ 
+-if [ ! -e /etc/gentoo-release ]
++if [ ! -e /sbin/openrc-run ]
+ then
+ 	case "$1" in
+ 		start)
+diff --git a/etc/init.d/zfs-mount.in b/etc/init.d/zfs-mount.in
+index 05cea9b..34db057 100755
+--- a/etc/init.d/zfs-mount.in
++++ b/etc/init.d/zfs-mount.in
+@@ -199,7 +199,7 @@ do_stop()
+ 
+ # ----------------------------------------------------
+ 
+-if [ ! -e /etc/gentoo-release ]
++if [ ! -e /sbin/openrc-run ]
+ then
+ 	case "$1" in
+ 		start)
+diff --git a/etc/init.d/zfs-share.in b/etc/init.d/zfs-share.in
+index 1b70da4..ce3cc1c 100755
+--- a/etc/init.d/zfs-share.in
++++ b/etc/init.d/zfs-share.in
+@@ -58,7 +58,7 @@ do_stop()
+ 
+ # ----------------------------------------------------
+ 
+-if [ ! -e /etc/gentoo-release ]; then
++if [ ! -e /sbin/openrc-run ]; then
+ 	case "$1" in
+ 		start)
+ 			do_start
+diff --git a/etc/init.d/zfs-zed.in b/etc/init.d/zfs-zed.in
+index 86e3185..d0086ee 100755
+--- a/etc/init.d/zfs-zed.in
++++ b/etc/init.d/zfs-zed.in
+@@ -98,7 +98,7 @@ do_reload()
+ 
+ # ----------------------------------------------------
+ 
+-if [ ! -e /etc/gentoo-release ]; then
++if [ ! -e /sbin/openrc-run ]; then
+ 	case "$1" in
+ 		start)
+ 			do_start
+-- 
+2.7.2
+