From 7cb1ae6064e7fee6f8122a81707886207faecb68f261a22a9fe88f3ff45ea8fa Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Tue, 9 Jan 2018 08:52:58 +0000 Subject: [PATCH] Accepting request 561151 from home:archie172:branches:security - Update to version 2.0.0: * Add support for new on-disk LUKS2 format * Enable to use system libargon2 instead of bundled version * Install tmpfiles.d configuration for LUKS2 locking directory * New command integritysetup: support for the new dm-integrity kernel target * Support for larger sector sizes for crypt devices * Miscellaneous fixes and improvements OBS-URL: https://build.opensuse.org/request/show/561151 OBS-URL: https://build.opensuse.org/package/show/security/cryptsetup?expand=0&rev=136 --- baselibs.conf | 4 ++-- cryptsetup-1.7.5.tar.sign | 16 ---------------- cryptsetup-1.7.5.tar.xz | 3 --- cryptsetup-2.0.0.tar.sign | 16 ++++++++++++++++ cryptsetup-2.0.0.tar.xz | 3 +++ cryptsetup.changes | 11 +++++++++++ cryptsetup.spec | 20 ++++++++++++++------ 7 files changed, 46 insertions(+), 27 deletions(-) delete mode 100644 cryptsetup-1.7.5.tar.sign delete mode 100644 cryptsetup-1.7.5.tar.xz create mode 100644 cryptsetup-2.0.0.tar.sign create mode 100644 cryptsetup-2.0.0.tar.xz diff --git a/baselibs.conf b/baselibs.conf index 44b405c..bea93f4 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,2 +1,2 @@ -libcryptsetup4 -libcryptsetup4-hmac +libcryptsetup12 +libcryptsetup12-hmac diff --git a/cryptsetup-1.7.5.tar.sign b/cryptsetup-1.7.5.tar.sign deleted file mode 100644 index fc68a69..0000000 --- a/cryptsetup-1.7.5.tar.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAlkBr7YACgkQ2bBXe9k+ -mPwzqQ//TXV9LStH2Bjs0w1N7d9/vIq9fHmKJJuiaMk1Oddx5tfTHO0VN4sZekOY -vx5MnLwFvH2/WXHv6uNqMvQoWFYmWV3WvptCo0g4L5lR4BxE7s8ItrRdGBc4e1Lv -LlBazFAPFW7VPhYk0L+/Ua2bUsxdPLb1B0S2QYEX0bFk4bZgv4bhyx0IZsrvq+37 -9tj6EYuOu6MDdkOKxCH4dlNw0MpuOZ0Aj/5B7x2HrxzmgvD/yoI75kszJoqc07Vk -LE7ZykIGTZEcZ0skFnfsz3VvdMH3+pp9hC3JYkt35EIAxYYZa45zFzaA9jisYrQm -4tp27j6o/DEc+CA5Y7xcwBfj2DNc4UhU0w7fonj7XHETLXO6qQPfanz4lCFdA3Kv -9djWyzZvJTwJWO21w3qTCxES0pfIRkRPz5xvLZ4a+rFyVDzPxK1h8uZZyANj6Rso -gmigL/vs/IYe3XKRO3yph8zsL/74+69y07kbl/ULPC0Ktj0JeHneczcgTHThH91L -cYEjsBkpTgH8c1oTBn8lkmIVD/eNzsI7K46dTbZxlOJL3FBDy4FnqDWl9L9fOUTu -VeolVU/6FKCbL0aQIPlSftACf18tK12qD2mlFJ+MJWhWyjoEHaBpCarKTnzp8luQ -jGWvYVnQa+qw743JIi7LI5j48rxNp2Kz5J7bFtn8WcsNwhuKh2c= -=VsAy ------END PGP SIGNATURE----- diff --git a/cryptsetup-1.7.5.tar.xz b/cryptsetup-1.7.5.tar.xz deleted file mode 100644 index ac3a417..0000000 --- a/cryptsetup-1.7.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2b30cd1d0dd606a53ac77b406e1d37798d4b0762fa89de6ea546201906a251bd -size 1232696 diff --git a/cryptsetup-2.0.0.tar.sign b/cryptsetup-2.0.0.tar.sign new file mode 100644 index 0000000..0ae6cd9 --- /dev/null +++ b/cryptsetup-2.0.0.tar.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAlotl/IACgkQ2bBXe9k+ +mPyUNw/8CCVoZn4zezBAS6vLU6mjBi1exyx8gWSKP9h1Th1TTpGOSMudycECTfVf +u9pPftpbprzu5Exrvdyp2aTAjoA9an0tE45O3PwV9f51a292hw44kA0TzfUB7sgi +BNX+KZAhgi4xAfxmpXFlLycheiQ/PnIHDyEogrOe567R7B8zHMbmRAKlY4ZNxfMh +Ppru7RAEwv1CVluRjFggxE9JZNJvXCjHalORAufFCpmQE3cbqTd7qEIa1lRbzEUA +RRrixas2WsRaPVnLm3MFII/ov5mkneWYxebithzkUKpXQc/WFhN8nG748YXWOxMT +Zgi/M+tl1HUlsxhH5Z/z/2m2pWSy5UY5L07dKyFp5u3ut5n/aQAaAzcT+tfGHXW7 +MG6JlImDcCqqNovN6FsJfuf+NDsAiQ9WMbimWk1IQPR59E/ipKEhXyXEtnBpC1hI +VGQcAEcZNFwoObqV+/NRYfrn8ARANohU/eytotggmnrt3hGjq2LrreWehBXllZtk +ZiRJtPpRSjUZASd6WvfrAspevXF/BjOCvUlEhMWgX20v6RViWaP+UdF+ovfWmLMZ +Y8w+lKMKeSHwIBfdqbsvKCszbn486OsIVUxXbz5T60ozjn58grVYhhzvl/GBpzd1 +O2dE+k1PzrbK0mCnieitGNVXEJxVa78ZTRLQa3GAhovec+AnXvk= +=iHFN +-----END PGP SIGNATURE----- diff --git a/cryptsetup-2.0.0.tar.xz b/cryptsetup-2.0.0.tar.xz new file mode 100644 index 0000000..d645544 --- /dev/null +++ b/cryptsetup-2.0.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:adc623b9e3e3ab5c14145b8baf21b741e513ee5bf90d2b4d85a745c2f05da199 +size 10079936 diff --git a/cryptsetup.changes b/cryptsetup.changes index 8f2b185..40f0ec7 100644 --- a/cryptsetup.changes +++ b/cryptsetup.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri Dec 22 16:16:10 UTC 2017 - archie.cobbs@gmail.com + +- Update to version 2.0.0: + * Add support for new on-disk LUKS2 format + * Enable to use system libargon2 instead of bundled version + * Install tmpfiles.d configuration for LUKS2 locking directory + * New command integritysetup: support for the new dm-integrity kernel target + * Support for larger sector sizes for crypt devices + * Miscellaneous fixes and improvements + ------------------------------------------------------------------- Sat Apr 29 11:52:58 UTC 2017 - mpluskal@suse.com diff --git a/cryptsetup.spec b/cryptsetup.spec index bbf8559..5c4871c 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,7 +1,7 @@ # # spec file for package cryptsetup # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,23 +16,25 @@ # -%define so_ver 4 +%define so_ver 12 Name: cryptsetup -Version: 1.7.5 +Version: 2.0.0 Release: 0 Summary: Set Up dm-crypt Based Encrypted Block Devices License: SUSE-GPL-2.0-with-openssl-exception and LGPL-2.0+ Group: System/Base Url: https://gitlab.com/cryptsetup/cryptsetup/ -Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/cryptsetup-%{version}.tar.xz +Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v2.0/cryptsetup-%{version}.tar.xz # GPG signature of the uncompressed tarball. -Source1: https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/cryptsetup-%{version}.tar.sign +Source1: https://www.kernel.org/pub/linux/utils/cryptsetup/v2.0/cryptsetup-%{version}.tar.sign Source2: baselibs.conf Source3: %{name}.keyring +BuildRequires: argon2-devel BuildRequires: device-mapper-devel BuildRequires: fipscheck BuildRequires: fipscheck-devel BuildRequires: libgcrypt-devel +BuildRequires: libjson-c-devel BuildRequires: libpwquality-devel BuildRequires: libselinux-devel BuildRequires: libuuid-devel @@ -95,7 +97,10 @@ time via the config file %{_sysconfdir}/crypttab. --enable-selinux \ --enable-fips \ --enable-pwquality \ - --enable-gcrypt-pbkdf2 + --enable-gcrypt-pbkdf2 \ + --enable-libargon2 \ + --with-luks2-lock-path=/run/cryptsetup \ + --with-tmpfilesdir='%{_tmpfilesdir}' make %{?_smp_mflags} V=1 %install @@ -154,10 +159,13 @@ fi /sbin/cryptsetup %{_sbindir}/cryptsetup %{_sbindir}/veritysetup +%{_sbindir}/integritysetup %{_sbindir}/cryptsetup-reencrypt %{_mandir}/man8/cryptsetup.8%{ext_man} %{_mandir}/man8/cryptsetup-reencrypt.8%{ext_man} %{_mandir}/man8/veritysetup.8%{ext_man} +%{_mandir}/man8/integritysetup.8%{ext_man} +%{_tmpfilesdir}/cryptsetup.conf %files -n libcryptsetup%{so_ver} %defattr(-,root,root)