diff -Nru zfs-linux-0.6.5.9/debian/changelog zfs-linux-0.6.5.9/debian/changelog --- zfs-linux-0.6.5.9/debian/changelog 2017-02-07 17:22:02.000000000 +0800 +++ zfs-linux-0.6.5.9/debian/changelog 2017-03-13 12:23:56.000000000 +0800 @@ -1,3 +1,15 @@ +zfs-linux (0.6.5.9-3) unstable; urgency=medium + + [ Petter Reinholdtsen ] + * Updated German debconf translation by Helge Kreutzmann. (Closes: #857528) + * Updated metadata on a few patches. + + [ Aron Xu ] + * Cherry-pick upstream fix for merged /usr/lib and /lib + * Manually maintain adt test Depends + + -- Aron Xu Mon, 13 Mar 2017 12:23:32 +0800 + zfs-linux (0.6.5.9-2) unstable; urgency=medium [ Fabian Grünbichler ] diff -Nru zfs-linux-0.6.5.9/debian/patches/0020-Fix-initramfs-hook-for-merged-usr-lib-and-lib.patch zfs-linux-0.6.5.9/debian/patches/0020-Fix-initramfs-hook-for-merged-usr-lib-and-lib.patch --- zfs-linux-0.6.5.9/debian/patches/0020-Fix-initramfs-hook-for-merged-usr-lib-and-lib.patch 1970-01-01 08:00:00.000000000 +0800 +++ zfs-linux-0.6.5.9/debian/patches/0020-Fix-initramfs-hook-for-merged-usr-lib-and-lib.patch 2017-03-13 12:20:26.000000000 +0800 @@ -0,0 +1,31 @@ +From: Matt Kemp +Date: Mon, 27 Feb 2017 14:03:23 -0600 +Subject: Fix initramfs hook for merged /usr/lib and /lib + +Under a merged `/lib` -> `/usr/lib` which renders `/lib` as a symlink, +`find /lib -type f -name libgcc_s.so.1` will not return a result as +`find` will not traverse the symlink. Modifying it to `find /lib/ -type +f -name libgcc_s.so.1` should work for both symlinked and non-symlinked +`/lib` directories. + +Reviewed-by: Brian Behlendorf +Signed-off-by: Matt Kemp +Closes #5834 +Applied-Upstream: https://github.com/zfsonlinux/zfs/commit/912e2ba92f45b61df476e7e15da33e0ea3eb0ae5 +--- + contrib/initramfs/hooks/zfs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/contrib/initramfs/hooks/zfs b/contrib/initramfs/hooks/zfs +index 53e876d..dd796b6 100755 +--- a/contrib/initramfs/hooks/zfs ++++ b/contrib/initramfs/hooks/zfs +@@ -55,7 +55,7 @@ mkdir -p "$DESTDIR/etc/" + # automatically detected. The `find` utility and extended `cp` options are + # used here because libgcc_s.so could be in a subdirectory of /lib for + # multi-arch installations. +-cp --target-directory="$DESTDIR" --parents $(find /lib -type f -name libgcc_s.so.1) ++cp --target-directory="$DESTDIR" --parents $(find /lib/ -type f -name libgcc_s.so.1) + + for ii in $COPY_EXEC_LIST + do diff -Nru zfs-linux-0.6.5.9/debian/patches/1000-ppc64el-endian-support.patch zfs-linux-0.6.5.9/debian/patches/1000-ppc64el-endian-support.patch --- zfs-linux-0.6.5.9/debian/patches/1000-ppc64el-endian-support.patch 2017-02-07 17:22:02.000000000 +0800 +++ zfs-linux-0.6.5.9/debian/patches/1000-ppc64el-endian-support.patch 2017-03-13 12:14:00.000000000 +0800 @@ -1,11 +1,15 @@ Description: Fix endian build problem on ppc64el Drop endian override in powerpc architecture definition allowing both big and little endian builds. + + Upstream applied a different fix, simply removing the _BIG_ENDIAN test. Author: Andy Whitcroft Origin: ubuntu Forwarded: no +Bug: https://github.com/zfsonlinux/zfs/pull/5856 Reviewed-By: Petter Reinholdtsen Last-Update: 2016-05-12 +Applied-Upstream: https://github.com/zfsonlinux/zfs/commit/fb963d33ee0dd350143ba1c9cd35d5f7d86910d2 Index: zfs-linux-0.6.5.3/lib/libspl/include/sys/isa_defs.h =================================================================== diff -Nru zfs-linux-0.6.5.9/debian/patches/1002-fix-mips-build.patch zfs-linux-0.6.5.9/debian/patches/1002-fix-mips-build.patch --- zfs-linux-0.6.5.9/debian/patches/1002-fix-mips-build.patch 2017-02-07 17:22:02.000000000 +0800 +++ zfs-linux-0.6.5.9/debian/patches/1002-fix-mips-build.patch 2017-03-13 12:14:00.000000000 +0800 @@ -1,10 +1,11 @@ Description: Fix build problem on mips* Make sure required defines are set on mips. Author: YunQiang Su -Debian-Bug: https://bugs.debian.org/824190 -Forwarded: no +Bug-Debian: https://bugs.debian.org/824190 +Bug: https://github.com/zfsonlinux/zfs/pull/4712 Reviewed-By: Petter Reinholdtsen Last-Update: 2016-05-25 +Applied-upstream: https://github.com/zfsonlinux/zfs/commit/2493dca54e18b24bcd8b7ff5432f4dc51dddc472 Index: zfs-linux-0.6.5.6/lib/libspl/include/sys/isa_defs.h =================================================================== diff -Nru zfs-linux-0.6.5.9/debian/patches/1003-linux-4.9-compat.patch zfs-linux-0.6.5.9/debian/patches/1003-linux-4.9-compat.patch --- zfs-linux-0.6.5.9/debian/patches/1003-linux-4.9-compat.patch 2017-02-07 17:22:02.000000000 +0800 +++ zfs-linux-0.6.5.9/debian/patches/1003-linux-4.9-compat.patch 2017-03-13 12:14:00.000000000 +0800 @@ -2,7 +2,7 @@ Commit 3b0ba3ba99b8a3af0fb532bf264629436b1abd84 fetched from upstream and refreshed to apply cleanly. Author: Brian Behlendorf -Debian-Bug: https://bugs.debian.org/847018 +Bug-Debian: https://bugs.debian.org/847018 Forwarded: no Reviewed-By: Petter Reinholdtsen Last-Update: 2016-12-15 diff -Nru zfs-linux-0.6.5.9/debian/patches/1004-zed-service-bindir.patch zfs-linux-0.6.5.9/debian/patches/1004-zed-service-bindir.patch --- zfs-linux-0.6.5.9/debian/patches/1004-zed-service-bindir.patch 2017-02-07 17:22:02.000000000 +0800 +++ zfs-linux-0.6.5.9/debian/patches/1004-zed-service-bindir.patch 2017-03-13 12:14:00.000000000 +0800 @@ -5,7 +5,7 @@ zfs-zed unit. Author: Carlos Alberto Lopez Author: Fabian Grünbichler -Debian-Bug: https://bugs.debian.org/849813 +Bug-Debian: https://bugs.debian.org/849813 Forwarded: no --- a/etc/systemd/system/zfs-zed.service.in +++ b/etc/systemd/system/zfs-zed.service.in diff -Nru zfs-linux-0.6.5.9/debian/patches/series zfs-linux-0.6.5.9/debian/patches/series --- zfs-linux-0.6.5.9/debian/patches/series 2017-02-07 17:22:02.000000000 +0800 +++ zfs-linux-0.6.5.9/debian/patches/series 2017-03-13 12:14:00.000000000 +0800 @@ -17,3 +17,4 @@ 0296-Use-a-different-technique-to-detect-whether-to-mount.patch 0334-Use-F-to-export-pools-so-as-not-to-dirty-up-device-l.patch 0336-Properly-use-the-Dracut-cleanup-hook-to-order-pool-s.patch +0020-Fix-initramfs-hook-for-merged-usr-lib-and-lib.patch diff -Nru zfs-linux-0.6.5.9/debian/po/de.po zfs-linux-0.6.5.9/debian/po/de.po --- zfs-linux-0.6.5.9/debian/po/de.po 2017-02-07 17:22:02.000000000 +0800 +++ zfs-linux-0.6.5.9/debian/po/de.po 2017-03-13 12:14:00.000000000 +0800 @@ -1,16 +1,16 @@ # Translation of zfs-linux debconf templates to German -# Copyright (C) Helge Kreutzmann , 2013. +# Copyright (C) Helge Kreutzmann , 2013, 2017. # This file is distributed under the same license as the zfs-linux package. # msgid "" msgstr "" -"Project-Id-Version: zfs-linux 0.6.1-1\n" +"Project-Id-Version: zfs-linux 0.6.5.9-2\n" "Report-Msgid-Bugs-To: zfs-linux@packages.debian.org\n" "POT-Creation-Date: 2015-11-01 14:11+0800\n" -"PO-Revision-Date: 2013-07-07 19:11+0200\n" +"PO-Revision-Date: 2017-03-12 07:37+0100\n" "Last-Translator: Helge Kreutzmann \n" "Language-Team: de \n" -"Language: \n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -39,7 +39,7 @@ "using ZFS on this kernel then keep in mind that it is at your own risk." msgstr "" "Dies ist zwar möglich, allerdings wird der Bau in einer 32-Bit-Umgebung " -"nicht unterstützt und wird wahrscheinlich Instabilitäten verursachen, die " +"nicht unterstützt und wahrscheinlich Instabilitäten verursachen, die " "möglicherweise Daten beschädigen. Es wird Ihnen nachdrücklich empfohlen, " "einen 64-Bit-Kernel zu verwenden; falls Sie sich entscheiden, mit der " "Verwendung von ZFS unter diesem Kernel fortzufahren, denken Sie daran, dass " @@ -61,14 +61,14 @@ msgstr "" "Sie versuchen, ZFS mit einem Kernel zu bauen, der weder als 32-Bit noch als " "64-Bit identifiziert werden konnte. Falls Sie sich nicht absolut sicher " -"sind, dass der laufende Kernel 64-bittig ist, sollten Sie wahrscheinlich den " +"sind, dass der laufende Kernel 64-bittig ist, sollten Sie eventuell den " "Bau abbrechen." #. Type: note #. Description #: ../zfs-dkms.templates:3001 msgid "Licenses of ZFS and Linux are incompatible" -msgstr "" +msgstr "Lizenzen von ZFS und Linux sind inkompatibel" #. Type: note #. Description @@ -81,6 +81,12 @@ "prevents using pieces of code exclusively available under one license with " "pieces of code exclusively available under the other in the same binary." msgstr "" +"ZFS ist unter der »Common Development and Distribution License (CDDL), der " +"Kernel unter der GNU General Public License Version 2 (GPL-2) lizenziert. " +"Obwohl beide freie Open-Source-Lizenzen sind, sind sie restriktiv. Die " +"Kombination beider führt zu Problemen, da sie verhindern, das Programmcode, " +"der exklusiv unter einer Lizenz steht, mit Code im gleichen Programm zusammen " +"verwandt wird, der exklusiv unter der anderen Lizenz steht." #. Type: note #. Description @@ -91,3 +97,7 @@ "the binaries in the same media (disk images, virtual appliances, etc) may " "lead to infringing." msgstr "" +"Sie werden ZFS mittels DKMS derart bauen, dass sie nicht zusammen in ein " +"monolithisches Programm gebaut werden. Bitte berücksichtigen Sie, dass der " +"Vertrieb beider Programme auf dem gleichen Medium (Plattenabbild, virtuelles " +"Gerät usw.) zu Urheberrechtsverletzungen führen kann." diff -Nru zfs-linux-0.6.5.9/debian/tests/control zfs-linux-0.6.5.9/debian/tests/control --- zfs-linux-0.6.5.9/debian/tests/control 2017-02-07 17:22:02.000000000 +0800 +++ zfs-linux-0.6.5.9/debian/tests/control 2017-03-13 12:21:30.000000000 +0800 @@ -1,3 +1,3 @@ Tests: kernel-smoke-test Restrictions: needs-root -Depends: @ +Depends: zfsutils-linux, zfs-zed, zfs-initramfs, zfs-dkms