[pkg-cryptsetup-devel] Bug#862186: unblock: cryptsetup/2:1.7.3-4
Guilhem Moulin
guilhem at guilhem.org
Tue May 9 15:09:17 UTC 2017
Package: release.debian.org
Severity: normal
User: release.debian.org at packages.debian.org
Usertags: unblock
Hi there,
cryptsetup/2:1.7.3-4 closes RC bug #861074. Quoting myself from Message
#15,
initramfs-tools 0.130 landed into testing on May 1st, and as of
2:1.7.3-3 the cryptroot hook doesn't detect resume devices with the
new logic from initramfs-tools >=0.129:
* setting RESUME under in an initramfs-tools configuration file
other than /etc/initramfs-tools/conf.d/resume isn't supported
* setting RESUME=none yields a (harmless) warning
* setting RESUME=auto (or leaving the variable undefined) might
result into an unresumable device: the initrd is then configured
to resume from the largest swap partition, which might not be
unlocked in time
2:1.7.3-4 also closes #861802 (license mismatch) as well as #847620
(drop obsolete update-rc.d parameters). Debdiff attached.
Thanks for considering its inclusion in Stretch!
Cheers,
--
Guilhem.
-------------- next part --------------
diff -Nru cryptsetup-1.7.3/debian/changelog cryptsetup-1.7.3/debian/changelog
--- cryptsetup-1.7.3/debian/changelog 2016-12-09 01:18:17.000000000 +0100
+++ cryptsetup-1.7.3/debian/changelog 2017-05-09 13:50:59.000000000 +0200
@@ -1,3 +1,16 @@
+cryptsetup (2:1.7.3-4) unstable; urgency=high
+
+ [ Guilhem Moulin ]
+ * Drop obsolete update-rc.d parameters. Thanks to Michael Biebl for the
+ patch. (Closes: #847620)
+ * debian/copyright: Fix license mismatch (docs/examples/*
+ lib/crypto_backend/* lib/loopaes/* lib/tcrypt/* lib/verity/* python/* are
+ LGPL-2.1+ not GPL-2+). (Closes: #861802)
+ * debian/initramfs/cryptroot-hook: honor RESUME={none,auto} as documented in
+ initramfs.conf(5) by initramfs-tools >=0.129. (Closes: #861074)
+
+ -- Jonas Meurer <mejo at debian.org> Tue, 09 May 2017 13:50:59 +0200
+
cryptsetup (2:1.7.3-3) unstable; urgency=medium
[ Jonas Meurer ]
diff -Nru cryptsetup-1.7.3/debian/control cryptsetup-1.7.3/debian/control
--- cryptsetup-1.7.3/debian/control 2016-12-09 01:18:17.000000000 +0100
+++ cryptsetup-1.7.3/debian/control 2017-05-09 13:50:59.000000000 +0200
@@ -13,7 +13,7 @@
Package: cryptsetup
Architecture: linux-any
Depends: ${shlibs:Depends}, ${misc:Depends}, dmsetup, cryptsetup-bin (>= 2:1.6.0)
-Recommends: kbd, console-setup, initramfs-tools (>= 0.91) | linux-initramfs-tool, busybox | busybox-static
+Recommends: kbd, console-setup, initramfs-tools (>= 0.129) | linux-initramfs-tool, busybox | busybox-static
Suggests: dosfstools, liblocale-gettext-perl, keyutils
Provides: cryptsetup-luks
Conflicts: cryptsetup-luks
diff -Nru cryptsetup-1.7.3/debian/copyright cryptsetup-1.7.3/debian/copyright
--- cryptsetup-1.7.3/debian/copyright 2016-12-09 01:18:17.000000000 +0100
+++ cryptsetup-1.7.3/debian/copyright 2017-05-09 13:50:59.000000000 +0200
@@ -40,6 +40,23 @@
Copyright: © 2005 Canonical Ltd.
License: GPL-2+
+Files: docs/examples/*
+Copyright: © 2011 Red Hat, Inc.
+License: LGPL-2.1+
+
+Files: lib/crypto_backend/* lib/loopaes/* lib/tcrypt/* lib/verity/* python/*
+Copyright: © 2009-2014 Red Hat, Inc.
+ © 2010-2015 Milan Broz <gmazyland at gmail.com>
+License: LGPL-2.1+
+
+Files: lib/crypto_backend/crc32.c
+Copyright: © 1986 Gary S. Brown
+License: public-domain
+ Gary S. Brown's licence is as follows:
+ .
+ You may use this program, or code or tables extracted from it, as
+ desired without restriction.
+
License: GPL-2+
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -57,3 +74,22 @@
.
On Debian systems, the complete text of the GNU General Public
License v2 can be found in `/usr/share/common-licenses/GPL-2'.
+
+License: LGPL-2.1+
+ This package is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published
+ by the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301 USA.
+ .
+ On Debian systems, the complete text of the GNU Lesser General Public
+ License v2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'.
diff -Nru cryptsetup-1.7.3/debian/initramfs/cryptroot-hook cryptsetup-1.7.3/debian/initramfs/cryptroot-hook
--- cryptsetup-1.7.3/debian/initramfs/cryptroot-hook 2016-12-09 01:18:17.000000000 +0100
+++ cryptsetup-1.7.3/debian/initramfs/cryptroot-hook 2017-05-09 13:50:59.000000000 +0200
@@ -93,12 +93,17 @@
esac
done
- # initramfs-tools
- if [ -e /etc/initramfs-tools/conf.d/resume ]; then
- device=$(sed -rn 's/^RESUME[[:space:]]*=[[:space:]]*// p' /etc/initramfs-tools/conf.d/resume)
- if [ -n "$device" ]; then
- candidates="${candidates:+$candidates }$device"
+ # initramfs-tools >=0.129
+ device="${RESUME:-auto}"
+ if [ "$device" != none ]; then
+ if [ "$device" = auto ]; then
+ # next line from /usr/share/initramfs-tools/hooks/resume
+ device="$(grep ^/dev/ /proc/swaps | sort -rnk3 | head -n 1 | cut -d " " -f 1)"
+ if [ -n "$device" ]; then
+ device="UUID=$(blkid -s UUID -o value "$device" || true)"
+ fi
fi
+ candidates="${candidates:+$candidates }$device"
fi
# Now check the sanity of all candidates
diff -Nru cryptsetup-1.7.3/debian/rules cryptsetup-1.7.3/debian/rules
--- cryptsetup-1.7.3/debian/rules 2016-12-09 01:18:17.000000000 +0100
+++ cryptsetup-1.7.3/debian/rules 2017-05-09 13:50:59.000000000 +0200
@@ -176,9 +176,9 @@
dh_installchangelogs -a
dh_installdocs -a
dh_installexamples -a debian/scripts/gen-ssl-key
- dh_installinit -a --no-start --name=cryptdisks-early --update-rcd-params="start 26 S . start 59 0 6 ."
+ dh_installinit -a --no-start --name=cryptdisks-early
dh_installinit -a --no-start --name=cryptdisks-udev
- dh_installinit -a --no-start --name=cryptdisks --update-rcd-params="start 28 S . start 48 0 6 ."
+ dh_installinit -a --no-start --name=cryptdisks
dh_installman -a debian/doc/crypttab.5 debian/doc/cryptdisks_start.8 debian/doc/cryptdisks_stop.8
dh_installman -p cryptsetup-bin debian/luksformat.8
# Copy relevant parts to cryptsetup-udeb package
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-cryptsetup-devel/attachments/20170509/481c0c10/attachment.sig>
More information about the pkg-cryptsetup-devel
mailing list