import cryptsetup-2.2.2-1.el8

.cryptsetup.metadata

@@ -1 +1 @@
-264a76475ed8b650d385c00cce65d592bfb9b894 SOURCES/cryptsetup-2.2.0-rc1.tar.xz
+135dc2e7b84bc8c74f01447f93d1392485b47a37 SOURCES/cryptsetup-2.2.2.tar.xz

.gitignore

@@ -1 +1 @@
-SOURCES/cryptsetup-2.2.0-rc1.tar.xz
+SOURCES/cryptsetup-2.2.2.tar.xz

SOURCES/cryptsetup-2.2.0-remove-overlooked-config-scratching-from-reencryptio.patch

@@ -1,27 +0,0 @@
-From 97b112e77173a8a7bf8ab0c14669b71539f26e4d Mon Sep 17 00:00:00 2001
-From: Ondrej Kozina <okozina@redhat.com>
-Date: Sat, 15 Jun 2019 15:47:53 +0200
-Subject: [PATCH] Remove overlooked config scratching from reencryption tests.
-
----
- tests/luks2-reencryption-test | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/tests/luks2-reencryption-test b/tests/luks2-reencryption-test
-index 93ed86c..81a52dd 100755
---- a/tests/luks2-reencryption-test
-+++ b/tests/luks2-reencryption-test
-@@ -22,10 +22,6 @@ PWD1="93R4P4pIqAH8"
- PWD2="1cND4319812f"
- PWD3="1-9Qu5Ejfnqv"
- 
--HAVE_KEYRING=$(grep -e "#define KERNEL_KEYRING" ../config.h)
--test -n "$HAVE_KEYRING" || HAVE_KEYRING=0
--HAVE_KEYRING=${HAVE_KEYRING: -1}
--
- function dm_crypt_features()
- {
- 	VER_STR=$(dmsetup targets | grep crypt | cut -f2 -dv)
--- 
-1.8.3.1
-

SPECS/cryptsetup.spec

@@ -4,8 +4,8 @@ Obsoletes: cryptsetup-python3
 
 Summary: A utility for setting up encrypted disks
 Name: cryptsetup
-Version: 2.2.0
-Release: 0.2%{?dist}
+Version: 2.2.2
+Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Applications/System
 URL: https://gitlab.com/cryptsetup/cryptsetup
@@ -17,13 +17,12 @@ Obsoletes: cryptsetup-luks < 1.4.0
 Requires: cryptsetup-libs = %{version}-%{release}
 Requires: libpwquality >= 1.2.0
 
-%global upstream_version %{version}-rc1
+%global upstream_version %{version}
 Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v2.0/cryptsetup-%{upstream_version}.tar.xz
 # Following patch has to applied last
 Patch0:  %{name}-add-system-library-paths.patch
 # Remove the patch when (if ever) osci infrastructure gets stable enough
 Patch1:  %{name}-disable-verity-compat-test.patch
-Patch2:  %{name}-2.2.0-remove-overlooked-config-scratching-from-reencryptio.patch
 
 %description
 The cryptsetup package contains a utility for setting up
@@ -80,7 +79,6 @@ can be used for offline reencryption of disk in situ.
 %prep
 %setup -q -n cryptsetup-%{upstream_version}
 %patch1 -p1
-%patch2 -p1
 %patch0 -p1
 chmod -x misc/dracut_90reencrypt/*
 
@@ -140,6 +138,23 @@ rm -rf %{buildroot}/%{_libdir}/*.la
 %clean
 
 %changelog
+* Mon Nov 18 2019 Ondrej Kozina <okozina@redhat.com> - 2.2.2-1
+- Update to cryptsetup 2.2.2
+- LUKS2 reencryption honors activation flags (one time and persistent).
+- LUKS2 reencryption works also without volume keys put in kernel
+  keyring service.
+- Resolves: #1757783 #1750680 #1753597 #1743399
+
+- Resolves: #1742815 #1746532
+* Fri Aug 30 2019 Ondrej Kozina <okozina@redhat.com> - 2.2.0-2
+- patch: Fix mapped segments overflow on 32bit architectures.
+- patch: Take optimal io size in account with LUKS2 reencryption.
+- Resolves: #1742815 #1746532
+
+* Thu Aug 15 2019 Ondrej Kozina <okozina@redhat.com> - 2.2.0-1
+- Update to cryptsetup 2.2.0 (final)
+- Resolves: #1738263 #1740342 #1733391 #1729600 #1733390
+
 * Fri Jun 14 2019 Ondrej Kozina <okozina@redhat.com> - 2.2.0-0.2
 - Updates to reencryption feature.
 - Resolves: #1676622