[Merge] ~mkukri/ubuntu/+source/cryptsetup:merge into ubuntu/+source/cryptsetup:debian/sid

[Dimitri John Ledkov]

Can you please experiment to see if we still need the memlock patch? All other changes implemented on all Launchpad builders suggest, that this may no longer be needed anymore.

Diff comments:

> diff --git a/debian/patches/decrease_memlock_ulimit.patch b/debian/patches/decrease_memlock_ulimit.patch
> new file mode 100644
> index 0000000..a9fd0d1
> --- /dev/null
> +++ b/debian/patches/decrease_memlock_ulimit.patch
> @@ -0,0 +1,49 @@
> +Description: Decrease memlock limit to mimic Xenial builder behavior.
> + This approach prevents cryptsetup to FTBFS, since the PPA builders were
> + upgraded to Bionic, which has a bigger memlock limit (but not enough).
> + With this quirk, cryptsetup won't mlock() its memory allocationss, hence
> + it behaves exactly as the Xenial builders. Meanwhile, we pursue the
> + proper fix (systemd patch to bump memlock to a higher limit on Bionic).
> +Author: Guilherme G. Piccoli <gpiccoli at canonical.com>
> +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1891473
> +Last-Update: 2020-09-09

Given
https://lists.ubuntu.com/archives/ubuntu-devel/2020-September/041165.html

and 
https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/1830746

this should no longer be required. Could you please attempt to drop this patch, rebuild in a ppa, and check if it all builds fine?

> +
> +--- a/tests/compat-test
> ++++ b/tests/compat-test
> +@@ -47,6 +47,10 @@
> + LOOPDEV=$(losetup -f 2>/dev/null)
> + FIPS_MODE=$(cat /proc/sys/crypto/fips_enabled 2>/dev/null)
> + 
> ++# Circumvent test failure due to Bionic builder; we need to decrease
> ++# the memlock limit here to mimic Xenial builder (see LP #1891473).
> ++ulimit -l 0
> ++
> + function remove_mapping()
> + {
> + 	[ -b /dev/mapper/$DEV_NAME3 ] && dmsetup remove --retry $DEV_NAME3 >/dev/null 2>&1
> +--- a/tests/luks2-validation-test
> ++++ b/tests/luks2-validation-test
> +@@ -21,6 +21,10 @@
> + 
> + [ -z "$srcdir" ] && srcdir="."
> + 
> ++# Circumvent test failure due to Bionic builder; we need to decrease
> ++# the memlock limit here to mimic Xenial builder (see LP #1891473).
> ++ulimit -l 0
> ++
> + function remove_mapping()
> + {
> + 	rm -rf $IMG $TST_IMGS >/dev/null 2>&1
> +--- a/tests/tcrypt-compat-test
> ++++ b/tests/tcrypt-compat-test
> +@@ -16,6 +16,10 @@
> + 
> + [ -z "$srcdir" ] && srcdir="."
> + 
> ++# Circumvent test failure due to Bionic builder; we need to decrease
> ++# the memlock limit here to mimic Xenial builder (see LP #1891473).
> ++ulimit -l 0
> ++
> + function remove_mapping()
> + {
> + 	[ -b /dev/mapper/$MAP ] && dmsetup remove --retry $MAP


-- 
https://code.launchpad.net/~mkukri/ubuntu/+source/cryptsetup/+git/cryptsetup/+merge/455868
Your team Ubuntu Sponsors is requested to review the proposed merge of ~mkukri/ubuntu/+source/cryptsetup:merge into ubuntu/+source/cryptsetup:debian/sid.