[Pkg-zfsonlinux-devel] [SCM] zfs branch, master, updated. debian/0.6.5.8-3-70-g7ca5474

[Aron Xu]

The following commit has been merged in the master branch:
commit b32e4cd744b6096391b328d0bcb1a651b5b0e4a0
Author: Aron Xu <aron at debian.org>
Date:   Mon Dec 18 22:48:30 2017 +0800

    Refresh patches

diff --git a/debian/patches/0003-Add-libuutil-to-LIBADD-for-libzfs-and-libzfs_core.patch b/debian/patches/0003-Add-libuutil-to-LIBADD-for-libzfs-and-libzfs_core.patch
index 42fa721..574c451 100644
--- a/debian/patches/0003-Add-libuutil-to-LIBADD-for-libzfs-and-libzfs_core.patch
+++ b/debian/patches/0003-Add-libuutil-to-LIBADD-for-libzfs-and-libzfs_core.patch
@@ -1,8 +1,8 @@
-Index: zfs-linux-0.6.5.3/lib/libzfs/Makefile.am
+Index: zfs/lib/libzfs/Makefile.am
 ===================================================================
---- zfs-linux-0.6.5.3.orig/lib/libzfs/Makefile.am	2015-10-27 14:34:47.344602154 -0600
-+++ zfs-linux-0.6.5.3/lib/libzfs/Makefile.am	2015-10-27 14:35:15.236602845 -0600
-@@ -32,6 +32,7 @@
+--- zfs.orig/lib/libzfs/Makefile.am
++++ zfs/lib/libzfs/Makefile.am
+@@ -31,6 +31,7 @@ nodist_libzfs_la_SOURCES = \
  
  libzfs_la_LIBADD = \
  	$(top_builddir)/lib/libzfs_core/libzfs_core.la \
@@ -10,11 +10,11 @@ Index: zfs-linux-0.6.5.3/lib/libzfs/Makefile.am
  	$(top_builddir)/lib/libshare/libshare.la \
  	$(top_builddir)/lib/libnvpair/libnvpair.la \
  	$(top_builddir)/lib/libzpool/libzpool.la
-Index: zfs-linux-0.6.5.3/lib/libzfs_core/Makefile.am
+Index: zfs/lib/libzfs_core/Makefile.am
 ===================================================================
---- zfs-linux-0.6.5.3.orig/lib/libzfs_core/Makefile.am	2015-10-27 14:34:47.344602154 -0600
-+++ zfs-linux-0.6.5.3/lib/libzfs_core/Makefile.am	2015-10-27 14:35:15.236602845 -0600
-@@ -16,7 +16,8 @@
+--- zfs.orig/lib/libzfs_core/Makefile.am
++++ zfs/lib/libzfs_core/Makefile.am
+@@ -16,7 +16,8 @@ nodist_libzfs_core_la_SOURCES = \
  	$(KERNEL_C)
  
  libzfs_core_la_LIBADD = \
diff --git a/debian/patches/0009-add-man-page-reference-to-systemd-units.patch b/debian/patches/0009-add-man-page-reference-to-systemd-units.patch
index 974445c..f1343d3 100644
--- a/debian/patches/0009-add-man-page-reference-to-systemd-units.patch
+++ b/debian/patches/0009-add-man-page-reference-to-systemd-units.patch
@@ -13,10 +13,10 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
  etc/systemd/system/zfs-share.service.in        | 1 +
  4 files changed, 4 insertions(+)
 
-diff --git a/etc/systemd/system/zfs-import-cache.service.in b/etc/systemd/system/zfs-import-cache.service.in
-index 02184a6..6170676 100644
---- a/etc/systemd/system/zfs-import-cache.service.in
-+++ b/etc/systemd/system/zfs-import-cache.service.in
+Index: zfs/etc/systemd/system/zfs-import-cache.service.in
+===================================================================
+--- zfs.orig/etc/systemd/system/zfs-import-cache.service.in
++++ zfs/etc/systemd/system/zfs-import-cache.service.in
 @@ -1,5 +1,6 @@
  [Unit]
  Description=Import ZFS pools by cache file
@@ -24,10 +24,10 @@ index 02184a6..6170676 100644
  DefaultDependencies=no
  Requires=systemd-udev-settle.service
  After=systemd-udev-settle.service
-diff --git a/etc/systemd/system/zfs-import-scan.service.in b/etc/systemd/system/zfs-import-scan.service.in
-index 625f3a9..9254fd3 100644
---- a/etc/systemd/system/zfs-import-scan.service.in
-+++ b/etc/systemd/system/zfs-import-scan.service.in
+Index: zfs/etc/systemd/system/zfs-import-scan.service.in
+===================================================================
+--- zfs.orig/etc/systemd/system/zfs-import-scan.service.in
++++ zfs/etc/systemd/system/zfs-import-scan.service.in
 @@ -1,5 +1,6 @@
  [Unit]
  Description=Import ZFS pools by device scanning
@@ -35,21 +35,21 @@ index 625f3a9..9254fd3 100644
  DefaultDependencies=no
  Requires=systemd-udev-settle.service
  After=systemd-udev-settle.service
-diff --git a/etc/systemd/system/zfs-mount.service.in b/etc/systemd/system/zfs-mount.service.in
-index 36dc3be..d3c912e 100644
---- a/etc/systemd/system/zfs-mount.service.in
-+++ b/etc/systemd/system/zfs-mount.service.in
+Index: zfs/etc/systemd/system/zfs-mount.service.in
+===================================================================
+--- zfs.orig/etc/systemd/system/zfs-mount.service.in
++++ zfs/etc/systemd/system/zfs-mount.service.in
 @@ -1,5 +1,6 @@
  [Unit]
  Description=Mount ZFS filesystems
 +Documentation=man:zfs(8)
  DefaultDependencies=no
  After=systemd-udev-settle.service
- After=zfs-import-cache.service
-diff --git a/etc/systemd/system/zfs-share.service.in b/etc/systemd/system/zfs-share.service.in
-index 494f5cb..d0c93a3 100644
---- a/etc/systemd/system/zfs-share.service.in
-+++ b/etc/systemd/system/zfs-share.service.in
+ After=zfs-import.target
+Index: zfs/etc/systemd/system/zfs-share.service.in
+===================================================================
+--- zfs.orig/etc/systemd/system/zfs-share.service.in
++++ zfs/etc/systemd/system/zfs-share.service.in
 @@ -1,5 +1,6 @@
  [Unit]
  Description=ZFS file system shares

-- 
UNNAMED PROJECT