From 73726d566046b270d93dd363551d1ba4cef301d2 Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@gmail.com>
Date: Thu, 10 Mar 2016 00:02:45 -0500
Subject: [PATCH] zfs: update to 0.6.5.5.

---
 srcpkgs/zfs/patches/musl-fixes.patch  |  4 ++--
 srcpkgs/zfs/patches/musl-getopt.patch | 25 -------------------------
 srcpkgs/zfs/template                  |  8 ++++----
 3 files changed, 6 insertions(+), 31 deletions(-)
 delete mode 100644 srcpkgs/zfs/patches/musl-getopt.patch

diff --git a/srcpkgs/zfs/patches/musl-fixes.patch b/srcpkgs/zfs/patches/musl-fixes.patch
index bc3fa77de37..7e51d48ee84 100644
--- a/srcpkgs/zfs/patches/musl-fixes.patch
+++ b/srcpkgs/zfs/patches/musl-fixes.patch
@@ -13,10 +13,10 @@ diff --git a/cmd/mount_zfs/mount_zfs.c b/cmd/mount_zfs/mount_zfs.c
 index e3e8cfc..91efda6 100644
 --- a/cmd/mount_zfs/mount_zfs.c
 +++ b/cmd/mount_zfs/mount_zfs.c
-@@ -32,6 +32,7 @@
- #include <sys/stat.h>
+@@ -33,6 +33,7 @@
  #include <libzfs.h>
  #include <locale.h>
+ #include <getopt.h>
 +#include <fcntl.h>
  
  #define	ZS_COMMENT	0x00000000	/* comment */
diff --git a/srcpkgs/zfs/patches/musl-getopt.patch b/srcpkgs/zfs/patches/musl-getopt.patch
deleted file mode 100644
index fe1d3bdc94d..00000000000
--- a/srcpkgs/zfs/patches/musl-getopt.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-mount.zfs is called by convention (and util-linux) with arguments last, i.e.
-  % mount.zfs <dataset> <mountpoint> -o <options>
-Use getopt_long so musl will permute arguments.
-
-Passing 0 as long_opts is unspecified, but safe for glibc and musl getopt_long.
-
---- a/cmd/mount_zfs/mount_zfs.c	2016-01-14 13:55:43.352951688 +0100
-+++ b/cmd/mount_zfs/mount_zfs.c	2016-01-14 13:53:35.685221569 +0100
-@@ -33,6 +33,7 @@
- #include <libzfs.h>
- #include <locale.h>
- #include <fcntl.h>
-+#include <getopt.h>
- 
- #define	ZS_COMMENT	0x00000000	/* comment */
- #define	ZS_ZFSUTIL	0x00000001	/* caller is zfs(8) */
-@@ -390,7 +391,7 @@
- 	opterr = 0;
- 
- 	/* check options */
--	while ((c = getopt(argc, argv, "sfnvo:h?")) != -1) {
-+	while ((c = getopt_long(argc, argv, "sfnvo:h?", 0, 0)) != -1) {
- 		switch (c) {
- 		case 's':
- 			sloppy = 1;
diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index 1aa823d66c6..bc88e60014f 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,7 +1,7 @@
 # Template file for 'zfs'
 pkgname=zfs
-version=0.6.5.4
-revision=4
+version=0.6.5.5
+revision=1
 patch_args="-Np1"
 wrksrc="${pkgname}-${pkgname}-${version/r/-}"
 build_style=gnu-configure
@@ -12,11 +12,11 @@ hostmakedepends="dracut automake libtool pkg-config"
 makedepends="spl-devel zlib-devel libuuid-devel libblkid-devel libtirpc-devel"
 conf_files="/etc/zfs/zed.d/zed.rc"
 short_desc="Z File System -- userland and kernel modules (using DKMS)"
-maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
+maintainer="Toyam Cox <Vaelatern@gmail.com>"
 license="CDDL"
 homepage="http://zfsonlinux.org/"
 distfiles="https://github.com/zfsonlinux/${pkgname}/archive/${pkgname}-${version/r/-}.tar.gz"
-checksum=081c53ff170f61aadadff53f12fdad38d467a4b1d27c11dfe2dcb18b663aaead
+checksum=4ffedbdc5c576e14187f3f2bdaf8b8f380b676dd8d96cc8dfab3068ae2a47dfb
 
 triggers="dkms"
 dkms_modules="zfs ${version/r/-}"