merge

OBS-URL: https://build.opensuse.org/package/show/security/cryptsetup?expand=0&rev=171

cryptsetup.changes

@@ -19,6 +19,14 @@ Mon Aug  2 14:43:51 UTC 2021 - Ludwig Nussel <lnussel@suse.de>
   * Add --test-args option.
 - switch to LUKS2 default format
 
+-------------------------------------------------------------------
+Mon Aug  2 12:39:40 UTC 2021 - Fabian Vogt <fvogt@suse.com>
+
+- Use LUKS2 as default format on Tumbleweed.
+  It provides some additional features which other tools
+  (e.g. systemd-cryptenroll) rely on. GRUB 2.06 supports unlocking
+  LUKS2 volumes meanwhile.
+
 -------------------------------------------------------------------
 Thu Jul  1 12:50:25 UTC 2021 - Ludwig Nussel <lnussel@suse.de>
 

cryptsetup.spec

@@ -26,7 +26,7 @@ Name:           cryptsetup
 Version:        2.4.0~rc1
 Release:        0
 Summary:        Setup program for dm-crypt Based Encrypted Block Devices
-License:        SUSE-GPL-2.0-with-openssl-exception AND LGPL-2.0-or-later
+License:        LGPL-2.0-or-later AND SUSE-GPL-2.0-with-openssl-exception
 Group:          System/Base
 URL:            https://gitlab.com/cryptsetup/cryptsetup/
 Source0:        https://www.kernel.org/pub/linux/utils/cryptsetup/v2.4/cryptsetup-%{tar_version}.tar.xz
@@ -58,6 +58,10 @@ BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libtool
 %endif
+%if %{?suse_version} >= 1550
+# LUKS2 used as default format, which GRUB < 2.06 can't read
+Conflicts:      grub2 < 2.06
+%endif
 
 %lang_package(cryptsetup)
 
@@ -133,6 +137,9 @@ autoreconf -f -i
   --enable-pwquality \
   --enable-gcrypt-pbkdf2 \
   --enable-libargon2 \
+%if %{?suse_version} < 1550
+  --with-default-luks-format=LUKS1 \
+%endif
   --with-luks2-lock-path=/run/cryptsetup \
   --with-tmpfilesdir='%{_tmpfilesdir}'
 %make_build