Semi-automated update for latest git commit

3 files changed, 17 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d0030f9962c7..8a8dfd14c621 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Wed Jan 24 18:30:10 UTC 2018
 pkgbase = zfs-utils-common-git
 	pkgdesc = Kernel module support files for the Zettabyte File System.
-	pkgver = 2018.01.19.r3252.6bc4a2376
+	pkgver = 2018.02.05.r3278.3d25488af
 	pkgrel = 1
 	url = http://zfsonlinux.org/
 	install = zfs-utils.install
@@ -18,7 +16,7 @@ pkgbase = zfs-utils-common-git
 	conflicts = zfs-utils-linux-lts-git
 	replaces = zfs-utils-linux,
 	replaces = zfs-utils-linux-lts
-	source = git+https://github.com/zfsonlinux/zfs.git#commit=6bc4a2376c694f813d2ee78af3d749aa2684f391
+	source = git+https://github.com/zfsonlinux/zfs.git#commit=3d25488afbc2eeaa92b12f7f8b6d686e7ef342eb
 	source = zfs-utils.bash-completion-r1
 	source = zfs-utils.initcpio.install
 	source = zfs-utils.initcpio.hook
diff --git a/PKGBUILD b/PKGBUILD
index 8870245d3922..f0df82887e61 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,14 +7,14 @@
 #
 pkgname="zfs-utils-common-git"
 
-pkgver=2018.01.19.r3252.6bc4a2376
+pkgver=2018.02.05.r3278.3d25488af
 pkgrel=1
 pkgdesc="Kernel module support files for the Zettabyte File System."
 depends=("")
 makedepends=("git")
 arch=("x86_64")
 url="http://zfsonlinux.org/"
-source=("git+https://github.com/zfsonlinux/zfs.git#commit=6bc4a2376c694f813d2ee78af3d749aa2684f391"
+source=("git+https://github.com/zfsonlinux/zfs.git#commit=3d25488afbc2eeaa92b12f7f8b6d686e7ef342eb"
         "zfs-utils.bash-completion-r1"
         "zfs-utils.initcpio.install"
         "zfs-utils.initcpio.hook")
@@ -34,7 +34,7 @@ build() {
     ./autogen.sh
     ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin --with-mounthelperdir=/usr/bin \
                 --libdir=/usr/lib --datadir=/usr/share --includedir=/usr/include \
-                --with-udevdir=/lib/udev --libexecdir=/usr/lib/zfs-0.7.5 \
+                --with-udevdir=/lib/udev --libexecdir=/usr/lib/zfs-0.7.6 \
                 --with-config=user --enable-systemd
     make
 }
diff --git a/zfs-utils.install b/zfs-utils.install
index bf57f75983bf..914ed46bf477 100644
--- a/zfs-utils.install
+++ b/zfs-utils.install
@@ -1,14 +1,18 @@
-
-show_zfs_import_warning() {
-    echo ">>> WARNING: A new systemd unit file was added to archzfs!"
-    echo ">>>          You may need enable zfs-import.target"
-    echo ">>>          See https://github.com/archzfs/archzfs/issues/186"
-}
-
 post_upgrade() {
+    
     # If upgrading from 2017.12.08.r3208.4e9b15696-1 or older
     # display zfs-import warning
     if [[ $(vercmp $2 2017.12.08.r3208.4e9b15696-1) -le 0 ]]; then
-        show_zfs_import_warning
+        echo '>>> WARNING: A new systemd unit file was added to archzfs!'
+        echo '>>>          You may need enable zfs-import.target'
+        echo '>>>          See https://github.com/archzfs/archzfs/issues/186'
+    fi
+    
+    # If upgrading from 2018.02.02.r3272.1b66810ba-1 or older
+    # display encryption format change warning
+    if [[ $(vercmp $2 2018.02.02.r3272.1b66810ba-1) -le 0 ]]; then
+        echo '>>> WARNING: The on-disk format for encrypted datasets has changed!'
+        echo '>>>          All encrypted datasets will mount read only and need to be migrated.'
+        echo '>>>          See https://github.com/archzfs/archzfs/issues/222'
     fi
 }