update to zfs/spl 0.6.5.6

diff --git a/Makefile b/Makefile
index 38bfd8b47fb3efb2012aed379f341cf993a676a2..f160fabac192fbc3a4215ae9d6bf87884a51c059 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,8 +5,8 @@ RELEASE=3.4
 # also update version in 
 # zfs-changelog.Debian and spl-changelog.Debian
 ZFSVER=0.6.5
-ZFSPKGREL=2~wheezy
-SPLPKGREL=2~wheezy
+ZFSPKGREL=3~wheezy
+SPLPKGREL=3~wheezy
 ZFSPKGVER=${ZFSVER}-${ZFSPKGREL}
 SPLPKGVER=${ZFSVER}-${SPLPKGREL}
 
@@ -65,11 +65,10 @@ download:
        rm -rf pkg-spl pkg-zfs ${SPLSRC} ${ZFSSRC}
        # list tags with:  git tag --list 'master/*'
        git clone https://github.com/zfsonlinux/pkg-spl.git
-       cd pkg-spl; git checkout spl-0.6.5-release
-       cd pkg-spl; git pull --no-edit git://github.com/zfsonlinux/spl.git spl-0.6.5-release
+       cd pkg-spl; git fetch https://github.com/zfsonlinux/spl.git spl-0.6.5-release
        cd pkg-spl; git checkout master/debian/wheezy/0.6.5-1-wheezy
-       # manual merge spl-0.6.5-release
-       cd pkg-spl; git merge --no-edit spl-0.6.5-release
+       # manual merge spl-0.6.5.6
+       cd pkg-spl; git merge --no-edit spl-0.6.5.6
        git clone https://github.com/zfsonlinux/pkg-zfs.git
        cd pkg-zfs; git checkout -b zfs-0.6.5.4
        cd pkg-zfs; git pull --no-edit git://github.com/zfsonlinux/zfs.git zfs-0.6.5-release
@@ -80,7 +79,7 @@ download:
        cp zfs-import.in.backup pkg-zfs/etc/init.d/zfs-import.in
        cd pkg-zfs; git add etc/init.d/zfs-import.in; git commit -m "fake add to allow merge"
        # ignore etc/init.d/zfs-import.in
-       cd pkg-zfs; git merge --no-edit zfs-0.6.5.4
+       cd pkg-zfs; git merge --no-edit zfs-0.6.5.6
        # remove stale file after merge
        rm pkg-zfs/etc/init.d/zfs-import.in;
        rmdir pkg-zfs/etc/init.d

diff --git a/pkg-spl.tar.gz b/pkg-spl.tar.gz
index 45785f480ba34a335b61a4ce2a103279dd2cd0ae..878c0c8a372eb0f37b3fe723d4675441fb70e103 100644 (file)
Binary files a/pkg-spl.tar.gz and b/pkg-spl.tar.gz differ

diff --git a/pkg-zfs.tar.gz b/pkg-zfs.tar.gz
index f3f50a86fadf86ea754121218112f19b78794463..a83b799bfe05371fcdbec3338e246700da7220a9 100644 (file)
Binary files a/pkg-zfs.tar.gz and b/pkg-zfs.tar.gz differ

diff --git a/spl-changelog.Debian b/spl-changelog.Debian
index 10cc480822a48506fd2b6c67fc7b81b9abad36e4..cb094d242f674e1015c76d3ab7ebeca0e5227e04 100644 (file)
--- a/spl-changelog.Debian
+++ b/spl-changelog.Debian
@@ -1,3 +1,9 @@
+spl-linux (0.6.5-3~wheezy) unstable; urgency=low
+
+  * update to 0.6.5.6
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 30 Mar 2016 11:32:38 +0200
+
 spl-linux (0.6.5-2~wheezy) unstable; urgency=low
 
   * update to 0.6.5.4

diff --git a/zfs-changelog.Debian b/zfs-changelog.Debian
index 659efea53fc9c8bace87c24c90afe41f82011b5e..520cb69ebd747744d08af4d60c2d6a52e5c1fee9 100644 (file)
--- a/zfs-changelog.Debian
+++ b/zfs-changelog.Debian
@@ -1,3 +1,9 @@
+zfs-linux (0.6.5-3~wheezy) unstable; urgency=low
+
+  * update to 0.6.5.6
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 30 Mar 2016 11:32:59 +0200
+
 zfs-linux (0.6.5-2~wheezy) unstable; urgency=low
 
   * update to 0.6.5.4