debian/changelog

@@ -1,3 +1,12 @@
+luksmeta (9-3) unstable; urgency=high
+
+  * Use cryptsetup-bin as build dependency, following the cryptsetup
+    transition
+  * Fix error in test-luksmeta introduced by cryptsetup defaulting to
+    luks2
+
+ -- Christoph Biedl <debian.axhn@manchmal.in-ulm.de>  Fri, 01 Mar 2019 10:44:08 +0100
+
 luksmeta (9-2) unstable; urgency=high
 
   * Relax content tests in test suite. Closes: #915256

debian/control

@@ -6,7 +6,7 @@ Vcs-Browser: https://git.in-ulm.de/cbiedl/luksmeta
 Vcs-Git: https://git.in-ulm.de/cbiedl/luksmeta.git
 Build-Depends: debhelper (>= 11~),
     asciidoctor,
-    cryptsetup,
+    cryptsetup-bin,
     libcryptsetup-dev (>= 2:1.5.1),
     pkg-config,
 Priority: optional

debian/patches/fix.test-luksmeta.patch

@@ -0,0 +1,19 @@
+Description: Work around test-luksmeta fail when running as non-root
+Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
+Date: 2019-03-01
+Forwarded: no
+
+    The cryptsetup luksFormat program now fails when running as
+    non-root, see #923513
+
+--- a/test-luksmeta
++++ b/test-luksmeta
+@@ -11,7 +11,7 @@
+ trap 'onexit' EXIT
+ 
+ truncate -s 4M $tmp
+-echo -n foo | cryptsetup luksFormat $tmp -
++echo -n foo | cryptsetup luksFormat --type luks1 $tmp -
+ 
+ ! ./luksmeta test -d $tmp
+ 

debian/patches/local.dont-fail-tests-for-disabled-module-load.patch

@@ -38,9 +38,9 @@ Bug-Debian: https://bugs.debian.org/881864
  trap 'onexit' EXIT
  
  truncate -s 4M $tmp
--echo -n foo | /sbin/cryptsetup luksFormat $tmp -
+-echo -n foo | /sbin/cryptsetup luksFormat --type luks1 $tmp -
 +PRE="$(md5sum $tmp)"
-+echo -n foo | /sbin/cryptsetup luksFormat $tmp - || true
++echo -n foo | /sbin/cryptsetup luksFormat --type luks1 $tmp - || true
 +PST="$(md5sum $tmp)"
 +if [ "$PRE" = "$PST" ] ; then
 +    echo 'cryptsetup failed, assuming AF_ALG,SOCK_SEQPACKET failure'

debian/patches/local.test-luksmeta.patch

@@ -9,8 +9,8 @@ Forwarded: not-needed
  trap 'onexit' EXIT
  
  truncate -s 4M $tmp
--echo -n foo | cryptsetup luksFormat $tmp -
-+echo -n foo | /sbin/cryptsetup luksFormat $tmp -
+-echo -n foo | cryptsetup luksFormat --type luks1 $tmp -
++echo -n foo | /sbin/cryptsetup luksFormat --type luks1 $tmp -
  
  ! ./luksmeta test -d $tmp
  

debian/patches/series

@@ -1,6 +1,7 @@
 # cherry-picked from upstream
 
 fix.relax-content-checks.patch
+fix.test-luksmeta.patch
 
 local.test-luksmeta.patch
 local.dont-fail-tests-for-disabled-module-load.patch