From 311eccc692a2ca70ba4b9de45596436521f9aeb0 Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Sun, 2 Mar 2014 09:12:04 +0100 Subject: [PATCH 001/142] Require libgcrypt 1.6.1 (with fixed PBKDF2 and Whirlpool hash). --- cryptsetup.spec | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index e64fa73..3a537c9 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,7 +1,7 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup Version: 1.6.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ and LGPLv2+ Group: Applications/System URL: http://cryptsetup.googlecode.com/ @@ -18,13 +18,6 @@ Requires: libpwquality >= 1.2.0 %define upstream_version %{version} Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v1.6/cryptsetup-%{upstream_version}.tar.xz -# Unpatched PBKDF2 in gcrypt is slow, disable it and use internal one. -%if 0%{?fedora} >= 21 || 0%{?rhel} >= 7 -%define configure_pbkdf2 --enable-gcrypt-pbkdf2 -%else -%define configure_pbkdf2 --disable-gcrypt-pbkdf2 -%endif - %description The cryptsetup package contains a utility for setting up disk encryption using dm-crypt kernel module. @@ -48,10 +41,8 @@ Summary: Cryptsetup shared library Provides: cryptsetup-luks-libs = %{version}-%{release} Obsoletes: cryptsetup-luks-libs < 1.4.0 Requires: fipscheck-lib%{_isa} >= 1.3.0 -# Need support for empty password in gcrypt PBKDF2 and fixed gcrypt PBKDF2 -%if 0%{?fedora} >= 21 || 0%{?rhel} >= 7 -Requires: libgcrypt >= 1.5.3-3 -%endif +# Need support for fixed gcrypt PBKDF2 and fixed Whirlpool hash. +Requires: libgcrypt >= 1.6.1 %description libs This package contains the cryptsetup shared library, libcryptsetup. @@ -149,6 +140,9 @@ install -d %{buildroot}/%{_libdir}/fipscheck %clean %changelog +* Sun Mar 02 2014 Milan Broz - 1.6.4-2 +- Require libgcrypt 1.6.1 (with fixed PBKDF2 and Whirlpool hash). + * Thu Feb 27 2014 Milan Broz - 1.6.4-1 - Update to cryptsetup 1.6.4. From b64d7d84e2852871308425046eaca67da123cf06 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 01:16:16 -0500 Subject: [PATCH 002/142] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- cryptsetup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index 3a537c9..b1f83ff 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,7 +1,7 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup Version: 1.6.4 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ and LGPLv2+ Group: Applications/System URL: http://cryptsetup.googlecode.com/ @@ -140,6 +140,9 @@ install -d %{buildroot}/%{_libdir}/fipscheck %clean %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 1.6.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sun Mar 02 2014 Milan Broz - 1.6.4-2 - Require libgcrypt 1.6.1 (with fixed PBKDF2 and Whirlpool hash). From 6e66c7950af8e9163a0ffb8d20c1daa0ad012d75 Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Sun, 29 Jun 2014 14:45:08 +0200 Subject: [PATCH 003/142] Update to cryptsetup 1.6.5. Add cryptsetup-python3 subpackage. --- .gitignore | 2 +- cryptsetup-1.6.4.tar.sign | 17 ---------------- cryptsetup-1.6.5.tar.sign | 17 ++++++++++++++++ cryptsetup.spec | 41 ++++++++++++++++++++++++++++++++++++--- sources | 2 +- 5 files changed, 57 insertions(+), 22 deletions(-) delete mode 100644 cryptsetup-1.6.4.tar.sign create mode 100644 cryptsetup-1.6.5.tar.sign diff --git a/.gitignore b/.gitignore index 0951472..7ec8220 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/cryptsetup-1.6.4.tar.xz +/cryptsetup-1.6.5.tar.xz diff --git a/cryptsetup-1.6.4.tar.sign b/cryptsetup-1.6.4.tar.sign deleted file mode 100644 index 5c5d310..0000000 --- a/cryptsetup-1.6.4.tar.sign +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQIcBAABCAAGBQJTD0ctAAoJENmwV3vZPpj8WAkQAKo2flibcxZAR7lW6NfW2SUo -VysNEylCPRQbPbDOrWRGQMrjNlQWz0YU504P+GwVFOrALW7K2v71oVa+8AE3dukh -0aogPTzso6HlNFnnjbd2IkCAbhgejn6gshhd2rF64YxLx5QOnX744aS5HgEb3QC4 -rkSGIih/rJz0GEsNb4gpuTceO9BnBINbmbV4172CbyOWvndkgArazkB5f1Qi5d2r -SUQVZQIzGmW+qVmsGElS4AtCsYz59qfeL6+REVHEY0YV9M1MkWF3ZCsflW6t0Qgb -MUzNb3MEYYh2NaQoF4Ul1ZbHNgnx6as9B/uCIuV6LPQiJvl7PkBlN56vO6FI2nE5 -x2yXed8Y2OJBGstHsGtMoP8DP96U0IKcEPpSwttKVwl6+qCqu3Wns27eAvrkKnD/ -8/PGrk1F9H+iB4JLez/WyrWEveQQKugkJPf8HUSNW4J5/Q/joD0/2sKfIBTYbEG1 -Hf0jvcfhnsMf4cr06K1VeOVkr596/EEQRyEKAEQHdRdSDXvZeprjA+yBai6v6V+W -OCm4DK3D6o9jhCLeotFSlOsMfA9gxWJ9uKrEnR7ITh7PmTf8PiZbX+VkexuwP8vT -PaDjBCRZ2mm1nIfYxohcEMNz/WgRdFKx4vmb13OyY1tEcQYjIk/EoP7EZrGNS1tJ -5X1fSnePI1PuO+WuyaHy -=jEBe ------END PGP SIGNATURE----- diff --git a/cryptsetup-1.6.5.tar.sign b/cryptsetup-1.6.5.tar.sign new file mode 100644 index 0000000..3d58c07 --- /dev/null +++ b/cryptsetup-1.6.5.tar.sign @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIcBAABCAAGBQJTsAB+AAoJENmwV3vZPpj8bh0P/3MhINlKtwNZUIpBmutuioiN +TSZBXnC08oriTWll3LaUtT18q4gfdNZ0nmetew9AcdAHtaYEiSgdiuVkx4TVmXNV +I7oAE1GCopYt7KCBBS06ql3RylrqEdpt0dscb0WDvvbtc5G0WFh9rDflsPXZpaEt +heqpLG6mNUHnkfl9SOc3h0X9/H6G6bITvn1nJdNvfoZFJdqVI28d059Ax4dsx9ag +x/smj/TyvfxpJ897g0Ta+j8PPXLm3vanZZW/eBYujJd/ks6dGY9oeqyU3xZ/Uiwx +D6qDSbrkD8kzXoj7YyyMWkK3QtL3vhBSJoRC9Icf8hCg3jHS2FZ5ZYS6hzYvJQp7 +qsiOBxAyMgl1u0hYYldv0WRyi3Dv+C7HQdVHZicLdK30KqN3DKyJEPTnVt4+1nj2 +xNyZKM0kkHHMK+Cws2p17Y/ESH8TocJzaYdOehA5avRix7F9Ygg1g9BUGMGo3GDb +DsrTes35A9GGnQ6M+/YIFmzfaG92SLDUHzxCBtZ6I1GPAsxK41qSJ5CMbfxN0w3/ +SGa3Xybi2ZTyDJf5pSJdnnRsU51dayG3ensXPwc56/thkLGiapIVziWWVTA9TsaS +4B9emIPFkpkyX3mrfMsW3ap+lkkZ/KuqSeTkQep+Y24a/yaRX4YBjJCvAuu3DaZc +tGJBiO00fS647Vw/KP5w +=E6bJ +-----END PGP SIGNATURE----- diff --git a/cryptsetup.spec b/cryptsetup.spec index b1f83ff..b52b723 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,13 +1,16 @@ +%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} + Summary: A utility for setting up encrypted disks Name: cryptsetup -Version: 1.6.4 -Release: 3%{?dist} +Version: 1.6.5 +Release: 1%{?dist} License: GPLv2+ and LGPLv2+ Group: Applications/System URL: http://cryptsetup.googlecode.com/ BuildRequires: libgcrypt-devel, popt-devel, device-mapper-devel BuildRequires: libgpg-error-devel, libuuid-devel, libsepol-devel -BuildRequires: libselinux-devel, python-devel, libpwquality-devel +BuildRequires: libselinux-devel, python-devel, python3-devel +BuildRequires: libpwquality-devel BuildRequires: fipscheck-devel >= 1.3.0 Provides: cryptsetup-luks = %{version}-%{release} Obsoletes: cryptsetup-luks < 1.4.0 @@ -76,11 +79,24 @@ Obsoletes: python-cryptsetup < 1.4.0 This package provides Python bindings for libcryptsetup, a library for setting up disk encryption using dm-crypt kernel module. +%package python3 +Group: System Environment/Libraries +Summary: Python3 bindings for libcryptsetup +Requires: %{name}-libs = %{version}-%{release} +Provides: python3-cryptsetup = %{version}-%{release} + +%description python3 +This package provides Python bindings for libcryptsetup, a library +for setting up disk encryption using dm-crypt kernel module. + %prep %setup -q -n cryptsetup-%{upstream_version} chmod -x python/pycryptsetup-test.py chmod -x misc/dracut_90reencrypt/* +# copy the whole directory for the python3 build +cp -a . %{py3dir} + %build %configure --enable-python --enable-fips --enable-cryptsetup-reencrypt --enable-pwquality %{?configure_pbkdf2} # remove rpath @@ -88,6 +104,11 @@ sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool make %{?_smp_mflags} +pushd %{py3dir} +%configure --enable-python --with-python_version=3 +make %{?_smp_mflags} +popd + %install # Generate HMAC checksums (FIPS) %define __spec_install_post \ @@ -100,6 +121,11 @@ make %{?_smp_mflags} make install DESTDIR=%{buildroot} rm -rf %{buildroot}/%{_libdir}/*.la install -d %{buildroot}/%{_libdir}/fipscheck + +pushd %{py3dir} +make install DESTDIR=%{buildroot} +rm -rf %{buildroot}/%{_libdir}/*.la +popd %find_lang cryptsetup %post -n cryptsetup-libs -p /sbin/ldconfig @@ -137,9 +163,18 @@ install -d %{buildroot}/%{_libdir}/fipscheck %exclude %{python_sitearch}/pycryptsetup.la %{python_sitearch}/pycryptsetup.so +%files python3 +%doc COPYING.LGPL python/pycryptsetup-test.py +%exclude %{python3_sitearch}/pycryptsetup.la +%{python3_sitearch}/pycryptsetup.so + %clean %changelog +* Sun Jun 29 2014 Milan Broz - 1.6.5-1 +- Update to cryptsetup 1.6.5. +- Add cryptsetup-python3 subpackage. + * Sat Jun 07 2014 Fedora Release Engineering - 1.6.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/sources b/sources index a86b5b8..dc1d9b6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f68ce7b7f4be08449f3c8b114ed5accb cryptsetup-1.6.4.tar.xz +128a5f63284ca3a26b4d4ffe821fa235 cryptsetup-1.6.5.tar.xz From 7ca797b4f61aac7e7d87b722caba0f45e84fdf2e Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Fri, 11 Jul 2014 17:08:04 -0400 Subject: [PATCH 004/142] fix license handling --- cryptsetup.spec | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index b52b723..44ed703 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -3,7 +3,7 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup Version: 1.6.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ and LGPLv2+ Group: Applications/System URL: http://cryptsetup.googlecode.com/ @@ -133,17 +133,22 @@ popd %postun -n cryptsetup-libs -p /sbin/ldconfig %files -%doc COPYING AUTHORS FAQ docs/*ReleaseNotes +%{!?_licensedir:%global license %%doc} +%license COPYING +%doc AUTHORS FAQ docs/*ReleaseNotes %{_mandir}/man8/cryptsetup.8.gz %{_sbindir}/cryptsetup %files -n veritysetup -%doc COPYING +%{!?_licensedir:%global license %%doc} +%license COPYING %{_mandir}/man8/veritysetup.8.gz %{_sbindir}/veritysetup %files reencrypt -%doc COPYING misc/dracut_90reencrypt +%{!?_licensedir:%global license %%doc} +%license COPYING +%doc misc/dracut_90reencrypt %{_mandir}/man8/cryptsetup-reencrypt.8.gz %{_sbindir}/cryptsetup-reencrypt @@ -154,23 +159,31 @@ popd %{_libdir}/pkgconfig/libcryptsetup.pc %files libs -f cryptsetup.lang -%doc COPYING COPYING.LGPL +%{!?_licensedir:%global license %%doc} +%license COPYING COPYING.LGPL %{_libdir}/libcryptsetup.so.* %{_libdir}/fipscheck/libcryptsetup.so.*.hmac %files python -%doc COPYING.LGPL python/pycryptsetup-test.py +%{!?_licensedir:%global license %%doc} +%license COPYING.LGPL +%doc python/pycryptsetup-test.py %exclude %{python_sitearch}/pycryptsetup.la %{python_sitearch}/pycryptsetup.so %files python3 -%doc COPYING.LGPL python/pycryptsetup-test.py +%{!?_licensedir:%global license %%doc} +%license COPYING.LGPL +%doc python/pycryptsetup-test.py %exclude %{python3_sitearch}/pycryptsetup.la %{python3_sitearch}/pycryptsetup.so %clean %changelog +* Fri Jul 11 2014 Tom Callaway - 1.6.5-2 +- fix license handling + * Sun Jun 29 2014 Milan Broz - 1.6.5-1 - Update to cryptsetup 1.6.5. - Add cryptsetup-python3 subpackage. From dd5a4958180e304a83ab8e797fcbbd283e3dd694 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 16 Aug 2014 01:40:56 +0000 Subject: [PATCH 005/142] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- cryptsetup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index 44ed703..524500e 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -3,7 +3,7 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup Version: 1.6.5 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ and LGPLv2+ Group: Applications/System URL: http://cryptsetup.googlecode.com/ @@ -181,6 +181,9 @@ popd %clean %changelog +* Sat Aug 16 2014 Fedora Release Engineering - 1.6.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Fri Jul 11 2014 Tom Callaway - 1.6.5-2 - fix license handling From 55872b7fe62f6eaa8f72a62a1f5715d5d0dc8615 Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Sat, 16 Aug 2014 13:11:03 +0200 Subject: [PATCH 006/142] Update to cryptsetup 1.6.6. --- .gitignore | 2 +- cryptsetup-1.6.5.tar.sign | 17 ----------------- cryptsetup-1.6.6.tar.sign | 17 +++++++++++++++++ cryptsetup.spec | 7 +++++-- sources | 2 +- 5 files changed, 24 insertions(+), 21 deletions(-) delete mode 100644 cryptsetup-1.6.5.tar.sign create mode 100644 cryptsetup-1.6.6.tar.sign diff --git a/.gitignore b/.gitignore index 7ec8220..e9128c6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/cryptsetup-1.6.5.tar.xz +/cryptsetup-1.6.6.tar.xz diff --git a/cryptsetup-1.6.5.tar.sign b/cryptsetup-1.6.5.tar.sign deleted file mode 100644 index 3d58c07..0000000 --- a/cryptsetup-1.6.5.tar.sign +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQIcBAABCAAGBQJTsAB+AAoJENmwV3vZPpj8bh0P/3MhINlKtwNZUIpBmutuioiN -TSZBXnC08oriTWll3LaUtT18q4gfdNZ0nmetew9AcdAHtaYEiSgdiuVkx4TVmXNV -I7oAE1GCopYt7KCBBS06ql3RylrqEdpt0dscb0WDvvbtc5G0WFh9rDflsPXZpaEt -heqpLG6mNUHnkfl9SOc3h0X9/H6G6bITvn1nJdNvfoZFJdqVI28d059Ax4dsx9ag -x/smj/TyvfxpJ897g0Ta+j8PPXLm3vanZZW/eBYujJd/ks6dGY9oeqyU3xZ/Uiwx -D6qDSbrkD8kzXoj7YyyMWkK3QtL3vhBSJoRC9Icf8hCg3jHS2FZ5ZYS6hzYvJQp7 -qsiOBxAyMgl1u0hYYldv0WRyi3Dv+C7HQdVHZicLdK30KqN3DKyJEPTnVt4+1nj2 -xNyZKM0kkHHMK+Cws2p17Y/ESH8TocJzaYdOehA5avRix7F9Ygg1g9BUGMGo3GDb -DsrTes35A9GGnQ6M+/YIFmzfaG92SLDUHzxCBtZ6I1GPAsxK41qSJ5CMbfxN0w3/ -SGa3Xybi2ZTyDJf5pSJdnnRsU51dayG3ensXPwc56/thkLGiapIVziWWVTA9TsaS -4B9emIPFkpkyX3mrfMsW3ap+lkkZ/KuqSeTkQep+Y24a/yaRX4YBjJCvAuu3DaZc -tGJBiO00fS647Vw/KP5w -=E6bJ ------END PGP SIGNATURE----- diff --git a/cryptsetup-1.6.6.tar.sign b/cryptsetup-1.6.6.tar.sign new file mode 100644 index 0000000..15d0dad --- /dev/null +++ b/cryptsetup-1.6.6.tar.sign @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIcBAABCAAGBQJT7zIAAAoJENmwV3vZPpj8pr4P/01AhigA8Eb7Cq9eF/WnMG3G +hg8qcmfITYZBZA4bsucnLIhaxDfQ4tt2ESsaNsH1aK05FnJYbXjD/PDdHofDh4tO +s/goqowY2Tp4V2aBCCQd9tbnfl5T1gqv1vUxzRg9laObHps1E/uuZ3OSC8WDsZoI +uJSGv4WycV/XInfxoAniLdUxrhvCu04Ea6gEtLoVUGOgJWU3/kFjSCmcN3dbApJs +Pu67DJPArZW/0sP2G8nn9yOCSbDeSNrNCRgOiz4xscAPtdB+xCcb5NbbqhMb//4B +BHw6aNeYhS4zVp5Fk974OHkoL20eHBK9wnSQCMnQLpBPN5HqOD1b4tyvAFqhlqU3 +asryxg26zfvSSj31H6a/2EMwnJSxFEut/CA5eTDbXYHmztxDDIUah22HHl/062QV +Kpq27icixgmqal0cdRW9045cxdP+Yw+GCnyd4bP6CDuSt9n2aS1MatKtR8h76t6V +LlbJIC2TIIBTpafjWcfCgk2skuFeK/2D9c+5YqaU8HQ+EDcgs63d5WCO1ODAlYbz +qIjzWAc2u2GqUEstAWafg2Hi35cGlDAWEFUQO80rSsZJpFuZIP+KMMOU+P/DmzMm +SecVM3/FJbFPAbQZ2rLmRXZmnGWnQqDME1PrrWMTAxIXZVYEpgOLWLeiPCOhwSKG +lzsftYJ4VhmI9Mib76RA +=2I3V +-----END PGP SIGNATURE----- diff --git a/cryptsetup.spec b/cryptsetup.spec index 524500e..ce63686 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -2,8 +2,8 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup -Version: 1.6.5 -Release: 3%{?dist} +Version: 1.6.6 +Release: 1%{?dist} License: GPLv2+ and LGPLv2+ Group: Applications/System URL: http://cryptsetup.googlecode.com/ @@ -181,6 +181,9 @@ popd %clean %changelog +* Sat Aug 16 2014 Milan Broz - 1.6.6-1 +- Update to cryptsetup 1.6.6. + * Sat Aug 16 2014 Fedora Release Engineering - 1.6.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index dc1d9b6..fecf4b5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -128a5f63284ca3a26b4d4ffe821fa235 cryptsetup-1.6.5.tar.xz +179c0781de59838a4e39f61b2df5ea48 cryptsetup-1.6.6.tar.xz From 25fc1ca9947b97c1658c2233b1ba29a43bee4ba8 Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Mon, 23 Mar 2015 19:17:13 +0100 Subject: [PATCH 007/142] Update to cryptsetup 1.6.7. Remove no longer needed fipscheck library dependence. Change URL to new homepage. --- .gitignore | 2 +- cryptsetup-1.6.6.tar.sign | 17 ----------------- cryptsetup-1.6.7.tar.sign | 17 +++++++++++++++++ cryptsetup.spec | 22 +++++++--------------- sources | 2 +- 5 files changed, 26 insertions(+), 34 deletions(-) delete mode 100644 cryptsetup-1.6.6.tar.sign create mode 100644 cryptsetup-1.6.7.tar.sign diff --git a/.gitignore b/.gitignore index e9128c6..780dd44 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/cryptsetup-1.6.6.tar.xz +/cryptsetup-1.6.7.tar.xz diff --git a/cryptsetup-1.6.6.tar.sign b/cryptsetup-1.6.6.tar.sign deleted file mode 100644 index 15d0dad..0000000 --- a/cryptsetup-1.6.6.tar.sign +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQIcBAABCAAGBQJT7zIAAAoJENmwV3vZPpj8pr4P/01AhigA8Eb7Cq9eF/WnMG3G -hg8qcmfITYZBZA4bsucnLIhaxDfQ4tt2ESsaNsH1aK05FnJYbXjD/PDdHofDh4tO -s/goqowY2Tp4V2aBCCQd9tbnfl5T1gqv1vUxzRg9laObHps1E/uuZ3OSC8WDsZoI -uJSGv4WycV/XInfxoAniLdUxrhvCu04Ea6gEtLoVUGOgJWU3/kFjSCmcN3dbApJs -Pu67DJPArZW/0sP2G8nn9yOCSbDeSNrNCRgOiz4xscAPtdB+xCcb5NbbqhMb//4B -BHw6aNeYhS4zVp5Fk974OHkoL20eHBK9wnSQCMnQLpBPN5HqOD1b4tyvAFqhlqU3 -asryxg26zfvSSj31H6a/2EMwnJSxFEut/CA5eTDbXYHmztxDDIUah22HHl/062QV -Kpq27icixgmqal0cdRW9045cxdP+Yw+GCnyd4bP6CDuSt9n2aS1MatKtR8h76t6V -LlbJIC2TIIBTpafjWcfCgk2skuFeK/2D9c+5YqaU8HQ+EDcgs63d5WCO1ODAlYbz -qIjzWAc2u2GqUEstAWafg2Hi35cGlDAWEFUQO80rSsZJpFuZIP+KMMOU+P/DmzMm -SecVM3/FJbFPAbQZ2rLmRXZmnGWnQqDME1PrrWMTAxIXZVYEpgOLWLeiPCOhwSKG -lzsftYJ4VhmI9Mib76RA -=2I3V ------END PGP SIGNATURE----- diff --git a/cryptsetup-1.6.7.tar.sign b/cryptsetup-1.6.7.tar.sign new file mode 100644 index 0000000..f032fbd --- /dev/null +++ b/cryptsetup-1.6.7.tar.sign @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIbBAABCAAGBQJVEE3fAAoJENmwV3vZPpj8ql4P9ijvmO15ur4wpcGFkNYyzfuA +Y17yaTT6Nde8cGLUCpw7rPBoxL/b4ZArJnNk9UP73MyycxfVijaX5XxxoQbpL8n0 +cn1vdXTFzqXGBTJkjO0uQor1szQbvaz7xbk7LeBgG+j/zZGRa/0AKs42qvTaWzHu +G50AqksMGFV1ih+d4wYdD+AqcUf6h+1HQRjq/DqEurg1EHQ+iMqem1htvrzTq8+V +ym3xHM+JxJ04syzPb92VntSmyfX6ztmh+61cflQiOrIbTw+MFeGmYMOTufkWmQFi +gFC+7mXTjO1YkmN+RFYZ52WY3shk3BLhAXT/pFlGFjwfHqrvFgfj+Iu9STVs2du2 +LLa+xF5yxaKyHHKkw2wn7edeepzfwSp0+lmDy8B0SGXh5wGNreNSX3IMAdJeJztM +7EyJa5JUSMfKWPHzy1gGYZRN/NQGGqG3c1+Sw5hy/ukFtLC4DSu5OtJNOt2c8MNw ++XPXh+Ssy+ma9e0E+pnmRYQ/nY2BWuN/gFB5Gvr08d4hifP9+LzI+bgQx4gNjB5Y +9py0moXVOxn/TICXSFgjDmvYgw7BZRVtaHFfkiKA5DrBeS07MROKzL59ykiuU7HW +HvCs3icShV+oSt79bMa7E+QhKRsBicS30QyLecttHkxbLxSg55qFpMa7m8+6VG2Y +LsfZNLwWJmf8jU9YUY0= +=jDZw +-----END PGP SIGNATURE----- diff --git a/cryptsetup.spec b/cryptsetup.spec index ce63686..e7ccbe9 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -2,20 +2,18 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup -Version: 1.6.6 +Version: 1.6.7 Release: 1%{?dist} License: GPLv2+ and LGPLv2+ Group: Applications/System -URL: http://cryptsetup.googlecode.com/ +URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: libgcrypt-devel, popt-devel, device-mapper-devel BuildRequires: libgpg-error-devel, libuuid-devel, libsepol-devel BuildRequires: libselinux-devel, python-devel, python3-devel BuildRequires: libpwquality-devel -BuildRequires: fipscheck-devel >= 1.3.0 Provides: cryptsetup-luks = %{version}-%{release} Obsoletes: cryptsetup-luks < 1.4.0 Requires: cryptsetup-libs = %{version}-%{release} -Requires: fipscheck-lib%{_isa} >= 1.3.0 Requires: libpwquality >= 1.2.0 %define upstream_version %{version} @@ -43,7 +41,6 @@ Group: System Environment/Libraries Summary: Cryptsetup shared library Provides: cryptsetup-luks-libs = %{version}-%{release} Obsoletes: cryptsetup-luks-libs < 1.4.0 -Requires: fipscheck-lib%{_isa} >= 1.3.0 # Need support for fixed gcrypt PBKDF2 and fixed Whirlpool hash. Requires: libgcrypt >= 1.6.1 @@ -110,17 +107,8 @@ make %{?_smp_mflags} popd %install -# Generate HMAC checksums (FIPS) -%define __spec_install_post \ - %{?__debug_package:%{__debug_install_post}} \ - %{__arch_install_post} \ - %{__os_install_post} \ - fipshmac -d %{buildroot}/%{_libdir}/fipscheck %{buildroot}/%{_libdir}/libcryptsetup.so.* \ -%{nil} - make install DESTDIR=%{buildroot} rm -rf %{buildroot}/%{_libdir}/*.la -install -d %{buildroot}/%{_libdir}/fipscheck pushd %{py3dir} make install DESTDIR=%{buildroot} @@ -162,7 +150,6 @@ popd %{!?_licensedir:%global license %%doc} %license COPYING COPYING.LGPL %{_libdir}/libcryptsetup.so.* -%{_libdir}/fipscheck/libcryptsetup.so.*.hmac %files python %{!?_licensedir:%global license %%doc} @@ -181,6 +168,11 @@ popd %clean %changelog +* Mon Mar 23 2015 Milan Broz - 1.6.7-1 +- Update to cryptsetup 1.6.7. +- Remove no longer needed fipscheck library dependence. +- Change URL to new homepage. + * Sat Aug 16 2014 Milan Broz - 1.6.6-1 - Update to cryptsetup 1.6.6. diff --git a/sources b/sources index fecf4b5..66bf23e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -179c0781de59838a4e39f61b2df5ea48 cryptsetup-1.6.6.tar.xz +918406eb5d2e2f5a7348c432ea9b1473 cryptsetup-1.6.7.tar.xz From b1c5771d8d6291daa8c4ead3f8f53b8b0642e7ce Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 03:26:08 +0000 Subject: [PATCH 008/142] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- cryptsetup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index e7ccbe9..804285a 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -3,7 +3,7 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup Version: 1.6.7 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ and LGPLv2+ Group: Applications/System URL: https://gitlab.com/cryptsetup/cryptsetup @@ -168,6 +168,9 @@ popd %clean %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 1.6.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Mon Mar 23 2015 Milan Broz - 1.6.7-1 - Update to cryptsetup 1.6.7. - Remove no longer needed fipscheck library dependence. From 350ad9f5e6ca711970bfb4c6562deaf75f78f71e Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Tue, 8 Sep 2015 14:38:35 +0200 Subject: [PATCH 009/142] Update to version 1.6.8. --- .gitignore | 2 +- cryptsetup-1.6.7.tar.sign | 17 ----------------- cryptsetup-1.6.8.tar.sign | 17 +++++++++++++++++ cryptsetup.spec | 5 ++++- sources | 2 +- 5 files changed, 23 insertions(+), 20 deletions(-) delete mode 100644 cryptsetup-1.6.7.tar.sign create mode 100644 cryptsetup-1.6.8.tar.sign diff --git a/.gitignore b/.gitignore index 780dd44..1ba2e99 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/cryptsetup-1.6.7.tar.xz +/cryptsetup-1.6.8.tar.xz diff --git a/cryptsetup-1.6.7.tar.sign b/cryptsetup-1.6.7.tar.sign deleted file mode 100644 index f032fbd..0000000 --- a/cryptsetup-1.6.7.tar.sign +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQIbBAABCAAGBQJVEE3fAAoJENmwV3vZPpj8ql4P9ijvmO15ur4wpcGFkNYyzfuA -Y17yaTT6Nde8cGLUCpw7rPBoxL/b4ZArJnNk9UP73MyycxfVijaX5XxxoQbpL8n0 -cn1vdXTFzqXGBTJkjO0uQor1szQbvaz7xbk7LeBgG+j/zZGRa/0AKs42qvTaWzHu -G50AqksMGFV1ih+d4wYdD+AqcUf6h+1HQRjq/DqEurg1EHQ+iMqem1htvrzTq8+V -ym3xHM+JxJ04syzPb92VntSmyfX6ztmh+61cflQiOrIbTw+MFeGmYMOTufkWmQFi -gFC+7mXTjO1YkmN+RFYZ52WY3shk3BLhAXT/pFlGFjwfHqrvFgfj+Iu9STVs2du2 -LLa+xF5yxaKyHHKkw2wn7edeepzfwSp0+lmDy8B0SGXh5wGNreNSX3IMAdJeJztM -7EyJa5JUSMfKWPHzy1gGYZRN/NQGGqG3c1+Sw5hy/ukFtLC4DSu5OtJNOt2c8MNw -+XPXh+Ssy+ma9e0E+pnmRYQ/nY2BWuN/gFB5Gvr08d4hifP9+LzI+bgQx4gNjB5Y -9py0moXVOxn/TICXSFgjDmvYgw7BZRVtaHFfkiKA5DrBeS07MROKzL59ykiuU7HW -HvCs3icShV+oSt79bMa7E+QhKRsBicS30QyLecttHkxbLxSg55qFpMa7m8+6VG2Y -LsfZNLwWJmf8jU9YUY0= -=jDZw ------END PGP SIGNATURE----- diff --git a/cryptsetup-1.6.8.tar.sign b/cryptsetup-1.6.8.tar.sign new file mode 100644 index 0000000..aa20cd3 --- /dev/null +++ b/cryptsetup-1.6.8.tar.sign @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIcBAABCAAGBQJV7r+oAAoJENmwV3vZPpj8KEsP/2BTTiaXCzwvqupSAo7dFpET +Tugtc99Nzrv8Yc4nNvboxXSD7/TOZYAEWz787KPANJo3Ks46F3BB9KjeqRxhnGAX ++Ce9wi8ufdjECSZjNDxl5tcJrmrmftAgBbZhPIaYE7wZuxF71Cl769XHdgVvSV2w +pyGbiqXdcnMVw1q4npndZNsVoMZ4vB1bEfz8AAgC6idF/yiAw2tI7VjUZfrNDd0b +mc6IOmDslyGxA1565w/HSiZqxqaZTsVGfwfluxTwpu+Du9eMHeViJV/4Z1Aka5lF +wNxnJZro9UlGkRCWXR6zZYXPrHEHGaNlwObUpWcfHSLNTP9ulgPY0tkVnXuY7uom +JGtGCdVPsqxCaBg8fd+QQRbPZqrIZGw+wgjikqTs9gnd+LdUBxHDuseRuE+mkk0w +cZW2RQf9f4nYj7LUvLuY0NBQ9brHsrU/IqjWQWnPrzmdCh2pdnb6UmOyWH0dcYcB +ldReYWbbCBO132QZuT53VJv/c4XATnEQLIgOaT3AUddVUAEvkNephesN1/rjuAKG +OwTVelvo4gp0ncYPZiQHzkVe5mTt/7JVyuXYDO/tnm4JYn9ZFQj00ZoGTeywWAGR +5xNH7Gjo8JGNm9oI358jfQw6zLBWn3FdyDgoxxvupNC6wi/O+7Gb86PxyMFn7Lii +sF1YN0no4oN+OyCDU17N +=apNw +-----END PGP SIGNATURE----- diff --git a/cryptsetup.spec b/cryptsetup.spec index 804285a..89c5ae9 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -2,7 +2,7 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup -Version: 1.6.7 +Version: 1.6.8 Release: 2%{?dist} License: GPLv2+ and LGPLv2+ Group: Applications/System @@ -168,6 +168,9 @@ popd %clean %changelog +* Tue Sep 08 2015 Milan Broz - 1.6.8-1 +- Update to cryptsetup 1.6.8. + * Wed Jun 17 2015 Fedora Release Engineering - 1.6.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 66bf23e..1dc1dfc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -918406eb5d2e2f5a7348c432ea9b1473 cryptsetup-1.6.7.tar.xz +a04d97ca2874e98c112fddbe930b19de cryptsetup-1.6.8.tar.xz From 63dffd8b8c86e3f8a6f55e3594fc34cc52f2415b Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Tue, 8 Sep 2015 14:51:14 +0200 Subject: [PATCH 010/142] Fix release log. --- cryptsetup.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index 89c5ae9..24115d9 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -168,7 +168,7 @@ popd %clean %changelog -* Tue Sep 08 2015 Milan Broz - 1.6.8-1 +* Tue Sep 08 2015 Milan Broz - 1.6.8-2 - Update to cryptsetup 1.6.8. * Wed Jun 17 2015 Fedora Release Engineering - 1.6.7-2 From 3be14d0aed60247bd46e0fa7b9e2d309c08777b9 Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Tue, 3 Nov 2015 14:24:40 +0100 Subject: [PATCH 011/142] Update to version 1.7.0. --- .gitignore | 2 +- cryptsetup-1.6.8.tar.sign | 17 ----------------- cryptsetup-1.7.0.tar.sign | 17 +++++++++++++++++ cryptsetup.spec | 12 +++++++++--- sources | 2 +- 5 files changed, 28 insertions(+), 22 deletions(-) delete mode 100644 cryptsetup-1.6.8.tar.sign create mode 100644 cryptsetup-1.7.0.tar.sign diff --git a/.gitignore b/.gitignore index 1ba2e99..d363990 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/cryptsetup-1.6.8.tar.xz +/cryptsetup-1.7.0.tar.xz diff --git a/cryptsetup-1.6.8.tar.sign b/cryptsetup-1.6.8.tar.sign deleted file mode 100644 index aa20cd3..0000000 --- a/cryptsetup-1.6.8.tar.sign +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQIcBAABCAAGBQJV7r+oAAoJENmwV3vZPpj8KEsP/2BTTiaXCzwvqupSAo7dFpET -Tugtc99Nzrv8Yc4nNvboxXSD7/TOZYAEWz787KPANJo3Ks46F3BB9KjeqRxhnGAX -+Ce9wi8ufdjECSZjNDxl5tcJrmrmftAgBbZhPIaYE7wZuxF71Cl769XHdgVvSV2w -pyGbiqXdcnMVw1q4npndZNsVoMZ4vB1bEfz8AAgC6idF/yiAw2tI7VjUZfrNDd0b -mc6IOmDslyGxA1565w/HSiZqxqaZTsVGfwfluxTwpu+Du9eMHeViJV/4Z1Aka5lF -wNxnJZro9UlGkRCWXR6zZYXPrHEHGaNlwObUpWcfHSLNTP9ulgPY0tkVnXuY7uom -JGtGCdVPsqxCaBg8fd+QQRbPZqrIZGw+wgjikqTs9gnd+LdUBxHDuseRuE+mkk0w -cZW2RQf9f4nYj7LUvLuY0NBQ9brHsrU/IqjWQWnPrzmdCh2pdnb6UmOyWH0dcYcB -ldReYWbbCBO132QZuT53VJv/c4XATnEQLIgOaT3AUddVUAEvkNephesN1/rjuAKG -OwTVelvo4gp0ncYPZiQHzkVe5mTt/7JVyuXYDO/tnm4JYn9ZFQj00ZoGTeywWAGR -5xNH7Gjo8JGNm9oI358jfQw6zLBWn3FdyDgoxxvupNC6wi/O+7Gb86PxyMFn7Lii -sF1YN0no4oN+OyCDU17N -=apNw ------END PGP SIGNATURE----- diff --git a/cryptsetup-1.7.0.tar.sign b/cryptsetup-1.7.0.tar.sign new file mode 100644 index 0000000..920afad --- /dev/null +++ b/cryptsetup-1.7.0.tar.sign @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIcBAABCAAGBQJWOKq0AAoJENmwV3vZPpj8VfgQALqERsJKR9EYJMjsZrij0cEO +gsy3CJ2zLo8vWBy0GakfH67fKCDxpoMCDKT2B76DJmAkQbaEJULZeaIxA+gQrjWj +Kg5HrzKjzwbnN8Cv6Wp/rhSK6GS943KO8DMu/lw3SjTEqp9lqySDE5ISwYIqOMS+ +0qr3UpPpJTt6vaMDrDEUvUTGzfV1cK4nvRjrw9nXSbnDpYr4N1PXGoT9eFKIJp8Y +LV/2esfC1P4y2/qm7Tx1ptOsiv9EAZitWtD7IqPgRbHsLvpO+W41OP5bnRtXTK3/ +RHBYQpKrR5uChLItI457/TYRK4ucxn25AjF/8rXoKgqNaE9ZC1+a1RRjxQqFqIIc +CtkwUWN9BL0y78jmz+DSn/B/YB18KesraUMkobmsxRVzea7Vzcbv/lcfwBVIkjMH +DKFJJSRDWa1Zuvola+uW/gvEQuELBQkqe6IErn8WhMN2u35YjQ7r1N6f2If4SvF1 +c/W8mgC/tV+L5v9THSGMjv4VZ/GMaFSq2zoxqMlqzFbapaFuoldTpIpx6TLmiWSg +PU1U/lAWn4IGPT6OPcJZyXgYNxs2Pixj5dAC4W+hpDTDecrVJzm+2jvMbLy7d0jl +yqWA2ka/fQAIOw8giGkphTuaDBMOt8yP2dpdrfac25aNUuEk3S7TG1KreAyvrkvH +ByaYWwWuY2yBRn+EI+K7 +=LQ5T +-----END PGP SIGNATURE----- diff --git a/cryptsetup.spec b/cryptsetup.spec index 24115d9..3279a56 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -2,8 +2,8 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup -Version: 1.6.8 -Release: 2%{?dist} +Version: 1.7.0 +Release: 1%{?dist} License: GPLv2+ and LGPLv2+ Group: Applications/System URL: https://gitlab.com/cryptsetup/cryptsetup @@ -17,7 +17,7 @@ Requires: cryptsetup-libs = %{version}-%{release} Requires: libpwquality >= 1.2.0 %define upstream_version %{version} -Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v1.6/cryptsetup-%{upstream_version}.tar.xz +Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/cryptsetup-%{upstream_version}.tar.xz %description The cryptsetup package contains a utility for setting up @@ -168,6 +168,12 @@ popd %clean %changelog + +* Tue Nov 03 2015 Milan Broz - 1.7.0-1 +- Update to cryptsetup 1.7.0. +- Switch to sha256 as default hash. +- Increase default PBKDF2 iteration time to 2 seconds. + * Tue Sep 08 2015 Milan Broz - 1.6.8-2 - Update to cryptsetup 1.6.8. diff --git a/sources b/sources index 1dc1dfc..6148d6a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a04d97ca2874e98c112fddbe930b19de cryptsetup-1.6.8.tar.xz +56c385fe87fc2b6873df4b7f89202d0f cryptsetup-1.7.0.tar.xz From a4e1342038a1aeb1e86ca28e623ff9d576b1b240 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 10 Nov 2015 14:12:15 +0000 Subject: [PATCH 012/142] - Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 --- cryptsetup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index 3279a56..0429f10 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -3,7 +3,7 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup Version: 1.7.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ and LGPLv2+ Group: Applications/System URL: https://gitlab.com/cryptsetup/cryptsetup @@ -168,6 +168,9 @@ popd %clean %changelog +* Tue Nov 10 2015 Fedora Release Engineering - 1.7.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 + * Tue Nov 03 2015 Milan Broz - 1.7.0-1 - Update to cryptsetup 1.7.0. From 4544b8a1597bd9445daf24df398b5ad18fac500d Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Wed, 27 Jan 2016 08:59:26 +0100 Subject: [PATCH 013/142] Replace %define with %global. --- cryptsetup.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index 0429f10..5ed8812 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -16,7 +16,7 @@ Obsoletes: cryptsetup-luks < 1.4.0 Requires: cryptsetup-libs = %{version}-%{release} Requires: libpwquality >= 1.2.0 -%define upstream_version %{version} +%global upstream_version %{version} Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/cryptsetup-%{upstream_version}.tar.xz %description @@ -171,7 +171,6 @@ popd * Tue Nov 10 2015 Fedora Release Engineering - 1.7.0-2 - Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 - * Tue Nov 03 2015 Milan Broz - 1.7.0-1 - Update to cryptsetup 1.7.0. - Switch to sha256 as default hash. From d2664b3a9683dd6332188456c74bf756738bef91 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 18:15:40 +0000 Subject: [PATCH 014/142] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- cryptsetup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index 5ed8812..3511e82 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -3,7 +3,7 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup Version: 1.7.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ and LGPLv2+ Group: Applications/System URL: https://gitlab.com/cryptsetup/cryptsetup @@ -168,6 +168,9 @@ popd %clean %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 1.7.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Tue Nov 10 2015 Fedora Release Engineering - 1.7.0-2 - Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 From a1bdd29026ebfc6aa51238b7328004c283e617fa Mon Sep 17 00:00:00 2001 From: milan Date: Sun, 28 Feb 2016 15:21:16 +0100 Subject: [PATCH 015/142] Update to version 1.7.1.  --- .gitignore | 2 +- cryptsetup-1.7.0.tar.sign | 17 ----------------- cryptsetup-1.7.1.tar.sign | 17 +++++++++++++++++ cryptsetup.spec | 7 +++++-- sources | 2 +- 5 files changed, 24 insertions(+), 21 deletions(-) delete mode 100644 cryptsetup-1.7.0.tar.sign create mode 100644 cryptsetup-1.7.1.tar.sign diff --git a/.gitignore b/.gitignore index d363990..2ff74c4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/cryptsetup-1.7.0.tar.xz +/cryptsetup-1.7.1.tar.xz diff --git a/cryptsetup-1.7.0.tar.sign b/cryptsetup-1.7.0.tar.sign deleted file mode 100644 index 920afad..0000000 --- a/cryptsetup-1.7.0.tar.sign +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQIcBAABCAAGBQJWOKq0AAoJENmwV3vZPpj8VfgQALqERsJKR9EYJMjsZrij0cEO -gsy3CJ2zLo8vWBy0GakfH67fKCDxpoMCDKT2B76DJmAkQbaEJULZeaIxA+gQrjWj -Kg5HrzKjzwbnN8Cv6Wp/rhSK6GS943KO8DMu/lw3SjTEqp9lqySDE5ISwYIqOMS+ -0qr3UpPpJTt6vaMDrDEUvUTGzfV1cK4nvRjrw9nXSbnDpYr4N1PXGoT9eFKIJp8Y -LV/2esfC1P4y2/qm7Tx1ptOsiv9EAZitWtD7IqPgRbHsLvpO+W41OP5bnRtXTK3/ -RHBYQpKrR5uChLItI457/TYRK4ucxn25AjF/8rXoKgqNaE9ZC1+a1RRjxQqFqIIc -CtkwUWN9BL0y78jmz+DSn/B/YB18KesraUMkobmsxRVzea7Vzcbv/lcfwBVIkjMH -DKFJJSRDWa1Zuvola+uW/gvEQuELBQkqe6IErn8WhMN2u35YjQ7r1N6f2If4SvF1 -c/W8mgC/tV+L5v9THSGMjv4VZ/GMaFSq2zoxqMlqzFbapaFuoldTpIpx6TLmiWSg -PU1U/lAWn4IGPT6OPcJZyXgYNxs2Pixj5dAC4W+hpDTDecrVJzm+2jvMbLy7d0jl -yqWA2ka/fQAIOw8giGkphTuaDBMOt8yP2dpdrfac25aNUuEk3S7TG1KreAyvrkvH -ByaYWwWuY2yBRn+EI+K7 -=LQ5T ------END PGP SIGNATURE----- diff --git a/cryptsetup-1.7.1.tar.sign b/cryptsetup-1.7.1.tar.sign new file mode 100644 index 0000000..11dcc07 --- /dev/null +++ b/cryptsetup-1.7.1.tar.sign @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIcBAABCAAGBQJW0vkJAAoJENmwV3vZPpj8aK4P/iU9gAadERsXEu7LkSYUhDhy +PIQCpxl1ozRJZ6XaXKUeJi2EmB5TM9tCZeO8koVDet2wDRqJa6TCH1WHQijTJdnr +XeEbuPEiX7n5g8GKsefu6lIZMY9NKnOsUoTD89PVMw2qzt78WbIKGh52t6QJUatk +s+Ic8uKXUGzYGT735D8N2NVsaT+QpNgNMYaI92iU6jpFbtP5OSQU+3cFJSMSO8S2 +YqeLXAXnJ3mZl0koSqTSjgs+5b4+4Nv0mou/rYUOdg4h1vQiePvDOdTRye+/RQSG +077X94M0w/GalSy8kzDiAZU7yC4H5WQDJQoy10ePJmPYhfo5MChmvMEtTkiiqEi7 +PMuoG1r77Dj/7x2VY4s4XY4ePCEEtBu2IEPzmJZPxM6oN6NPhBzPCctR4Ybn+d3o +8x2vKVTkfqQAxwO5TLsSyDJSKSMI06AJbZDBSEJcX56r+gezyf11KFF0XaN1SjRQ +VGJHkqhzfX8PCQe1JvsfhW3a/EpppUI13SlS16rvoqMvE7aZaOOR1TaBxgPvsINk +BV210m4PKZYU4nqAbVgkJL5O8dFcbw0MFuYpQvazRQFAC/Dz+ta6R3gJ3H5Avsuw +UYfqCQJ4b8t+X5e4yHoUyJXw8gIxdwmmcJMZXweBzP/7DxGsxxu+3kUnYJV4sRQg +BD4YYLWuz+1a3iS7XD8u +=0WaO +-----END PGP SIGNATURE----- diff --git a/cryptsetup.spec b/cryptsetup.spec index 3511e82..1667a59 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -2,8 +2,8 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup -Version: 1.7.0 -Release: 3%{?dist} +Version: 1.7.1 +Release: 1%{?dist} License: GPLv2+ and LGPLv2+ Group: Applications/System URL: https://gitlab.com/cryptsetup/cryptsetup @@ -168,6 +168,9 @@ popd %clean %changelog +* Sun Feb 28 2016 Milan Broz - 1.7.1-1 +- Update to cryptsetup 1.7.1. + * Wed Feb 03 2016 Fedora Release Engineering - 1.7.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 6148d6a..fb2d8c6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -56c385fe87fc2b6873df4b7f89202d0f cryptsetup-1.7.0.tar.xz +e38da1c80088cbaaccf931ef61e726dc cryptsetup-1.7.1.tar.xz From 22f01ff394d32a48e11f825c6d17e578c595f97f Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Sat, 4 Jun 2016 15:33:56 +0200 Subject: [PATCH 016/142] Update to cryptsetup 1.7.2. --- .gitignore | 2 +- cryptsetup-1.7.1.tar.sign | 17 ----------------- cryptsetup-1.7.2.tar.sign | 17 +++++++++++++++++ cryptsetup.spec | 5 ++++- sources | 2 +- 5 files changed, 23 insertions(+), 20 deletions(-) delete mode 100644 cryptsetup-1.7.1.tar.sign create mode 100644 cryptsetup-1.7.2.tar.sign diff --git a/.gitignore b/.gitignore index 2ff74c4..450b3c0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/cryptsetup-1.7.1.tar.xz +/cryptsetup-1.7.2.tar.xz diff --git a/cryptsetup-1.7.1.tar.sign b/cryptsetup-1.7.1.tar.sign deleted file mode 100644 index 11dcc07..0000000 --- a/cryptsetup-1.7.1.tar.sign +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQIcBAABCAAGBQJW0vkJAAoJENmwV3vZPpj8aK4P/iU9gAadERsXEu7LkSYUhDhy -PIQCpxl1ozRJZ6XaXKUeJi2EmB5TM9tCZeO8koVDet2wDRqJa6TCH1WHQijTJdnr -XeEbuPEiX7n5g8GKsefu6lIZMY9NKnOsUoTD89PVMw2qzt78WbIKGh52t6QJUatk -s+Ic8uKXUGzYGT735D8N2NVsaT+QpNgNMYaI92iU6jpFbtP5OSQU+3cFJSMSO8S2 -YqeLXAXnJ3mZl0koSqTSjgs+5b4+4Nv0mou/rYUOdg4h1vQiePvDOdTRye+/RQSG -077X94M0w/GalSy8kzDiAZU7yC4H5WQDJQoy10ePJmPYhfo5MChmvMEtTkiiqEi7 -PMuoG1r77Dj/7x2VY4s4XY4ePCEEtBu2IEPzmJZPxM6oN6NPhBzPCctR4Ybn+d3o -8x2vKVTkfqQAxwO5TLsSyDJSKSMI06AJbZDBSEJcX56r+gezyf11KFF0XaN1SjRQ -VGJHkqhzfX8PCQe1JvsfhW3a/EpppUI13SlS16rvoqMvE7aZaOOR1TaBxgPvsINk -BV210m4PKZYU4nqAbVgkJL5O8dFcbw0MFuYpQvazRQFAC/Dz+ta6R3gJ3H5Avsuw -UYfqCQJ4b8t+X5e4yHoUyJXw8gIxdwmmcJMZXweBzP/7DxGsxxu+3kUnYJV4sRQg -BD4YYLWuz+1a3iS7XD8u -=0WaO ------END PGP SIGNATURE----- diff --git a/cryptsetup-1.7.2.tar.sign b/cryptsetup-1.7.2.tar.sign new file mode 100644 index 0000000..2de97ff --- /dev/null +++ b/cryptsetup-1.7.2.tar.sign @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIcBAABCAAGBQJXUsbKAAoJENmwV3vZPpj8bV4QAI7QyOCNpP+++FLHK+RbX4aM +bYMxB589BwPIykUypK8ocaSuht0fPBSOV1+oUnrskRxGvSxAB1XG+TJowWHmsAzq +ZcIYZeIX1r6RdMQIUWIdQfIGLj7MNF6LgS26aFT7ceC64/J8DqQIqEmOzoUlgo22 +Rd/Ii58jOvzbhrj1P8odjdQqu4yYa3t81M9QwzXLFymWB5h769+JaxYtxsRQ1GIH +dcVo5WCv8ECz8yaXFfWNzgNYsNTL9EhPy3dC4nccQy5rjVzoS4BslENzorWCpaVP +j0qSthWDDRcoxzJMEABTTwy5o10LVIMqEuW90370RhA8yfSreX7O7rWShKFszQwy +mXQmt3glS5xk6KRFRwVMCN+31eBzC4kAsIjpWymb6C/ictog6bDB4MovGtUvjF/M +DGAuywnp7wQzE6c6KulVmeyEOWVn/eqSApXE64koKATQ9zVUd/QV8tVL2vwYdyuz +CHIT+OFlvattv6CGU9e3k8g/5YKUo4dWHveQgLeRiSviT60gbRdV/5i3LnxFvHjr +HTGTWOH0U/CjJ5EQxepbS8v18AM3vcCCdjyHrs5JXpIIr6h4I1KQZzjTaP/BPG3+ +nTfEOxxv0cfT6L7zNG+BTDHKEQEgnL1K4JXXEKBWty5XpaVRQlJLlQYqB4rCkOK0 +0VS3WWmzmFExX+iL7Jo1 +=GYgV +-----END PGP SIGNATURE----- diff --git a/cryptsetup.spec b/cryptsetup.spec index 1667a59..9df55ac 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -2,7 +2,7 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup -Version: 1.7.1 +Version: 1.7.2 Release: 1%{?dist} License: GPLv2+ and LGPLv2+ Group: Applications/System @@ -168,6 +168,9 @@ popd %clean %changelog +* Sat Jun 04 2016 Milan Broz - 1.7.2-1 +- Update to cryptsetup 1.7.2. + * Sun Feb 28 2016 Milan Broz - 1.7.1-1 - Update to cryptsetup 1.7.1. diff --git a/sources b/sources index fb2d8c6..b4b0ada 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e38da1c80088cbaaccf931ef61e726dc cryptsetup-1.7.1.tar.xz +a11a140cea496961222170944db01fc1 cryptsetup-1.7.2.tar.xz From 7952d31d4f7f382d83ccf371fcf96a3470b56330 Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Mon, 13 Jun 2016 10:20:21 +0200 Subject: [PATCH 017/142] Rebuilt for compatible glibc symbols. See https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/VUOTESHSWFRCYPXIVG6BSMAUITS7QCK2/ --- cryptsetup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index 9df55ac..5ed92d2 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -3,7 +3,7 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup Version: 1.7.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ and LGPLv2+ Group: Applications/System URL: https://gitlab.com/cryptsetup/cryptsetup @@ -168,6 +168,9 @@ popd %clean %changelog +* Mon Jun 13 2016 Milan Broz - 1.7.2-2 +- Rebuilt for compatible symbol changes in glibc. + * Sat Jun 04 2016 Milan Broz - 1.7.2-1 - Update to cryptsetup 1.7.2. From 7fa49fb8b1770c9b723eaf57897069e955ea6366 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 19 Jul 2016 06:51:29 +0000 Subject: [PATCH 018/142] - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages --- cryptsetup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index 5ed92d2..94d0634 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -3,7 +3,7 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup Version: 1.7.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ and LGPLv2+ Group: Applications/System URL: https://gitlab.com/cryptsetup/cryptsetup @@ -168,6 +168,9 @@ popd %clean %changelog +* Tue Jul 19 2016 Fedora Release Engineering - 1.7.2-3 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + * Mon Jun 13 2016 Milan Broz - 1.7.2-2 - Rebuilt for compatible symbol changes in glibc. From bd21a19e4c8f90423f0269f04b6bf1d84c0dd95b Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Sun, 30 Oct 2016 15:18:53 +0100 Subject: [PATCH 019/142] Update to cryptsetup 1.7.3. --- .gitignore | 2 +- cryptsetup-1.7.2.tar.sign | 17 ----------------- cryptsetup-1.7.3.tar.sign | 16 ++++++++++++++++ cryptsetup.spec | 7 +++++-- sources | 2 +- 5 files changed, 23 insertions(+), 21 deletions(-) delete mode 100644 cryptsetup-1.7.2.tar.sign create mode 100644 cryptsetup-1.7.3.tar.sign diff --git a/.gitignore b/.gitignore index 450b3c0..f789e26 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/cryptsetup-1.7.2.tar.xz +/cryptsetup-1.7.3.tar.xz diff --git a/cryptsetup-1.7.2.tar.sign b/cryptsetup-1.7.2.tar.sign deleted file mode 100644 index 2de97ff..0000000 --- a/cryptsetup-1.7.2.tar.sign +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQIcBAABCAAGBQJXUsbKAAoJENmwV3vZPpj8bV4QAI7QyOCNpP+++FLHK+RbX4aM -bYMxB589BwPIykUypK8ocaSuht0fPBSOV1+oUnrskRxGvSxAB1XG+TJowWHmsAzq -ZcIYZeIX1r6RdMQIUWIdQfIGLj7MNF6LgS26aFT7ceC64/J8DqQIqEmOzoUlgo22 -Rd/Ii58jOvzbhrj1P8odjdQqu4yYa3t81M9QwzXLFymWB5h769+JaxYtxsRQ1GIH -dcVo5WCv8ECz8yaXFfWNzgNYsNTL9EhPy3dC4nccQy5rjVzoS4BslENzorWCpaVP -j0qSthWDDRcoxzJMEABTTwy5o10LVIMqEuW90370RhA8yfSreX7O7rWShKFszQwy -mXQmt3glS5xk6KRFRwVMCN+31eBzC4kAsIjpWymb6C/ictog6bDB4MovGtUvjF/M -DGAuywnp7wQzE6c6KulVmeyEOWVn/eqSApXE64koKATQ9zVUd/QV8tVL2vwYdyuz -CHIT+OFlvattv6CGU9e3k8g/5YKUo4dWHveQgLeRiSviT60gbRdV/5i3LnxFvHjr -HTGTWOH0U/CjJ5EQxepbS8v18AM3vcCCdjyHrs5JXpIIr6h4I1KQZzjTaP/BPG3+ -nTfEOxxv0cfT6L7zNG+BTDHKEQEgnL1K4JXXEKBWty5XpaVRQlJLlQYqB4rCkOK0 -0VS3WWmzmFExX+iL7Jo1 -=GYgV ------END PGP SIGNATURE----- diff --git a/cryptsetup-1.7.3.tar.sign b/cryptsetup-1.7.3.tar.sign new file mode 100644 index 0000000..8cf8c80 --- /dev/null +++ b/cryptsetup-1.7.3.tar.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIcBAABCAAGBQJYFfvxAAoJENmwV3vZPpj8cRYP/ReaGuHS1nTs0WCl03C77cLI +57fmQH4WpclQy5VIXfJMcgLq7QqQICE8Im8ijpLblg7THPZBMvAzxBxbUdOmjuoV +o39/DZujUhLsYfCEY5Bbb1KRWDcgZB4aKCdoeYgiO37S1Rnn+H9NeT7Jya0N9I42 +l/AuWYaB1kDw8cWeRtvgLA0RGDXUOvcwGkThWYbf8vem/Gt9/R8Dq4/bhLs3/jG1 +o4FaUa2knFCQMRxTeknJcoFbLLAjA5S6CBZYvQGTmdAiA6kza7h9oIaj4/rBxjZ9 +//xjlKWXhTkuNUdxCQ5fO7+46e5ABrkGlD3I5nCs4bKNFuINpl2F+bKkGQu+T9E8 +OBg6xjheg6Gl9NG6t/TF4XgrmK8F9E5fXLiiFzmCx8XHPpc4O9LWZXnB7wCUuZU1 +q85iCjyweKCRyVD+mdSk/aWsus44IN1hJX180tOR4/fwC2qAllO7229x+fVW0Srq +bl8Ru4nCuT1udxLVwD64pYRpRTI1GdTccErKz+W7ERlqU6Gu+RdI9KZ/YQ57yJaL +5VrjCxcW5LrnplQ8U4kumx/gsL4ye64CxKf96JEt4oM/roPP0lk6llOz5QcoISYr +4KFPxg+pDmm4UnjxNAER5mta6swwZlXDMQdWd+ZKeKmgLgv1JWoSo251Mn+CxOdK +159SLGguCjTC9+7WW9sK +=mN2r +-----END PGP SIGNATURE----- diff --git a/cryptsetup.spec b/cryptsetup.spec index 94d0634..08fcd7c 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -2,8 +2,8 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup -Version: 1.7.2 -Release: 3%{?dist} +Version: 1.7.3 +Release: 1%{?dist} License: GPLv2+ and LGPLv2+ Group: Applications/System URL: https://gitlab.com/cryptsetup/cryptsetup @@ -168,6 +168,9 @@ popd %clean %changelog +* Sun Oct 30 2016 Milan Broz - 1.7.3-1 +- Update to cryptsetup 1.7.3. + * Tue Jul 19 2016 Fedora Release Engineering - 1.7.2-3 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages diff --git a/sources b/sources index b4b0ada..914f1b2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a11a140cea496961222170944db01fc1 cryptsetup-1.7.2.tar.xz +7e3fdb1a1cd055cb9c5f847b15230d81 cryptsetup-1.7.3.tar.xz From a4744b07b01a6489a357a27a35bf7e70a2bb3f9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 19 Dec 2016 18:20:36 +0100 Subject: [PATCH 020/142] Rebuild for Python 3.6 --- cryptsetup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index 08fcd7c..e9e2733 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -3,7 +3,7 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup Version: 1.7.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ and LGPLv2+ Group: Applications/System URL: https://gitlab.com/cryptsetup/cryptsetup @@ -168,6 +168,9 @@ popd %clean %changelog +* Mon Dec 19 2016 Miro Hrončok - 1.7.3-2 +- Rebuild for Python 3.6 + * Sun Oct 30 2016 Milan Broz - 1.7.3-1 - Update to cryptsetup 1.7.3. From f0156f049d8f3fd8af0f07189237b65d1299fea9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 08:00:47 +0000 Subject: [PATCH 021/142] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- cryptsetup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index e9e2733..ddb2837 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -3,7 +3,7 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup Version: 1.7.3 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ and LGPLv2+ Group: Applications/System URL: https://gitlab.com/cryptsetup/cryptsetup @@ -168,6 +168,9 @@ popd %clean %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 1.7.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Mon Dec 19 2016 Miro Hrončok - 1.7.3-2 - Rebuild for Python 3.6 From 1cdb36ed15d8a622509531f729753734f281611a Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Wed, 15 Mar 2017 13:32:20 +0100 Subject: [PATCH 022/142] Update to cryptsetup 1.7.4. --- .gitignore | 2 +- cryptsetup-1.7.3.tar.sign | 16 ---------------- cryptsetup-1.7.4.tar.sign | 16 ++++++++++++++++ cryptsetup.spec | 7 +++++-- sources | 2 +- 5 files changed, 23 insertions(+), 20 deletions(-) delete mode 100644 cryptsetup-1.7.3.tar.sign create mode 100644 cryptsetup-1.7.4.tar.sign diff --git a/.gitignore b/.gitignore index f789e26..9c0f4a1 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/cryptsetup-1.7.3.tar.xz +/cryptsetup-1.7.4.tar.xz diff --git a/cryptsetup-1.7.3.tar.sign b/cryptsetup-1.7.3.tar.sign deleted file mode 100644 index 8cf8c80..0000000 --- a/cryptsetup-1.7.3.tar.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIcBAABCAAGBQJYFfvxAAoJENmwV3vZPpj8cRYP/ReaGuHS1nTs0WCl03C77cLI -57fmQH4WpclQy5VIXfJMcgLq7QqQICE8Im8ijpLblg7THPZBMvAzxBxbUdOmjuoV -o39/DZujUhLsYfCEY5Bbb1KRWDcgZB4aKCdoeYgiO37S1Rnn+H9NeT7Jya0N9I42 -l/AuWYaB1kDw8cWeRtvgLA0RGDXUOvcwGkThWYbf8vem/Gt9/R8Dq4/bhLs3/jG1 -o4FaUa2knFCQMRxTeknJcoFbLLAjA5S6CBZYvQGTmdAiA6kza7h9oIaj4/rBxjZ9 -//xjlKWXhTkuNUdxCQ5fO7+46e5ABrkGlD3I5nCs4bKNFuINpl2F+bKkGQu+T9E8 -OBg6xjheg6Gl9NG6t/TF4XgrmK8F9E5fXLiiFzmCx8XHPpc4O9LWZXnB7wCUuZU1 -q85iCjyweKCRyVD+mdSk/aWsus44IN1hJX180tOR4/fwC2qAllO7229x+fVW0Srq -bl8Ru4nCuT1udxLVwD64pYRpRTI1GdTccErKz+W7ERlqU6Gu+RdI9KZ/YQ57yJaL -5VrjCxcW5LrnplQ8U4kumx/gsL4ye64CxKf96JEt4oM/roPP0lk6llOz5QcoISYr -4KFPxg+pDmm4UnjxNAER5mta6swwZlXDMQdWd+ZKeKmgLgv1JWoSo251Mn+CxOdK -159SLGguCjTC9+7WW9sK -=mN2r ------END PGP SIGNATURE----- diff --git a/cryptsetup-1.7.4.tar.sign b/cryptsetup-1.7.4.tar.sign new file mode 100644 index 0000000..c589c01 --- /dev/null +++ b/cryptsetup-1.7.4.tar.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAljJDlYACgkQ2bBXe9k+ +mPyYrw//Y6siSxgAilu0UelfWqgj/8MqbVLFLdjeUE8R0CsoUnYBUJv8Ik2OERyp +hjqa8vkwkwpRGOGjggRkrk2uVtsovIShpWW5Kv9HzRD04CMj3ixxVtDIX/1AwdC3 +BuJJuwTJxnKPVncXcxsP94VCBqpzhgAVMDV7HX2kh/HuVWp0X79vjctPliwijhrz +WDfvI6ntE1QFPGfU6zQb+QmTQtrjAkQXVVwpoHDerXUVhu9BxfNbscpB45cN0PbT +n5HGTFJFXs1uU0QlCejeVAXlZAJIQkhA+QcTcqC2MHSZ6DsGx/ozCiNMRjmDoALf +zne6jhRjuN1DEijNVDu85n6uRk4vi3HDNwxOoMvEb2IdEWwMRpcVmrNWyAwH6oOx +nrzyLyEuQv0u/XWTwlzx56XncfAGOhh6bFldU4aS/w56z3Coh/fSrZnDk991ZMEF +7COirZ7tUV9ON/2epgNx7RYfDcXhTWbGQ6/Cuogj5zWv9quGn+n/GnvuEUDLfLHs +o5CLAzNo5+a8XwOGxkFZO6cnFzadtwBcSEwmRVzvjkpJWIMQLcq2+GtaFxCFOiK+ +NQOKmhuXJ40n+BOx/NMcsGY4tq+WshJUeD3mDPlUEB7gldGFNCSm01btPqaZZ8bI +nXr/CV8pnx9QJUL6C2ou5jUZyCvUXvyKTwMgDIV1qba13kgxrbk= +=ablJ +-----END PGP SIGNATURE----- diff --git a/cryptsetup.spec b/cryptsetup.spec index ddb2837..8a3e093 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -2,8 +2,8 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup -Version: 1.7.3 -Release: 3%{?dist} +Version: 1.7.4 +Release: 1%{?dist} License: GPLv2+ and LGPLv2+ Group: Applications/System URL: https://gitlab.com/cryptsetup/cryptsetup @@ -168,6 +168,9 @@ popd %clean %changelog +* Wed Mar 15 2017 Milan Broz - 1.7.4-1 +- Update to cryptsetup 1.7.4. + * Fri Feb 10 2017 Fedora Release Engineering - 1.7.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 914f1b2..3bdb004 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7e3fdb1a1cd055cb9c5f847b15230d81 cryptsetup-1.7.3.tar.xz +SHA512 (cryptsetup-1.7.4.tar.xz) = c5f58227b38dcc2e2858c4bbcb641acead3b6bcdad0d8d76e5f46936669e4aff4dbc20a2980040341320d35d39f029725a9f20607753cad44f64ac0443b64b71 From b64fb92578bcf24d2a2d2e6e73823e3447f367e7 Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Thu, 27 Apr 2017 12:52:11 +0200 Subject: [PATCH 023/142] Update to cryptsetup 1.7.5. --- .gitignore | 2 +- cryptsetup-1.7.4.tar.sign | 16 ---------------- cryptsetup-1.7.5.tar.sign | 16 ++++++++++++++++ cryptsetup.spec | 5 ++++- sources | 2 +- 5 files changed, 22 insertions(+), 19 deletions(-) delete mode 100644 cryptsetup-1.7.4.tar.sign create mode 100644 cryptsetup-1.7.5.tar.sign diff --git a/.gitignore b/.gitignore index 9c0f4a1..1255129 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/cryptsetup-1.7.4.tar.xz +/cryptsetup-1.7.5.tar.xz diff --git a/cryptsetup-1.7.4.tar.sign b/cryptsetup-1.7.4.tar.sign deleted file mode 100644 index c589c01..0000000 --- a/cryptsetup-1.7.4.tar.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAljJDlYACgkQ2bBXe9k+ -mPyYrw//Y6siSxgAilu0UelfWqgj/8MqbVLFLdjeUE8R0CsoUnYBUJv8Ik2OERyp -hjqa8vkwkwpRGOGjggRkrk2uVtsovIShpWW5Kv9HzRD04CMj3ixxVtDIX/1AwdC3 -BuJJuwTJxnKPVncXcxsP94VCBqpzhgAVMDV7HX2kh/HuVWp0X79vjctPliwijhrz -WDfvI6ntE1QFPGfU6zQb+QmTQtrjAkQXVVwpoHDerXUVhu9BxfNbscpB45cN0PbT -n5HGTFJFXs1uU0QlCejeVAXlZAJIQkhA+QcTcqC2MHSZ6DsGx/ozCiNMRjmDoALf -zne6jhRjuN1DEijNVDu85n6uRk4vi3HDNwxOoMvEb2IdEWwMRpcVmrNWyAwH6oOx -nrzyLyEuQv0u/XWTwlzx56XncfAGOhh6bFldU4aS/w56z3Coh/fSrZnDk991ZMEF -7COirZ7tUV9ON/2epgNx7RYfDcXhTWbGQ6/Cuogj5zWv9quGn+n/GnvuEUDLfLHs -o5CLAzNo5+a8XwOGxkFZO6cnFzadtwBcSEwmRVzvjkpJWIMQLcq2+GtaFxCFOiK+ -NQOKmhuXJ40n+BOx/NMcsGY4tq+WshJUeD3mDPlUEB7gldGFNCSm01btPqaZZ8bI -nXr/CV8pnx9QJUL6C2ou5jUZyCvUXvyKTwMgDIV1qba13kgxrbk= -=ablJ ------END PGP SIGNATURE----- diff --git a/cryptsetup-1.7.5.tar.sign b/cryptsetup-1.7.5.tar.sign new file mode 100644 index 0000000..fde5423 --- /dev/null +++ b/cryptsetup-1.7.5.tar.sign @@ -0,0 +1,16 @@ +-----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.spec b/cryptsetup.spec index 8a3e093..1cb46e4 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -2,7 +2,7 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup -Version: 1.7.4 +Version: 1.7.5 Release: 1%{?dist} License: GPLv2+ and LGPLv2+ Group: Applications/System @@ -168,6 +168,9 @@ popd %clean %changelog +* Thu Apr 27 2017 Milan Broz - 1.7.5-1 +- Update to cryptsetup 1.7.5. + * Wed Mar 15 2017 Milan Broz - 1.7.4-1 - Update to cryptsetup 1.7.4. diff --git a/sources b/sources index 3bdb004..fcbe58e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cryptsetup-1.7.4.tar.xz) = c5f58227b38dcc2e2858c4bbcb641acead3b6bcdad0d8d76e5f46936669e4aff4dbc20a2980040341320d35d39f029725a9f20607753cad44f64ac0443b64b71 +SHA512 (cryptsetup-1.7.5.tar.xz) = d473f7b06d705a3868a70f3767fafc664436b5897ba59025ea1268f815cb80a9076841ff9ff96cc130fb83ba18b03c1eee38cfaf1b471fdd883a3e126b771439 From 298150b163e513a14cc23700e114a882cf170411 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 05:41:47 +0000 Subject: [PATCH 024/142] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- cryptsetup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index 1cb46e4..97a086d 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -3,7 +3,7 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup Version: 1.7.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ and LGPLv2+ Group: Applications/System URL: https://gitlab.com/cryptsetup/cryptsetup @@ -168,6 +168,9 @@ popd %clean %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 1.7.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Thu Apr 27 2017 Milan Broz - 1.7.5-1 - Update to cryptsetup 1.7.5. From 9842899680e7b2daa2f8c47be130633a861b1390 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 19:18:40 +0000 Subject: [PATCH 025/142] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- cryptsetup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index 97a086d..ee91891 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -3,7 +3,7 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup Version: 1.7.5 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ and LGPLv2+ Group: Applications/System URL: https://gitlab.com/cryptsetup/cryptsetup @@ -168,6 +168,9 @@ popd %clean %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 1.7.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 1.7.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From d5f76b67bede8d68bacf32e3132f87ab31c1753e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 19 Aug 2017 09:38:12 -0400 Subject: [PATCH 026/142] Python 2 binary package renamed to python2-cryptsetup --- cryptsetup.spec | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index ee91891..f59966e 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -3,7 +3,7 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup Version: 1.7.5 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ and LGPLv2+ Group: Applications/System URL: https://gitlab.com/cryptsetup/cryptsetup @@ -65,14 +65,17 @@ Requires: cryptsetup-libs = %{version}-%{release} This package contains cryptsetup-reencrypt utility which can be used for offline reencryption of disk in situ. -%package python +%package -n python2-cryptsetup Group: System Environment/Libraries Summary: Python bindings for libcryptsetup Requires: %{name}-libs = %{version}-%{release} -Provides: python-cryptsetup = %{version}-%{release} +%{?python_provide:%python_provide python2-cryptsetup} +# Remove before F30 +Provides: %{name}-python%{?_isa} = %{version}-%{release} +Obsoletes: %{name}-python < %{version}-%{release} Obsoletes: python-cryptsetup < 1.4.0 -%description python +%description -n python2-cryptsetup This package provides Python bindings for libcryptsetup, a library for setting up disk encryption using dm-crypt kernel module. @@ -151,7 +154,7 @@ popd %license COPYING COPYING.LGPL %{_libdir}/libcryptsetup.so.* -%files python +%files -n python2-cryptsetup %{!?_licensedir:%global license %%doc} %license COPYING.LGPL %doc python/pycryptsetup-test.py @@ -168,6 +171,10 @@ popd %clean %changelog +* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 1.7.5-4 +- Python 2 binary package renamed to python2-cryptsetup + See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 + * Wed Aug 02 2017 Fedora Release Engineering - 1.7.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 56cfe019146f89a43056f120b3bbe17b3e8b321a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 20 Aug 2017 09:25:49 -0400 Subject: [PATCH 027/142] Add Provides for the old name without %_isa --- cryptsetup.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index f59966e..57e4d85 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -3,7 +3,7 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup Version: 1.7.5 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ and LGPLv2+ Group: Applications/System URL: https://gitlab.com/cryptsetup/cryptsetup @@ -71,6 +71,7 @@ Summary: Python bindings for libcryptsetup Requires: %{name}-libs = %{version}-%{release} %{?python_provide:%python_provide python2-cryptsetup} # Remove before F30 +Provides: %{name}-python = %{version}-%{release} Provides: %{name}-python%{?_isa} = %{version}-%{release} Obsoletes: %{name}-python < %{version}-%{release} Obsoletes: python-cryptsetup < 1.4.0 @@ -171,6 +172,9 @@ popd %clean %changelog +* Sun Aug 20 2017 Zbigniew Jędrzejewski-Szmek - 1.7.5-5 +- Add Provides for the old name without %%_isa + * Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 1.7.5-4 - Python 2 binary package renamed to python2-cryptsetup See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 From 544bd280c3bc17e097aa48a93db36d846b74cb6e Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Fri, 3 Nov 2017 10:42:21 +0100 Subject: [PATCH 028/142] Update to cryptsetup 2.0.0 rc1 --- .gitignore | 2 +- cryptsetup-1.7.5.tar.sign | 16 ---------------- cryptsetup-2.0.0-rc1.tar.sign | 16 ++++++++++++++++ cryptsetup.spec | 32 ++++++++++++++++++++++++++------ sources | 2 +- 5 files changed, 44 insertions(+), 24 deletions(-) delete mode 100644 cryptsetup-1.7.5.tar.sign create mode 100644 cryptsetup-2.0.0-rc1.tar.sign diff --git a/.gitignore b/.gitignore index 1255129..d690276 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/cryptsetup-1.7.5.tar.xz +/cryptsetup-2.0.0-rc1.tar.xz diff --git a/cryptsetup-1.7.5.tar.sign b/cryptsetup-1.7.5.tar.sign deleted file mode 100644 index fde5423..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-2.0.0-rc1.tar.sign b/cryptsetup-2.0.0-rc1.tar.sign new file mode 100644 index 0000000..ca325f4 --- /dev/null +++ b/cryptsetup-2.0.0-rc1.tar.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAln5lawACgkQ2bBXe9k+ +mPz8iBAAprrjsO4tsOeQJBlMjfg1sTrCnhUjjWjc5qJUpN+dHhqfJgi4NUdQP6Qx +f/S2xTa+fskq2DtskXHVSnwiTaholT0KOVpm8L+Zov+7llQuiOf9e0Qk0bjFKQP8 +UjmEvsPzzkHg8r71N8T/GoPKkWZiGcY/KdIDMgAVxPb9whF0rV2wFJ26ZtDEvxRr +8GIrxmb3YzQjwp+JHklhSreUHmwnEV3s0VNlauOYlaf99oZXyFZ6INbeRpYCjdXJ +JPHYXOhIYv1uVldEsS8GNa+iEZEUCNBQhwkFkS94XLpaY/MDIIXBsL1DRFhFJqjz +7LVLzJf6/S+KEdYZTZFesCcx28puzk4oKyXcwLXbUgHgCn60/UJqYaUc2/tc8NTY +2pue6GcoZp0rbbe9gvPJ5P/0bkM/4IGNXEpfYWbCAUb9vHochg/3FOumE61xoX37 +fYwMctDjTW2xhNlzQlwmMcGJyhUVC4+Epcb3yrHeiw+DqsM5kdjzrvZEkYTquSxv +xnRsteCIsNCwYRrA30epvkiXaeEUlf3dR9CwSWRhp06KsieGIxgvSvoGXh6dWgnF +/eMd1yBRR0Fjt49CkUFxUeCMbPWnNUEjp/7TS/nKvpRieBgyncvgxZVA+FVZ6N+d +cg9uMuQ8rApwOpTFBHU5j2A70i72C+7G5+SHCYSqUvKZTqwPhhw= +=fFiV +-----END PGP SIGNATURE----- diff --git a/cryptsetup.spec b/cryptsetup.spec index 57e4d85..4c5e499 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -2,22 +2,22 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup -Version: 1.7.5 -Release: 5%{?dist} +Version: 2.0.0 +Release: 0.2%{?dist} License: GPLv2+ and LGPLv2+ Group: Applications/System URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: libgcrypt-devel, popt-devel, device-mapper-devel BuildRequires: libgpg-error-devel, libuuid-devel, libsepol-devel BuildRequires: libselinux-devel, python-devel, python3-devel -BuildRequires: libpwquality-devel +BuildRequires: libpwquality-devel, json-c-devel Provides: cryptsetup-luks = %{version}-%{release} Obsoletes: cryptsetup-luks < 1.4.0 Requires: cryptsetup-libs = %{version}-%{release} Requires: libpwquality >= 1.2.0 -%global upstream_version %{version} -Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/cryptsetup-%{upstream_version}.tar.xz +%global upstream_version %{version}-rc1 +Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v2.0/cryptsetup-%{upstream_version}.tar.xz %description The cryptsetup package contains a utility for setting up @@ -56,6 +56,15 @@ Requires: cryptsetup-libs = %{version}-%{release} The veritysetup package contains a utility for setting up disk verification using dm-verity kernel module. +%package -n integritysetup +Group: Applications/System +Summary: A utility for setting up dm-integrity volumes +Requires: cryptsetup-libs = %{version}-%{release} + +%description -n integritysetup +The integritysetup package contains a utility for setting up +disk integrity protection using dm-integrity kernel module. + %package reencrypt Group: Applications/System Summary: A utility for offline reencryption of LUKS encrypted disks. @@ -99,7 +108,7 @@ chmod -x misc/dracut_90reencrypt/* cp -a . %{py3dir} %build -%configure --enable-python --enable-fips --enable-cryptsetup-reencrypt --enable-pwquality %{?configure_pbkdf2} +%configure --enable-python --enable-fips --enable-pwquality %{?configure_pbkdf2} # remove rpath sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool @@ -137,6 +146,12 @@ popd %{_mandir}/man8/veritysetup.8.gz %{_sbindir}/veritysetup +%files -n integritysetup +%{!?_licensedir:%global license %%doc} +%license COPYING +%{_mandir}/man8/integritysetup.8.gz +%{_sbindir}/integritysetup + %files reencrypt %{!?_licensedir:%global license %%doc} %license COPYING @@ -154,6 +169,7 @@ popd %{!?_licensedir:%global license %%doc} %license COPYING COPYING.LGPL %{_libdir}/libcryptsetup.so.* +%{_tmpfilesdir}/cryptsetup.conf %files -n python2-cryptsetup %{!?_licensedir:%global license %%doc} @@ -172,6 +188,10 @@ popd %clean %changelog +* Tue Nov 07 2017 Ondrej Kozina - 2.0.0-0.2 +- Update to cryptsetup 2.0.0-rc1 (with libcryptsetup soname bump). +- Added integritysetup subpackage. + * Sun Aug 20 2017 Zbigniew Jędrzejewski-Szmek - 1.7.5-5 - Add Provides for the old name without %%_isa diff --git a/sources b/sources index fcbe58e..7125d52 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cryptsetup-1.7.5.tar.xz) = d473f7b06d705a3868a70f3767fafc664436b5897ba59025ea1268f815cb80a9076841ff9ff96cc130fb83ba18b03c1eee38cfaf1b471fdd883a3e126b771439 +SHA512 (cryptsetup-2.0.0-rc1.tar.xz) = 397c45b11dd275c2e7da6442a80a92da0de8888a1b9547ae16ee69681c5b63d95253fe0e80ea20a09d14d06d0e138ad349486999f94ce065140f49dcd1dd8427 From 245fb0ba8bb6e9827f03911f89c58621774b552c Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Wed, 8 Nov 2017 13:32:52 +0100 Subject: [PATCH 029/142] Temporary build providing legacy library. --- .gitignore | 1 + cryptsetup.spec | 16 +++++++++++++++- sources | 1 + 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index d690276..1a537b9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /cryptsetup-2.0.0-rc1.tar.xz +/cryptsetup-1.7.5.tar.xz diff --git a/cryptsetup.spec b/cryptsetup.spec index 4c5e499..db9237a 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -3,7 +3,7 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup Version: 2.0.0 -Release: 0.2%{?dist} +Release: 0.3%{?dist} License: GPLv2+ and LGPLv2+ Group: Applications/System URL: https://gitlab.com/cryptsetup/cryptsetup @@ -18,6 +18,7 @@ Requires: libpwquality >= 1.2.0 %global upstream_version %{version}-rc1 Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v2.0/cryptsetup-%{upstream_version}.tar.xz +Source1: https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/cryptsetup-1.7.5.tar.xz %description The cryptsetup package contains a utility for setting up @@ -106,9 +107,16 @@ chmod -x misc/dracut_90reencrypt/* # copy the whole directory for the python3 build cp -a . %{py3dir} +%setup -T -a 1 -D -n cryptsetup-%{upstream_version} %build %configure --enable-python --enable-fips --enable-pwquality %{?configure_pbkdf2} +pushd cryptsetup-1.7.5 +%configure --enable-python --enable-fips --enable-pwquality --enable-cryptsetup-reencrypt %{?configure_pbkdf2} +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool +make %{?_smp_mflags} +popd # remove rpath sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool @@ -120,6 +128,9 @@ make %{?_smp_mflags} popd %install +pushd cryptsetup-1.7.5 +make install DESTDIR=%{buildroot} +popd make install DESTDIR=%{buildroot} rm -rf %{buildroot}/%{_libdir}/*.la @@ -188,6 +199,9 @@ popd %clean %changelog +* Wed Nov 08 2017 Ondrej Kozina - 2.0.0-0.3 +- Temporary build providing legacy library. + * Tue Nov 07 2017 Ondrej Kozina - 2.0.0-0.2 - Update to cryptsetup 2.0.0-rc1 (with libcryptsetup soname bump). - Added integritysetup subpackage. diff --git a/sources b/sources index 7125d52..0ce5130 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (cryptsetup-2.0.0-rc1.tar.xz) = 397c45b11dd275c2e7da6442a80a92da0de8888a1b9547ae16ee69681c5b63d95253fe0e80ea20a09d14d06d0e138ad349486999f94ce065140f49dcd1dd8427 +SHA512 (cryptsetup-1.7.5.tar.xz) = d473f7b06d705a3868a70f3767fafc664436b5897ba59025ea1268f815cb80a9076841ff9ff96cc130fb83ba18b03c1eee38cfaf1b471fdd883a3e126b771439 From 0e8cd2ac4fd405df02e837cb7ef412e7d47edb22 Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Thu, 9 Nov 2017 12:28:51 +0100 Subject: [PATCH 030/142] drop legacy library --- .gitignore | 1 - cryptsetup.spec | 16 ++++------------ sources | 1 - 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 1a537b9..d690276 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ /cryptsetup-2.0.0-rc1.tar.xz -/cryptsetup-1.7.5.tar.xz diff --git a/cryptsetup.spec b/cryptsetup.spec index db9237a..d645958 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -3,7 +3,7 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup Version: 2.0.0 -Release: 0.3%{?dist} +Release: 0.4%{?dist} License: GPLv2+ and LGPLv2+ Group: Applications/System URL: https://gitlab.com/cryptsetup/cryptsetup @@ -18,7 +18,6 @@ Requires: libpwquality >= 1.2.0 %global upstream_version %{version}-rc1 Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v2.0/cryptsetup-%{upstream_version}.tar.xz -Source1: https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/cryptsetup-1.7.5.tar.xz %description The cryptsetup package contains a utility for setting up @@ -107,16 +106,9 @@ chmod -x misc/dracut_90reencrypt/* # copy the whole directory for the python3 build cp -a . %{py3dir} -%setup -T -a 1 -D -n cryptsetup-%{upstream_version} %build %configure --enable-python --enable-fips --enable-pwquality %{?configure_pbkdf2} -pushd cryptsetup-1.7.5 -%configure --enable-python --enable-fips --enable-pwquality --enable-cryptsetup-reencrypt %{?configure_pbkdf2} -sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool -sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -make %{?_smp_mflags} -popd # remove rpath sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool @@ -128,9 +120,6 @@ make %{?_smp_mflags} popd %install -pushd cryptsetup-1.7.5 -make install DESTDIR=%{buildroot} -popd make install DESTDIR=%{buildroot} rm -rf %{buildroot}/%{_libdir}/*.la @@ -199,6 +188,9 @@ popd %clean %changelog +* Thu Nov 09 2017 Ondrej Kozina - 2.0.0-0.4 +- Drop the legacy library. + * Wed Nov 08 2017 Ondrej Kozina - 2.0.0-0.3 - Temporary build providing legacy library. diff --git a/sources b/sources index 0ce5130..7125d52 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ SHA512 (cryptsetup-2.0.0-rc1.tar.xz) = 397c45b11dd275c2e7da6442a80a92da0de8888a1b9547ae16ee69681c5b63d95253fe0e80ea20a09d14d06d0e138ad349486999f94ce065140f49dcd1dd8427 -SHA512 (cryptsetup-1.7.5.tar.xz) = d473f7b06d705a3868a70f3767fafc664436b5897ba59025ea1268f815cb80a9076841ff9ff96cc130fb83ba18b03c1eee38cfaf1b471fdd883a3e126b771439 From bae1dbc35ae2039ffba1ca4243f226b0d9d298ed Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Mon, 20 Nov 2017 17:19:21 +0100 Subject: [PATCH 031/142] Link to system libargon2 instead of using bundled code. --- build-libargon2-fix.patch | 213 ++++++++++++++++++++++++++++++++++++++ cryptsetup.spec | 13 ++- 2 files changed, 222 insertions(+), 4 deletions(-) create mode 100644 build-libargon2-fix.patch diff --git a/build-libargon2-fix.patch b/build-libargon2-fix.patch new file mode 100644 index 0000000..4eb195e --- /dev/null +++ b/build-libargon2-fix.patch @@ -0,0 +1,213 @@ +commit d93ac3c496ac135dd54d848c27796d3cdf5f2418 +Author: Guilhem Moulin +Date: Wed Nov 1 14:58:01 2017 +0100 + + Remove libargon2 code from source tree + + [mbroz: fix for make distcheck] + +diff --git a/Makefile.am b/Makefile.am +index 23d5961..6f8b189 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -29,7 +29,9 @@ include python/Makemodule.am + + include scripts/Makemodule.am + ++if CRYPTO_INTERNAL_ARGON2 + include lib/crypto_backend/argon2/Makemodule.am ++endif + include lib/crypto_backend/Makemodule.am + include lib/Makemodule.am + +@@ -39,7 +41,8 @@ ACLOCAL_AMFLAGS = -I m4 + + DISTCHECK_CONFIGURE_FLAGS = \ + --enable-python \ +- --with-tmpfilesdir=$$dc_install_base/usr/lib/tmpfiles.d ++ --with-tmpfilesdir=$$dc_install_base/usr/lib/tmpfiles.d \ ++ --enable-internal-argon2 + + distclean-local: + -find . -name \*~ -o -name \*.orig -o -name \*.rej | xargs rm -f +diff -rupN a/Makefile.in b/Makefile.in +--- cryptsetup-2.0.0-rc1.old/Makefile.in 2017-11-20 12:54:24.182902262 +0100 ++++ cryptsetup-2.0.0-rc1/Makefile.in 2017-11-20 12:56:19.702622374 +0100 +@@ -99,20 +99,22 @@ sbin_PROGRAMS = $(am__EXEEXT_1) $(am__EX + @INTEGRITYSETUP_TRUE@am__append_3 = man/integritysetup.8 + @PYTHON_CRYPTSETUP_TRUE@am__append_4 = python/pycryptsetup-test.py + @CRYPTSETUP_TMPFILE_TRUE@am__append_5 = scripts/cryptsetup.conf +-@CRYPTO_BACKEND_GCRYPT_TRUE@am__append_6 = lib/crypto_backend/crypto_gcrypt.c +-@CRYPTO_BACKEND_OPENSSL_TRUE@am__append_7 = lib/crypto_backend/crypto_openssl.c +-@CRYPTO_BACKEND_NSS_TRUE@am__append_8 = lib/crypto_backend/crypto_nss.c +-@CRYPTO_BACKEND_KERNEL_TRUE@am__append_9 = lib/crypto_backend/crypto_kernel.c +-@CRYPTO_BACKEND_NETTLE_TRUE@am__append_10 = lib/crypto_backend/crypto_nettle.c +-@CRYPTO_INTERNAL_PBKDF2_TRUE@am__append_11 = lib/crypto_backend/pbkdf2_generic.c +-@CRYPTSETUP_TRUE@am__append_12 = cryptsetup +-@CRYPTSETUP_TRUE@@STATIC_TOOLS_TRUE@am__append_13 = cryptsetup.static +-@VERITYSETUP_TRUE@am__append_14 = veritysetup +-@STATIC_TOOLS_TRUE@@VERITYSETUP_TRUE@am__append_15 = veritysetup.static +-@INTEGRITYSETUP_TRUE@am__append_16 = integritysetup +-@INTEGRITYSETUP_TRUE@@STATIC_TOOLS_TRUE@am__append_17 = integritysetup.static +-@REENCRYPT_TRUE@am__append_18 = cryptsetup-reencrypt +-@REENCRYPT_TRUE@@STATIC_TOOLS_TRUE@am__append_19 = cryptsetup-reencrypt.static ++@CRYPTO_INTERNAL_ARGON2_TRUE@am__append_6 = libargon2.la ++@CRYPTO_INTERNAL_ARGON2_TRUE@am__append_7 = lib/crypto_backend/argon2/LICENSE ++@CRYPTO_BACKEND_GCRYPT_TRUE@am__append_8 = lib/crypto_backend/crypto_gcrypt.c ++@CRYPTO_BACKEND_OPENSSL_TRUE@am__append_9 = lib/crypto_backend/crypto_openssl.c ++@CRYPTO_BACKEND_NSS_TRUE@am__append_10 = lib/crypto_backend/crypto_nss.c ++@CRYPTO_BACKEND_KERNEL_TRUE@am__append_11 = lib/crypto_backend/crypto_kernel.c ++@CRYPTO_BACKEND_NETTLE_TRUE@am__append_12 = lib/crypto_backend/crypto_nettle.c ++@CRYPTO_INTERNAL_PBKDF2_TRUE@am__append_13 = lib/crypto_backend/pbkdf2_generic.c ++@CRYPTSETUP_TRUE@am__append_14 = cryptsetup ++@CRYPTSETUP_TRUE@@STATIC_TOOLS_TRUE@am__append_15 = cryptsetup.static ++@VERITYSETUP_TRUE@am__append_16 = veritysetup ++@STATIC_TOOLS_TRUE@@VERITYSETUP_TRUE@am__append_17 = veritysetup.static ++@INTEGRITYSETUP_TRUE@am__append_18 = integritysetup ++@INTEGRITYSETUP_TRUE@@STATIC_TOOLS_TRUE@am__append_19 = integritysetup.static ++@REENCRYPT_TRUE@am__append_20 = cryptsetup-reencrypt ++@REENCRYPT_TRUE@@STATIC_TOOLS_TRUE@am__append_21 = cryptsetup-reencrypt.static + subdir = . + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ +@@ -167,14 +169,27 @@ am__installdirs = "$(DESTDIR)$(libdir)" + LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) \ + $(pyexec_LTLIBRARIES) + libargon2_la_LIBADD = ++am__libargon2_la_SOURCES_DIST = \ ++ lib/crypto_backend/argon2/blake2/blake2b.c \ ++ lib/crypto_backend/argon2/blake2/blake2.h \ ++ lib/crypto_backend/argon2/blake2/blake2-impl.h \ ++ lib/crypto_backend/argon2/blake2/blamka-round-ref.h \ ++ lib/crypto_backend/argon2/argon2.c \ ++ lib/crypto_backend/argon2/argon2.h \ ++ lib/crypto_backend/argon2/core.c \ ++ lib/crypto_backend/argon2/core.h \ ++ lib/crypto_backend/argon2/encoding.c \ ++ lib/crypto_backend/argon2/encoding.h \ ++ lib/crypto_backend/argon2/ref.c \ ++ lib/crypto_backend/argon2/thread.c \ ++ lib/crypto_backend/argon2/thread.h + am__dirstamp = $(am__leading_dot)dirstamp +-am_libargon2_la_OBJECTS = \ +- lib/crypto_backend/argon2/blake2/libargon2_la-blake2b.lo \ +- lib/crypto_backend/argon2/libargon2_la-argon2.lo \ +- lib/crypto_backend/argon2/libargon2_la-core.lo \ +- lib/crypto_backend/argon2/libargon2_la-encoding.lo \ +- lib/crypto_backend/argon2/libargon2_la-ref.lo \ +- lib/crypto_backend/argon2/libargon2_la-thread.lo ++@CRYPTO_INTERNAL_ARGON2_TRUE@am_libargon2_la_OBJECTS = lib/crypto_backend/argon2/blake2/libargon2_la-blake2b.lo \ ++@CRYPTO_INTERNAL_ARGON2_TRUE@ lib/crypto_backend/argon2/libargon2_la-argon2.lo \ ++@CRYPTO_INTERNAL_ARGON2_TRUE@ lib/crypto_backend/argon2/libargon2_la-core.lo \ ++@CRYPTO_INTERNAL_ARGON2_TRUE@ lib/crypto_backend/argon2/libargon2_la-encoding.lo \ ++@CRYPTO_INTERNAL_ARGON2_TRUE@ lib/crypto_backend/argon2/libargon2_la-ref.lo \ ++@CRYPTO_INTERNAL_ARGON2_TRUE@ lib/crypto_backend/argon2/libargon2_la-thread.lo + libargon2_la_OBJECTS = $(am_libargon2_la_OBJECTS) + AM_V_lt = $(am__v_lt_@AM_V@) + am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +@@ -183,6 +198,7 @@ am__v_lt_1 = + libargon2_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libargon2_la_CFLAGS) \ + $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++@CRYPTO_INTERNAL_ARGON2_TRUE@am_libargon2_la_rpath = + am__libcrypto_backend_la_SOURCES_DIST = \ + lib/crypto_backend/crypto_backend.h \ + lib/crypto_backend/crypto_cipher_kernel.c \ +@@ -423,7 +439,7 @@ SOURCES = $(libargon2_la_SOURCES) $(libc + $(cryptsetup_static_SOURCES) $(integritysetup_SOURCES) \ + $(integritysetup_static_SOURCES) $(veritysetup_SOURCES) \ + $(veritysetup_static_SOURCES) +-DIST_SOURCES = $(libargon2_la_SOURCES) \ ++DIST_SOURCES = $(am__libargon2_la_SOURCES_DIST) \ + $(am__libcrypto_backend_la_SOURCES_DIST) \ + $(libcryptsetup_la_SOURCES) \ + $(am__pycryptsetup_la_SOURCES_DIST) \ +@@ -741,8 +757,7 @@ top_srcdir = @top_srcdir@ + EXTRA_DIST = COPYING.LGPL FAQ docs misc man/cryptsetup.8 \ + man/integritysetup.8 man/veritysetup.8 \ + man/cryptsetup-reencrypt.8 python/pycryptsetup-test.py \ +- lib/crypto_backend/argon2/LICENSE lib/libcryptsetup.pc.in \ +- lib/libcryptsetup.sym ++ $(am__append_7) lib/libcryptsetup.pc.in lib/libcryptsetup.sym + SUBDIRS = po tests + TESTS = $(am__append_4) + CLEANFILES = python/*.img +@@ -760,7 +775,7 @@ AM_CPPFLAGS = \ + AM_CFLAGS = -Wall + AM_LDFLAGS = + tmpfilesddir = @DEFAULT_TMPFILESDIR@ +-noinst_LTLIBRARIES = libargon2.la libcrypto_backend.la ++noinst_LTLIBRARIES = $(am__append_6) libcrypto_backend.la + man8_MANS = man/cryptsetup.8 $(am__append_1) $(am__append_2) \ + $(am__append_3) + tmpfilesd_DATA = $(am__append_5) +@@ -769,31 +784,31 @@ tmpfilesd_DATA = $(am__append_5) + @PYTHON_CRYPTSETUP_TRUE@pycryptsetup_la_CPPFLAGS = $(AM_CPPFLAGS) $(PYTHON_CPPFLAGS) $(PYTHON_INCLUDES) -fno-strict-aliasing + @PYTHON_CRYPTSETUP_TRUE@pycryptsetup_la_LDFLAGS = -avoid-version -module -shared -export-dynamic + @PYTHON_CRYPTSETUP_TRUE@pycryptsetup_la_LIBADD = libcryptsetup.la $(PYTHON_LIBS) +-libargon2_la_CFLAGS = $(AM_CFLAGS) -std=c89 -pthread -O3 +-libargon2_la_CPPFLAGS = $(AM_CPPFLAGS) -I lib/crypto_backend/argon2/blake2 +-libargon2_la_SOURCES = \ +- lib/crypto_backend/argon2/blake2/blake2b.c \ +- lib/crypto_backend/argon2/blake2/blake2.h \ +- lib/crypto_backend/argon2/blake2/blake2-impl.h \ +- lib/crypto_backend/argon2/blake2/blamka-round-ref.h \ +- lib/crypto_backend/argon2/argon2.c \ +- lib/crypto_backend/argon2/argon2.h \ +- lib/crypto_backend/argon2/core.c \ +- lib/crypto_backend/argon2/core.h \ +- lib/crypto_backend/argon2/encoding.c \ +- lib/crypto_backend/argon2/encoding.h \ +- lib/crypto_backend/argon2/ref.c \ +- lib/crypto_backend/argon2/thread.c \ +- lib/crypto_backend/argon2/thread.h ++@CRYPTO_INTERNAL_ARGON2_TRUE@libargon2_la_CFLAGS = $(AM_CFLAGS) -std=c89 -pthread -O3 ++@CRYPTO_INTERNAL_ARGON2_TRUE@libargon2_la_CPPFLAGS = $(AM_CPPFLAGS) -I lib/crypto_backend/argon2/blake2 ++@CRYPTO_INTERNAL_ARGON2_TRUE@libargon2_la_SOURCES = \ ++@CRYPTO_INTERNAL_ARGON2_TRUE@ lib/crypto_backend/argon2/blake2/blake2b.c \ ++@CRYPTO_INTERNAL_ARGON2_TRUE@ lib/crypto_backend/argon2/blake2/blake2.h \ ++@CRYPTO_INTERNAL_ARGON2_TRUE@ lib/crypto_backend/argon2/blake2/blake2-impl.h \ ++@CRYPTO_INTERNAL_ARGON2_TRUE@ lib/crypto_backend/argon2/blake2/blamka-round-ref.h \ ++@CRYPTO_INTERNAL_ARGON2_TRUE@ lib/crypto_backend/argon2/argon2.c \ ++@CRYPTO_INTERNAL_ARGON2_TRUE@ lib/crypto_backend/argon2/argon2.h \ ++@CRYPTO_INTERNAL_ARGON2_TRUE@ lib/crypto_backend/argon2/core.c \ ++@CRYPTO_INTERNAL_ARGON2_TRUE@ lib/crypto_backend/argon2/core.h \ ++@CRYPTO_INTERNAL_ARGON2_TRUE@ lib/crypto_backend/argon2/encoding.c \ ++@CRYPTO_INTERNAL_ARGON2_TRUE@ lib/crypto_backend/argon2/encoding.h \ ++@CRYPTO_INTERNAL_ARGON2_TRUE@ lib/crypto_backend/argon2/ref.c \ ++@CRYPTO_INTERNAL_ARGON2_TRUE@ lib/crypto_backend/argon2/thread.c \ ++@CRYPTO_INTERNAL_ARGON2_TRUE@ lib/crypto_backend/argon2/thread.h + + libcrypto_backend_la_CFLAGS = $(AM_CFLAGS) @CRYPTO_CFLAGS@ + libcrypto_backend_la_SOURCES = lib/crypto_backend/crypto_backend.h \ + lib/crypto_backend/crypto_cipher_kernel.c \ + lib/crypto_backend/crypto_storage.c \ + lib/crypto_backend/pbkdf_check.c lib/crypto_backend/crc32.c \ +- lib/crypto_backend/argon2_generic.c $(am__append_6) \ +- $(am__append_7) $(am__append_8) $(am__append_9) \ +- $(am__append_10) $(am__append_11) ++ lib/crypto_backend/argon2_generic.c $(am__append_8) \ ++ $(am__append_9) $(am__append_10) $(am__append_11) \ ++ $(am__append_12) $(am__append_13) + @CRYPTO_INTERNAL_ARGON2_TRUE@libcrypto_backend_la_DEPENDENCIES = libargon2.la + @CRYPTO_INTERNAL_ARGON2_TRUE@libcrypto_backend_la_LIBADD = libargon2.la + pkgconfigdir = $(libdir)/pkgconfig +@@ -976,7 +991,8 @@ libcryptsetup_la_SOURCES = \ + ACLOCAL_AMFLAGS = -I m4 + DISTCHECK_CONFIGURE_FLAGS = \ + --enable-python \ +- --with-tmpfilesdir=$$dc_install_base/usr/lib/tmpfiles.d ++ --with-tmpfilesdir=$$dc_install_base/usr/lib/tmpfiles.d \ ++ --enable-internal-argon2 + + all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive +@@ -1149,7 +1165,7 @@ lib/crypto_backend/argon2/libargon2_la-t + lib/crypto_backend/argon2/$(DEPDIR)/$(am__dirstamp) + + libargon2.la: $(libargon2_la_OBJECTS) $(libargon2_la_DEPENDENCIES) $(EXTRA_libargon2_la_DEPENDENCIES) +- $(AM_V_CCLD)$(libargon2_la_LINK) $(libargon2_la_OBJECTS) $(libargon2_la_LIBADD) $(LIBS) ++ $(AM_V_CCLD)$(libargon2_la_LINK) $(am_libargon2_la_rpath) $(libargon2_la_OBJECTS) $(libargon2_la_LIBADD) $(LIBS) + lib/crypto_backend/$(am__dirstamp): + @$(MKDIR_P) lib/crypto_backend + @: > lib/crypto_backend/$(am__dirstamp) diff --git a/cryptsetup.spec b/cryptsetup.spec index d645958..43664ce 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -3,14 +3,14 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup Version: 2.0.0 -Release: 0.4%{?dist} +Release: 0.5%{?dist} License: GPLv2+ and LGPLv2+ Group: Applications/System URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: libgcrypt-devel, popt-devel, device-mapper-devel BuildRequires: libgpg-error-devel, libuuid-devel, libsepol-devel BuildRequires: libselinux-devel, python-devel, python3-devel -BuildRequires: libpwquality-devel, json-c-devel +BuildRequires: libpwquality-devel, json-c-devel, libargon2-devel Provides: cryptsetup-luks = %{version}-%{release} Obsoletes: cryptsetup-luks < 1.4.0 Requires: cryptsetup-libs = %{version}-%{release} @@ -18,6 +18,7 @@ Requires: libpwquality >= 1.2.0 %global upstream_version %{version}-rc1 Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v2.0/cryptsetup-%{upstream_version}.tar.xz +Patch0: build-libargon2-fix.patch %description The cryptsetup package contains a utility for setting up @@ -101,6 +102,7 @@ for setting up disk encryption using dm-crypt kernel module. %prep %setup -q -n cryptsetup-%{upstream_version} +%patch0 -p1 chmod -x python/pycryptsetup-test.py chmod -x misc/dracut_90reencrypt/* @@ -108,14 +110,14 @@ chmod -x misc/dracut_90reencrypt/* cp -a . %{py3dir} %build -%configure --enable-python --enable-fips --enable-pwquality %{?configure_pbkdf2} +%configure --enable-python --enable-fips --enable-pwquality --enable-libargon2 %{?configure_pbkdf2} # remove rpath sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool make %{?_smp_mflags} pushd %{py3dir} -%configure --enable-python --with-python_version=3 +%configure --enable-python --with-python_version=3 --enable-fips --enable-pwquality --enable-libargon2 %{?configure_pbkdf2} make %{?_smp_mflags} popd @@ -188,6 +190,9 @@ popd %clean %changelog +* Mon Nov 20 2017 Milan Broz - 2.0.0-0.5 +- Link to system libargon2 instead of using bundled code. + * Thu Nov 09 2017 Ondrej Kozina - 2.0.0-0.4 - Drop the legacy library. From 25929b2a0d009abd346ca4388f0fb5232290fdeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sun, 10 Dec 2017 20:50:31 +0100 Subject: [PATCH 032/142] Rebuilt for libjson-c.so.3 --- cryptsetup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index 43664ce..2021087 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -3,7 +3,7 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup Version: 2.0.0 -Release: 0.5%{?dist} +Release: 0.6%{?dist} License: GPLv2+ and LGPLv2+ Group: Applications/System URL: https://gitlab.com/cryptsetup/cryptsetup @@ -190,6 +190,9 @@ popd %clean %changelog +* Sun Dec 10 2017 Björn Esser - 2.0.0-0.6 +- Rebuilt for libjson-c.so.3 + * Mon Nov 20 2017 Milan Broz - 2.0.0-0.5 - Link to system libargon2 instead of using bundled code. From 296729ba36af054bff1a3230e4c166c77e2c1ac3 Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Tue, 12 Dec 2017 10:55:01 +0100 Subject: [PATCH 033/142] Update to cryptsetup 2.0.0 (final) --- .gitignore | 2 +- build-libargon2-fix.patch | 213 -------------------------------------- cryptsetup.spec | 9 +- sources | 2 +- 4 files changed, 7 insertions(+), 219 deletions(-) delete mode 100644 build-libargon2-fix.patch diff --git a/.gitignore b/.gitignore index d690276..be5cef5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/cryptsetup-2.0.0-rc1.tar.xz +/cryptsetup-2.0.0.tar.xz diff --git a/build-libargon2-fix.patch b/build-libargon2-fix.patch deleted file mode 100644 index 4eb195e..0000000 --- a/build-libargon2-fix.patch +++ /dev/null @@ -1,213 +0,0 @@ -commit d93ac3c496ac135dd54d848c27796d3cdf5f2418 -Author: Guilhem Moulin -Date: Wed Nov 1 14:58:01 2017 +0100 - - Remove libargon2 code from source tree - - [mbroz: fix for make distcheck] - -diff --git a/Makefile.am b/Makefile.am -index 23d5961..6f8b189 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -29,7 +29,9 @@ include python/Makemodule.am - - include scripts/Makemodule.am - -+if CRYPTO_INTERNAL_ARGON2 - include lib/crypto_backend/argon2/Makemodule.am -+endif - include lib/crypto_backend/Makemodule.am - include lib/Makemodule.am - -@@ -39,7 +41,8 @@ ACLOCAL_AMFLAGS = -I m4 - - DISTCHECK_CONFIGURE_FLAGS = \ - --enable-python \ -- --with-tmpfilesdir=$$dc_install_base/usr/lib/tmpfiles.d -+ --with-tmpfilesdir=$$dc_install_base/usr/lib/tmpfiles.d \ -+ --enable-internal-argon2 - - distclean-local: - -find . -name \*~ -o -name \*.orig -o -name \*.rej | xargs rm -f -diff -rupN a/Makefile.in b/Makefile.in ---- cryptsetup-2.0.0-rc1.old/Makefile.in 2017-11-20 12:54:24.182902262 +0100 -+++ cryptsetup-2.0.0-rc1/Makefile.in 2017-11-20 12:56:19.702622374 +0100 -@@ -99,20 +99,22 @@ sbin_PROGRAMS = $(am__EXEEXT_1) $(am__EX - @INTEGRITYSETUP_TRUE@am__append_3 = man/integritysetup.8 - @PYTHON_CRYPTSETUP_TRUE@am__append_4 = python/pycryptsetup-test.py - @CRYPTSETUP_TMPFILE_TRUE@am__append_5 = scripts/cryptsetup.conf --@CRYPTO_BACKEND_GCRYPT_TRUE@am__append_6 = lib/crypto_backend/crypto_gcrypt.c --@CRYPTO_BACKEND_OPENSSL_TRUE@am__append_7 = lib/crypto_backend/crypto_openssl.c --@CRYPTO_BACKEND_NSS_TRUE@am__append_8 = lib/crypto_backend/crypto_nss.c --@CRYPTO_BACKEND_KERNEL_TRUE@am__append_9 = lib/crypto_backend/crypto_kernel.c --@CRYPTO_BACKEND_NETTLE_TRUE@am__append_10 = lib/crypto_backend/crypto_nettle.c --@CRYPTO_INTERNAL_PBKDF2_TRUE@am__append_11 = lib/crypto_backend/pbkdf2_generic.c --@CRYPTSETUP_TRUE@am__append_12 = cryptsetup --@CRYPTSETUP_TRUE@@STATIC_TOOLS_TRUE@am__append_13 = cryptsetup.static --@VERITYSETUP_TRUE@am__append_14 = veritysetup --@STATIC_TOOLS_TRUE@@VERITYSETUP_TRUE@am__append_15 = veritysetup.static --@INTEGRITYSETUP_TRUE@am__append_16 = integritysetup --@INTEGRITYSETUP_TRUE@@STATIC_TOOLS_TRUE@am__append_17 = integritysetup.static --@REENCRYPT_TRUE@am__append_18 = cryptsetup-reencrypt --@REENCRYPT_TRUE@@STATIC_TOOLS_TRUE@am__append_19 = cryptsetup-reencrypt.static -+@CRYPTO_INTERNAL_ARGON2_TRUE@am__append_6 = libargon2.la -+@CRYPTO_INTERNAL_ARGON2_TRUE@am__append_7 = lib/crypto_backend/argon2/LICENSE -+@CRYPTO_BACKEND_GCRYPT_TRUE@am__append_8 = lib/crypto_backend/crypto_gcrypt.c -+@CRYPTO_BACKEND_OPENSSL_TRUE@am__append_9 = lib/crypto_backend/crypto_openssl.c -+@CRYPTO_BACKEND_NSS_TRUE@am__append_10 = lib/crypto_backend/crypto_nss.c -+@CRYPTO_BACKEND_KERNEL_TRUE@am__append_11 = lib/crypto_backend/crypto_kernel.c -+@CRYPTO_BACKEND_NETTLE_TRUE@am__append_12 = lib/crypto_backend/crypto_nettle.c -+@CRYPTO_INTERNAL_PBKDF2_TRUE@am__append_13 = lib/crypto_backend/pbkdf2_generic.c -+@CRYPTSETUP_TRUE@am__append_14 = cryptsetup -+@CRYPTSETUP_TRUE@@STATIC_TOOLS_TRUE@am__append_15 = cryptsetup.static -+@VERITYSETUP_TRUE@am__append_16 = veritysetup -+@STATIC_TOOLS_TRUE@@VERITYSETUP_TRUE@am__append_17 = veritysetup.static -+@INTEGRITYSETUP_TRUE@am__append_18 = integritysetup -+@INTEGRITYSETUP_TRUE@@STATIC_TOOLS_TRUE@am__append_19 = integritysetup.static -+@REENCRYPT_TRUE@am__append_20 = cryptsetup-reencrypt -+@REENCRYPT_TRUE@@STATIC_TOOLS_TRUE@am__append_21 = cryptsetup-reencrypt.static - subdir = . - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ -@@ -167,14 +169,27 @@ am__installdirs = "$(DESTDIR)$(libdir)" - LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) \ - $(pyexec_LTLIBRARIES) - libargon2_la_LIBADD = -+am__libargon2_la_SOURCES_DIST = \ -+ lib/crypto_backend/argon2/blake2/blake2b.c \ -+ lib/crypto_backend/argon2/blake2/blake2.h \ -+ lib/crypto_backend/argon2/blake2/blake2-impl.h \ -+ lib/crypto_backend/argon2/blake2/blamka-round-ref.h \ -+ lib/crypto_backend/argon2/argon2.c \ -+ lib/crypto_backend/argon2/argon2.h \ -+ lib/crypto_backend/argon2/core.c \ -+ lib/crypto_backend/argon2/core.h \ -+ lib/crypto_backend/argon2/encoding.c \ -+ lib/crypto_backend/argon2/encoding.h \ -+ lib/crypto_backend/argon2/ref.c \ -+ lib/crypto_backend/argon2/thread.c \ -+ lib/crypto_backend/argon2/thread.h - am__dirstamp = $(am__leading_dot)dirstamp --am_libargon2_la_OBJECTS = \ -- lib/crypto_backend/argon2/blake2/libargon2_la-blake2b.lo \ -- lib/crypto_backend/argon2/libargon2_la-argon2.lo \ -- lib/crypto_backend/argon2/libargon2_la-core.lo \ -- lib/crypto_backend/argon2/libargon2_la-encoding.lo \ -- lib/crypto_backend/argon2/libargon2_la-ref.lo \ -- lib/crypto_backend/argon2/libargon2_la-thread.lo -+@CRYPTO_INTERNAL_ARGON2_TRUE@am_libargon2_la_OBJECTS = lib/crypto_backend/argon2/blake2/libargon2_la-blake2b.lo \ -+@CRYPTO_INTERNAL_ARGON2_TRUE@ lib/crypto_backend/argon2/libargon2_la-argon2.lo \ -+@CRYPTO_INTERNAL_ARGON2_TRUE@ lib/crypto_backend/argon2/libargon2_la-core.lo \ -+@CRYPTO_INTERNAL_ARGON2_TRUE@ lib/crypto_backend/argon2/libargon2_la-encoding.lo \ -+@CRYPTO_INTERNAL_ARGON2_TRUE@ lib/crypto_backend/argon2/libargon2_la-ref.lo \ -+@CRYPTO_INTERNAL_ARGON2_TRUE@ lib/crypto_backend/argon2/libargon2_la-thread.lo - libargon2_la_OBJECTS = $(am_libargon2_la_OBJECTS) - AM_V_lt = $(am__v_lt_@AM_V@) - am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -@@ -183,6 +198,7 @@ am__v_lt_1 = - libargon2_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libargon2_la_CFLAGS) \ - $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+@CRYPTO_INTERNAL_ARGON2_TRUE@am_libargon2_la_rpath = - am__libcrypto_backend_la_SOURCES_DIST = \ - lib/crypto_backend/crypto_backend.h \ - lib/crypto_backend/crypto_cipher_kernel.c \ -@@ -423,7 +439,7 @@ SOURCES = $(libargon2_la_SOURCES) $(libc - $(cryptsetup_static_SOURCES) $(integritysetup_SOURCES) \ - $(integritysetup_static_SOURCES) $(veritysetup_SOURCES) \ - $(veritysetup_static_SOURCES) --DIST_SOURCES = $(libargon2_la_SOURCES) \ -+DIST_SOURCES = $(am__libargon2_la_SOURCES_DIST) \ - $(am__libcrypto_backend_la_SOURCES_DIST) \ - $(libcryptsetup_la_SOURCES) \ - $(am__pycryptsetup_la_SOURCES_DIST) \ -@@ -741,8 +757,7 @@ top_srcdir = @top_srcdir@ - EXTRA_DIST = COPYING.LGPL FAQ docs misc man/cryptsetup.8 \ - man/integritysetup.8 man/veritysetup.8 \ - man/cryptsetup-reencrypt.8 python/pycryptsetup-test.py \ -- lib/crypto_backend/argon2/LICENSE lib/libcryptsetup.pc.in \ -- lib/libcryptsetup.sym -+ $(am__append_7) lib/libcryptsetup.pc.in lib/libcryptsetup.sym - SUBDIRS = po tests - TESTS = $(am__append_4) - CLEANFILES = python/*.img -@@ -760,7 +775,7 @@ AM_CPPFLAGS = \ - AM_CFLAGS = -Wall - AM_LDFLAGS = - tmpfilesddir = @DEFAULT_TMPFILESDIR@ --noinst_LTLIBRARIES = libargon2.la libcrypto_backend.la -+noinst_LTLIBRARIES = $(am__append_6) libcrypto_backend.la - man8_MANS = man/cryptsetup.8 $(am__append_1) $(am__append_2) \ - $(am__append_3) - tmpfilesd_DATA = $(am__append_5) -@@ -769,31 +784,31 @@ tmpfilesd_DATA = $(am__append_5) - @PYTHON_CRYPTSETUP_TRUE@pycryptsetup_la_CPPFLAGS = $(AM_CPPFLAGS) $(PYTHON_CPPFLAGS) $(PYTHON_INCLUDES) -fno-strict-aliasing - @PYTHON_CRYPTSETUP_TRUE@pycryptsetup_la_LDFLAGS = -avoid-version -module -shared -export-dynamic - @PYTHON_CRYPTSETUP_TRUE@pycryptsetup_la_LIBADD = libcryptsetup.la $(PYTHON_LIBS) --libargon2_la_CFLAGS = $(AM_CFLAGS) -std=c89 -pthread -O3 --libargon2_la_CPPFLAGS = $(AM_CPPFLAGS) -I lib/crypto_backend/argon2/blake2 --libargon2_la_SOURCES = \ -- lib/crypto_backend/argon2/blake2/blake2b.c \ -- lib/crypto_backend/argon2/blake2/blake2.h \ -- lib/crypto_backend/argon2/blake2/blake2-impl.h \ -- lib/crypto_backend/argon2/blake2/blamka-round-ref.h \ -- lib/crypto_backend/argon2/argon2.c \ -- lib/crypto_backend/argon2/argon2.h \ -- lib/crypto_backend/argon2/core.c \ -- lib/crypto_backend/argon2/core.h \ -- lib/crypto_backend/argon2/encoding.c \ -- lib/crypto_backend/argon2/encoding.h \ -- lib/crypto_backend/argon2/ref.c \ -- lib/crypto_backend/argon2/thread.c \ -- lib/crypto_backend/argon2/thread.h -+@CRYPTO_INTERNAL_ARGON2_TRUE@libargon2_la_CFLAGS = $(AM_CFLAGS) -std=c89 -pthread -O3 -+@CRYPTO_INTERNAL_ARGON2_TRUE@libargon2_la_CPPFLAGS = $(AM_CPPFLAGS) -I lib/crypto_backend/argon2/blake2 -+@CRYPTO_INTERNAL_ARGON2_TRUE@libargon2_la_SOURCES = \ -+@CRYPTO_INTERNAL_ARGON2_TRUE@ lib/crypto_backend/argon2/blake2/blake2b.c \ -+@CRYPTO_INTERNAL_ARGON2_TRUE@ lib/crypto_backend/argon2/blake2/blake2.h \ -+@CRYPTO_INTERNAL_ARGON2_TRUE@ lib/crypto_backend/argon2/blake2/blake2-impl.h \ -+@CRYPTO_INTERNAL_ARGON2_TRUE@ lib/crypto_backend/argon2/blake2/blamka-round-ref.h \ -+@CRYPTO_INTERNAL_ARGON2_TRUE@ lib/crypto_backend/argon2/argon2.c \ -+@CRYPTO_INTERNAL_ARGON2_TRUE@ lib/crypto_backend/argon2/argon2.h \ -+@CRYPTO_INTERNAL_ARGON2_TRUE@ lib/crypto_backend/argon2/core.c \ -+@CRYPTO_INTERNAL_ARGON2_TRUE@ lib/crypto_backend/argon2/core.h \ -+@CRYPTO_INTERNAL_ARGON2_TRUE@ lib/crypto_backend/argon2/encoding.c \ -+@CRYPTO_INTERNAL_ARGON2_TRUE@ lib/crypto_backend/argon2/encoding.h \ -+@CRYPTO_INTERNAL_ARGON2_TRUE@ lib/crypto_backend/argon2/ref.c \ -+@CRYPTO_INTERNAL_ARGON2_TRUE@ lib/crypto_backend/argon2/thread.c \ -+@CRYPTO_INTERNAL_ARGON2_TRUE@ lib/crypto_backend/argon2/thread.h - - libcrypto_backend_la_CFLAGS = $(AM_CFLAGS) @CRYPTO_CFLAGS@ - libcrypto_backend_la_SOURCES = lib/crypto_backend/crypto_backend.h \ - lib/crypto_backend/crypto_cipher_kernel.c \ - lib/crypto_backend/crypto_storage.c \ - lib/crypto_backend/pbkdf_check.c lib/crypto_backend/crc32.c \ -- lib/crypto_backend/argon2_generic.c $(am__append_6) \ -- $(am__append_7) $(am__append_8) $(am__append_9) \ -- $(am__append_10) $(am__append_11) -+ lib/crypto_backend/argon2_generic.c $(am__append_8) \ -+ $(am__append_9) $(am__append_10) $(am__append_11) \ -+ $(am__append_12) $(am__append_13) - @CRYPTO_INTERNAL_ARGON2_TRUE@libcrypto_backend_la_DEPENDENCIES = libargon2.la - @CRYPTO_INTERNAL_ARGON2_TRUE@libcrypto_backend_la_LIBADD = libargon2.la - pkgconfigdir = $(libdir)/pkgconfig -@@ -976,7 +991,8 @@ libcryptsetup_la_SOURCES = \ - ACLOCAL_AMFLAGS = -I m4 - DISTCHECK_CONFIGURE_FLAGS = \ - --enable-python \ -- --with-tmpfilesdir=$$dc_install_base/usr/lib/tmpfiles.d -+ --with-tmpfilesdir=$$dc_install_base/usr/lib/tmpfiles.d \ -+ --enable-internal-argon2 - - all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive -@@ -1149,7 +1165,7 @@ lib/crypto_backend/argon2/libargon2_la-t - lib/crypto_backend/argon2/$(DEPDIR)/$(am__dirstamp) - - libargon2.la: $(libargon2_la_OBJECTS) $(libargon2_la_DEPENDENCIES) $(EXTRA_libargon2_la_DEPENDENCIES) -- $(AM_V_CCLD)$(libargon2_la_LINK) $(libargon2_la_OBJECTS) $(libargon2_la_LIBADD) $(LIBS) -+ $(AM_V_CCLD)$(libargon2_la_LINK) $(am_libargon2_la_rpath) $(libargon2_la_OBJECTS) $(libargon2_la_LIBADD) $(LIBS) - lib/crypto_backend/$(am__dirstamp): - @$(MKDIR_P) lib/crypto_backend - @: > lib/crypto_backend/$(am__dirstamp) diff --git a/cryptsetup.spec b/cryptsetup.spec index 2021087..c996e9d 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -3,7 +3,7 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup Version: 2.0.0 -Release: 0.6%{?dist} +Release: 1%{?dist} License: GPLv2+ and LGPLv2+ Group: Applications/System URL: https://gitlab.com/cryptsetup/cryptsetup @@ -16,9 +16,8 @@ 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 -Patch0: build-libargon2-fix.patch %description The cryptsetup package contains a utility for setting up @@ -102,7 +101,6 @@ for setting up disk encryption using dm-crypt kernel module. %prep %setup -q -n cryptsetup-%{upstream_version} -%patch0 -p1 chmod -x python/pycryptsetup-test.py chmod -x misc/dracut_90reencrypt/* @@ -190,6 +188,9 @@ popd %clean %changelog +* Tue Dec 12 2017 Ondrej Kozina - 2.0.0-1 +- Update to cryptsetup 2.0.0 (final). + * Sun Dec 10 2017 Björn Esser - 2.0.0-0.6 - Rebuilt for libjson-c.so.3 diff --git a/sources b/sources index 7125d52..8c32b71 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cryptsetup-2.0.0-rc1.tar.xz) = 397c45b11dd275c2e7da6442a80a92da0de8888a1b9547ae16ee69681c5b63d95253fe0e80ea20a09d14d06d0e138ad349486999f94ce065140f49dcd1dd8427 +SHA512 (cryptsetup-2.0.0.tar.xz) = 195e9c0b6429d21ec0cc7c5faddfde85cb71eee09d348fa50df6779693a2dc05fce04bada4c835150964e08b2e8af30e4194155e0f6366b24c7812f48477a249 From 8c891f7dd90039d36e0f7a1a69095176c2610c74 Mon Sep 17 00:00:00 2001 From: Iryna Shcherbina Date: Fri, 15 Dec 2017 12:38:39 +0100 Subject: [PATCH 034/142] Update Python 2 dependency declarations to new packaging standards --- cryptsetup.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index c996e9d..834d20a 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -3,13 +3,13 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup Version: 2.0.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ and LGPLv2+ Group: Applications/System URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: libgcrypt-devel, popt-devel, device-mapper-devel BuildRequires: libgpg-error-devel, libuuid-devel, libsepol-devel -BuildRequires: libselinux-devel, python-devel, python3-devel +BuildRequires: libselinux-devel, python2-devel, python3-devel BuildRequires: libpwquality-devel, json-c-devel, libargon2-devel Provides: cryptsetup-luks = %{version}-%{release} Obsoletes: cryptsetup-luks < 1.4.0 @@ -188,6 +188,10 @@ popd %clean %changelog +* Fri Dec 15 2017 Iryna Shcherbina - 2.0.0-2 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + * Tue Dec 12 2017 Ondrej Kozina - 2.0.0-1 - Update to cryptsetup 2.0.0 (final). From a7d5c760ee31124c6ca44c19dd852f370432c926 Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Thu, 4 Jan 2018 19:00:47 +0100 Subject: [PATCH 035/142] Override locking path to /run/cryptsetup. --- cryptsetup.spec | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index 834d20a..b7a57da 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -3,7 +3,7 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup Version: 2.0.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ and LGPLv2+ Group: Applications/System URL: https://gitlab.com/cryptsetup/cryptsetup @@ -17,6 +17,7 @@ Requires: cryptsetup-libs = %{version}-%{release} Requires: libpwquality >= 1.2.0 %global upstream_version %{version} +%global luks2_locking_dir /run/cryptsetup Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v2.0/cryptsetup-%{upstream_version}.tar.xz %description @@ -108,14 +109,16 @@ chmod -x misc/dracut_90reencrypt/* cp -a . %{py3dir} %build -%configure --enable-python --enable-fips --enable-pwquality --enable-libargon2 %{?configure_pbkdf2} +# remove --with-luks2-lock-path after upstream cryptsetup release > 2.0.0 +%configure --enable-python --enable-fips --enable-pwquality --enable-libargon2 --with-luks2-lock-path=%{luks2_locking_dir} %{?configure_pbkdf2} # remove rpath sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool make %{?_smp_mflags} pushd %{py3dir} -%configure --enable-python --with-python_version=3 --enable-fips --enable-pwquality --enable-libargon2 %{?configure_pbkdf2} +# remove --with-luks2-lock-path after upstream cryptsetup release > 2.0.0 +%configure --enable-python --with-python_version=3 --enable-fips --enable-pwquality --enable-libargon2 --with-luks2-lock-path=%{luks2_locking_dir} %{?configure_pbkdf2} make %{?_smp_mflags} popd @@ -170,6 +173,7 @@ popd %license COPYING COPYING.LGPL %{_libdir}/libcryptsetup.so.* %{_tmpfilesdir}/cryptsetup.conf +%ghost %dir %{luks2_locking_dir} %files -n python2-cryptsetup %{!?_licensedir:%global license %%doc} @@ -188,6 +192,10 @@ popd %clean %changelog +* Thu Jan 04 2018 Ondrej Kozina - 2.0.0-3 +- Override locking path to /run/cryptsetup (going to be new default) +- Claim ownership of the locking directory + * Fri Dec 15 2017 Iryna Shcherbina - 2.0.0-2 - Update Python 2 dependency declarations to new packaging standards (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) From 0d1e810867256667ba24e21c9965e78b2175b6d4 Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Sun, 21 Jan 2018 13:29:49 +0100 Subject: [PATCH 036/142] Update to cryptsetup 2.0.1. --- .gitignore | 2 +- cryptsetup-2.0.0-rc1.tar.sign | 16 ---------------- cryptsetup-2.0.1.tar.sign | 16 ++++++++++++++++ cryptsetup.spec | 16 ++++++++-------- sources | 2 +- 5 files changed, 26 insertions(+), 26 deletions(-) delete mode 100644 cryptsetup-2.0.0-rc1.tar.sign create mode 100644 cryptsetup-2.0.1.tar.sign diff --git a/.gitignore b/.gitignore index be5cef5..64d406b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/cryptsetup-2.0.0.tar.xz +/cryptsetup-2.0.1.tar.xz diff --git a/cryptsetup-2.0.0-rc1.tar.sign b/cryptsetup-2.0.0-rc1.tar.sign deleted file mode 100644 index ca325f4..0000000 --- a/cryptsetup-2.0.0-rc1.tar.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAln5lawACgkQ2bBXe9k+ -mPz8iBAAprrjsO4tsOeQJBlMjfg1sTrCnhUjjWjc5qJUpN+dHhqfJgi4NUdQP6Qx -f/S2xTa+fskq2DtskXHVSnwiTaholT0KOVpm8L+Zov+7llQuiOf9e0Qk0bjFKQP8 -UjmEvsPzzkHg8r71N8T/GoPKkWZiGcY/KdIDMgAVxPb9whF0rV2wFJ26ZtDEvxRr -8GIrxmb3YzQjwp+JHklhSreUHmwnEV3s0VNlauOYlaf99oZXyFZ6INbeRpYCjdXJ -JPHYXOhIYv1uVldEsS8GNa+iEZEUCNBQhwkFkS94XLpaY/MDIIXBsL1DRFhFJqjz -7LVLzJf6/S+KEdYZTZFesCcx28puzk4oKyXcwLXbUgHgCn60/UJqYaUc2/tc8NTY -2pue6GcoZp0rbbe9gvPJ5P/0bkM/4IGNXEpfYWbCAUb9vHochg/3FOumE61xoX37 -fYwMctDjTW2xhNlzQlwmMcGJyhUVC4+Epcb3yrHeiw+DqsM5kdjzrvZEkYTquSxv -xnRsteCIsNCwYRrA30epvkiXaeEUlf3dR9CwSWRhp06KsieGIxgvSvoGXh6dWgnF -/eMd1yBRR0Fjt49CkUFxUeCMbPWnNUEjp/7TS/nKvpRieBgyncvgxZVA+FVZ6N+d -cg9uMuQ8rApwOpTFBHU5j2A70i72C+7G5+SHCYSqUvKZTqwPhhw= -=fFiV ------END PGP SIGNATURE----- diff --git a/cryptsetup-2.0.1.tar.sign b/cryptsetup-2.0.1.tar.sign new file mode 100644 index 0000000..8d79043 --- /dev/null +++ b/cryptsetup-2.0.1.tar.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAlpkfDAACgkQ2bBXe9k+ +mPxsUA//dMQaPwqITtohSntd+xGobT4uvlL/7B7MzD+61wSSh0gEk5wkpGkF4laL +7ai9JL9j2t0djBtCykFgke6VoWupZze9cSlOm/CV227wdBSwdOFo/Y5MlEWNozoT +JS1il/TM/egsxAt6GN7jUYPJ/TtcaFaLIZWXEb+xAT91Ep5FAL4Kpeu5Jd6m2hA0 +tWy3JtPeICp7z2gNvrb5bid3CzHTE6y5fgK5hoLtHQASCOvDUrEtCCuB+6USqtS1 +3dZ4uhm1p+MuEgSo5K4OZfbc0lT56qtIdnrqD+HveRJUbeqyBhaj71SSJgmfE+Em +AS07LlZwqwozKopK4/e97Nq8PHAidj6NNbWBXs8cWidzAQCAo3y0yTfAVQsj0mJh +PRNUOrL9Ev2klNo63swIe121aPitX2ybeIWMNGbdg8NYm8jhYfVUp2jAsP12V2rZ +daFu46t3ZZQwYHKp7jgR83ghj7J7qynqWT+Z3BUoNg+vvD5d5ZWJTvxEOgSvzkle +HjkJoW0bZoCvzzArVAlMCl5u+JpEGZQe0XCQyzfU1Glkur1EVKdpMvF8OusjtyZb +t6va9N9zDgX3b6BiA9HMB2EWwfXNDICNPEf5dOHPECsLx/tT2+BCtFIlKE7ne2r+ +iwIepRcMYL9kPSu5nTnCpImTWvPNBqJe8vfCaXMZi91H6ZQGwCE= +=WOMG +-----END PGP SIGNATURE----- diff --git a/cryptsetup.spec b/cryptsetup.spec index b7a57da..0011784 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -2,8 +2,8 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup -Version: 2.0.0 -Release: 3%{?dist} +Version: 2.0.1 +Release: 1%{?dist} License: GPLv2+ and LGPLv2+ Group: Applications/System URL: https://gitlab.com/cryptsetup/cryptsetup @@ -17,7 +17,6 @@ Requires: cryptsetup-libs = %{version}-%{release} Requires: libpwquality >= 1.2.0 %global upstream_version %{version} -%global luks2_locking_dir /run/cryptsetup Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v2.0/cryptsetup-%{upstream_version}.tar.xz %description @@ -109,16 +108,14 @@ chmod -x misc/dracut_90reencrypt/* cp -a . %{py3dir} %build -# remove --with-luks2-lock-path after upstream cryptsetup release > 2.0.0 -%configure --enable-python --enable-fips --enable-pwquality --enable-libargon2 --with-luks2-lock-path=%{luks2_locking_dir} %{?configure_pbkdf2} +%configure --enable-python --enable-fips --enable-pwquality --enable-libargon2 %{?configure_pbkdf2} # remove rpath sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool make %{?_smp_mflags} pushd %{py3dir} -# remove --with-luks2-lock-path after upstream cryptsetup release > 2.0.0 -%configure --enable-python --with-python_version=3 --enable-fips --enable-pwquality --enable-libargon2 --with-luks2-lock-path=%{luks2_locking_dir} %{?configure_pbkdf2} +%configure --enable-python --with-python_version=3 --enable-fips --enable-pwquality --enable-libargon2 %{?configure_pbkdf2} make %{?_smp_mflags} popd @@ -173,7 +170,7 @@ popd %license COPYING COPYING.LGPL %{_libdir}/libcryptsetup.so.* %{_tmpfilesdir}/cryptsetup.conf -%ghost %dir %{luks2_locking_dir} +%ghost %dir /run/cryptsetup %files -n python2-cryptsetup %{!?_licensedir:%global license %%doc} @@ -192,6 +189,9 @@ popd %clean %changelog +* Sun Jan 21 2018 Milan Broz - 2.0.1-1 +- Update to cryptsetup 2.0.1. + * Thu Jan 04 2018 Ondrej Kozina - 2.0.0-3 - Override locking path to /run/cryptsetup (going to be new default) - Claim ownership of the locking directory diff --git a/sources b/sources index 8c32b71..33b824a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cryptsetup-2.0.0.tar.xz) = 195e9c0b6429d21ec0cc7c5faddfde85cb71eee09d348fa50df6779693a2dc05fce04bada4c835150964e08b2e8af30e4194155e0f6366b24c7812f48477a249 +SHA512 (cryptsetup-2.0.1.tar.xz) = b0c16de67169aefe861e0d6692dfa7ff1d7cf34990611c71edb82606ebf39a529511b36f7c452da591bdc39c4125a4355b7444d268680458219f2cad63e0f74b From 6642858b1d311a1fa38d32134eee4f3e27094aac Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 05:59:27 +0000 Subject: [PATCH 037/142] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cryptsetup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index 0011784..ba2a4a2 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -3,7 +3,7 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup Version: 2.0.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ and LGPLv2+ Group: Applications/System URL: https://gitlab.com/cryptsetup/cryptsetup @@ -189,6 +189,9 @@ popd %clean %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 2.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Sun Jan 21 2018 Milan Broz - 2.0.1-1 - Update to cryptsetup 2.0.1. From f150d6cec5759c02ad7841699208462d7a5a8da4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Tue, 6 Mar 2018 15:14:48 +0100 Subject: [PATCH 038/142] Rebuilt for libjson-c.so.4 (json-c v0.13.1) --- cryptsetup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index ba2a4a2..da8338e 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -3,7 +3,7 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup Version: 2.0.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ and LGPLv2+ Group: Applications/System URL: https://gitlab.com/cryptsetup/cryptsetup @@ -189,6 +189,9 @@ popd %clean %changelog +* Tue Mar 06 2018 Björn Esser - 2.0.1-3 +- Rebuilt for libjson-c.so.4 (json-c v0.13.1) + * Wed Feb 07 2018 Fedora Release Engineering - 2.0.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 1bf03109eedf64d6b3ec524a49d6d4cf705791b7 Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Wed, 7 Mar 2018 14:05:02 +0100 Subject: [PATCH 039/142] Update to version 2.0.2. --- .gitignore | 2 +- cryptsetup-2.0.1.tar.sign | 16 ---------------- cryptsetup-2.0.2.tar.sign | 16 ++++++++++++++++ cryptsetup.spec | 7 +++++-- sources | 2 +- 5 files changed, 23 insertions(+), 20 deletions(-) delete mode 100644 cryptsetup-2.0.1.tar.sign create mode 100644 cryptsetup-2.0.2.tar.sign diff --git a/.gitignore b/.gitignore index 64d406b..dec6d62 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/cryptsetup-2.0.1.tar.xz +/cryptsetup-2.0.2.tar.xz diff --git a/cryptsetup-2.0.1.tar.sign b/cryptsetup-2.0.1.tar.sign deleted file mode 100644 index 8d79043..0000000 --- a/cryptsetup-2.0.1.tar.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAlpkfDAACgkQ2bBXe9k+ -mPxsUA//dMQaPwqITtohSntd+xGobT4uvlL/7B7MzD+61wSSh0gEk5wkpGkF4laL -7ai9JL9j2t0djBtCykFgke6VoWupZze9cSlOm/CV227wdBSwdOFo/Y5MlEWNozoT -JS1il/TM/egsxAt6GN7jUYPJ/TtcaFaLIZWXEb+xAT91Ep5FAL4Kpeu5Jd6m2hA0 -tWy3JtPeICp7z2gNvrb5bid3CzHTE6y5fgK5hoLtHQASCOvDUrEtCCuB+6USqtS1 -3dZ4uhm1p+MuEgSo5K4OZfbc0lT56qtIdnrqD+HveRJUbeqyBhaj71SSJgmfE+Em -AS07LlZwqwozKopK4/e97Nq8PHAidj6NNbWBXs8cWidzAQCAo3y0yTfAVQsj0mJh -PRNUOrL9Ev2klNo63swIe121aPitX2ybeIWMNGbdg8NYm8jhYfVUp2jAsP12V2rZ -daFu46t3ZZQwYHKp7jgR83ghj7J7qynqWT+Z3BUoNg+vvD5d5ZWJTvxEOgSvzkle -HjkJoW0bZoCvzzArVAlMCl5u+JpEGZQe0XCQyzfU1Glkur1EVKdpMvF8OusjtyZb -t6va9N9zDgX3b6BiA9HMB2EWwfXNDICNPEf5dOHPECsLx/tT2+BCtFIlKE7ne2r+ -iwIepRcMYL9kPSu5nTnCpImTWvPNBqJe8vfCaXMZi91H6ZQGwCE= -=WOMG ------END PGP SIGNATURE----- diff --git a/cryptsetup-2.0.2.tar.sign b/cryptsetup-2.0.2.tar.sign new file mode 100644 index 0000000..0b754e7 --- /dev/null +++ b/cryptsetup-2.0.2.tar.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAlqf2zIACgkQ2bBXe9k+ +mPx0WRAAt3DUuIi08RTFFWOmAamVajUjH17BGdlG65X+LWCey7/OfL5qS1uxFYa8 +5uwJQ6yOLjfOH7D3D94GnnwkXxsd4n0c5FnKkYykSaFOhIoM6QZhbSPhLuvVe4Q3 +ZQMaRMjzjhfQm9iAsyYSQKUaVWZhAzYG76APaLiV1Bh/qXK20hxqM853JKvlHkKZ +IqfXbwEdQSPY+VtcV/Tzef/xXXZbLmwg4zobcA0WXnqbgJxl0foLPMBQ5F2hCtsN +CZPAXG+JlAC149OD7MaXvy27gxGJKvpsocU45nINry6Lae4G/UI8jlSA8RH6v2kj +dx6KNCuG0isfoAjJytGJYrUAkvxaj2QaZgV07WC7u4YRMwpmd1bJcuDeQ4maGO+t +u2LPDSTIBr9u6rMV5KAAc6iq5FshwSuQ1a9TVKnTGI8WQCY9NFzyRD/e8NRfYJ6E +xgWtRW0xsYk20cBEt9fy81LvWZm+2L3niFRFiRoQ6lkKx8gugOTAgrtqAOGXKMaY +ExDeaSPkD++7CLJIaoylzq0aqQKTt+uJhTEsGK56cDzovfmBnUGqct41p2AwAngp +kUPHd+GSD+smgr8Per3AGnF9dO+qLVjwPImfvO/wBXZ+Wv+PUXZCaiHQYA80Ulhs +oc+B3LxgExR2R7MbSrjL6a8vvI5M7JTBM/cvL/pSywPvg3xbCPY= +=nXjA +-----END PGP SIGNATURE----- diff --git a/cryptsetup.spec b/cryptsetup.spec index da8338e..8804d25 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -2,8 +2,8 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup -Version: 2.0.1 -Release: 3%{?dist} +Version: 2.0.2 +Release: 1%{?dist} License: GPLv2+ and LGPLv2+ Group: Applications/System URL: https://gitlab.com/cryptsetup/cryptsetup @@ -189,6 +189,9 @@ popd %clean %changelog +* Wed Mar 07 2018 Milan Broz - 2.0.2-1 +- Update to cryptsetup 2.0.2. + * Tue Mar 06 2018 Björn Esser - 2.0.1-3 - Rebuilt for libjson-c.so.4 (json-c v0.13.1) diff --git a/sources b/sources index 33b824a..bc4c4f0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cryptsetup-2.0.1.tar.xz) = b0c16de67169aefe861e0d6692dfa7ff1d7cf34990611c71edb82606ebf39a529511b36f7c452da591bdc39c4125a4355b7444d268680458219f2cad63e0f74b +SHA512 (cryptsetup-2.0.2.tar.xz) = 1c37b81b1dcb1223293b30ddc7096e074d01e2dd978b543fbda7ae11ecc29c1c461d12e4b22288bb382a188e9e679bf1ad3e281e77428374b7c605c8902c1b17 From 181a0d8f35e5e64828bfa3b0d91193d2abf4e6bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Tue, 27 Mar 2018 09:51:26 +0200 Subject: [PATCH 040/142] Rebuilt for libjson-c.so.4 (json-c v0.13.1) --- cryptsetup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index 8804d25..b75692d 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -3,7 +3,7 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup Version: 2.0.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ and LGPLv2+ Group: Applications/System URL: https://gitlab.com/cryptsetup/cryptsetup @@ -189,6 +189,9 @@ popd %clean %changelog +* Tue Mar 27 2018 Björn Esser - 2.0.2-2 +- Rebuilt for libjson-c.so.4 (json-c v0.13.1) on fc28 + * Wed Mar 07 2018 Milan Broz - 2.0.2-1 - Update to cryptsetup 2.0.2. From 221ea11f26a81e9a389f4d5238f150235aa2ef3b Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Wed, 25 Apr 2018 15:39:19 +0200 Subject: [PATCH 041/142] Add conditions for python sub-packages. --- cryptsetup.spec | 52 +++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 48 insertions(+), 4 deletions(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index b75692d..ebfa994 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,15 +1,38 @@ %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%if 0%{?fedora} +%if 0%{?fedora} >= 29 +%global python2_enable 0 +%global python3_enable 0 +%else +%global python2_enable 1 +%global python3_enable 1 +%endif +%else +%global python3_enable 0 +%if 0%{?rhel} == 7 +%global python2_enable 1 +%else +%global python2_enable 0 +%endif +%endif + Summary: A utility for setting up encrypted disks Name: cryptsetup Version: 2.0.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ and LGPLv2+ Group: Applications/System URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: libgcrypt-devel, popt-devel, device-mapper-devel BuildRequires: libgpg-error-devel, libuuid-devel, libsepol-devel -BuildRequires: libselinux-devel, python2-devel, python3-devel +BuildRequires: libselinux-devel +%if %{python2_enable} +BuildRequires: python2-devel +%endif +%if %{python3_enable} +BuildRequires: python3-devel +%endif BuildRequires: libpwquality-devel, json-c-devel, libargon2-devel Provides: cryptsetup-luks = %{version}-%{release} Obsoletes: cryptsetup-luks < 1.4.0 @@ -74,6 +97,7 @@ Requires: cryptsetup-libs = %{version}-%{release} This package contains cryptsetup-reencrypt utility which can be used for offline reencryption of disk in situ. +%if %{python2_enable} %package -n python2-cryptsetup Group: System Environment/Libraries Summary: Python bindings for libcryptsetup @@ -88,7 +112,9 @@ Obsoletes: python-cryptsetup < 1.4.0 %description -n python2-cryptsetup This package provides Python bindings for libcryptsetup, a library for setting up disk encryption using dm-crypt kernel module. +%endif +%if %{python3_enable} %package python3 Group: System Environment/Libraries Summary: Python3 bindings for libcryptsetup @@ -98,6 +124,7 @@ Provides: python3-cryptsetup = %{version}-%{release} %description python3 This package provides Python bindings for libcryptsetup, a library for setting up disk encryption using dm-crypt kernel module. +%endif %prep %setup -q -n cryptsetup-%{upstream_version} @@ -105,28 +132,38 @@ chmod -x python/pycryptsetup-test.py chmod -x misc/dracut_90reencrypt/* # copy the whole directory for the python3 build +%if %{python3_enable} cp -a . %{py3dir} +%endif %build -%configure --enable-python --enable-fips --enable-pwquality --enable-libargon2 %{?configure_pbkdf2} +%if %{python2_enable} || %{python3_enable} +%configure --enable-python --enable-fips --enable-pwquality --enable-libargon2 +%else +%configure --enable-fips --enable-pwquality --enable-libargon2 +%endif # remove rpath sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool make %{?_smp_mflags} +%if %{python3_enable} pushd %{py3dir} -%configure --enable-python --with-python_version=3 --enable-fips --enable-pwquality --enable-libargon2 %{?configure_pbkdf2} +%configure --enable-python --with-python_version=3 --enable-fips --enable-pwquality --enable-libargon2 make %{?_smp_mflags} popd +%endif %install make install DESTDIR=%{buildroot} rm -rf %{buildroot}/%{_libdir}/*.la +%if %{python3_enable} pushd %{py3dir} make install DESTDIR=%{buildroot} rm -rf %{buildroot}/%{_libdir}/*.la popd +%endif %find_lang cryptsetup %post -n cryptsetup-libs -p /sbin/ldconfig @@ -172,23 +209,30 @@ popd %{_tmpfilesdir}/cryptsetup.conf %ghost %dir /run/cryptsetup +%if %{python2_enable} %files -n python2-cryptsetup %{!?_licensedir:%global license %%doc} %license COPYING.LGPL %doc python/pycryptsetup-test.py %exclude %{python_sitearch}/pycryptsetup.la %{python_sitearch}/pycryptsetup.so +%endif +%if %{python3_enable} %files python3 %{!?_licensedir:%global license %%doc} %license COPYING.LGPL %doc python/pycryptsetup-test.py %exclude %{python3_sitearch}/pycryptsetup.la %{python3_sitearch}/pycryptsetup.so +%endif %clean %changelog +* Wed Apr 25 2018 Ondrej Kozina - 2.0.2-3 +- Add conditions for python sub-packages + * Tue Mar 27 2018 Björn Esser - 2.0.2-2 - Rebuilt for libjson-c.so.4 (json-c v0.13.1) on fc28 From d446a640e185febb151525aa25d1c29a7e374ca1 Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Thu, 26 Apr 2018 16:24:02 +0200 Subject: [PATCH 042/142] Add explicit BuildRequires: gcc. --- cryptsetup.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index ebfa994..b755be0 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -26,7 +26,7 @@ Group: Applications/System URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: libgcrypt-devel, popt-devel, device-mapper-devel BuildRequires: libgpg-error-devel, libuuid-devel, libsepol-devel -BuildRequires: libselinux-devel +BuildRequires: libselinux-devel, gcc %if %{python2_enable} BuildRequires: python2-devel %endif From 66649e23949d27108393719616b8234f514f1945 Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Fri, 4 May 2018 07:35:09 +0200 Subject: [PATCH 043/142] Update to version 2.0.3. --- .gitignore | 2 +- cryptsetup-2.0.2.tar.sign | 16 ---------------- cryptsetup-2.0.3.tar.sign | 16 ++++++++++++++++ cryptsetup.spec | 7 +++++-- sources | 2 +- 5 files changed, 23 insertions(+), 20 deletions(-) delete mode 100644 cryptsetup-2.0.2.tar.sign create mode 100644 cryptsetup-2.0.3.tar.sign diff --git a/.gitignore b/.gitignore index dec6d62..250bd90 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/cryptsetup-2.0.2.tar.xz +/cryptsetup-2.0.3.tar.xz diff --git a/cryptsetup-2.0.2.tar.sign b/cryptsetup-2.0.2.tar.sign deleted file mode 100644 index 0b754e7..0000000 --- a/cryptsetup-2.0.2.tar.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAlqf2zIACgkQ2bBXe9k+ -mPx0WRAAt3DUuIi08RTFFWOmAamVajUjH17BGdlG65X+LWCey7/OfL5qS1uxFYa8 -5uwJQ6yOLjfOH7D3D94GnnwkXxsd4n0c5FnKkYykSaFOhIoM6QZhbSPhLuvVe4Q3 -ZQMaRMjzjhfQm9iAsyYSQKUaVWZhAzYG76APaLiV1Bh/qXK20hxqM853JKvlHkKZ -IqfXbwEdQSPY+VtcV/Tzef/xXXZbLmwg4zobcA0WXnqbgJxl0foLPMBQ5F2hCtsN -CZPAXG+JlAC149OD7MaXvy27gxGJKvpsocU45nINry6Lae4G/UI8jlSA8RH6v2kj -dx6KNCuG0isfoAjJytGJYrUAkvxaj2QaZgV07WC7u4YRMwpmd1bJcuDeQ4maGO+t -u2LPDSTIBr9u6rMV5KAAc6iq5FshwSuQ1a9TVKnTGI8WQCY9NFzyRD/e8NRfYJ6E -xgWtRW0xsYk20cBEt9fy81LvWZm+2L3niFRFiRoQ6lkKx8gugOTAgrtqAOGXKMaY -ExDeaSPkD++7CLJIaoylzq0aqQKTt+uJhTEsGK56cDzovfmBnUGqct41p2AwAngp -kUPHd+GSD+smgr8Per3AGnF9dO+qLVjwPImfvO/wBXZ+Wv+PUXZCaiHQYA80Ulhs -oc+B3LxgExR2R7MbSrjL6a8vvI5M7JTBM/cvL/pSywPvg3xbCPY= -=nXjA ------END PGP SIGNATURE----- diff --git a/cryptsetup-2.0.3.tar.sign b/cryptsetup-2.0.3.tar.sign new file mode 100644 index 0000000..d6aec0f --- /dev/null +++ b/cryptsetup-2.0.3.tar.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAlrrdLoACgkQ2bBXe9k+ +mPyLahAAraQIV2y/5E9aVKLFznTb5ismDdP1ehk/ZeruHlzTd4r2VCcjE/Ew5coj +4WPP4d4R8YWvdw7DMp4z1iB3nh+1w7OdgN3/UZxeoLekFfAaQ5EcH9MnVKMXoRPK +77zCKHa27sP87M6dMhBvOhJnkevAmNqI8IiRPQmZ53ZFa0Srga5dbyKIZhLSpnrT +OORHIorwt45Ky6BTh4MJzCzsOBvxxQLKEc1ipXZ/CDUtKeI2liwjNz+bQ13w+gEw +3bWKp6x13RBr8TPufCrU6R0RK5emaZO8XHXWloToGYLp86opUq9PTsh14oTnpFA9 +HwK1Lu6nXDeyjbt05rW9fDXzDNQ0VPM1+Y2nZDXRzJpbNmSMM2Mp9nq08EDjiCrI +gb1cBwQmVNsPc78zn9zdtLwRTSYTuOvj1S946t33o/0poGF7UJVT0Yii/Ee2GsYS +Cqb33RKPfCKYs6uH1QrFzl9kvl3eGroxKWxxMStxwhEP2bMZOiXzFz73kq4MxU0A +o1hD9nKuHeQ4jq9qmrFqBCd030E76Ix5JniIW3gt+9oSIEHx86Cpqq3DRpfBhfGn +11WRdSxkB5Os64lAxH+K2pusA8Yw31SKItCpK6UnsJoDAaIlldZjD0wkyxTH5rSP +4I4dJcnR15/T+do1wilvb7CNGa0ckpfCdg/OhLUfWFXMjEkaCD8= +=AtEZ +-----END PGP SIGNATURE----- diff --git a/cryptsetup.spec b/cryptsetup.spec index b755be0..2cc4c12 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -19,8 +19,8 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup -Version: 2.0.2 -Release: 3%{?dist} +Version: 2.0.3 +Release: 1%{?dist} License: GPLv2+ and LGPLv2+ Group: Applications/System URL: https://gitlab.com/cryptsetup/cryptsetup @@ -230,6 +230,9 @@ popd %clean %changelog +* Fri May 04 2018 Milan Broz - 2.0.3-1 +- Update to cryptsetup 2.0.3. + * Wed Apr 25 2018 Ondrej Kozina - 2.0.2-3 - Add conditions for python sub-packages diff --git a/sources b/sources index bc4c4f0..2e866c8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cryptsetup-2.0.2.tar.xz) = 1c37b81b1dcb1223293b30ddc7096e074d01e2dd978b543fbda7ae11ecc29c1c461d12e4b22288bb382a188e9e679bf1ad3e281e77428374b7c605c8902c1b17 +SHA512 (cryptsetup-2.0.3.tar.xz) = f5ac54aa9614b234f2d1e84758a98914d283b669f4ab5cbe0ed7cdf25ce77f2d1abdf1e5b5010d803971f0e29120954110ee4fcc538137b04fbdc13b7804385e From 6cb68aead970cec9063a1bf5fc5c08b3e71ed730 Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Fri, 4 May 2018 10:45:20 +0200 Subject: [PATCH 044/142] Add obsolete macros for python subpackages. --- cryptsetup.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index 2cc4c12..5a86aba 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -2,6 +2,8 @@ %if 0%{?fedora} %if 0%{?fedora} >= 29 +Obsoletes: python2-cryptsetup +Obsoletes: python3-cryptsetup %global python2_enable 0 %global python3_enable 0 %else @@ -20,7 +22,7 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup Version: 2.0.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ and LGPLv2+ Group: Applications/System URL: https://gitlab.com/cryptsetup/cryptsetup @@ -230,6 +232,9 @@ popd %clean %changelog +* Fri May 04 2018 Ondrej Kozina - 2.0.3-2 +- Add missing 'Obsoletes' macros for python subpackages. + * Fri May 04 2018 Milan Broz - 2.0.3-1 - Update to cryptsetup 2.0.3. From cfc9ba278ed60c759c551cafb26f03dfe7b545b2 Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Fri, 4 May 2018 15:40:37 +0200 Subject: [PATCH 045/142] Fix obsolete macro for python3 subpackage. --- cryptsetup.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index 5a86aba..2bc02d4 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -3,7 +3,7 @@ %if 0%{?fedora} %if 0%{?fedora} >= 29 Obsoletes: python2-cryptsetup -Obsoletes: python3-cryptsetup +Obsoletes: cryptsetup-python3 %global python2_enable 0 %global python3_enable 0 %else @@ -22,7 +22,7 @@ Obsoletes: python3-cryptsetup Summary: A utility for setting up encrypted disks Name: cryptsetup Version: 2.0.3 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ and LGPLv2+ Group: Applications/System URL: https://gitlab.com/cryptsetup/cryptsetup @@ -232,6 +232,9 @@ popd %clean %changelog +* Fri May 04 2018 Ondrej Kozina - 2.0.3-3 +- Fix obsolete macro for python3 subpackage. + * Fri May 04 2018 Ondrej Kozina - 2.0.3-2 - Add missing 'Obsoletes' macros for python subpackages. From a4654e719c06ed3b66559d9de3ccd793909afc27 Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Tue, 29 May 2018 15:41:53 +0200 Subject: [PATCH 046/142] Remove rpath before rebuilding for python3 api. --- cryptsetup.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cryptsetup.spec b/cryptsetup.spec index 2bc02d4..0d2ea1a 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -152,6 +152,9 @@ make %{?_smp_mflags} %if %{python3_enable} pushd %{py3dir} %configure --enable-python --with-python_version=3 --enable-fips --enable-pwquality --enable-libargon2 +# remove rpath +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool make %{?_smp_mflags} popd %endif From 51772706fea550d3c49e7a8526688548af371e3c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 22:23:35 +0000 Subject: [PATCH 047/142] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cryptsetup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index 0d2ea1a..e0d0943 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -22,7 +22,7 @@ Obsoletes: cryptsetup-python3 Summary: A utility for setting up encrypted disks Name: cryptsetup Version: 2.0.3 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ and LGPLv2+ Group: Applications/System URL: https://gitlab.com/cryptsetup/cryptsetup @@ -235,6 +235,9 @@ popd %clean %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 2.0.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri May 04 2018 Ondrej Kozina - 2.0.3-3 - Fix obsolete macro for python3 subpackage. From 102814679ac88c3f87346abba3a7fb26e407e75a Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Tue, 17 Jul 2018 15:26:16 +0200 Subject: [PATCH 048/142] Various spec file updates. - Replace sed script with --disable-rpath configure option. - Switch cryptsetup to openssl crypto backend. - Remove redundant Requires section from devel subpackage. - Drop BuildRequires on libselinux-devel,libsepol-devel and libgpg-error-devel packages. --- cryptsetup.spec | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index e0d0943..fc28134 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -22,13 +22,12 @@ Obsoletes: cryptsetup-python3 Summary: A utility for setting up encrypted disks Name: cryptsetup Version: 2.0.3 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ and LGPLv2+ Group: Applications/System URL: https://gitlab.com/cryptsetup/cryptsetup -BuildRequires: libgcrypt-devel, popt-devel, device-mapper-devel -BuildRequires: libgpg-error-devel, libuuid-devel, libsepol-devel -BuildRequires: libselinux-devel, gcc +BuildRequires: openssl-devel, popt-devel, device-mapper-devel +BuildRequires: libuuid-devel, gcc %if %{python2_enable} BuildRequires: python2-devel %endif @@ -51,7 +50,6 @@ disk encryption using dm-crypt kernel module. %package devel Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: libgcrypt-devel > 1.1.42, device-mapper-devel, libuuid-devel Requires: pkgconfig Summary: Headers and libraries for using encrypted file systems Provides: cryptsetup-luks-devel = %{version}-%{release} @@ -140,21 +138,15 @@ cp -a . %{py3dir} %build %if %{python2_enable} || %{python3_enable} -%configure --enable-python --enable-fips --enable-pwquality --enable-libargon2 +%configure --enable-python --enable-fips --enable-pwquality --enable-libargon2 --disable-rpath --with-crypto_backend=openssl %else -%configure --enable-fips --enable-pwquality --enable-libargon2 +%configure --enable-fips --enable-pwquality --enable-libargon2 --disable-rpath --with-crypto_backend=openssl %endif -# remove rpath -sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool -sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool make %{?_smp_mflags} %if %{python3_enable} pushd %{py3dir} -%configure --enable-python --with-python_version=3 --enable-fips --enable-pwquality --enable-libargon2 -# remove rpath -sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool -sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool +%configure --enable-python --with-python_version=3 --enable-fips --enable-pwquality --enable-libargon2 --disable-rpath --with-crypto_backend=openssl make %{?_smp_mflags} popd %endif @@ -235,6 +227,11 @@ popd %clean %changelog +* Tue Jul 17 2018 Ondrej Kozina - 2.0.3-5 +- Replace sed script with --disable-rpath configure option. +- Switch cryptsetup to openssl crypto backend. +- Spec file cleanup. + * Thu Jul 12 2018 Fedora Release Engineering - 2.0.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 0dd1b208bcd487948d85f4920d87c731e3cfc332 Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Tue, 17 Jul 2018 16:00:23 +0200 Subject: [PATCH 049/142] Remove libgcrypt dependency. - removes an oversight of explicit runtime dependency in cryptsetup-libs --- cryptsetup.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index fc28134..8d5f69a 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -22,7 +22,7 @@ Obsoletes: cryptsetup-python3 Summary: A utility for setting up encrypted disks Name: cryptsetup Version: 2.0.3 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ and LGPLv2+ Group: Applications/System URL: https://gitlab.com/cryptsetup/cryptsetup @@ -64,8 +64,6 @@ Group: System Environment/Libraries Summary: Cryptsetup shared library Provides: cryptsetup-luks-libs = %{version}-%{release} Obsoletes: cryptsetup-luks-libs < 1.4.0 -# Need support for fixed gcrypt PBKDF2 and fixed Whirlpool hash. -Requires: libgcrypt >= 1.6.1 %description libs This package contains the cryptsetup shared library, libcryptsetup. @@ -227,6 +225,9 @@ popd %clean %changelog +* Tue Jul 17 2018 Ondrej Kozina - 2.0.3-6 +- Remove libgcrypt dependency from cryptsetup-libs package. + * Tue Jul 17 2018 Ondrej Kozina - 2.0.3-5 - Replace sed script with --disable-rpath configure option. - Switch cryptsetup to openssl crypto backend. From 45d9619c3d7681da130ad33565c8c0f7f300ce20 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 30 Jul 2018 00:22:28 +0200 Subject: [PATCH 050/142] =?UTF-8?q?%{python=5Fsitearch}=20=E2=86=92=20%{py?= =?UTF-8?q?thon2=5Fsitearch}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Igor Gnatenko --- cryptsetup.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index 8d5f69a..cb57b57 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -210,7 +210,7 @@ popd %license COPYING.LGPL %doc python/pycryptsetup-test.py %exclude %{python_sitearch}/pycryptsetup.la -%{python_sitearch}/pycryptsetup.so +%{python2_sitearch}/pycryptsetup.so %endif %if %{python3_enable} From 3b2e11ecf4e511dfb720b2be4738150db6adc4f6 Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Fri, 3 Aug 2018 14:12:12 +0200 Subject: [PATCH 051/142] Update to version 2.0.4. --- .gitignore | 2 +- cryptsetup-2.0.3.tar.sign | 16 ---------------- cryptsetup-2.0.4.tar.sign | 16 ++++++++++++++++ cryptsetup-add-system-library-paths.patch | 22 ++++++++++++++++++++++ cryptsetup.spec | 20 +++++++++++++------- sources | 2 +- 6 files changed, 53 insertions(+), 25 deletions(-) delete mode 100644 cryptsetup-2.0.3.tar.sign create mode 100644 cryptsetup-2.0.4.tar.sign create mode 100644 cryptsetup-add-system-library-paths.patch diff --git a/.gitignore b/.gitignore index 250bd90..7336e5a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/cryptsetup-2.0.3.tar.xz +/cryptsetup-2.0.4.tar.xz diff --git a/cryptsetup-2.0.3.tar.sign b/cryptsetup-2.0.3.tar.sign deleted file mode 100644 index d6aec0f..0000000 --- a/cryptsetup-2.0.3.tar.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAlrrdLoACgkQ2bBXe9k+ -mPyLahAAraQIV2y/5E9aVKLFznTb5ismDdP1ehk/ZeruHlzTd4r2VCcjE/Ew5coj -4WPP4d4R8YWvdw7DMp4z1iB3nh+1w7OdgN3/UZxeoLekFfAaQ5EcH9MnVKMXoRPK -77zCKHa27sP87M6dMhBvOhJnkevAmNqI8IiRPQmZ53ZFa0Srga5dbyKIZhLSpnrT -OORHIorwt45Ky6BTh4MJzCzsOBvxxQLKEc1ipXZ/CDUtKeI2liwjNz+bQ13w+gEw -3bWKp6x13RBr8TPufCrU6R0RK5emaZO8XHXWloToGYLp86opUq9PTsh14oTnpFA9 -HwK1Lu6nXDeyjbt05rW9fDXzDNQ0VPM1+Y2nZDXRzJpbNmSMM2Mp9nq08EDjiCrI -gb1cBwQmVNsPc78zn9zdtLwRTSYTuOvj1S946t33o/0poGF7UJVT0Yii/Ee2GsYS -Cqb33RKPfCKYs6uH1QrFzl9kvl3eGroxKWxxMStxwhEP2bMZOiXzFz73kq4MxU0A -o1hD9nKuHeQ4jq9qmrFqBCd030E76Ix5JniIW3gt+9oSIEHx86Cpqq3DRpfBhfGn -11WRdSxkB5Os64lAxH+K2pusA8Yw31SKItCpK6UnsJoDAaIlldZjD0wkyxTH5rSP -4I4dJcnR15/T+do1wilvb7CNGa0ckpfCdg/OhLUfWFXMjEkaCD8= -=AtEZ ------END PGP SIGNATURE----- diff --git a/cryptsetup-2.0.4.tar.sign b/cryptsetup-2.0.4.tar.sign new file mode 100644 index 0000000..44595ed --- /dev/null +++ b/cryptsetup-2.0.4.tar.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAltkMxMACgkQ2bBXe9k+ +mPwN2hAAvJwEaj1rfAUVhwZ21wMx7wDezI0OLamKAtKKP8saYjH9GA8HpfikGhHD +/LqcM31dacsyFP2iK+qj5GuS8aPm9HqePkXa0sqBcWw7Bsr4a091HYtReT3+bG8j +zIZtTzsjapZ425/nVB9ClJcEES8N3OpW+zhamv84T1zDwbVtC5x1wiMtsvdM6Rhg +bz7R7kam/OPIxgfSWVufVUaMGWDO6zPwND1Wn7ZVm6UNsTPLV/M3/H+uPm4y+jaW +In+eDhb05eNcY94dBVhRdqd/72CJ1OXUMEo8GEtmVPljvCDI2ljZ4LEoBUve323f +/kzjzZZqljaVoQOl3pT+d7jqvg5EybM6crV8E++VJO3mVSAd5CZhk4LV/HsrnDuy +4XtZLSPSQQkyhcezZ0+8EmGzzXVlBMfg6o/Jsnao5DKuIoea78mmH1DX6XnEjFoI +MeM+W+3A1scK05LYeo6ZhtGvwlVxUOfsrl5zDp1X+kTT94zPvjmsY2xa0cP3eXZ3 +vxSI1dosbmL91tE65gEVa1dGEYWMWYeR8K8ZqwVhxsg3QJInOM+sh/KdWQP1o/Lp +S1D5zi/8gi9R43K7Nd3Xi027d02gOkwvowie1leXBXdNYrAZIeQJbcdXiXbSAOiD +NTjKDPwGZbXmPcQckF1er9nd821ofxbnGEM6jBzCEprEX3YSf3M= +=V9r2 +-----END PGP SIGNATURE----- diff --git a/cryptsetup-add-system-library-paths.patch b/cryptsetup-add-system-library-paths.patch new file mode 100644 index 0000000..cc22adf --- /dev/null +++ b/cryptsetup-add-system-library-paths.patch @@ -0,0 +1,22 @@ +diff -rupN cryptsetup-2.0.4.old/configure cryptsetup-2.0.4/configure +--- cryptsetup-2.0.4.old/configure 2018-08-03 12:31:52.000000000 +0200 ++++ cryptsetup-2.0.4/configure 2018-08-03 13:42:50.605275535 +0200 +@@ -12300,6 +12300,9 @@ fi + # before this can be enabled. + hardcode_into_libs=yes + ++ # Add ABI-specific directories to the system library path. ++ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" ++ + # Ideally, we could use ldconfig to report *all* directores which are + # searched for libraries, however this is still not possible. Aside from not + # being certain /sbin/ldconfig is available, command +@@ -12308,7 +12311,7 @@ fi + # appending ld.so.conf contents (and includes) to the search path. + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" ++ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on diff --git a/cryptsetup.spec b/cryptsetup.spec index cb57b57..a5b5955 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -21,20 +21,20 @@ Obsoletes: cryptsetup-python3 Summary: A utility for setting up encrypted disks Name: cryptsetup -Version: 2.0.3 -Release: 6%{?dist} +Version: 2.0.4 +Release: 1%{?dist} License: GPLv2+ and LGPLv2+ Group: Applications/System URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: openssl-devel, popt-devel, device-mapper-devel -BuildRequires: libuuid-devel, gcc +BuildRequires: libuuid-devel, gcc, json-c-devel, libargon2-devel +BuildRequires: libpwquality-devel, libblkid-devel %if %{python2_enable} BuildRequires: python2-devel %endif %if %{python3_enable} BuildRequires: python3-devel %endif -BuildRequires: libpwquality-devel, json-c-devel, libargon2-devel Provides: cryptsetup-luks = %{version}-%{release} Obsoletes: cryptsetup-luks < 1.4.0 Requires: cryptsetup-libs = %{version}-%{release} @@ -42,6 +42,7 @@ Requires: libpwquality >= 1.2.0 %global upstream_version %{version} Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v2.0/cryptsetup-%{upstream_version}.tar.xz +Patch0: %{name}-add-system-library-paths.patch %description The cryptsetup package contains a utility for setting up @@ -126,6 +127,7 @@ for setting up disk encryption using dm-crypt kernel module. %prep %setup -q -n cryptsetup-%{upstream_version} +%patch0 -p1 chmod -x python/pycryptsetup-test.py chmod -x misc/dracut_90reencrypt/* @@ -136,15 +138,15 @@ cp -a . %{py3dir} %build %if %{python2_enable} || %{python3_enable} -%configure --enable-python --enable-fips --enable-pwquality --enable-libargon2 --disable-rpath --with-crypto_backend=openssl +%configure --enable-python --enable-fips --enable-pwquality --enable-libargon2 --with-crypto_backend=openssl %else -%configure --enable-fips --enable-pwquality --enable-libargon2 --disable-rpath --with-crypto_backend=openssl +%configure --enable-fips --enable-pwquality --enable-libargon2 --with-crypto_backend=openssl %endif make %{?_smp_mflags} %if %{python3_enable} pushd %{py3dir} -%configure --enable-python --with-python_version=3 --enable-fips --enable-pwquality --enable-libargon2 --disable-rpath --with-crypto_backend=openssl +%configure --enable-python --with-python_version=3 --enable-fips --enable-pwquality --enable-libargon2 --with-crypto_backend=openssl make %{?_smp_mflags} popd %endif @@ -225,6 +227,10 @@ popd %clean %changelog +* Fri Aug 03 2018 Ondrej Kozina - 2.0.4-1 +- Update to cryptsetup 2.0.4. +- patch: Add Fedora system library paths in configure. + * Tue Jul 17 2018 Ondrej Kozina - 2.0.3-6 - Remove libgcrypt dependency from cryptsetup-libs package. diff --git a/sources b/sources index 2e866c8..7e6a2b4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cryptsetup-2.0.3.tar.xz) = f5ac54aa9614b234f2d1e84758a98914d283b669f4ab5cbe0ed7cdf25ce77f2d1abdf1e5b5010d803971f0e29120954110ee4fcc538137b04fbdc13b7804385e +SHA512 (cryptsetup-2.0.4.tar.xz) = 74d442c7c7837da719a14aefa8bf0b5dffbb050acd6fbd140c50d43470c828f79fdcf7cd6acf1c149a4e1129a100059df6216b7d8ca04eb0b070cb8d4ca33e61 From ceb52ce323450ed1fe6baae3fffcaf5986739274 Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Mon, 29 Oct 2018 11:28:21 +0100 Subject: [PATCH 052/142] Update to version 2.0.5. --- .gitignore | 2 +- cryptsetup-2.0.4.tar.sign | 16 ---------------- cryptsetup-2.0.5.tar.sign | 16 ++++++++++++++++ cryptsetup.spec | 5 ++++- sources | 2 +- 5 files changed, 22 insertions(+), 19 deletions(-) delete mode 100644 cryptsetup-2.0.4.tar.sign create mode 100644 cryptsetup-2.0.5.tar.sign diff --git a/.gitignore b/.gitignore index 7336e5a..e8dfd3a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/cryptsetup-2.0.4.tar.xz +/cryptsetup-2.0.5.tar.xz diff --git a/cryptsetup-2.0.4.tar.sign b/cryptsetup-2.0.4.tar.sign deleted file mode 100644 index 44595ed..0000000 --- a/cryptsetup-2.0.4.tar.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAltkMxMACgkQ2bBXe9k+ -mPwN2hAAvJwEaj1rfAUVhwZ21wMx7wDezI0OLamKAtKKP8saYjH9GA8HpfikGhHD -/LqcM31dacsyFP2iK+qj5GuS8aPm9HqePkXa0sqBcWw7Bsr4a091HYtReT3+bG8j -zIZtTzsjapZ425/nVB9ClJcEES8N3OpW+zhamv84T1zDwbVtC5x1wiMtsvdM6Rhg -bz7R7kam/OPIxgfSWVufVUaMGWDO6zPwND1Wn7ZVm6UNsTPLV/M3/H+uPm4y+jaW -In+eDhb05eNcY94dBVhRdqd/72CJ1OXUMEo8GEtmVPljvCDI2ljZ4LEoBUve323f -/kzjzZZqljaVoQOl3pT+d7jqvg5EybM6crV8E++VJO3mVSAd5CZhk4LV/HsrnDuy -4XtZLSPSQQkyhcezZ0+8EmGzzXVlBMfg6o/Jsnao5DKuIoea78mmH1DX6XnEjFoI -MeM+W+3A1scK05LYeo6ZhtGvwlVxUOfsrl5zDp1X+kTT94zPvjmsY2xa0cP3eXZ3 -vxSI1dosbmL91tE65gEVa1dGEYWMWYeR8K8ZqwVhxsg3QJInOM+sh/KdWQP1o/Lp -S1D5zi/8gi9R43K7Nd3Xi027d02gOkwvowie1leXBXdNYrAZIeQJbcdXiXbSAOiD -NTjKDPwGZbXmPcQckF1er9nd821ofxbnGEM6jBzCEprEX3YSf3M= -=V9r2 ------END PGP SIGNATURE----- diff --git a/cryptsetup-2.0.5.tar.sign b/cryptsetup-2.0.5.tar.sign new file mode 100644 index 0000000..a15253a --- /dev/null +++ b/cryptsetup-2.0.5.tar.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAlvVz2sACgkQ2bBXe9k+ +mPyYuQ//fNwPronpHFrOzmv277cfzVT6zrgLKOaf/YlqA0h5XmBVX9xcOD9rXhda +ld9rumIQn9s8G8HLavxxxhnciqeNOS0T/1ry3NVpxYdfF1FptIjchH/Lo697P5dX +C1oAqchOqfxjm6dwmbllvXTgoHV657JUC5tuaL6Wl26DrhImmAgNi42yZehNtHZz +8FN0Fc0muU06LUmKR2a4P5xj2SvlNntMnvld+qLHf+k+bBrcJyu2cqaBNns45mXy +uDHXclP+8ofXW3mELmSBJ89GzLkr8Zpxp2dITv2GqtewX1MH5b8cMUwIVsCClqHl +2YNGhMqRkDDj0C8u8JpYvmmZxcMUaKr5EMze18NeqPXpZCBoW5nvEtsS7hWbCdyu +VPqdP4mHfHeQtZkk3U4SZLEU7xFzcTwhgpxRQPe6ujyz+PlrOLk0Z9js9WgOJZ1U +7a9YNnXWlNIcVqOoYm9SPBo9nj+eoVUr2GG3lT02udj5YhGZjDG0gbjgtM99jg+T +Bcv/h9abx6a2TmPIRW9Pa98ggIaeY3HbAK4D4xBritrfhvtyXMAYWbwj8ZkyCsCX +41I10Eh3dNXR6/OJQFjKv7RCqGzanyCzEG0F+G4mw5xqPx5jhowmjI7GaC54X7UZ +7RWYt1pl8F+UGIbBRl3BWuI+cHM0RBJ4Jx53f6zpqDP9hL58RbA= +=o3rq +-----END PGP SIGNATURE----- diff --git a/cryptsetup.spec b/cryptsetup.spec index a5b5955..badae13 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -21,7 +21,7 @@ Obsoletes: cryptsetup-python3 Summary: A utility for setting up encrypted disks Name: cryptsetup -Version: 2.0.4 +Version: 2.0.5 Release: 1%{?dist} License: GPLv2+ and LGPLv2+ Group: Applications/System @@ -227,6 +227,9 @@ popd %clean %changelog +* Mon Oct 29 2018 Ondrej Kozina - 2.0.5-1 +- Update to cryptsetup 2.0.5. + * Fri Aug 03 2018 Ondrej Kozina - 2.0.4-1 - Update to cryptsetup 2.0.4. - patch: Add Fedora system library paths in configure. diff --git a/sources b/sources index 7e6a2b4..ac3f257 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cryptsetup-2.0.4.tar.xz) = 74d442c7c7837da719a14aefa8bf0b5dffbb050acd6fbd140c50d43470c828f79fdcf7cd6acf1c149a4e1129a100059df6216b7d8ca04eb0b070cb8d4ca33e61 +SHA512 (cryptsetup-2.0.5.tar.xz) = bac3f5fde1be02d325c097f85e77aef44ce764c1bca7f0554cedd69b9444e5a5529f11b9ae74d36dc1977e88e11422a58dfa17e48559eac7f5e6c4ce332409ae From d68990b0e7a5a3b4c8dc96e1a50d2a6afdbf2fb2 Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Mon, 3 Dec 2018 15:45:46 +0100 Subject: [PATCH 053/142] Update to cryptsetup 2.0.6. --- .gitignore | 2 +- cryptsetup-2.0.5.tar.sign | 16 ---------------- cryptsetup-2.0.6.tar.sign | 16 ++++++++++++++++ cryptsetup.spec | 5 ++++- sources | 2 +- 5 files changed, 22 insertions(+), 19 deletions(-) delete mode 100644 cryptsetup-2.0.5.tar.sign create mode 100644 cryptsetup-2.0.6.tar.sign diff --git a/.gitignore b/.gitignore index e8dfd3a..e194678 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/cryptsetup-2.0.5.tar.xz +/cryptsetup-2.0.6.tar.xz diff --git a/cryptsetup-2.0.5.tar.sign b/cryptsetup-2.0.5.tar.sign deleted file mode 100644 index a15253a..0000000 --- a/cryptsetup-2.0.5.tar.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAlvVz2sACgkQ2bBXe9k+ -mPyYuQ//fNwPronpHFrOzmv277cfzVT6zrgLKOaf/YlqA0h5XmBVX9xcOD9rXhda -ld9rumIQn9s8G8HLavxxxhnciqeNOS0T/1ry3NVpxYdfF1FptIjchH/Lo697P5dX -C1oAqchOqfxjm6dwmbllvXTgoHV657JUC5tuaL6Wl26DrhImmAgNi42yZehNtHZz -8FN0Fc0muU06LUmKR2a4P5xj2SvlNntMnvld+qLHf+k+bBrcJyu2cqaBNns45mXy -uDHXclP+8ofXW3mELmSBJ89GzLkr8Zpxp2dITv2GqtewX1MH5b8cMUwIVsCClqHl -2YNGhMqRkDDj0C8u8JpYvmmZxcMUaKr5EMze18NeqPXpZCBoW5nvEtsS7hWbCdyu -VPqdP4mHfHeQtZkk3U4SZLEU7xFzcTwhgpxRQPe6ujyz+PlrOLk0Z9js9WgOJZ1U -7a9YNnXWlNIcVqOoYm9SPBo9nj+eoVUr2GG3lT02udj5YhGZjDG0gbjgtM99jg+T -Bcv/h9abx6a2TmPIRW9Pa98ggIaeY3HbAK4D4xBritrfhvtyXMAYWbwj8ZkyCsCX -41I10Eh3dNXR6/OJQFjKv7RCqGzanyCzEG0F+G4mw5xqPx5jhowmjI7GaC54X7UZ -7RWYt1pl8F+UGIbBRl3BWuI+cHM0RBJ4Jx53f6zpqDP9hL58RbA= -=o3rq ------END PGP SIGNATURE----- diff --git a/cryptsetup-2.0.6.tar.sign b/cryptsetup-2.0.6.tar.sign new file mode 100644 index 0000000..f7e354a --- /dev/null +++ b/cryptsetup-2.0.6.tar.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAlwE+GIACgkQ2bBXe9k+ +mPxm1w//b2cl85MwZsmuHfVPNAVuuyYeS+L4VGQ1+nn+HFuvwaRJwJ+CR1ldXCou +5DuJ33H5EeDU5OBJvhzBYXGPeS3omzzOoAp6659zLYzbuuviCs0M3Tzthx1KGaoQ +4bj5dvEpDrtRmQp2ieUNbqcMV1wHy9Xgt6MeKwmtsE4Crda/3aqroKdEpXh1gJbn +k5V3be8nJLiFjUm2YBc94p5GysTNJRRJiNOBNWmqk+lXgZ3P8YylhjO71f9eOpSc +Vei6zlniNNrilPi2Vn3Hs/uE0EEGNB/tXt8UVv9Gsh+VQFilOJ6Z2KbL9kYJOv+J +M8jHExEz33M3fM+4wuJD6qcYjAdoPZiLsnUD1HzSRQwO5GA6xkdd8x94SIuJ0p/O +On5Nk980sc8DnZwAlfuDfHaxgpEKY6+BGkzoTn5WbbNpgPw/4poZyJubMEjVdFdw +vP82I4juMuoBZi77wWnxxwjAfidqjwxQze53M2SeIrPJCKG54xfFa4XXNB5VQpuU +yiRGXhNcLgbvzMw0W/iStIw8JW3tUnl6tNLhw+YWQ3Z9rUi7DrVd1OwXOp3j8p+Z +MB43Ce1PtNkJbaSEwUVWSIoN2ZevrL7xLa/WaxAmZZAitkgAACKr4Q1XDpDF+lIe +7FcGl1Ehf/9lvFlYtg99V1NJ2Rp97UOxC6OG1SbmhaMPToZd6NA= +=BxP3 +-----END PGP SIGNATURE----- diff --git a/cryptsetup.spec b/cryptsetup.spec index badae13..a6f4e7b 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -21,7 +21,7 @@ Obsoletes: cryptsetup-python3 Summary: A utility for setting up encrypted disks Name: cryptsetup -Version: 2.0.5 +Version: 2.0.6 Release: 1%{?dist} License: GPLv2+ and LGPLv2+ Group: Applications/System @@ -227,6 +227,9 @@ popd %clean %changelog +* Mon Dec 03 2018 Ondrej Kozina - 2.0.6-1 +- Update to cryptsetup 2.0.6. + * Mon Oct 29 2018 Ondrej Kozina - 2.0.5-1 - Update to cryptsetup 2.0.5. diff --git a/sources b/sources index ac3f257..224fd6e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cryptsetup-2.0.5.tar.xz) = bac3f5fde1be02d325c097f85e77aef44ce764c1bca7f0554cedd69b9444e5a5529f11b9ae74d36dc1977e88e11422a58dfa17e48559eac7f5e6c4ce332409ae +SHA512 (cryptsetup-2.0.6.tar.xz) = 1fdb9068fe2b5825cef65323a9b788b5e043c1000e614e47e2b21ab3969e416653580aba639755ba936718ad612b986768029df5e07f3fa191db2bf29d2501ef From 4ee521054e39e0bb6ac0860ae70ee14479beff3d Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Tue, 22 Jan 2019 10:46:24 +0100 Subject: [PATCH 054/142] Switch default metadata format to LUKS2. - Resolves: #1668013 --- cryptsetup.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index a6f4e7b..797c566 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -22,7 +22,7 @@ Obsoletes: cryptsetup-python3 Summary: A utility for setting up encrypted disks Name: cryptsetup Version: 2.0.6 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ and LGPLv2+ Group: Applications/System URL: https://gitlab.com/cryptsetup/cryptsetup @@ -138,15 +138,15 @@ cp -a . %{py3dir} %build %if %{python2_enable} || %{python3_enable} -%configure --enable-python --enable-fips --enable-pwquality --enable-libargon2 --with-crypto_backend=openssl +%configure --enable-python --enable-fips --enable-pwquality --enable-libargon2 --with-crypto_backend=openssl --with-default-luks-format=LUKS2 %else -%configure --enable-fips --enable-pwquality --enable-libargon2 --with-crypto_backend=openssl +%configure --enable-fips --enable-pwquality --enable-libargon2 --with-crypto_backend=openssl --with-default-luks-format=LUKS2 %endif make %{?_smp_mflags} %if %{python3_enable} pushd %{py3dir} -%configure --enable-python --with-python_version=3 --enable-fips --enable-pwquality --enable-libargon2 --with-crypto_backend=openssl +%configure --enable-python --with-python_version=3 --enable-fips --enable-pwquality --enable-libargon2 --with-crypto_backend=openssl --with-default-luks-format=LUKS2 make %{?_smp_mflags} popd %endif @@ -227,6 +227,10 @@ popd %clean %changelog +* Tue Jan 22 2019 Ondrej Kozina - 2.0.6-2 +- Switch default metadata format to LUKS2. +- Resolves: #1668013 + * Mon Dec 03 2018 Ondrej Kozina - 2.0.6-1 - Update to cryptsetup 2.0.6. From bd4413d0fce2abd6d1f25d1a4953ce6a68f131fa Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 22 Jan 2019 18:38:45 +0100 Subject: [PATCH 055/142] Remove obsolete ldconfig scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko --- cryptsetup.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index 797c566..e19e44e 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -163,9 +163,7 @@ popd %endif %find_lang cryptsetup -%post -n cryptsetup-libs -p /sbin/ldconfig - -%postun -n cryptsetup-libs -p /sbin/ldconfig +%ldconfig_scriptlets -n cryptsetup-libs %files %{!?_licensedir:%global license %%doc} From a63008bf0bf605bf5294b59b2e4603c584cabb44 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:41 +0100 Subject: [PATCH 056/142] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- cryptsetup.spec | 8 -------- 1 file changed, 8 deletions(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index e19e44e..5b6758a 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -24,7 +24,6 @@ Name: cryptsetup Version: 2.0.6 Release: 2%{?dist} License: GPLv2+ and LGPLv2+ -Group: Applications/System URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: openssl-devel, popt-devel, device-mapper-devel BuildRequires: libuuid-devel, gcc, json-c-devel, libargon2-devel @@ -49,7 +48,6 @@ The cryptsetup package contains a utility for setting up disk encryption using dm-crypt kernel module. %package devel -Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig Summary: Headers and libraries for using encrypted file systems @@ -61,7 +59,6 @@ The cryptsetup-devel package contains libraries and header files used for writing code that makes use of disk encryption. %package libs -Group: System Environment/Libraries Summary: Cryptsetup shared library Provides: cryptsetup-luks-libs = %{version}-%{release} Obsoletes: cryptsetup-luks-libs < 1.4.0 @@ -70,7 +67,6 @@ Obsoletes: cryptsetup-luks-libs < 1.4.0 This package contains the cryptsetup shared library, libcryptsetup. %package -n veritysetup -Group: Applications/System Summary: A utility for setting up dm-verity volumes Requires: cryptsetup-libs = %{version}-%{release} @@ -79,7 +75,6 @@ The veritysetup package contains a utility for setting up disk verification using dm-verity kernel module. %package -n integritysetup -Group: Applications/System Summary: A utility for setting up dm-integrity volumes Requires: cryptsetup-libs = %{version}-%{release} @@ -88,7 +83,6 @@ The integritysetup package contains a utility for setting up disk integrity protection using dm-integrity kernel module. %package reencrypt -Group: Applications/System Summary: A utility for offline reencryption of LUKS encrypted disks. Requires: cryptsetup-libs = %{version}-%{release} @@ -98,7 +92,6 @@ can be used for offline reencryption of disk in situ. %if %{python2_enable} %package -n python2-cryptsetup -Group: System Environment/Libraries Summary: Python bindings for libcryptsetup Requires: %{name}-libs = %{version}-%{release} %{?python_provide:%python_provide python2-cryptsetup} @@ -115,7 +108,6 @@ for setting up disk encryption using dm-crypt kernel module. %if %{python3_enable} %package python3 -Group: System Environment/Libraries Summary: Python3 bindings for libcryptsetup Requires: %{name}-libs = %{version}-%{release} Provides: python3-cryptsetup = %{version}-%{release} From 267bafcd644432af9693cef46e06737c8e7a2330 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 29 Jan 2019 05:45:36 +0100 Subject: [PATCH 057/142] Remove unneeded %clean section It is the behavior since EPEL5. Signed-off-by: Igor Gnatenko --- cryptsetup.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index 5b6758a..e9f11fc 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -214,8 +214,6 @@ popd %{python3_sitearch}/pycryptsetup.so %endif -%clean - %changelog * Tue Jan 22 2019 Ondrej Kozina - 2.0.6-2 - Switch default metadata format to LUKS2. From c54b94c5ef413dfb67a36d56c662979755dcdfd2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 16:28:53 +0000 Subject: [PATCH 058/142] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cryptsetup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index e9f11fc..c15d4dd 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -22,7 +22,7 @@ Obsoletes: cryptsetup-python3 Summary: A utility for setting up encrypted disks Name: cryptsetup Version: 2.0.6 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ and LGPLv2+ URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: openssl-devel, popt-devel, device-mapper-devel @@ -215,6 +215,9 @@ popd %endif %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 2.0.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Tue Jan 22 2019 Ondrej Kozina - 2.0.6-2 - Switch default metadata format to LUKS2. - Resolves: #1668013 From 6dea81785943401c217bae212e759ca9de880770 Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Fri, 8 Feb 2019 16:00:54 +0100 Subject: [PATCH 059/142] Update to cryptsetup 2.1.0. --- .gitignore | 2 +- cryptsetup-2.0.6.tar.sign | 16 ------ cryptsetup-2.1.0.tar.sign | 16 ++++++ cryptsetup.spec | 106 +++----------------------------------- sources | 2 +- 5 files changed, 26 insertions(+), 116 deletions(-) delete mode 100644 cryptsetup-2.0.6.tar.sign create mode 100644 cryptsetup-2.1.0.tar.sign diff --git a/.gitignore b/.gitignore index e194678..f5ce051 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/cryptsetup-2.0.6.tar.xz +/cryptsetup-2.1.0.tar.xz diff --git a/cryptsetup-2.0.6.tar.sign b/cryptsetup-2.0.6.tar.sign deleted file mode 100644 index f7e354a..0000000 --- a/cryptsetup-2.0.6.tar.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAlwE+GIACgkQ2bBXe9k+ -mPxm1w//b2cl85MwZsmuHfVPNAVuuyYeS+L4VGQ1+nn+HFuvwaRJwJ+CR1ldXCou -5DuJ33H5EeDU5OBJvhzBYXGPeS3omzzOoAp6659zLYzbuuviCs0M3Tzthx1KGaoQ -4bj5dvEpDrtRmQp2ieUNbqcMV1wHy9Xgt6MeKwmtsE4Crda/3aqroKdEpXh1gJbn -k5V3be8nJLiFjUm2YBc94p5GysTNJRRJiNOBNWmqk+lXgZ3P8YylhjO71f9eOpSc -Vei6zlniNNrilPi2Vn3Hs/uE0EEGNB/tXt8UVv9Gsh+VQFilOJ6Z2KbL9kYJOv+J -M8jHExEz33M3fM+4wuJD6qcYjAdoPZiLsnUD1HzSRQwO5GA6xkdd8x94SIuJ0p/O -On5Nk980sc8DnZwAlfuDfHaxgpEKY6+BGkzoTn5WbbNpgPw/4poZyJubMEjVdFdw -vP82I4juMuoBZi77wWnxxwjAfidqjwxQze53M2SeIrPJCKG54xfFa4XXNB5VQpuU -yiRGXhNcLgbvzMw0W/iStIw8JW3tUnl6tNLhw+YWQ3Z9rUi7DrVd1OwXOp3j8p+Z -MB43Ce1PtNkJbaSEwUVWSIoN2ZevrL7xLa/WaxAmZZAitkgAACKr4Q1XDpDF+lIe -7FcGl1Ehf/9lvFlYtg99V1NJ2Rp97UOxC6OG1SbmhaMPToZd6NA= -=BxP3 ------END PGP SIGNATURE----- diff --git a/cryptsetup-2.1.0.tar.sign b/cryptsetup-2.1.0.tar.sign new file mode 100644 index 0000000..60ad186 --- /dev/null +++ b/cryptsetup-2.1.0.tar.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAlxdkp0ACgkQ2bBXe9k+ +mPx0JxAAu+yx54yDHQO1QOZvINKVSrLwZ/nGAy+JDQsOsM/+zOlXictxD/yybzZv +GFuWdn5POnZDfwjp9b9UvudOUbxTLWNimyavV58iG0ICgFbxC6wpCVn0NxC+lPtt +3uThWXTgJzcDpGbi9oi7FWEoihG7DJHMsGVUeUnhcZC+NSdXl6/ZTb5i68/rNNzc +YHwM7OSWczn39Bdr0+/gs3jxnO01OP1weNgFZ6ChcENkSp8n+TQJEVwa+yiuO+rP +BcBws0zjBYTKcpm/ZtuPGczwOaEBwk/jyamgfoobIeCzIyyUdMrCxwE/3oYMJxqS +faijxMd21RZ3yqnkwvhTO1CbGWHAlVCqjAzyX8okhgjVi8gQpWvD67WRSC7FX+vD +72m9yZ5qTO0lNPTtze6xo88UvWskIZtSg1rPtP39vyBnAAgZflKFRu8r+IgXn612 +VRJLlit+mCmKOgi5ochkxlJgrMY6FmWbVMlq1sxFy1dk3wRQTh5DYzT5IGnhdXi8 +osY2swVKnVJhkThomVUJ8pXIwWGKZNGMzTU7Eofi9zSHwTMm0y6EdFNlXogrzmY3 +vEHOb3zEqPujWegBeqsHhuHgPQewgts+7bIPEbvEPsSwSqMvX8BPsyLv7c6bat9x +GhXTLwGeJ2RcNmF5bH7GMe7b+XLVaeBzNjLE3Ty0iFWgzT3Uwd0= +=gOH9 +-----END PGP SIGNATURE----- diff --git a/cryptsetup.spec b/cryptsetup.spec index c15d4dd..3478c5a 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,39 +1,12 @@ -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} - -%if 0%{?fedora} -%if 0%{?fedora} >= 29 -Obsoletes: python2-cryptsetup -Obsoletes: cryptsetup-python3 -%global python2_enable 0 -%global python3_enable 0 -%else -%global python2_enable 1 -%global python3_enable 1 -%endif -%else -%global python3_enable 0 -%if 0%{?rhel} == 7 -%global python2_enable 1 -%else -%global python2_enable 0 -%endif -%endif - Summary: A utility for setting up encrypted disks Name: cryptsetup -Version: 2.0.6 -Release: 3%{?dist} +Version: 2.1.0 +Release: 1%{?dist} License: GPLv2+ and LGPLv2+ URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: openssl-devel, popt-devel, device-mapper-devel BuildRequires: libuuid-devel, gcc, json-c-devel, libargon2-devel BuildRequires: libpwquality-devel, libblkid-devel -%if %{python2_enable} -BuildRequires: python2-devel -%endif -%if %{python3_enable} -BuildRequires: python3-devel -%endif Provides: cryptsetup-luks = %{version}-%{release} Obsoletes: cryptsetup-luks < 1.4.0 Requires: cryptsetup-libs = %{version}-%{release} @@ -90,69 +63,19 @@ Requires: cryptsetup-libs = %{version}-%{release} This package contains cryptsetup-reencrypt utility which can be used for offline reencryption of disk in situ. -%if %{python2_enable} -%package -n python2-cryptsetup -Summary: Python bindings for libcryptsetup -Requires: %{name}-libs = %{version}-%{release} -%{?python_provide:%python_provide python2-cryptsetup} -# Remove before F30 -Provides: %{name}-python = %{version}-%{release} -Provides: %{name}-python%{?_isa} = %{version}-%{release} -Obsoletes: %{name}-python < %{version}-%{release} -Obsoletes: python-cryptsetup < 1.4.0 - -%description -n python2-cryptsetup -This package provides Python bindings for libcryptsetup, a library -for setting up disk encryption using dm-crypt kernel module. -%endif - -%if %{python3_enable} -%package python3 -Summary: Python3 bindings for libcryptsetup -Requires: %{name}-libs = %{version}-%{release} -Provides: python3-cryptsetup = %{version}-%{release} - -%description python3 -This package provides Python bindings for libcryptsetup, a library -for setting up disk encryption using dm-crypt kernel module. -%endif - %prep %setup -q -n cryptsetup-%{upstream_version} %patch0 -p1 -chmod -x python/pycryptsetup-test.py chmod -x misc/dracut_90reencrypt/* -# copy the whole directory for the python3 build -%if %{python3_enable} -cp -a . %{py3dir} -%endif - %build -%if %{python2_enable} || %{python3_enable} -%configure --enable-python --enable-fips --enable-pwquality --enable-libargon2 --with-crypto_backend=openssl --with-default-luks-format=LUKS2 -%else -%configure --enable-fips --enable-pwquality --enable-libargon2 --with-crypto_backend=openssl --with-default-luks-format=LUKS2 -%endif +%configure --enable-fips --enable-pwquality --enable-libargon2 make %{?_smp_mflags} -%if %{python3_enable} -pushd %{py3dir} -%configure --enable-python --with-python_version=3 --enable-fips --enable-pwquality --enable-libargon2 --with-crypto_backend=openssl --with-default-luks-format=LUKS2 -make %{?_smp_mflags} -popd -%endif - %install make install DESTDIR=%{buildroot} rm -rf %{buildroot}/%{_libdir}/*.la -%if %{python3_enable} -pushd %{py3dir} -make install DESTDIR=%{buildroot} -rm -rf %{buildroot}/%{_libdir}/*.la -popd -%endif %find_lang cryptsetup %ldconfig_scriptlets -n cryptsetup-libs @@ -196,25 +119,12 @@ popd %{_tmpfilesdir}/cryptsetup.conf %ghost %dir /run/cryptsetup -%if %{python2_enable} -%files -n python2-cryptsetup -%{!?_licensedir:%global license %%doc} -%license COPYING.LGPL -%doc python/pycryptsetup-test.py -%exclude %{python_sitearch}/pycryptsetup.la -%{python2_sitearch}/pycryptsetup.so -%endif - -%if %{python3_enable} -%files python3 -%{!?_licensedir:%global license %%doc} -%license COPYING.LGPL -%doc python/pycryptsetup-test.py -%exclude %{python3_sitearch}/pycryptsetup.la -%{python3_sitearch}/pycryptsetup.so -%endif - %changelog +* Fri Feb 08 2019 Ondrej Kozina - 2.1.0-1 +- Update to cryptsetup 2.1.0. +- Drop python specific bits from spec file (python was removed + from upstream project) + * Thu Jan 31 2019 Fedora Release Engineering - 2.0.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 224fd6e..21117a3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cryptsetup-2.0.6.tar.xz) = 1fdb9068fe2b5825cef65323a9b788b5e043c1000e614e47e2b21ab3969e416653580aba639755ba936718ad612b986768029df5e07f3fa191db2bf29d2501ef +SHA512 (cryptsetup-2.1.0.tar.xz) = f1b68e4d9d0ca2361fe9bdd51c60630dd4ab7a689b7be7756edf4dee12929d2356dd0658c9b940ffe27c033ef289efaf49daf21d250d37fdfa15394b5d821928 From 6fbf418fd11ea7aaf001817e4bbd54a45ff79f15 Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Mon, 18 Mar 2019 13:30:09 +0100 Subject: [PATCH 060/142] Rebuild for new libargon2 soname. --- cryptsetup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index 3478c5a..39f88b6 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,7 +1,7 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup Version: 2.1.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ and LGPLv2+ URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: openssl-devel, popt-devel, device-mapper-devel @@ -120,6 +120,9 @@ rm -rf %{buildroot}/%{_libdir}/*.la %ghost %dir /run/cryptsetup %changelog +* Mon Mar 18 2019 Milan Broz - 2.1.0-2 +- Rebuild for new libargon2 soname. + * Fri Feb 08 2019 Ondrej Kozina - 2.1.0-1 - Update to cryptsetup 2.1.0. - Drop python specific bits from spec file (python was removed From eaa427d5739927a05d5de546520d6adbd67592ad Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 4 Apr 2019 12:40:47 +0200 Subject: [PATCH 061/142] Add back python2-cryptsetup and cryptsetup-python3 obsoletes They were lost in commit 6dea817. Add them back to support F28->F30 upgrade path. --- cryptsetup.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index 39f88b6..7c5c1a6 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,7 +1,7 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup Version: 2.1.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ and LGPLv2+ URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: openssl-devel, popt-devel, device-mapper-devel @@ -11,6 +11,10 @@ Provides: cryptsetup-luks = %{version}-%{release} Obsoletes: cryptsetup-luks < 1.4.0 Requires: cryptsetup-libs = %{version}-%{release} Requires: libpwquality >= 1.2.0 +# python subpackages were removed in F29; keep the obsoletes until F30 to +# support F28->F30 upgrade path. +Obsoletes: python2-cryptsetup < 2.1.0 +Obsoletes: cryptsetup-python3 < 2.1.0 %global upstream_version %{version} Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v2.0/cryptsetup-%{upstream_version}.tar.xz @@ -120,6 +124,9 @@ rm -rf %{buildroot}/%{_libdir}/*.la %ghost %dir /run/cryptsetup %changelog +* Thu Apr 04 2019 Kalev Lember - 2.1.0-3 +- Add back python2-cryptsetup and cryptsetup-python3 obsoletes + * Mon Mar 18 2019 Milan Broz - 2.1.0-2 - Rebuild for new libargon2 soname. From 82aaa7e3e15ab4e8dbbee9c71b640d1c2b1287c4 Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Fri, 3 May 2019 16:41:00 +0200 Subject: [PATCH 062/142] Update to cryptsetup 2.2.0-rc0. --- .gitignore | 2 +- cryptsetup-2.1.0.tar.sign | 16 ---------------- cryptsetup-2.2.0-rc0.tar.sign | 16 ++++++++++++++++ cryptsetup.spec | 9 ++++++--- sources | 2 +- 5 files changed, 24 insertions(+), 21 deletions(-) delete mode 100644 cryptsetup-2.1.0.tar.sign create mode 100644 cryptsetup-2.2.0-rc0.tar.sign diff --git a/.gitignore b/.gitignore index f5ce051..17ca904 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/cryptsetup-2.1.0.tar.xz +/cryptsetup-2.2.0-rc0.tar.xz diff --git a/cryptsetup-2.1.0.tar.sign b/cryptsetup-2.1.0.tar.sign deleted file mode 100644 index 60ad186..0000000 --- a/cryptsetup-2.1.0.tar.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAlxdkp0ACgkQ2bBXe9k+ -mPx0JxAAu+yx54yDHQO1QOZvINKVSrLwZ/nGAy+JDQsOsM/+zOlXictxD/yybzZv -GFuWdn5POnZDfwjp9b9UvudOUbxTLWNimyavV58iG0ICgFbxC6wpCVn0NxC+lPtt -3uThWXTgJzcDpGbi9oi7FWEoihG7DJHMsGVUeUnhcZC+NSdXl6/ZTb5i68/rNNzc -YHwM7OSWczn39Bdr0+/gs3jxnO01OP1weNgFZ6ChcENkSp8n+TQJEVwa+yiuO+rP -BcBws0zjBYTKcpm/ZtuPGczwOaEBwk/jyamgfoobIeCzIyyUdMrCxwE/3oYMJxqS -faijxMd21RZ3yqnkwvhTO1CbGWHAlVCqjAzyX8okhgjVi8gQpWvD67WRSC7FX+vD -72m9yZ5qTO0lNPTtze6xo88UvWskIZtSg1rPtP39vyBnAAgZflKFRu8r+IgXn612 -VRJLlit+mCmKOgi5ochkxlJgrMY6FmWbVMlq1sxFy1dk3wRQTh5DYzT5IGnhdXi8 -osY2swVKnVJhkThomVUJ8pXIwWGKZNGMzTU7Eofi9zSHwTMm0y6EdFNlXogrzmY3 -vEHOb3zEqPujWegBeqsHhuHgPQewgts+7bIPEbvEPsSwSqMvX8BPsyLv7c6bat9x -GhXTLwGeJ2RcNmF5bH7GMe7b+XLVaeBzNjLE3Ty0iFWgzT3Uwd0= -=gOH9 ------END PGP SIGNATURE----- diff --git a/cryptsetup-2.2.0-rc0.tar.sign b/cryptsetup-2.2.0-rc0.tar.sign new file mode 100644 index 0000000..d761f31 --- /dev/null +++ b/cryptsetup-2.2.0-rc0.tar.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAlzMROUACgkQ2bBXe9k+ +mPwxXRAAgnTDwHEEA8hA20QYQ3fAoNDLJ4piMIJqWakE3QWb/+JEIlTyOz8GHchk +G4XN0BjBafX37xW4iKdS/DsBxFonYt7aAhaoFnaj68I9DCv0PehV69wLk53cjI0o +fNyKFUKCUSM0tQvxs5HiqOKH+4UsbyYGvZS/Gu+f+tajl+s28r5ggE80T6p2nkix +/Sdfh+CcUdhrKlJmIK7eKHmp+lyV/mEUksfBw2zUwRb/Eewd1JJIedPTZO+d3pxw ++j3onLRDxKo0vbE1IYGAnBjv7NI562tJSQ3CnmmgqV3vtRr8nc5gbjmHNPDTHO5h +AWDTkaIa+C65Nfdeo0MOQyODd3TPAGIgWVIsb54+a5tcQBq4T6hni03bQl7Lx3MD +UYmOK2v8062HU2e1e6DFARVRS8QPkbFSqlwNUU+ysOnsdFIHUi9HbzNZBY6RN5wU +f2iThT0dmvobDrukOiMFOJO06MYHZvh43IbTsL2c3NE66BUHLiuNfLQn+FNZ8HqX +eVgybsP88YZFla7ggCpNUZZ9+Ninc57+aJOnmowGACqWHN7RToevKtmyW7nZcur9 +QoVzjx+P6o0LYQMrXUMFbuDMorHken0ipYpMW3y1seEzejI7lyq9Cot/RMu+q01o +oa++cvBxdK6rRzCwcindS8pCEUn2BChSdtWnrLRXdYU9BSj9QFw= +=9yis +-----END PGP SIGNATURE----- diff --git a/cryptsetup.spec b/cryptsetup.spec index 7c5c1a6..9a294cd 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,7 +1,7 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup -Version: 2.1.0 -Release: 3%{?dist} +Version: 2.2.0 +Release: 0.1%{?dist} License: GPLv2+ and LGPLv2+ URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: openssl-devel, popt-devel, device-mapper-devel @@ -16,7 +16,7 @@ Requires: libpwquality >= 1.2.0 Obsoletes: python2-cryptsetup < 2.1.0 Obsoletes: cryptsetup-python3 < 2.1.0 -%global upstream_version %{version} +%global upstream_version %{version}-rc0 Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v2.0/cryptsetup-%{upstream_version}.tar.xz Patch0: %{name}-add-system-library-paths.patch @@ -124,6 +124,9 @@ rm -rf %{buildroot}/%{_libdir}/*.la %ghost %dir /run/cryptsetup %changelog +* Fri May 03 2019 Ondrej Kozina - 2.2.0-0.1 +- Update to cryptsetup 2.2.0-rc0. + * Thu Apr 04 2019 Kalev Lember - 2.1.0-3 - Add back python2-cryptsetup and cryptsetup-python3 obsoletes diff --git a/sources b/sources index 21117a3..9a6d05a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cryptsetup-2.1.0.tar.xz) = f1b68e4d9d0ca2361fe9bdd51c60630dd4ab7a689b7be7756edf4dee12929d2356dd0658c9b940ffe27c033ef289efaf49daf21d250d37fdfa15394b5d821928 +SHA512 (cryptsetup-2.2.0-rc0.tar.xz) = ef168ee8757b7f9f6e7ffd5c310f2699ad4461c9886583b9a610f06c67996d688db060913c053da2f1f17090caaa07425ea735b7fcae50b2e1f32aa62f48e1a1 From 9b27f43a7e056848e3281bb3acd03f253f6de908 Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Fri, 14 Jun 2019 17:55:05 +0200 Subject: [PATCH 063/142] Update to cryptsetup 2.2.0-rc1. --- .gitignore | 1 + cryptsetup-2.2.0-rc0.tar.sign | 16 ---------------- cryptsetup-2.2.0-rc1.tar.sign | 16 ++++++++++++++++ cryptsetup.spec | 7 +++++-- sources | 2 +- 5 files changed, 23 insertions(+), 19 deletions(-) delete mode 100644 cryptsetup-2.2.0-rc0.tar.sign create mode 100644 cryptsetup-2.2.0-rc1.tar.sign diff --git a/.gitignore b/.gitignore index 17ca904..14129ee 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /cryptsetup-2.2.0-rc0.tar.xz +/cryptsetup-2.2.0-rc1.tar.xz diff --git a/cryptsetup-2.2.0-rc0.tar.sign b/cryptsetup-2.2.0-rc0.tar.sign deleted file mode 100644 index d761f31..0000000 --- a/cryptsetup-2.2.0-rc0.tar.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAlzMROUACgkQ2bBXe9k+ -mPwxXRAAgnTDwHEEA8hA20QYQ3fAoNDLJ4piMIJqWakE3QWb/+JEIlTyOz8GHchk -G4XN0BjBafX37xW4iKdS/DsBxFonYt7aAhaoFnaj68I9DCv0PehV69wLk53cjI0o -fNyKFUKCUSM0tQvxs5HiqOKH+4UsbyYGvZS/Gu+f+tajl+s28r5ggE80T6p2nkix -/Sdfh+CcUdhrKlJmIK7eKHmp+lyV/mEUksfBw2zUwRb/Eewd1JJIedPTZO+d3pxw -+j3onLRDxKo0vbE1IYGAnBjv7NI562tJSQ3CnmmgqV3vtRr8nc5gbjmHNPDTHO5h -AWDTkaIa+C65Nfdeo0MOQyODd3TPAGIgWVIsb54+a5tcQBq4T6hni03bQl7Lx3MD -UYmOK2v8062HU2e1e6DFARVRS8QPkbFSqlwNUU+ysOnsdFIHUi9HbzNZBY6RN5wU -f2iThT0dmvobDrukOiMFOJO06MYHZvh43IbTsL2c3NE66BUHLiuNfLQn+FNZ8HqX -eVgybsP88YZFla7ggCpNUZZ9+Ninc57+aJOnmowGACqWHN7RToevKtmyW7nZcur9 -QoVzjx+P6o0LYQMrXUMFbuDMorHken0ipYpMW3y1seEzejI7lyq9Cot/RMu+q01o -oa++cvBxdK6rRzCwcindS8pCEUn2BChSdtWnrLRXdYU9BSj9QFw= -=9yis ------END PGP SIGNATURE----- diff --git a/cryptsetup-2.2.0-rc1.tar.sign b/cryptsetup-2.2.0-rc1.tar.sign new file mode 100644 index 0000000..4e3ddad --- /dev/null +++ b/cryptsetup-2.2.0-rc1.tar.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAl0Dp9EACgkQ2bBXe9k+ +mPy02Q/7BwavnJG/pdmGvKisc9W0qcLoMuKDMtzHtm6tqMG7nPAsnF+Mhq9ltgYH +VAOx55ED79A6NmhP29TxKCwkJaH2jv0SjCBIupym/YGCt2QE4V03TiinhGNJMG6H +MD9hu3/+ZllIdhfyONgNHp1E5dFDJTHNOvRDTyfrE81ZHgky4SqLD2bTOtRdmui7 +gcD3HCrh5s7MOE9OMNE389ePbCHeWpiv6QfIwZpbUjqnx5QufiwdvOqhQzAYl1IQ +TJ6Z/M3wlLKsmIs6NpBTfFL12o0DYI4gDYKSdV+Ls03tH9drHTw18ha7bo4WBbay +3QqLLFT42B+8/CnO05oVJlyXqKSD8IkkxEmik6QyWtl8ApSSMIxr42lfWSRquU9H +n6DKfF59WwbpX7kAagm4vx++d6k2iHVZS/b33r4lNNMFQ+BKk7pd1T8ywamkPeEd +N4sby+Oc0dPMDJGl4otD8rA5pMgBoxVH9Ql6gRwJOLy4l2NfBYqJnxYmKkCej1TJ +sUGxlhLHRoe3DVY5lRNoAqxpcnTVMPvdJ9Gm790y9hrgPMpxgPjI1/e5egy9SDgW +IAjc3aKtaYlLa2u0cAyLbWjDwggG2V9IA0sw1H73E1yjk7V6MZUoJNkH0ToUcw/n +A3i3bbnDuicbNjByVYKN/Ptl0E9RT0Y6r3TNKFJR1zzNZlz81hg= +=HhTi +-----END PGP SIGNATURE----- diff --git a/cryptsetup.spec b/cryptsetup.spec index 9a294cd..e76b567 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,7 +1,7 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup Version: 2.2.0 -Release: 0.1%{?dist} +Release: 0.2%{?dist} License: GPLv2+ and LGPLv2+ URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: openssl-devel, popt-devel, device-mapper-devel @@ -16,7 +16,7 @@ Requires: libpwquality >= 1.2.0 Obsoletes: python2-cryptsetup < 2.1.0 Obsoletes: cryptsetup-python3 < 2.1.0 -%global upstream_version %{version}-rc0 +%global upstream_version %{version}-rc1 Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v2.0/cryptsetup-%{upstream_version}.tar.xz Patch0: %{name}-add-system-library-paths.patch @@ -124,6 +124,9 @@ rm -rf %{buildroot}/%{_libdir}/*.la %ghost %dir /run/cryptsetup %changelog +* Fri Jun 14 2019 Ondrej Kozina - 2.2.0-0.2 +- Update to cryptsetup 2.2.0-rc1. + * Fri May 03 2019 Ondrej Kozina - 2.2.0-0.1 - Update to cryptsetup 2.2.0-rc0. diff --git a/sources b/sources index 9a6d05a..c8a0bad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cryptsetup-2.2.0-rc0.tar.xz) = ef168ee8757b7f9f6e7ffd5c310f2699ad4461c9886583b9a610f06c67996d688db060913c053da2f1f17090caaa07425ea735b7fcae50b2e1f32aa62f48e1a1 +SHA512 (cryptsetup-2.2.0-rc1.tar.xz) = a9875d3e20a99377ed3065ac9a4079968766b7774b2ea67226591f992932168278752dc762ef9843077e75da004f58e362327deb0981efbb0ce0928216aea2da From edb5a7beb757f957bca871bc56aa123a2cd851d9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 21:14:52 +0000 Subject: [PATCH 064/142] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cryptsetup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index e76b567..f11e673 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,7 +1,7 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup Version: 2.2.0 -Release: 0.2%{?dist} +Release: 0.3%{?dist} License: GPLv2+ and LGPLv2+ URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: openssl-devel, popt-devel, device-mapper-devel @@ -124,6 +124,9 @@ rm -rf %{buildroot}/%{_libdir}/*.la %ghost %dir /run/cryptsetup %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 2.2.0-0.3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Jun 14 2019 Ondrej Kozina - 2.2.0-0.2 - Update to cryptsetup 2.2.0-rc1. From 4890123740facb762609fdbcc617c388d5db7fbd Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Thu, 15 Aug 2019 09:22:26 +0200 Subject: [PATCH 065/142] Update to version 2.2.0. --- .gitignore | 3 +-- cryptsetup-2.2.0-rc1.tar.sign | 16 ---------------- cryptsetup-2.2.0.tar.sign | 16 ++++++++++++++++ cryptsetup-add-system-library-paths.patch | 10 +++++----- cryptsetup.spec | 9 ++++++--- sources | 2 +- 6 files changed, 29 insertions(+), 27 deletions(-) delete mode 100644 cryptsetup-2.2.0-rc1.tar.sign create mode 100644 cryptsetup-2.2.0.tar.sign diff --git a/.gitignore b/.gitignore index 14129ee..e7554ce 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -/cryptsetup-2.2.0-rc0.tar.xz -/cryptsetup-2.2.0-rc1.tar.xz +/cryptsetup-2.2.0.tar.xz diff --git a/cryptsetup-2.2.0-rc1.tar.sign b/cryptsetup-2.2.0-rc1.tar.sign deleted file mode 100644 index 4e3ddad..0000000 --- a/cryptsetup-2.2.0-rc1.tar.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAl0Dp9EACgkQ2bBXe9k+ -mPy02Q/7BwavnJG/pdmGvKisc9W0qcLoMuKDMtzHtm6tqMG7nPAsnF+Mhq9ltgYH -VAOx55ED79A6NmhP29TxKCwkJaH2jv0SjCBIupym/YGCt2QE4V03TiinhGNJMG6H -MD9hu3/+ZllIdhfyONgNHp1E5dFDJTHNOvRDTyfrE81ZHgky4SqLD2bTOtRdmui7 -gcD3HCrh5s7MOE9OMNE389ePbCHeWpiv6QfIwZpbUjqnx5QufiwdvOqhQzAYl1IQ -TJ6Z/M3wlLKsmIs6NpBTfFL12o0DYI4gDYKSdV+Ls03tH9drHTw18ha7bo4WBbay -3QqLLFT42B+8/CnO05oVJlyXqKSD8IkkxEmik6QyWtl8ApSSMIxr42lfWSRquU9H -n6DKfF59WwbpX7kAagm4vx++d6k2iHVZS/b33r4lNNMFQ+BKk7pd1T8ywamkPeEd -N4sby+Oc0dPMDJGl4otD8rA5pMgBoxVH9Ql6gRwJOLy4l2NfBYqJnxYmKkCej1TJ -sUGxlhLHRoe3DVY5lRNoAqxpcnTVMPvdJ9Gm790y9hrgPMpxgPjI1/e5egy9SDgW -IAjc3aKtaYlLa2u0cAyLbWjDwggG2V9IA0sw1H73E1yjk7V6MZUoJNkH0ToUcw/n -A3i3bbnDuicbNjByVYKN/Ptl0E9RT0Y6r3TNKFJR1zzNZlz81hg= -=HhTi ------END PGP SIGNATURE----- diff --git a/cryptsetup-2.2.0.tar.sign b/cryptsetup-2.2.0.tar.sign new file mode 100644 index 0000000..c7e623c --- /dev/null +++ b/cryptsetup-2.2.0.tar.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAl1U/ywACgkQ2bBXe9k+ +mPx+RQ//Q6PcBF+9kxLl9BmbDqOnGPgCBksDsPD78ergJ+JPsmSVc71JD0lR5zha +kaOogegxZwQRv6K7W0lF9HKmlLIucj1o0fkvJ9gI+olyKiLahqQIVcBJ6vMXvMvy +653IPOFm2NfSBwN0FFVgk1T3SQCccxZXQDtfEqrILsP70coRax0mP6ArbqQ2a072 +Vo8dcSWz6+aNRcHsgMsSpqjtbYSDSb5ngrb/lUGvqTyN+C/zp4l7ktSiMeUPXhx/ +92IolBWY0MHCCADQRZmBzfMse4bo1BlHBC/Se02WiLGLJla9/J3d2xY25/tDPJ3Y +AExv/01Fy5nrqZaY9asCAnOT/eCPKqx8SedcXjw4jxKIC7Bc9cWs+n4+UiNIhHWz +ajL2tGcCThhubxcBJoqR1VJGwfLXGa/QYKGEG9KT5EDffBJaL2dwgBHvkdPung0O +jyiPjVYVzj18F1M3O54gCvEGYyg6R4Bf/m4RoWGKYBlTvyBAwNBs65JpjKrFMUpY +WxtZItVghAO/pzrTjsgk7EwYGmxWYzBuiG+e2tRcDJnMZ8PCWhKWdOB/xn7bHfdN +JGptCkGoQ3szXNArMjuBBUausV+yaJKAID2jgM7Ukd/V3ipIRlSCkHDsEeDwZ4zb +qfDVGfTa3NrajChuTh7cp3SpNYqNpR0VmR7Y1o4JWSSAAAN8yYI= +=tbBV +-----END PGP SIGNATURE----- diff --git a/cryptsetup-add-system-library-paths.patch b/cryptsetup-add-system-library-paths.patch index cc22adf..0a5d753 100644 --- a/cryptsetup-add-system-library-paths.patch +++ b/cryptsetup-add-system-library-paths.patch @@ -1,7 +1,7 @@ -diff -rupN cryptsetup-2.0.4.old/configure cryptsetup-2.0.4/configure ---- cryptsetup-2.0.4.old/configure 2018-08-03 12:31:52.000000000 +0200 -+++ cryptsetup-2.0.4/configure 2018-08-03 13:42:50.605275535 +0200 -@@ -12300,6 +12300,9 @@ fi +diff -rupN cryptsetup-2.2.0.old/configure cryptsetup-2.2.0/configure +--- cryptsetup-2.2.0.old/configure 2019-08-14 20:45:07.000000000 +0200 ++++ cryptsetup-2.2.0/configure 2019-08-15 09:11:14.775184005 +0200 +@@ -12294,6 +12294,9 @@ fi # before this can be enabled. hardcode_into_libs=yes @@ -11,7 +11,7 @@ diff -rupN cryptsetup-2.0.4.old/configure cryptsetup-2.0.4/configure # Ideally, we could use ldconfig to report *all* directores which are # searched for libraries, however this is still not possible. Aside from not # being certain /sbin/ldconfig is available, command -@@ -12308,7 +12311,7 @@ fi +@@ -12302,7 +12305,7 @@ fi # appending ld.so.conf contents (and includes) to the search path. if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` diff --git a/cryptsetup.spec b/cryptsetup.spec index f11e673..3a85760 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,7 +1,7 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup Version: 2.2.0 -Release: 0.3%{?dist} +Release: 1%{?dist} License: GPLv2+ and LGPLv2+ URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: openssl-devel, popt-devel, device-mapper-devel @@ -16,8 +16,8 @@ Requires: libpwquality >= 1.2.0 Obsoletes: python2-cryptsetup < 2.1.0 Obsoletes: cryptsetup-python3 < 2.1.0 -%global upstream_version %{version}-rc1 -Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v2.0/cryptsetup-%{upstream_version}.tar.xz +%global upstream_version %{version} +Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v2.2/cryptsetup-%{upstream_version}.tar.xz Patch0: %{name}-add-system-library-paths.patch %description @@ -124,6 +124,9 @@ rm -rf %{buildroot}/%{_libdir}/*.la %ghost %dir /run/cryptsetup %changelog +* Thu Aug 15 2019 Milan Broz - 2.2.0-1 +- Update to cryptsetup 2.2.0. + * Wed Jul 24 2019 Fedora Release Engineering - 2.2.0-0.3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index c8a0bad..47136a5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cryptsetup-2.2.0-rc1.tar.xz) = a9875d3e20a99377ed3065ac9a4079968766b7774b2ea67226591f992932168278752dc762ef9843077e75da004f58e362327deb0981efbb0ce0928216aea2da +SHA512 (cryptsetup-2.2.0.tar.xz) = 903ef5811999ce3836bc348334192a432a971f94aa9c850491c8ba856a2c87385f75abc9296b0913ee6785149b8a7bd40457ad07e01f4ac7a1e62e97c7b18e6e From 7f9eec0142b7599b37a9b0e78662ba19fcd2ad4b Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Thu, 15 Aug 2019 10:26:01 +0200 Subject: [PATCH 066/142] Add gating test files. --- tests/.fmf/version | 1 + tests/provision.fmf | 5 +++++ tests/tests.yml | 29 +++++++++++++++++++++++++++++ 3 files changed, 35 insertions(+) create mode 100644 tests/.fmf/version create mode 100644 tests/provision.fmf create mode 100644 tests/tests.yml diff --git a/tests/.fmf/version b/tests/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/tests/provision.fmf b/tests/provision.fmf new file mode 100644 index 0000000..952b5a6 --- /dev/null +++ b/tests/provision.fmf @@ -0,0 +1,5 @@ +--- +standard-inventory-qcow2: + qemu: + m: 3G + diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..2eb23b5 --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,29 @@ +- hosts: localhost + roles: + - role: standard-test-source + tags: + - classic + - role: standard-test-basic + tags: + - classic + tests: + - upstream_test_suite: + dir: source/tests + run: make -f Makefile.localtest tests + environment: + CRYPTSETUP_PATH: /sbin + required_packages: + - cryptsetup + - cryptsetup-devel + - cryptsetup-reencrypt + - integritysetup + - veritysetup + - gcc + - make + - kernel-headers + - device-mapper-devel + - expect + - keyutils + - jq + - vim-common + - sharutils From 17d38c11ec3cc733439fdd5716e124b9235b4716 Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Fri, 6 Sep 2019 20:51:32 +0200 Subject: [PATCH 067/142] Update to version 2.2.1. --- .gitignore | 2 +- cryptsetup-2.2.0.tar.sign | 16 ---------------- cryptsetup-2.2.1.tar.sign | 16 ++++++++++++++++ cryptsetup.spec | 5 ++++- sources | 2 +- 5 files changed, 22 insertions(+), 19 deletions(-) delete mode 100644 cryptsetup-2.2.0.tar.sign create mode 100644 cryptsetup-2.2.1.tar.sign diff --git a/.gitignore b/.gitignore index e7554ce..23981ae 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/cryptsetup-2.2.0.tar.xz +/cryptsetup-2.2.1.tar.xz diff --git a/cryptsetup-2.2.0.tar.sign b/cryptsetup-2.2.0.tar.sign deleted file mode 100644 index c7e623c..0000000 --- a/cryptsetup-2.2.0.tar.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAl1U/ywACgkQ2bBXe9k+ -mPx+RQ//Q6PcBF+9kxLl9BmbDqOnGPgCBksDsPD78ergJ+JPsmSVc71JD0lR5zha -kaOogegxZwQRv6K7W0lF9HKmlLIucj1o0fkvJ9gI+olyKiLahqQIVcBJ6vMXvMvy -653IPOFm2NfSBwN0FFVgk1T3SQCccxZXQDtfEqrILsP70coRax0mP6ArbqQ2a072 -Vo8dcSWz6+aNRcHsgMsSpqjtbYSDSb5ngrb/lUGvqTyN+C/zp4l7ktSiMeUPXhx/ -92IolBWY0MHCCADQRZmBzfMse4bo1BlHBC/Se02WiLGLJla9/J3d2xY25/tDPJ3Y -AExv/01Fy5nrqZaY9asCAnOT/eCPKqx8SedcXjw4jxKIC7Bc9cWs+n4+UiNIhHWz -ajL2tGcCThhubxcBJoqR1VJGwfLXGa/QYKGEG9KT5EDffBJaL2dwgBHvkdPung0O -jyiPjVYVzj18F1M3O54gCvEGYyg6R4Bf/m4RoWGKYBlTvyBAwNBs65JpjKrFMUpY -WxtZItVghAO/pzrTjsgk7EwYGmxWYzBuiG+e2tRcDJnMZ8PCWhKWdOB/xn7bHfdN -JGptCkGoQ3szXNArMjuBBUausV+yaJKAID2jgM7Ukd/V3ipIRlSCkHDsEeDwZ4zb -qfDVGfTa3NrajChuTh7cp3SpNYqNpR0VmR7Y1o4JWSSAAAN8yYI= -=tbBV ------END PGP SIGNATURE----- diff --git a/cryptsetup-2.2.1.tar.sign b/cryptsetup-2.2.1.tar.sign new file mode 100644 index 0000000..56e4633 --- /dev/null +++ b/cryptsetup-2.2.1.tar.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAl1yPhIACgkQ2bBXe9k+ +mPzETw/9GU7HRpHdLeLQBjGAirv9Eun8c79DD4jFaX+V1B439Uehk2EKbSq8kIZL +ROhcuuuei0GmRvFiNmZPQBdvvIvMCYlXxkAcPNN/MBDTbBemGp1rWuUw3c6OMr8V +IVWI4G9axdEAEb9MnC7zpGtX00QiPrUDHLT1ncYzyp9oEzj7Llp3hGgeLheLp4b+ +imKmEjziAwKECVmrNu1jvXl6EdHfquqtFv7pq1MnXvwNfcKE3XXvFWAGP07kLx6j +Rvbo7Vm7fBs9lvItsH/wHOPU6v9wPC4KF9qCLaz2KvUMg8f52Ikl6IWxBCOUsrfZ +YddAzWQ64fkg+vXi/VM3s9A61Ik7QmFj7CUC935BeTTacHlUGfxVCex+RjrOFveD +rBoxiBmmxiIhEmMRM6KkCUez21o3eF0I4TK90tzNaifmoxsd0UWRVOztzyzcYjwX +GROnkvdv7q3Ni6lXfFihzO/yVGX6/NxUS0ncfYfys+vf+8Dq//Uu8GRt45XZbjnl +5hWOa0TQnZB0g/jbHmmD31cLpZGorLp4G81ACducjvPTNfEknVmx7HoohYeU9z6f +VdRwiTLueQq/cqW+dXck2ndU4LNLAekeyNP65OR6WPiRy0T+sqY2OOTvDoTQmPij +juJJ43Q4XJlCMIfWX5iBNqWHVHTJspUyxpuu6JZSR6DxjikX32w= +=2m01 +-----END PGP SIGNATURE----- diff --git a/cryptsetup.spec b/cryptsetup.spec index 3a85760..46cdd3d 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,6 +1,6 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup -Version: 2.2.0 +Version: 2.2.1 Release: 1%{?dist} License: GPLv2+ and LGPLv2+ URL: https://gitlab.com/cryptsetup/cryptsetup @@ -124,6 +124,9 @@ rm -rf %{buildroot}/%{_libdir}/*.la %ghost %dir /run/cryptsetup %changelog +* Fri Sep 06 2019 Ondrej Kozina - 2.2.1-1 +- Update to cryptsetup 2.2.1. + * Thu Aug 15 2019 Milan Broz - 2.2.0-1 - Update to cryptsetup 2.2.0. diff --git a/sources b/sources index 47136a5..7a7db85 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cryptsetup-2.2.0.tar.xz) = 903ef5811999ce3836bc348334192a432a971f94aa9c850491c8ba856a2c87385f75abc9296b0913ee6785149b8a7bd40457ad07e01f4ac7a1e62e97c7b18e6e +SHA512 (cryptsetup-2.2.1.tar.xz) = e4b45b24ad63cc4c22cb816f04cf4af71431e15134a8208af1a24e64ded54c07aba6c43521c063f03429304e0610b6cce849332564d69a46934fb7bae8e99718 From f672f010702cc2a0692d4947f5ae47063d1f2fdd Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Fri, 1 Nov 2019 12:02:36 +0100 Subject: [PATCH 068/142] Update to version 2.2.2. --- .gitignore | 2 +- cryptsetup-2.2.1.tar.sign | 16 ---------------- cryptsetup-2.2.2.tar.sign | 16 ++++++++++++++++ cryptsetup.spec | 5 ++++- sources | 2 +- 5 files changed, 22 insertions(+), 19 deletions(-) delete mode 100644 cryptsetup-2.2.1.tar.sign create mode 100644 cryptsetup-2.2.2.tar.sign diff --git a/.gitignore b/.gitignore index 23981ae..923aeba 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/cryptsetup-2.2.1.tar.xz +/cryptsetup-2.2.2.tar.xz diff --git a/cryptsetup-2.2.1.tar.sign b/cryptsetup-2.2.1.tar.sign deleted file mode 100644 index 56e4633..0000000 --- a/cryptsetup-2.2.1.tar.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAl1yPhIACgkQ2bBXe9k+ -mPzETw/9GU7HRpHdLeLQBjGAirv9Eun8c79DD4jFaX+V1B439Uehk2EKbSq8kIZL -ROhcuuuei0GmRvFiNmZPQBdvvIvMCYlXxkAcPNN/MBDTbBemGp1rWuUw3c6OMr8V -IVWI4G9axdEAEb9MnC7zpGtX00QiPrUDHLT1ncYzyp9oEzj7Llp3hGgeLheLp4b+ -imKmEjziAwKECVmrNu1jvXl6EdHfquqtFv7pq1MnXvwNfcKE3XXvFWAGP07kLx6j -Rvbo7Vm7fBs9lvItsH/wHOPU6v9wPC4KF9qCLaz2KvUMg8f52Ikl6IWxBCOUsrfZ -YddAzWQ64fkg+vXi/VM3s9A61Ik7QmFj7CUC935BeTTacHlUGfxVCex+RjrOFveD -rBoxiBmmxiIhEmMRM6KkCUez21o3eF0I4TK90tzNaifmoxsd0UWRVOztzyzcYjwX -GROnkvdv7q3Ni6lXfFihzO/yVGX6/NxUS0ncfYfys+vf+8Dq//Uu8GRt45XZbjnl -5hWOa0TQnZB0g/jbHmmD31cLpZGorLp4G81ACducjvPTNfEknVmx7HoohYeU9z6f -VdRwiTLueQq/cqW+dXck2ndU4LNLAekeyNP65OR6WPiRy0T+sqY2OOTvDoTQmPij -juJJ43Q4XJlCMIfWX5iBNqWHVHTJspUyxpuu6JZSR6DxjikX32w= -=2m01 ------END PGP SIGNATURE----- diff --git a/cryptsetup-2.2.2.tar.sign b/cryptsetup-2.2.2.tar.sign new file mode 100644 index 0000000..357b1ba --- /dev/null +++ b/cryptsetup-2.2.2.tar.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAl279xoACgkQ2bBXe9k+ +mPw4BRAAsG4WJQ0ZVJBlVY7O8Xv3hcyWuUmrb0bROJH3VXndBmURs6ynZsVqA2Bz +ZybwIpj9YUKmJRDc7xZ3hOSr4gHO+oMB4h7o+BtNAI+1/wapvCpEAspgWZifzxrA +toYrvJJVrRpMEoNIQmor6P54nR/0SiNY+7Eagdf9Hobuyi30iiOnTgAyl20p4z9z +ujjOza2yVGxYTe1S2O/brgK8yBMyVWfatgd6/6TUyeyf0PctE9w7Xt2iLlqT2bIY +RECXx63kpLuOIOJTl1+1FUcBW2CUbSU5q7bZHhVBhqteeLnVya/ljS2dvz4pLHuE +AUHzo4baSQWmsFjxmcIXUH5bZkQWfKz7a+xnPC1hqBhYDTcMs7Z1AgrFF10JqFyF +uTdRbotn2e+Yil/LLhAv2vV6M75+VidR5qSInALUS6cAWtghODfcQkuTEv/CA6rn +SfLw830MuMcblbb75GpZEZ9uGRjaqZDlWbI1ctXQzv2KOp2XWLdN+FV44b/030At +02NBC7YQIUdTHdJZ9POh7SwNJjgeyAjfjZabwC4AkxPbarVTcrPGFx9khEiz2HpO +SAUKbwnoZTwuOH48xhNPEz9V3qthLGFrBAaylWhGSFDQ1P1TLHlZhx6i6QFnE8dT +r54CA7lGHbv82y6p87zkJhRVcttg09cQsIRu9DfqDFpuqXpF4WE= +=BvEx +-----END PGP SIGNATURE----- diff --git a/cryptsetup.spec b/cryptsetup.spec index 46cdd3d..aa8d3d3 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,6 +1,6 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup -Version: 2.2.1 +Version: 2.2.2 Release: 1%{?dist} License: GPLv2+ and LGPLv2+ URL: https://gitlab.com/cryptsetup/cryptsetup @@ -124,6 +124,9 @@ rm -rf %{buildroot}/%{_libdir}/*.la %ghost %dir /run/cryptsetup %changelog +* Fri Nov 01 2019 Ondrej Kozina - 2.2.2-1 +- Update to cryptsetup 2.2.2. + * Fri Sep 06 2019 Ondrej Kozina - 2.2.1-1 - Update to cryptsetup 2.2.1. diff --git a/sources b/sources index 7a7db85..ea70be7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cryptsetup-2.2.1.tar.xz) = e4b45b24ad63cc4c22cb816f04cf4af71431e15134a8208af1a24e64ded54c07aba6c43521c063f03429304e0610b6cce849332564d69a46934fb7bae8e99718 +SHA512 (cryptsetup-2.2.2.tar.xz) = d04123a622438ecbee28145cbdc71886b6f13db87df1c67522bff6e6e3cba817e895e2d085bdb08c78f9cafba557b1203177811a0c316ccd9b7c19939f3fc851 From b153bd72d0c01486bacda4221b95bcfcd5f9e50b Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Sun, 12 Jan 2020 13:18:38 +0100 Subject: [PATCH 069/142] Update to version 2.3.0-rc0. --- .gitignore | 2 +- cryptsetup-2.2.2.tar.sign | 16 ---------------- cryptsetup-2.3.0-rc0.tar.sign | 16 ++++++++++++++++ cryptsetup.spec | 11 +++++++---- sources | 2 +- 5 files changed, 25 insertions(+), 22 deletions(-) delete mode 100644 cryptsetup-2.2.2.tar.sign create mode 100644 cryptsetup-2.3.0-rc0.tar.sign diff --git a/.gitignore b/.gitignore index 923aeba..7a57526 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/cryptsetup-2.2.2.tar.xz +/cryptsetup-2.3.0-rc0.tar.xz diff --git a/cryptsetup-2.2.2.tar.sign b/cryptsetup-2.2.2.tar.sign deleted file mode 100644 index 357b1ba..0000000 --- a/cryptsetup-2.2.2.tar.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAl279xoACgkQ2bBXe9k+ -mPw4BRAAsG4WJQ0ZVJBlVY7O8Xv3hcyWuUmrb0bROJH3VXndBmURs6ynZsVqA2Bz -ZybwIpj9YUKmJRDc7xZ3hOSr4gHO+oMB4h7o+BtNAI+1/wapvCpEAspgWZifzxrA -toYrvJJVrRpMEoNIQmor6P54nR/0SiNY+7Eagdf9Hobuyi30iiOnTgAyl20p4z9z -ujjOza2yVGxYTe1S2O/brgK8yBMyVWfatgd6/6TUyeyf0PctE9w7Xt2iLlqT2bIY -RECXx63kpLuOIOJTl1+1FUcBW2CUbSU5q7bZHhVBhqteeLnVya/ljS2dvz4pLHuE -AUHzo4baSQWmsFjxmcIXUH5bZkQWfKz7a+xnPC1hqBhYDTcMs7Z1AgrFF10JqFyF -uTdRbotn2e+Yil/LLhAv2vV6M75+VidR5qSInALUS6cAWtghODfcQkuTEv/CA6rn -SfLw830MuMcblbb75GpZEZ9uGRjaqZDlWbI1ctXQzv2KOp2XWLdN+FV44b/030At -02NBC7YQIUdTHdJZ9POh7SwNJjgeyAjfjZabwC4AkxPbarVTcrPGFx9khEiz2HpO -SAUKbwnoZTwuOH48xhNPEz9V3qthLGFrBAaylWhGSFDQ1P1TLHlZhx6i6QFnE8dT -r54CA7lGHbv82y6p87zkJhRVcttg09cQsIRu9DfqDFpuqXpF4WE= -=BvEx ------END PGP SIGNATURE----- diff --git a/cryptsetup-2.3.0-rc0.tar.sign b/cryptsetup-2.3.0-rc0.tar.sign new file mode 100644 index 0000000..62a4b7f --- /dev/null +++ b/cryptsetup-2.3.0-rc0.tar.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAl4bBlIACgkQ2bBXe9k+ +mPwtPA/+PhtaG0hLMS4IfkZKUNPv7fzOopSGIR/PoVvAcl2VPb3qmfnnLevnS4ge +/gFmgXUkA04rUuPoOrKW8vP5fyoXeGjlOaHlYM466IszOyz8lhvhmEr4dftExr4S +UYoJ6pWmEOEOGCVn41Lz8SHbDCoPCneC9ilG5ciY/eR1uMJxXQvrTgNO7khxkGim +a8OyKg8h9jUGSlbTP99r/PFSeOTYE3HCvYSDRv1pAO4lc7lapS9+n5o3X2CwSD6L +eDNXFq/rkMUe9hz4Xm3zWuzdpEaYvK8O7esdfSZtQHjyUctTaDqh4a/EOmWDO0Kb +p2qs0xyh052O15xM2z0EiJwCTnFtzE+n791NOc92CNrUaU5G3I2jZXgfIEUjwnLK +kEOhAigyjfTLUm34E0hsdSPoPexl1i/KkGGy3E1qPcKiIUSk2Lo4ixocZ3zgkkqy +J4tJCOpHBwRsujdD7mC4NS3QpCkcRJ9bE3lHLd0CaZVx+krN4W24S/Qhszu0BRsN +cFezqnyRQcZQhKT/1LmiwKwSihHMxh+yay/I0tpwrpXRwT23XOYDWfdWUB1Iaitc +BXwbBY6DaxN7XQo3omB5dcSLEkLmt506N0tQ0fdZtJ8T6SAv9WZdcto/3thG3ONH +QmozJ1A0k10Jb1SKYV0bYSWEOdt3LSAnA8LY2h2jc5bAIOSdh0w= +=yXLX +-----END PGP SIGNATURE----- diff --git a/cryptsetup.spec b/cryptsetup.spec index aa8d3d3..a729e5d 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,7 +1,7 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup -Version: 2.2.2 -Release: 1%{?dist} +Version: 2.3.0 +Release: 0.1%{?dist} License: GPLv2+ and LGPLv2+ URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: openssl-devel, popt-devel, device-mapper-devel @@ -16,8 +16,8 @@ Requires: libpwquality >= 1.2.0 Obsoletes: python2-cryptsetup < 2.1.0 Obsoletes: cryptsetup-python3 < 2.1.0 -%global upstream_version %{version} -Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v2.2/cryptsetup-%{upstream_version}.tar.xz +%global upstream_version %{version}-rc0 +Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/cryptsetup-%{upstream_version}.tar.xz Patch0: %{name}-add-system-library-paths.patch %description @@ -124,6 +124,9 @@ rm -rf %{buildroot}/%{_libdir}/*.la %ghost %dir /run/cryptsetup %changelog +* Sun Jan 12 2020 Milan Broz - 2.3.0-0.1 +- Update to cryptsetup 2.3.0-rc0. + * Fri Nov 01 2019 Ondrej Kozina - 2.2.2-1 - Update to cryptsetup 2.2.2. diff --git a/sources b/sources index ea70be7..af2ae4f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cryptsetup-2.2.2.tar.xz) = d04123a622438ecbee28145cbdc71886b6f13db87df1c67522bff6e6e3cba817e895e2d085bdb08c78f9cafba557b1203177811a0c316ccd9b7c19939f3fc851 +SHA512 (cryptsetup-2.3.0-rc0.tar.xz) = 3b707f85828aa0691c7bf039041a5b95444471c402fe74c74c50404d8bd1abae3021f180c6510cd1bb8537e56a3bfac085199fab597b48eaeb156b1d1a317df5 From f0628cfd6bb43f3193092d7a07ed8392192714ae Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 15:04:27 +0000 Subject: [PATCH 070/142] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cryptsetup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index a729e5d..b0e7f18 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,7 +1,7 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup Version: 2.3.0 -Release: 0.1%{?dist} +Release: 0.2%{?dist} License: GPLv2+ and LGPLv2+ URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: openssl-devel, popt-devel, device-mapper-devel @@ -124,6 +124,9 @@ rm -rf %{buildroot}/%{_libdir}/*.la %ghost %dir /run/cryptsetup %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 2.3.0-0.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sun Jan 12 2020 Milan Broz - 2.3.0-0.1 - Update to cryptsetup 2.3.0-rc0. From 09cfa4adf87e0843e7c20562b32daae33d67f4ec Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Sun, 2 Feb 2020 18:05:40 +0100 Subject: [PATCH 071/142] Update to version 2.3.0. --- .gitignore | 2 +- cryptsetup-2.3.0-rc0.tar.sign | 16 ---------------- cryptsetup-2.3.0.tar.sign | 16 ++++++++++++++++ cryptsetup.spec | 9 ++++++--- sources | 2 +- 5 files changed, 24 insertions(+), 21 deletions(-) delete mode 100644 cryptsetup-2.3.0-rc0.tar.sign create mode 100644 cryptsetup-2.3.0.tar.sign diff --git a/.gitignore b/.gitignore index 7a57526..067da5f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/cryptsetup-2.3.0-rc0.tar.xz +/cryptsetup-2.3.0.tar.xz diff --git a/cryptsetup-2.3.0-rc0.tar.sign b/cryptsetup-2.3.0-rc0.tar.sign deleted file mode 100644 index 62a4b7f..0000000 --- a/cryptsetup-2.3.0-rc0.tar.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAl4bBlIACgkQ2bBXe9k+ -mPwtPA/+PhtaG0hLMS4IfkZKUNPv7fzOopSGIR/PoVvAcl2VPb3qmfnnLevnS4ge -/gFmgXUkA04rUuPoOrKW8vP5fyoXeGjlOaHlYM466IszOyz8lhvhmEr4dftExr4S -UYoJ6pWmEOEOGCVn41Lz8SHbDCoPCneC9ilG5ciY/eR1uMJxXQvrTgNO7khxkGim -a8OyKg8h9jUGSlbTP99r/PFSeOTYE3HCvYSDRv1pAO4lc7lapS9+n5o3X2CwSD6L -eDNXFq/rkMUe9hz4Xm3zWuzdpEaYvK8O7esdfSZtQHjyUctTaDqh4a/EOmWDO0Kb -p2qs0xyh052O15xM2z0EiJwCTnFtzE+n791NOc92CNrUaU5G3I2jZXgfIEUjwnLK -kEOhAigyjfTLUm34E0hsdSPoPexl1i/KkGGy3E1qPcKiIUSk2Lo4ixocZ3zgkkqy -J4tJCOpHBwRsujdD7mC4NS3QpCkcRJ9bE3lHLd0CaZVx+krN4W24S/Qhszu0BRsN -cFezqnyRQcZQhKT/1LmiwKwSihHMxh+yay/I0tpwrpXRwT23XOYDWfdWUB1Iaitc -BXwbBY6DaxN7XQo3omB5dcSLEkLmt506N0tQ0fdZtJ8T6SAv9WZdcto/3thG3ONH -QmozJ1A0k10Jb1SKYV0bYSWEOdt3LSAnA8LY2h2jc5bAIOSdh0w= -=yXLX ------END PGP SIGNATURE----- diff --git a/cryptsetup-2.3.0.tar.sign b/cryptsetup-2.3.0.tar.sign new file mode 100644 index 0000000..6e8be91 --- /dev/null +++ b/cryptsetup-2.3.0.tar.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAl42+b4ACgkQ2bBXe9k+ +mPyC+w/+JY0R3jpt+iCfDjp/Terjwm+Q1NqOjTJ1pSps9ZzZF5vgqxDqF4IljxNX +zM4YtEN9HUUoE0U12FXmFTYlfoD4rj1AzR4Er9oX+P4YlGVQ0dmkGGr9gsmh+mpY +m9fZg3jLp+ebhkhIQqMgsUj2xjgQlYoc7hcRcNq9weatLBAidHIdd0JR/0ot2yAS +eLRodVOtfMvLDGhatMgwxm+FEXbPbgQXYrOemcqlHYPzKLv6xir9ZsLowZxABRaB +41LZ8o6+4VGqpoNA0r4M1XFqcJ0mDYLdLib7uNNFY97A5bZTUEmALuiHOBNdEygG +AgBUPnZPJUgSRKmJP4QL2CM6U3si3eNLDwrIjwp0cFtqnZB3bUzGfeu0h/XXSkrV +b6Yja7zneZNeWaxz8GWCiZwVVBtM2n7PamdVV4xqQF6GE0o84EkJ91oZBim+a/5B +PUOgcctQaYUAKkuvYXVhZQBaL5D4ppBWaFthENZSQ4sSlEILtsz5LYvWq1oMLWkv +rZN9lftPd5GqASkTIDQcTNL0GNdJR+P+0kMCNiWOCJzZNzEIk2D6tlyxjnJV8qrk +rFcShE9R3dADDJ9Ew+91JRk8C2XSG9gOS29K3fF2Hdnv7nfiTns3dh2V6kz/821W +E39CREgh0A67zppzKWyHnH1BayDeREgRA/TatjZWDAZOHWRM+Ig= +=cfqp +-----END PGP SIGNATURE----- diff --git a/cryptsetup.spec b/cryptsetup.spec index b0e7f18..13609f8 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,7 +1,7 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup Version: 2.3.0 -Release: 0.2%{?dist} +Release: 1%{?dist} License: GPLv2+ and LGPLv2+ URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: openssl-devel, popt-devel, device-mapper-devel @@ -16,7 +16,7 @@ Requires: libpwquality >= 1.2.0 Obsoletes: python2-cryptsetup < 2.1.0 Obsoletes: cryptsetup-python3 < 2.1.0 -%global upstream_version %{version}-rc0 +%global upstream_version %{version} Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/cryptsetup-%{upstream_version}.tar.xz Patch0: %{name}-add-system-library-paths.patch @@ -121,9 +121,12 @@ rm -rf %{buildroot}/%{_libdir}/*.la %license COPYING COPYING.LGPL %{_libdir}/libcryptsetup.so.* %{_tmpfilesdir}/cryptsetup.conf -%ghost %dir /run/cryptsetup +%ghost %attr(700, -, -) %dir /run/cryptsetup %changelog +* Sun Feb 02 2020 Milan Broz - 2.3.0-1 +- Update to cryptsetup 2.3.0. + * Tue Jan 28 2020 Fedora Release Engineering - 2.3.0-0.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index af2ae4f..363613c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cryptsetup-2.3.0-rc0.tar.xz) = 3b707f85828aa0691c7bf039041a5b95444471c402fe74c74c50404d8bd1abae3021f180c6510cd1bb8537e56a3bfac085199fab597b48eaeb156b1d1a317df5 +SHA512 (cryptsetup-2.3.0.tar.xz) = d4af8edb7a50603028c6c6999ae7a1851d2232ee11d4a501270afb424f0a7dc82893a6a5d30d3a3188634aa80ec1a79f22a91b539910df10d07f8d9ae532cb08 From 329a2d78897fdee269464b95eedf73569348cc9f Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Mon, 10 Feb 2020 12:38:33 +0100 Subject: [PATCH 072/142] Add rpmlintrc to avoid some annoying warnings. --- cryptsetup.rpmlintrc | 1 + cryptsetup.spec | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 cryptsetup.rpmlintrc diff --git a/cryptsetup.rpmlintrc b/cryptsetup.rpmlintrc new file mode 100644 index 0000000..68c240e --- /dev/null +++ b/cryptsetup.rpmlintrc @@ -0,0 +1 @@ +addFilter(r'spelling-error .* en_US (dm|reencryption|situ|libcryptsetup)') diff --git a/cryptsetup.spec b/cryptsetup.spec index 13609f8..c2a023f 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -60,7 +60,7 @@ The integritysetup package contains a utility for setting up disk integrity protection using dm-integrity kernel module. %package reencrypt -Summary: A utility for offline reencryption of LUKS encrypted disks. +Summary: A utility for offline reencryption of LUKS encrypted disks Requires: cryptsetup-libs = %{version}-%{release} %description reencrypt From ca3bde7dd6971569109531cbc1f26279528d8107 Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Thu, 12 Mar 2020 13:06:22 +0100 Subject: [PATCH 073/142] Update to version 2.3.1. --- .gitignore | 2 +- cryptsetup-2.3.0.tar.sign | 16 ---------------- cryptsetup-2.3.1.tar.sign | 16 ++++++++++++++++ cryptsetup.spec | 5 ++++- sources | 2 +- 5 files changed, 22 insertions(+), 19 deletions(-) delete mode 100644 cryptsetup-2.3.0.tar.sign create mode 100644 cryptsetup-2.3.1.tar.sign diff --git a/.gitignore b/.gitignore index 067da5f..f83f7c7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/cryptsetup-2.3.0.tar.xz +/cryptsetup-2.3.1.tar.xz diff --git a/cryptsetup-2.3.0.tar.sign b/cryptsetup-2.3.0.tar.sign deleted file mode 100644 index 6e8be91..0000000 --- a/cryptsetup-2.3.0.tar.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAl42+b4ACgkQ2bBXe9k+ -mPyC+w/+JY0R3jpt+iCfDjp/Terjwm+Q1NqOjTJ1pSps9ZzZF5vgqxDqF4IljxNX -zM4YtEN9HUUoE0U12FXmFTYlfoD4rj1AzR4Er9oX+P4YlGVQ0dmkGGr9gsmh+mpY -m9fZg3jLp+ebhkhIQqMgsUj2xjgQlYoc7hcRcNq9weatLBAidHIdd0JR/0ot2yAS -eLRodVOtfMvLDGhatMgwxm+FEXbPbgQXYrOemcqlHYPzKLv6xir9ZsLowZxABRaB -41LZ8o6+4VGqpoNA0r4M1XFqcJ0mDYLdLib7uNNFY97A5bZTUEmALuiHOBNdEygG -AgBUPnZPJUgSRKmJP4QL2CM6U3si3eNLDwrIjwp0cFtqnZB3bUzGfeu0h/XXSkrV -b6Yja7zneZNeWaxz8GWCiZwVVBtM2n7PamdVV4xqQF6GE0o84EkJ91oZBim+a/5B -PUOgcctQaYUAKkuvYXVhZQBaL5D4ppBWaFthENZSQ4sSlEILtsz5LYvWq1oMLWkv -rZN9lftPd5GqASkTIDQcTNL0GNdJR+P+0kMCNiWOCJzZNzEIk2D6tlyxjnJV8qrk -rFcShE9R3dADDJ9Ew+91JRk8C2XSG9gOS29K3fF2Hdnv7nfiTns3dh2V6kz/821W -E39CREgh0A67zppzKWyHnH1BayDeREgRA/TatjZWDAZOHWRM+Ig= -=cfqp ------END PGP SIGNATURE----- diff --git a/cryptsetup-2.3.1.tar.sign b/cryptsetup-2.3.1.tar.sign new file mode 100644 index 0000000..72d336f --- /dev/null +++ b/cryptsetup-2.3.1.tar.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAl5p+RgACgkQ2bBXe9k+ +mPyBoQ//fK3nWpug0VJpWhxwoe0SOj0x/2CYP9bJAwkT33davLiDkkM0pfvq9Y5L +rdbX0JRJemwFwS6V0DuZNDK2b88xEeJpvnNmDWXtKQ2HS9BPNesJJmzgBRY4P06q +bwxUvndnDLP7fAZtEMiLQJYCzuLkGwnEQFMh1GLfAM2H8FM9YZYz/HvezTlDTLYi +9SJ0iF8UF+VR8jPl3hqGQXkiHPVopvMEhwL9kpP1dJdYmeMFVYH/l+3jQ0Qw5de7 +YaqEitsKaT/JT236vSfR/RCFEifswbea+fplQE5a0kVuVmAkaEnL65fS1S9+18Ol +7Vo/8JaXxN6kjVpBVwn57RpWpGiLYXYjTzOtRrAQx7Q0oX3ycCwnii1TEzDvFcJL +aPsZsbNMf6Cgj+iw0htPCoXInaZW52GHIGJc8rR5WKdl3v5Md2vgGV6TTVcMYee+ +KQ2RuQtiDXC9+4OhfTPZ5Rpxn+Dns9xl0hfsmbRJDH1THJncaX1B/0qN8gHtsvMG +/+p9tZ7Ox6EpiIh8CcsyJT83bzgq0FO0Ut8jsh8fM+YKHEISvEFkkGAmykLim/e+ +ef6aYpkxHoGA+jpwmDaXF0LBPY2jAxs6OQxQwuD9i+BDkyMH1arO/AkRkEMqQMY6 +2yyVfu6doOVEACX51zZmB3bBvQLUtjPJh/5hS/0InGOP2Nm3lwA= +=1LIc +-----END PGP SIGNATURE----- diff --git a/cryptsetup.spec b/cryptsetup.spec index c2a023f..3de0f07 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,6 +1,6 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup -Version: 2.3.0 +Version: 2.3.1 Release: 1%{?dist} License: GPLv2+ and LGPLv2+ URL: https://gitlab.com/cryptsetup/cryptsetup @@ -124,6 +124,9 @@ rm -rf %{buildroot}/%{_libdir}/*.la %ghost %attr(700, -, -) %dir /run/cryptsetup %changelog +* Thu Mar 12 2020 Ondrej Kozina - 2.3.1-1 +- Update to cryptsetup 2.3.1. + * Sun Feb 02 2020 Milan Broz - 2.3.0-1 - Update to cryptsetup 2.3.0. diff --git a/sources b/sources index 363613c..a589b1f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cryptsetup-2.3.0.tar.xz) = d4af8edb7a50603028c6c6999ae7a1851d2232ee11d4a501270afb424f0a7dc82893a6a5d30d3a3188634aa80ec1a79f22a91b539910df10d07f8d9ae532cb08 +SHA512 (cryptsetup-2.3.1.tar.xz) = e6ee77d72eda0b990db894d794a686f22043161b17b5f5c8cd54a64c5751f884a241c76b03bbccd52f74440c609036d50ed8503584bc3a0a011e4854a60dd4bf From 5ab2a1f7d3b1fc762f23e2bbde92c67248c1f4b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Tue, 14 Apr 2020 21:08:17 +0200 Subject: [PATCH 074/142] Add support for upcoming json-c 0.14.0 --- ...d-support-for-upcoming-json-c-0.14.0.patch | 177 ++++++++++++++++++ cryptsetup.spec | 8 +- 2 files changed, 184 insertions(+), 1 deletion(-) create mode 100644 0001-Add-support-for-upcoming-json-c-0.14.0.patch diff --git a/0001-Add-support-for-upcoming-json-c-0.14.0.patch b/0001-Add-support-for-upcoming-json-c-0.14.0.patch new file mode 100644 index 0000000..fba1f36 --- /dev/null +++ b/0001-Add-support-for-upcoming-json-c-0.14.0.patch @@ -0,0 +1,177 @@ +From 604abec333a0efb44fd8bc610aa0b1151dd0f612 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= +Date: Mon, 13 Apr 2020 11:48:17 +0200 +Subject: [PATCH] Add support for upcoming json-c 0.14.0. + + * TRUE/FALSE are not defined anymore. 1 and 0 are used instead. + * json_object_get_uint64() and json_object_new_uint64() are part + of the upstream API now. +--- + lib/luks2/luks2_internal.h | 4 +++- + lib/luks2/luks2_json_metadata.c | 38 +++++++++++++++++---------------- + 2 files changed, 23 insertions(+), 19 deletions(-) + +diff --git a/lib/luks2/luks2_internal.h b/lib/luks2/luks2_internal.h +index b9fec6b5..939101d6 100644 +--- a/lib/luks2/luks2_internal.h ++++ b/lib/luks2/luks2_internal.h +@@ -58,9 +58,11 @@ json_object *LUKS2_get_segments_jobj(struct luks2_hdr *hdr); + void hexprint_base64(struct crypt_device *cd, json_object *jobj, + const char *sep, const char *line_sep); + ++#if !(defined JSON_C_VERSION_NUM && JSON_C_VERSION_NUM >= ((13 << 8) | 99)) + uint64_t json_object_get_uint64(json_object *jobj); +-uint32_t json_object_get_uint32(json_object *jobj); + json_object *json_object_new_uint64(uint64_t value); ++#endif ++uint32_t json_object_get_uint32(json_object *jobj); + + int json_object_object_add_by_uint(json_object *jobj, unsigned key, json_object *jobj_val); + void json_object_object_del_by_uint(json_object *jobj, unsigned key); +diff --git a/lib/luks2/luks2_json_metadata.c b/lib/luks2/luks2_json_metadata.c +index 781280c2..712c2bbd 100644 +--- a/lib/luks2/luks2_json_metadata.c ++++ b/lib/luks2/luks2_json_metadata.c +@@ -234,13 +234,14 @@ static json_bool json_str_to_uint64(json_object *jobj, uint64_t *value) + tmp = strtoull(json_object_get_string(jobj), &endptr, 10); + if (*endptr || errno) { + *value = 0; +- return FALSE; ++ return 0; + } + + *value = tmp; +- return TRUE; ++ return 1; + } + ++#if !(defined JSON_C_VERSION_NUM && JSON_C_VERSION_NUM >= ((13 << 8) | 99)) + uint64_t json_object_get_uint64(json_object *jobj) + { + uint64_t r; +@@ -262,6 +263,7 @@ json_object *json_object_new_uint64(uint64_t value) + jobj = json_object_new_string(num); + return jobj; + } ++#endif + + /* + * Validate helpers +@@ -273,9 +275,9 @@ static json_bool numbered(struct crypt_device *cd, const char *name, const char + for (i = 0; key[i]; i++) + if (!isdigit(key[i])) { + log_dbg(cd, "%s \"%s\" is not in numbered form.", name, key); +- return FALSE; ++ return 0; + } +- return TRUE; ++ return 1; + } + + json_object *json_contains(struct crypt_device *cd, json_object *jobj, const char *name, +@@ -300,7 +302,7 @@ json_bool validate_json_uint32(json_object *jobj) + errno = 0; + tmp = json_object_get_int64(jobj); + +- return (errno || tmp < 0 || tmp > UINT32_MAX) ? FALSE : TRUE; ++ return (errno || tmp < 0 || tmp > UINT32_MAX) ? 0 : 1; + } + + static json_bool validate_keyslots_array(struct crypt_device *cd, +@@ -313,17 +315,17 @@ static json_bool validate_keyslots_array(struct crypt_device *cd, + jobj = json_object_array_get_idx(jarr, i); + if (!json_object_is_type(jobj, json_type_string)) { + log_dbg(cd, "Illegal value type in keyslots array at index %d.", i); +- return FALSE; ++ return 0; + } + + if (!json_contains(cd, jobj_keys, "", "Keyslots section", + json_object_get_string(jobj), json_type_object)) +- return FALSE; ++ return 0; + + i++; + } + +- return TRUE; ++ return 1; + } + + static json_bool validate_segments_array(struct crypt_device *cd, +@@ -336,17 +338,17 @@ static json_bool validate_segments_array(struct crypt_device *cd, + jobj = json_object_array_get_idx(jarr, i); + if (!json_object_is_type(jobj, json_type_string)) { + log_dbg(cd, "Illegal value type in segments array at index %d.", i); +- return FALSE; ++ return 0; + } + + if (!json_contains(cd, jobj_segments, "", "Segments section", + json_object_get_string(jobj), json_type_object)) +- return FALSE; ++ return 0; + + i++; + } + +- return TRUE; ++ return 1; + } + + static json_bool segment_has_digest(const char *segment_name, json_object *jobj_digests) +@@ -357,10 +359,10 @@ static json_bool segment_has_digest(const char *segment_name, json_object *jobj_ + UNUSED(key); + json_object_object_get_ex(val, "segments", &jobj_segments); + if (LUKS2_array_jobj(jobj_segments, segment_name)) +- return TRUE; ++ return 1; + } + +- return FALSE; ++ return 0; + } + + static json_bool validate_intervals(struct crypt_device *cd, +@@ -372,18 +374,18 @@ static json_bool validate_intervals(struct crypt_device *cd, + while (i < length) { + if (ix[i].offset < 2 * metadata_size) { + log_dbg(cd, "Illegal area offset: %" PRIu64 ".", ix[i].offset); +- return FALSE; ++ return 0; + } + + if (!ix[i].length) { + log_dbg(cd, "Area length must be greater than zero."); +- return FALSE; ++ return 0; + } + + if ((ix[i].offset + ix[i].length) > keyslots_area_end) { + log_dbg(cd, "Area [%" PRIu64 ", %" PRIu64 "] overflows binary keyslots area (ends at offset: %" PRIu64 ").", + ix[i].offset, ix[i].offset + ix[i].length, keyslots_area_end); +- return FALSE; ++ return 0; + } + + for (j = 0; j < length; j++) { +@@ -393,14 +395,14 @@ static json_bool validate_intervals(struct crypt_device *cd, + log_dbg(cd, "Overlapping areas [%" PRIu64 ",%" PRIu64 "] and [%" PRIu64 ",%" PRIu64 "].", + ix[i].offset, ix[i].offset + ix[i].length, + ix[j].offset, ix[j].offset + ix[j].length); +- return FALSE; ++ return 0; + } + } + + i++; + } + +- return TRUE; ++ return 1; + } + + static int LUKS2_keyslot_validate(struct crypt_device *cd, json_object *hdr_jobj, json_object *hdr_keyslot, const char *key) +-- +2.26.0 + diff --git a/cryptsetup.spec b/cryptsetup.spec index 3de0f07..6acac6d 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,7 +1,7 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup Version: 2.3.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ and LGPLv2+ URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: openssl-devel, popt-devel, device-mapper-devel @@ -19,6 +19,8 @@ Obsoletes: cryptsetup-python3 < 2.1.0 %global upstream_version %{version} Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/cryptsetup-%{upstream_version}.tar.xz Patch0: %{name}-add-system-library-paths.patch +# https://gitlab.com/cryptsetup/cryptsetup/-/commit/604abec333a0efb44fd8bc610aa0b1151dd0f612 +Patch1: 0001-Add-support-for-upcoming-json-c-0.14.0.patch %description The cryptsetup package contains a utility for setting up @@ -70,6 +72,7 @@ can be used for offline reencryption of disk in situ. %prep %setup -q -n cryptsetup-%{upstream_version} %patch0 -p1 +%patch1 -p1 chmod -x misc/dracut_90reencrypt/* %build @@ -124,6 +127,9 @@ rm -rf %{buildroot}/%{_libdir}/*.la %ghost %attr(700, -, -) %dir /run/cryptsetup %changelog +* Tue Apr 14 2020 Björn Esser - 2.3.1-2 +- Add support for upcoming json-c 0.14.0 + * Thu Mar 12 2020 Ondrej Kozina - 2.3.1-1 - Update to cryptsetup 2.3.1. From 4bbb581d155ed3c442050766ff22f631f1527d46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Tue, 14 Apr 2020 21:10:35 +0200 Subject: [PATCH 075/142] Use %%make_build, %%make_install and %%autosetup macros --- cryptsetup.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index 6acac6d..ae92dd9 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -70,17 +70,15 @@ This package contains cryptsetup-reencrypt utility which can be used for offline reencryption of disk in situ. %prep -%setup -q -n cryptsetup-%{upstream_version} -%patch0 -p1 -%patch1 -p1 +%autosetup -n cryptsetup-%{upstream_version} -p 1 chmod -x misc/dracut_90reencrypt/* %build %configure --enable-fips --enable-pwquality --enable-libargon2 -make %{?_smp_mflags} +%make_build %install -make install DESTDIR=%{buildroot} +%make_install rm -rf %{buildroot}/%{_libdir}/*.la %find_lang cryptsetup @@ -129,6 +127,7 @@ rm -rf %{buildroot}/%{_libdir}/*.la %changelog * Tue Apr 14 2020 Björn Esser - 2.3.1-2 - Add support for upcoming json-c 0.14.0 +- Use %%make_build, %%make_install and %%autosetup macros * Thu Mar 12 2020 Ondrej Kozina - 2.3.1-1 - Update to cryptsetup 2.3.1. From eb705e87aea4376a630d33fc18275ee6cca632ba Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Thu, 16 Apr 2020 21:28:19 +0200 Subject: [PATCH 076/142] Fix broken json-c patch (#1824878). --- ...name-clash-with-newer-json-c-library.patch | 510 ++++++++++++++++++ cryptsetup.spec | 6 +- 2 files changed, 515 insertions(+), 1 deletion(-) create mode 100644 0002-Avoid-name-clash-with-newer-json-c-library.patch diff --git a/0002-Avoid-name-clash-with-newer-json-c-library.patch b/0002-Avoid-name-clash-with-newer-json-c-library.patch new file mode 100644 index 0000000..4c2a617 --- /dev/null +++ b/0002-Avoid-name-clash-with-newer-json-c-library.patch @@ -0,0 +1,510 @@ +From e6a356974330e3ae21579a5737976e9a2aad1b51 Mon Sep 17 00:00:00 2001 +From: Ondrej Kozina +Date: Tue, 14 Apr 2020 17:24:54 +0200 +Subject: [PATCH 2/8] Avoid name clash with newer json-c library. + +This is partial revert of previous commit and also +fixes wrong decision to name our internal helpers with +json_object prefix. +--- + lib/luks2/luks2_internal.h | 8 +++----- + lib/luks2/luks2_json_format.c | 6 +++--- + lib/luks2/luks2_json_metadata.c | 18 ++++++++---------- + lib/luks2/luks2_keyslot.c | 8 ++++---- + lib/luks2/luks2_keyslot_luks2.c | 16 ++++++++-------- + lib/luks2/luks2_keyslot_reenc.c | 20 ++++++++++---------- + lib/luks2/luks2_luks1_convert.c | 22 +++++++++++----------- + lib/luks2/luks2_reencrypt.c | 16 ++++++++-------- + lib/luks2/luks2_segment.c | 12 ++++++------ + 9 files changed, 61 insertions(+), 65 deletions(-) + +diff --git a/lib/luks2/luks2_internal.h b/lib/luks2/luks2_internal.h +index 939101d..a5bcb1f 100644 +--- a/lib/luks2/luks2_internal.h ++++ b/lib/luks2/luks2_internal.h +@@ -58,11 +58,9 @@ json_object *LUKS2_get_segments_jobj(struct luks2_hdr *hdr); + void hexprint_base64(struct crypt_device *cd, json_object *jobj, + const char *sep, const char *line_sep); + +-#if !(defined JSON_C_VERSION_NUM && JSON_C_VERSION_NUM >= ((13 << 8) | 99)) +-uint64_t json_object_get_uint64(json_object *jobj); +-json_object *json_object_new_uint64(uint64_t value); +-#endif +-uint32_t json_object_get_uint32(json_object *jobj); ++uint64_t crypt_jobj_get_uint64(json_object *jobj); ++uint32_t crypt_jobj_get_uint32(json_object *jobj); ++json_object *crypt_jobj_new_uint64(uint64_t value); + + int json_object_object_add_by_uint(json_object *jobj, unsigned key, json_object *jobj_val); + void json_object_object_del_by_uint(json_object *jobj, unsigned key); +diff --git a/lib/luks2/luks2_json_format.c b/lib/luks2/luks2_json_format.c +index 0fde2ff..1416766 100644 +--- a/lib/luks2/luks2_json_format.c ++++ b/lib/luks2/luks2_json_format.c +@@ -325,8 +325,8 @@ int LUKS2_generate_hdr( + + json_object_object_add_by_uint(jobj_segments, 0, jobj_segment); + +- json_object_object_add(jobj_config, "json_size", json_object_new_uint64(metadata_size - LUKS2_HDR_BIN_LEN)); +- json_object_object_add(jobj_config, "keyslots_size", json_object_new_uint64(keyslots_size)); ++ json_object_object_add(jobj_config, "json_size", crypt_jobj_new_uint64(metadata_size - LUKS2_HDR_BIN_LEN)); ++ json_object_object_add(jobj_config, "keyslots_size", crypt_jobj_new_uint64(keyslots_size)); + + JSON_DBG(cd, hdr->jobj, "Header JSON:"); + return 0; +@@ -400,6 +400,6 @@ int LUKS2_set_keyslots_size(struct crypt_device *cd, + if (!json_object_object_get_ex(hdr->jobj, "config", &jobj_config)) + return 1; + +- json_object_object_add(jobj_config, "keyslots_size", json_object_new_uint64(keyslots_size)); ++ json_object_object_add(jobj_config, "keyslots_size", crypt_jobj_new_uint64(keyslots_size)); + return 0; + } +diff --git a/lib/luks2/luks2_json_metadata.c b/lib/luks2/luks2_json_metadata.c +index 712c2bb..68da9c2 100644 +--- a/lib/luks2/luks2_json_metadata.c ++++ b/lib/luks2/luks2_json_metadata.c +@@ -219,7 +219,7 @@ int LUKS2_get_default_segment(struct luks2_hdr *hdr) + * json_type_int needs to be validated first. + * See validate_json_uint32() + */ +-uint32_t json_object_get_uint32(json_object *jobj) ++uint32_t crypt_jobj_get_uint32(json_object *jobj) + { + return json_object_get_int64(jobj); + } +@@ -241,15 +241,14 @@ static json_bool json_str_to_uint64(json_object *jobj, uint64_t *value) + return 1; + } + +-#if !(defined JSON_C_VERSION_NUM && JSON_C_VERSION_NUM >= ((13 << 8) | 99)) +-uint64_t json_object_get_uint64(json_object *jobj) ++uint64_t crypt_jobj_get_uint64(json_object *jobj) + { + uint64_t r; + json_str_to_uint64(jobj, &r); + return r; + } + +-json_object *json_object_new_uint64(uint64_t value) ++json_object *crypt_jobj_new_uint64(uint64_t value) + { + /* 18446744073709551615 */ + char num[21]; +@@ -263,7 +262,6 @@ json_object *json_object_new_uint64(uint64_t value) + jobj = json_object_new_string(num); + return jobj; + } +-#endif + + /* + * Validate helpers +@@ -457,7 +455,7 @@ static int hdr_validate_json_size(struct crypt_device *cd, json_object *hdr_jobj + + json = json_object_to_json_string_ext(hdr_jobj, + JSON_C_TO_STRING_PLAIN | JSON_C_TO_STRING_NOSLASHESCAPE); +- json_area_size = json_object_get_uint64(jobj1); ++ json_area_size = crypt_jobj_get_uint64(jobj1); + json_size = (uint64_t)strlen(json); + + if (hdr_json_size != json_area_size) { +@@ -545,7 +543,7 @@ static int hdr_validate_crypt_segment(struct crypt_device *cd, + return 1; + } + +- sector_size = json_object_get_uint32(jobj_sector_size); ++ sector_size = crypt_jobj_get_uint32(jobj_sector_size); + if (!sector_size || MISALIGNED_512(sector_size)) { + log_dbg(cd, "Illegal sector size: %" PRIu32, sector_size); + return 1; +@@ -1568,7 +1566,7 @@ static void hdr_dump_keyslots(struct crypt_device *cd, json_object *hdr_jobj) + log_std(cd, " %s: %s%s\n", slot, tmps, r == -ENOENT ? " (unbound)" : ""); + + if (json_object_object_get_ex(val, "key_size", &jobj2)) +- log_std(cd, "\tKey: %u bits\n", json_object_get_uint32(jobj2) * 8); ++ log_std(cd, "\tKey: %u bits\n", crypt_jobj_get_uint32(jobj2) * 8); + + log_std(cd, "\tPriority: %s\n", get_priority_desc(val)); + +@@ -1651,7 +1649,7 @@ static void hdr_dump_segments(struct crypt_device *cd, json_object *hdr_jobj) + log_std(cd, "\tcipher: %s\n", json_object_get_string(jobj1)); + + if (json_object_object_get_ex(jobj_segment, "sector_size", &jobj1)) +- log_std(cd, "\tsector: %" PRIu32 " [bytes]\n", json_object_get_uint32(jobj1)); ++ log_std(cd, "\tsector: %" PRIu32 " [bytes]\n", crypt_jobj_get_uint32(jobj1)); + + if (json_object_object_get_ex(jobj_segment, "integrity", &jobj1) && + json_object_object_get_ex(jobj1, "type", &jobj2)) +@@ -1748,7 +1746,7 @@ int LUKS2_get_data_size(struct luks2_hdr *hdr, uint64_t *size, bool *dynamic) + return 0; + } + +- tmp += json_object_get_uint64(jobj_size); ++ tmp += crypt_jobj_get_uint64(jobj_size); + } + + /* impossible, real device size must not be zero */ +diff --git a/lib/luks2/luks2_keyslot.c b/lib/luks2/luks2_keyslot.c +index 97031ad..3b8c889 100644 +--- a/lib/luks2/luks2_keyslot.c ++++ b/lib/luks2/luks2_keyslot.c +@@ -300,11 +300,11 @@ int LUKS2_keyslot_area(struct luks2_hdr *hdr, + + if (!json_object_object_get_ex(jobj_area, "offset", &jobj)) + return -EINVAL; +- *offset = json_object_get_uint64(jobj); ++ *offset = crypt_jobj_get_uint64(jobj); + + if (!json_object_object_get_ex(jobj_area, "size", &jobj)) + return -EINVAL; +- *length = json_object_get_uint64(jobj); ++ *length = crypt_jobj_get_uint64(jobj); + + return 0; + } +@@ -835,8 +835,8 @@ int placeholder_keyslot_alloc(struct crypt_device *cd, + + /* Area object */ + jobj_area = json_object_new_object(); +- json_object_object_add(jobj_area, "offset", json_object_new_uint64(area_offset)); +- json_object_object_add(jobj_area, "size", json_object_new_uint64(area_length)); ++ json_object_object_add(jobj_area, "offset", crypt_jobj_new_uint64(area_offset)); ++ json_object_object_add(jobj_area, "size", crypt_jobj_new_uint64(area_length)); + json_object_object_add(jobj_keyslot, "area", jobj_area); + + json_object_object_add_by_uint(jobj_keyslots, keyslot, jobj_keyslot); +diff --git a/lib/luks2/luks2_keyslot_luks2.c b/lib/luks2/luks2_keyslot_luks2.c +index cf0e53e..156f0c1 100644 +--- a/lib/luks2/luks2_keyslot_luks2.c ++++ b/lib/luks2/luks2_keyslot_luks2.c +@@ -220,7 +220,7 @@ static int luks2_keyslot_set_key(struct crypt_device *cd, + + if (!json_object_object_get_ex(jobj_area, "offset", &jobj2)) + return -EINVAL; +- area_offset = json_object_get_uint64(jobj2); ++ area_offset = crypt_jobj_get_uint64(jobj2); + + if (!json_object_object_get_ex(jobj_area, "encryption", &jobj2)) + return -EINVAL; +@@ -313,7 +313,7 @@ static int luks2_keyslot_get_key(struct crypt_device *cd, + + if (!json_object_object_get_ex(jobj_area, "offset", &jobj2)) + return -EINVAL; +- area_offset = json_object_get_uint64(jobj2); ++ area_offset = crypt_jobj_get_uint64(jobj2); + + if (!json_object_object_get_ex(jobj_area, "encryption", &jobj2)) + return -EINVAL; +@@ -494,8 +494,8 @@ static int luks2_keyslot_alloc(struct crypt_device *cd, + /* Area object */ + jobj_area = json_object_new_object(); + json_object_object_add(jobj_area, "type", json_object_new_string("raw")); +- json_object_object_add(jobj_area, "offset", json_object_new_uint64(area_offset)); +- json_object_object_add(jobj_area, "size", json_object_new_uint64(area_length)); ++ json_object_object_add(jobj_area, "offset", crypt_jobj_new_uint64(area_offset)); ++ json_object_object_add(jobj_area, "size", crypt_jobj_new_uint64(area_length)); + json_object_object_add(jobj_keyslot, "area", jobj_area); + + json_object_object_add_by_uint(jobj_keyslots, keyslot, jobj_keyslot); +@@ -607,7 +607,7 @@ static int luks2_keyslot_dump(struct crypt_device *cd, int keyslot) + log_std(cd, "\tCipher: %s\n", json_object_get_string(jobj1)); + + json_object_object_get_ex(jobj_area, "key_size", &jobj1); +- log_std(cd, "\tCipher key: %u bits\n", json_object_get_uint32(jobj1) * 8); ++ log_std(cd, "\tCipher key: %u bits\n", crypt_jobj_get_uint32(jobj1) * 8); + + json_object_object_get_ex(jobj_kdf, "type", &jobj1); + log_std(cd, "\tPBKDF: %s\n", json_object_get_string(jobj1)); +@@ -617,7 +617,7 @@ static int luks2_keyslot_dump(struct crypt_device *cd, int keyslot) + log_std(cd, "\tHash: %s\n", json_object_get_string(jobj1)); + + json_object_object_get_ex(jobj_kdf, "iterations", &jobj1); +- log_std(cd, "\tIterations: %" PRIu64 "\n", json_object_get_uint64(jobj1)); ++ log_std(cd, "\tIterations: %" PRIu64 "\n", crypt_jobj_get_uint64(jobj1)); + } else { + json_object_object_get_ex(jobj_kdf, "time", &jobj1); + log_std(cd, "\tTime cost: %" PRIu64 "\n", json_object_get_int64(jobj1)); +@@ -640,10 +640,10 @@ static int luks2_keyslot_dump(struct crypt_device *cd, int keyslot) + log_std(cd, "\tAF hash: %s\n", json_object_get_string(jobj1)); + + json_object_object_get_ex(jobj_area, "offset", &jobj1); +- log_std(cd, "\tArea offset:%" PRIu64 " [bytes]\n", json_object_get_uint64(jobj1)); ++ log_std(cd, "\tArea offset:%" PRIu64 " [bytes]\n", crypt_jobj_get_uint64(jobj1)); + + json_object_object_get_ex(jobj_area, "size", &jobj1); +- log_std(cd, "\tArea length:%" PRIu64 " [bytes]\n", json_object_get_uint64(jobj1)); ++ log_std(cd, "\tArea length:%" PRIu64 " [bytes]\n", crypt_jobj_get_uint64(jobj1)); + + return 0; + } +diff --git a/lib/luks2/luks2_keyslot_reenc.c b/lib/luks2/luks2_keyslot_reenc.c +index a09056b..b939467 100644 +--- a/lib/luks2/luks2_keyslot_reenc.c ++++ b/lib/luks2/luks2_keyslot_reenc.c +@@ -67,13 +67,13 @@ int reenc_keyslot_alloc(struct crypt_device *cd, + + if (params->data_shift) { + json_object_object_add(jobj_area, "type", json_object_new_string("datashift")); +- json_object_object_add(jobj_area, "shift_size", json_object_new_uint64(params->data_shift << SECTOR_SHIFT)); ++ json_object_object_add(jobj_area, "shift_size", crypt_jobj_new_uint64(params->data_shift << SECTOR_SHIFT)); + } else + /* except data shift protection, initial setting is irrelevant. Type can be changed during reencryption */ + json_object_object_add(jobj_area, "type", json_object_new_string("none")); + +- json_object_object_add(jobj_area, "offset", json_object_new_uint64(area_offset)); +- json_object_object_add(jobj_area, "size", json_object_new_uint64(area_length)); ++ json_object_object_add(jobj_area, "offset", crypt_jobj_new_uint64(area_offset)); ++ json_object_object_add(jobj_area, "size", crypt_jobj_new_uint64(area_length)); + + json_object_object_add(jobj_keyslot, "type", json_object_new_string("reencrypt")); + json_object_object_add(jobj_keyslot, "key_size", json_object_new_int(1)); /* useless but mandatory */ +@@ -113,8 +113,8 @@ static int reenc_keyslot_store_data(struct crypt_device *cd, + !json_object_object_get_ex(jobj_area, "size", &jobj_length)) + return -EINVAL; + +- area_offset = json_object_get_uint64(jobj_offset); +- area_length = json_object_get_uint64(jobj_length); ++ area_offset = crypt_jobj_get_uint64(jobj_offset); ++ area_length = crypt_jobj_get_uint64(jobj_length); + + if (!area_offset || !area_length || ((uint64_t)buffer_len > area_length)) + return -EINVAL; +@@ -242,14 +242,14 @@ static int reenc_keyslot_dump(struct crypt_device *cd, int keyslot) + log_std(cd, "\t%-12s%d [bytes]\n", "Hash data:", json_object_get_int(jobj1)); + } else if (!strcmp(json_object_get_string(jobj_resilience), "datashift")) { + json_object_object_get_ex(jobj_area, "shift_size", &jobj1); +- log_std(cd, "\t%-12s%" PRIu64 "[bytes]\n", "Shift size:", json_object_get_uint64(jobj1)); ++ log_std(cd, "\t%-12s%" PRIu64 "[bytes]\n", "Shift size:", crypt_jobj_get_uint64(jobj1)); + } + + json_object_object_get_ex(jobj_area, "offset", &jobj1); +- log_std(cd, "\tArea offset:%" PRIu64 " [bytes]\n", json_object_get_uint64(jobj1)); ++ log_std(cd, "\tArea offset:%" PRIu64 " [bytes]\n", crypt_jobj_get_uint64(jobj1)); + + json_object_object_get_ex(jobj_area, "size", &jobj1); +- log_std(cd, "\tArea length:%" PRIu64 " [bytes]\n", json_object_get_uint64(jobj1)); ++ log_std(cd, "\tArea length:%" PRIu64 " [bytes]\n", crypt_jobj_get_uint64(jobj1)); + + return 0; + } +@@ -304,7 +304,7 @@ static int reenc_keyslot_validate(struct crypt_device *cd, json_object *jobj_key + return -EINVAL; + if (!validate_json_uint32(jobj_sector_size)) + return -EINVAL; +- sector_size = json_object_get_uint32(jobj_sector_size); ++ sector_size = crypt_jobj_get_uint32(jobj_sector_size); + if (sector_size < SECTOR_SIZE || NOTPOW2(sector_size)) { + log_dbg(cd, "Invalid sector_size (%" PRIu32 ") for checksum resilience mode.", sector_size); + return -EINVAL; +@@ -313,7 +313,7 @@ static int reenc_keyslot_validate(struct crypt_device *cd, json_object *jobj_key + if (!(jobj_shift_size = json_contains(cd, jobj_area, "type:datashift", "Keyslot area", "shift_size", json_type_string))) + return -EINVAL; + +- shift_size = json_object_get_uint64(jobj_shift_size); ++ shift_size = crypt_jobj_get_uint64(jobj_shift_size); + if (!shift_size) + return -EINVAL; + +diff --git a/lib/luks2/luks2_luks1_convert.c b/lib/luks2/luks2_luks1_convert.c +index ca47e5d..603c44d 100644 +--- a/lib/luks2/luks2_luks1_convert.c ++++ b/lib/luks2/luks2_luks1_convert.c +@@ -91,8 +91,8 @@ static int json_luks1_keyslot(const struct luks_phdr *hdr_v1, int keyslot, struc + } + area_size = offs_b - offs_a; + json_object_object_add(jobj_area, "key_size", json_object_new_int(hdr_v1->keyBytes)); +- json_object_object_add(jobj_area, "offset", json_object_new_uint64(offset)); +- json_object_object_add(jobj_area, "size", json_object_new_uint64(area_size)); ++ json_object_object_add(jobj_area, "offset", crypt_jobj_new_uint64(offset)); ++ json_object_object_add(jobj_area, "size", crypt_jobj_new_uint64(area_size)); + json_object_object_add(keyslot_obj, "area", jobj_area); + + *keyslot_object = keyslot_obj; +@@ -145,7 +145,7 @@ static int json_luks1_segment(const struct luks_phdr *hdr_v1, struct json_object + /* offset field */ + number = (uint64_t)hdr_v1->payloadOffset * SECTOR_SIZE; + +- field = json_object_new_uint64(number); ++ field = crypt_jobj_new_uint64(number); + if (!field) { + json_object_put(segment_obj); + return -ENOMEM; +@@ -401,9 +401,9 @@ static int json_luks1_object(struct luks_phdr *hdr_v1, struct json_object **luks + json_object_object_add(luks1_obj, "config", field); + + json_size = LUKS2_HDR_16K_LEN - LUKS2_HDR_BIN_LEN; +- json_object_object_add(field, "json_size", json_object_new_uint64(json_size)); ++ json_object_object_add(field, "json_size", crypt_jobj_new_uint64(json_size)); + keyslots_size -= (keyslots_size % 4096); +- json_object_object_add(field, "keyslots_size", json_object_new_uint64(keyslots_size)); ++ json_object_object_add(field, "keyslots_size", crypt_jobj_new_uint64(keyslots_size)); + + *luks1_object = luks1_obj; + return 0; +@@ -419,8 +419,8 @@ static void move_keyslot_offset(json_object *jobj, int offset_add) + UNUSED(key); + json_object_object_get_ex(val, "area", &jobj_area); + json_object_object_get_ex(jobj_area, "offset", &jobj2); +- offset = json_object_get_uint64(jobj2) + offset_add; +- json_object_object_add(jobj_area, "offset", json_object_new_uint64(offset)); ++ offset = crypt_jobj_get_uint64(jobj2) + offset_add; ++ json_object_object_add(jobj_area, "offset", crypt_jobj_new_uint64(offset)); + } + } + +@@ -764,7 +764,7 @@ int LUKS2_luks2_to_luks1(struct crypt_device *cd, struct luks2_hdr *hdr2, struct + return -EINVAL; + if (!json_object_object_get_ex(jobj_area, "offset", &jobj1)) + return -EINVAL; +- offset = json_object_get_uint64(jobj1); ++ offset = crypt_jobj_get_uint64(jobj1); + } else { + if (LUKS2_find_area_gap(cd, hdr2, key_size, &offset, &area_length)) + return -EINVAL; +@@ -796,7 +796,7 @@ int LUKS2_luks2_to_luks1(struct crypt_device *cd, struct luks2_hdr *hdr2, struct + + if (!json_object_object_get_ex(jobj_kdf, "iterations", &jobj1)) + continue; +- hdr1->keyblock[i].passwordIterations = json_object_get_uint32(jobj1); ++ hdr1->keyblock[i].passwordIterations = crypt_jobj_get_uint32(jobj1); + + if (!json_object_object_get_ex(jobj_kdf, "salt", &jobj1)) + continue; +@@ -837,7 +837,7 @@ int LUKS2_luks2_to_luks1(struct crypt_device *cd, struct luks2_hdr *hdr2, struct + + if (!json_object_object_get_ex(jobj_digest, "iterations", &jobj1)) + return -EINVAL; +- hdr1->mkDigestIterations = json_object_get_uint32(jobj1); ++ hdr1->mkDigestIterations = crypt_jobj_get_uint32(jobj1); + + if (!json_object_object_get_ex(jobj_digest, "digest", &jobj1)) + return -EINVAL; +@@ -862,7 +862,7 @@ int LUKS2_luks2_to_luks1(struct crypt_device *cd, struct luks2_hdr *hdr2, struct + + if (!json_object_object_get_ex(jobj_segment, "offset", &jobj1)) + return -EINVAL; +- offset = json_object_get_uint64(jobj1) / SECTOR_SIZE; ++ offset = crypt_jobj_get_uint64(jobj1) / SECTOR_SIZE; + if (offset > UINT32_MAX) + return -EINVAL; + /* FIXME: LUKS1 requires offset == 0 || offset >= luks1_hdr_size */ +diff --git a/lib/luks2/luks2_reencrypt.c b/lib/luks2/luks2_reencrypt.c +index 60a007b..68d3194 100644 +--- a/lib/luks2/luks2_reencrypt.c ++++ b/lib/luks2/luks2_reencrypt.c +@@ -165,7 +165,7 @@ static uint32_t reencrypt_alignment(struct luks2_hdr *hdr) + if (!json_object_object_get_ex(jobj_area, "sector_size", &jobj_sector_size)) + return 0; + +- return json_object_get_uint32(jobj_sector_size); ++ return crypt_jobj_get_uint32(jobj_sector_size); + } + + static json_object *_enc_create_segments_shift_after(struct crypt_device *cd, +@@ -200,13 +200,13 @@ static json_object *_enc_create_segments_shift_after(struct crypt_device *cd, + json_segment_remove_flag(jobj_seg_new, "in-reencryption"); + tmp = rh->length; + } else { +- json_object_object_add(jobj_seg_new, "offset", json_object_new_uint64(rh->offset + data_offset)); +- json_object_object_add(jobj_seg_new, "iv_tweak", json_object_new_uint64(rh->offset >> SECTOR_SHIFT)); ++ json_object_object_add(jobj_seg_new, "offset", crypt_jobj_new_uint64(rh->offset + data_offset)); ++ json_object_object_add(jobj_seg_new, "iv_tweak", crypt_jobj_new_uint64(rh->offset >> SECTOR_SHIFT)); + tmp = json_segment_get_size(jobj_seg_new, 0) + rh->length; + } + + /* alter size of new segment, reenc_seg == 0 we're finished */ +- json_object_object_add(jobj_seg_new, "size", reenc_seg > 0 ? json_object_new_uint64(tmp) : json_object_new_string("dynamic")); ++ json_object_object_add(jobj_seg_new, "size", reenc_seg > 0 ? crypt_jobj_new_uint64(tmp) : json_object_new_string("dynamic")); + json_object_object_add_by_uint(jobj_segs_post, reenc_seg, jobj_seg_new); + + return jobj_segs_post; +@@ -256,7 +256,7 @@ static json_object *reencrypt_make_hot_segments_encrypt_shift(struct crypt_devic + jobj_seg_shrunk = NULL; + if (json_object_copy(LUKS2_get_segment_jobj(hdr, sg), &jobj_seg_shrunk)) + goto err; +- json_object_object_add(jobj_seg_shrunk, "size", json_object_new_uint64(segment_size - rh->length)); ++ json_object_object_add(jobj_seg_shrunk, "size", crypt_jobj_new_uint64(segment_size - rh->length)); + json_object_object_add_by_uint(jobj_segs_hot, sg++, jobj_seg_shrunk); + } + +@@ -336,7 +336,7 @@ static json_object *reencrypt_make_post_segments_forward(struct crypt_device *cd + goto err; + jobj_old_seg = jobj_old_seg_copy; + fixed_length = rh->device_size - fixed_length; +- json_object_object_add(jobj_old_seg, "size", json_object_new_uint64(fixed_length)); ++ json_object_object_add(jobj_old_seg, "size", crypt_jobj_new_uint64(fixed_length)); + } else + json_object_get(jobj_old_seg); + json_object_object_add_by_uint(jobj_segs_post, 1, jobj_old_seg); +@@ -491,7 +491,7 @@ static json_object *reencrypt_make_hot_segments_backward(struct crypt_device *cd + if (rh->offset) { + if (json_object_copy(LUKS2_get_segment_jobj(hdr, 0), &jobj_old_seg)) + goto err; +- json_object_object_add(jobj_old_seg, "size", json_object_new_uint64(rh->offset)); ++ json_object_object_add(jobj_old_seg, "size", crypt_jobj_new_uint64(rh->offset)); + + json_object_object_add_by_uint(jobj_segs_hot, sg++, jobj_old_seg); + } +@@ -575,7 +575,7 @@ static uint64_t reencrypt_data_shift(struct luks2_hdr *hdr) + if (!json_object_object_get_ex(jobj_area, "shift_size", &jobj_data_shift)) + return 0; + +- return json_object_get_uint64(jobj_data_shift); ++ return crypt_jobj_get_uint64(jobj_data_shift); + } + + static crypt_reencrypt_mode_info reencrypt_mode(struct luks2_hdr *hdr) +diff --git a/lib/luks2/luks2_segment.c b/lib/luks2/luks2_segment.c +index d71a607..8708ba5 100644 +--- a/lib/luks2/luks2_segment.c ++++ b/lib/luks2/luks2_segment.c +@@ -55,7 +55,7 @@ uint64_t json_segment_get_offset(json_object *jobj_segment, unsigned blockwise) + !json_object_object_get_ex(jobj_segment, "offset", &jobj)) + return 0; + +- return blockwise ? json_object_get_uint64(jobj) >> SECTOR_SHIFT : json_object_get_uint64(jobj); ++ return blockwise ? crypt_jobj_get_uint64(jobj) >> SECTOR_SHIFT : crypt_jobj_get_uint64(jobj); + } + + const char *json_segment_type(json_object *jobj_segment) +@@ -77,7 +77,7 @@ uint64_t json_segment_get_iv_offset(json_object *jobj_segment) + !json_object_object_get_ex(jobj_segment, "iv_tweak", &jobj)) + return 0; + +- return json_object_get_uint64(jobj); ++ return crypt_jobj_get_uint64(jobj); + } + + uint64_t json_segment_get_size(json_object *jobj_segment, unsigned blockwise) +@@ -88,7 +88,7 @@ uint64_t json_segment_get_size(json_object *jobj_segment, unsigned blockwise) + !json_object_object_get_ex(jobj_segment, "size", &jobj)) + return 0; + +- return blockwise ? json_object_get_uint64(jobj) >> SECTOR_SHIFT : json_object_get_uint64(jobj); ++ return blockwise ? crypt_jobj_get_uint64(jobj) >> SECTOR_SHIFT : crypt_jobj_get_uint64(jobj); + } + + const char *json_segment_get_cipher(json_object *jobj_segment) +@@ -229,8 +229,8 @@ static json_object *_segment_create_generic(const char *type, uint64_t offset, c + return NULL; + + json_object_object_add(jobj, "type", json_object_new_string(type)); +- json_object_object_add(jobj, "offset", json_object_new_uint64(offset)); +- json_object_object_add(jobj, "size", length ? json_object_new_uint64(*length) : json_object_new_string("dynamic")); ++ json_object_object_add(jobj, "offset", crypt_jobj_new_uint64(offset)); ++ json_object_object_add(jobj, "size", length ? crypt_jobj_new_uint64(*length) : json_object_new_string("dynamic")); + + return jobj; + } +@@ -252,7 +252,7 @@ json_object *json_segment_create_crypt(uint64_t offset, + if (!jobj) + return NULL; + +- json_object_object_add(jobj, "iv_tweak", json_object_new_uint64(iv_offset)); ++ json_object_object_add(jobj, "iv_tweak", crypt_jobj_new_uint64(iv_offset)); + json_object_object_add(jobj, "encryption", json_object_new_string(cipher)); + json_object_object_add(jobj, "sector_size", json_object_new_int(sector_size)); + if (reencryption) +-- +2.26.1 + diff --git a/cryptsetup.spec b/cryptsetup.spec index ae92dd9..dc1bb28 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,7 +1,7 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup Version: 2.3.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ and LGPLv2+ URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: openssl-devel, popt-devel, device-mapper-devel @@ -21,6 +21,7 @@ Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/cryptsetup-%{ups Patch0: %{name}-add-system-library-paths.patch # https://gitlab.com/cryptsetup/cryptsetup/-/commit/604abec333a0efb44fd8bc610aa0b1151dd0f612 Patch1: 0001-Add-support-for-upcoming-json-c-0.14.0.patch +Patch2: 0002-Avoid-name-clash-with-newer-json-c-library.patch %description The cryptsetup package contains a utility for setting up @@ -125,6 +126,9 @@ rm -rf %{buildroot}/%{_libdir}/*.la %ghost %attr(700, -, -) %dir /run/cryptsetup %changelog +* Thu Apr 16 2020 Milan Broz - 2.3.1-3 +- Fix broken json-c patch (#1824878). + * Tue Apr 14 2020 Björn Esser - 2.3.1-2 - Add support for upcoming json-c 0.14.0 - Use %%make_build, %%make_install and %%autosetup macros From c1f61f1874056c405f877955ca8305c4d4e1a908 Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Fri, 17 Apr 2020 00:03:31 +0200 Subject: [PATCH 077/142] Add gating.yaml. --- gating.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 gating.yaml diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..afcf378 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,8 @@ +--- !Policy +product_versions: + - fedora-33 + - fedora-rawhide +decision_context: bodhi_update_push_stable +rules: + - !PassingTestCaseRule {test_case_name: dist.abicheck} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} From 178e590ce39aa5257d5bff211b014daf02841f44 Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Fri, 17 Apr 2020 11:10:22 +0200 Subject: [PATCH 078/142] Fix broken patches application order (#1824878). --- cryptsetup.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index dc1bb28..bb83d4b 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -18,10 +18,11 @@ Obsoletes: cryptsetup-python3 < 2.1.0 %global upstream_version %{version} Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/cryptsetup-%{upstream_version}.tar.xz -Patch0: %{name}-add-system-library-paths.patch # https://gitlab.com/cryptsetup/cryptsetup/-/commit/604abec333a0efb44fd8bc610aa0b1151dd0f612 -Patch1: 0001-Add-support-for-upcoming-json-c-0.14.0.patch -Patch2: 0002-Avoid-name-clash-with-newer-json-c-library.patch +Patch0: 0001-Add-support-for-upcoming-json-c-0.14.0.patch +Patch1: 0002-Avoid-name-clash-with-newer-json-c-library.patch +# Following patch has to applied last +Patch2: %{name}-add-system-library-paths.patch %description The cryptsetup package contains a utility for setting up From 479b6a73bb85a5039e7922cc580dc31ccfed2b0e Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Mon, 20 Apr 2020 13:02:15 +0200 Subject: [PATCH 079/142] Make apply-last-patch approach obvious. --- cryptsetup.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index bb83d4b..87c3ca2 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -22,7 +22,7 @@ Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/cryptsetup-%{ups Patch0: 0001-Add-support-for-upcoming-json-c-0.14.0.patch Patch1: 0002-Avoid-name-clash-with-newer-json-c-library.patch # Following patch has to applied last -Patch2: %{name}-add-system-library-paths.patch +Patch9999: %{name}-add-system-library-paths.patch %description The cryptsetup package contains a utility for setting up From 8a385b7ef4de7f68e3d368a0cb009bb839982b47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Tue, 21 Apr 2020 19:49:15 +0200 Subject: [PATCH 080/142] Rebuild (json-c) --- cryptsetup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index 87c3ca2..a8cfbc8 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,7 +1,7 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup Version: 2.3.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ and LGPLv2+ URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: openssl-devel, popt-devel, device-mapper-devel @@ -127,6 +127,9 @@ rm -rf %{buildroot}/%{_libdir}/*.la %ghost %attr(700, -, -) %dir /run/cryptsetup %changelog +* Tue Apr 21 2020 Björn Esser - 2.3.1-4 +- Rebuild (json-c) + * Thu Apr 16 2020 Milan Broz - 2.3.1-3 - Fix broken json-c patch (#1824878). From 82967dd40aac5a7580914b6b7f7ecfd87917211c Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Thu, 30 Apr 2020 18:05:04 +0200 Subject: [PATCH 081/142] Update to version 2.3.2. --- .gitignore | 2 +- ...d-support-for-upcoming-json-c-0.14.0.patch | 177 ------ ...name-clash-with-newer-json-c-library.patch | 510 ------------------ cryptsetup-2.3.1.tar.sign | 16 - cryptsetup-2.3.2.tar.sign | 16 + cryptsetup.spec | 10 +- sources | 2 +- 7 files changed, 23 insertions(+), 710 deletions(-) delete mode 100644 0001-Add-support-for-upcoming-json-c-0.14.0.patch delete mode 100644 0002-Avoid-name-clash-with-newer-json-c-library.patch delete mode 100644 cryptsetup-2.3.1.tar.sign create mode 100644 cryptsetup-2.3.2.tar.sign diff --git a/.gitignore b/.gitignore index f83f7c7..80a70af 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/cryptsetup-2.3.1.tar.xz +/cryptsetup-2.3.2.tar.xz diff --git a/0001-Add-support-for-upcoming-json-c-0.14.0.patch b/0001-Add-support-for-upcoming-json-c-0.14.0.patch deleted file mode 100644 index fba1f36..0000000 --- a/0001-Add-support-for-upcoming-json-c-0.14.0.patch +++ /dev/null @@ -1,177 +0,0 @@ -From 604abec333a0efb44fd8bc610aa0b1151dd0f612 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= -Date: Mon, 13 Apr 2020 11:48:17 +0200 -Subject: [PATCH] Add support for upcoming json-c 0.14.0. - - * TRUE/FALSE are not defined anymore. 1 and 0 are used instead. - * json_object_get_uint64() and json_object_new_uint64() are part - of the upstream API now. ---- - lib/luks2/luks2_internal.h | 4 +++- - lib/luks2/luks2_json_metadata.c | 38 +++++++++++++++++---------------- - 2 files changed, 23 insertions(+), 19 deletions(-) - -diff --git a/lib/luks2/luks2_internal.h b/lib/luks2/luks2_internal.h -index b9fec6b5..939101d6 100644 ---- a/lib/luks2/luks2_internal.h -+++ b/lib/luks2/luks2_internal.h -@@ -58,9 +58,11 @@ json_object *LUKS2_get_segments_jobj(struct luks2_hdr *hdr); - void hexprint_base64(struct crypt_device *cd, json_object *jobj, - const char *sep, const char *line_sep); - -+#if !(defined JSON_C_VERSION_NUM && JSON_C_VERSION_NUM >= ((13 << 8) | 99)) - uint64_t json_object_get_uint64(json_object *jobj); --uint32_t json_object_get_uint32(json_object *jobj); - json_object *json_object_new_uint64(uint64_t value); -+#endif -+uint32_t json_object_get_uint32(json_object *jobj); - - int json_object_object_add_by_uint(json_object *jobj, unsigned key, json_object *jobj_val); - void json_object_object_del_by_uint(json_object *jobj, unsigned key); -diff --git a/lib/luks2/luks2_json_metadata.c b/lib/luks2/luks2_json_metadata.c -index 781280c2..712c2bbd 100644 ---- a/lib/luks2/luks2_json_metadata.c -+++ b/lib/luks2/luks2_json_metadata.c -@@ -234,13 +234,14 @@ static json_bool json_str_to_uint64(json_object *jobj, uint64_t *value) - tmp = strtoull(json_object_get_string(jobj), &endptr, 10); - if (*endptr || errno) { - *value = 0; -- return FALSE; -+ return 0; - } - - *value = tmp; -- return TRUE; -+ return 1; - } - -+#if !(defined JSON_C_VERSION_NUM && JSON_C_VERSION_NUM >= ((13 << 8) | 99)) - uint64_t json_object_get_uint64(json_object *jobj) - { - uint64_t r; -@@ -262,6 +263,7 @@ json_object *json_object_new_uint64(uint64_t value) - jobj = json_object_new_string(num); - return jobj; - } -+#endif - - /* - * Validate helpers -@@ -273,9 +275,9 @@ static json_bool numbered(struct crypt_device *cd, const char *name, const char - for (i = 0; key[i]; i++) - if (!isdigit(key[i])) { - log_dbg(cd, "%s \"%s\" is not in numbered form.", name, key); -- return FALSE; -+ return 0; - } -- return TRUE; -+ return 1; - } - - json_object *json_contains(struct crypt_device *cd, json_object *jobj, const char *name, -@@ -300,7 +302,7 @@ json_bool validate_json_uint32(json_object *jobj) - errno = 0; - tmp = json_object_get_int64(jobj); - -- return (errno || tmp < 0 || tmp > UINT32_MAX) ? FALSE : TRUE; -+ return (errno || tmp < 0 || tmp > UINT32_MAX) ? 0 : 1; - } - - static json_bool validate_keyslots_array(struct crypt_device *cd, -@@ -313,17 +315,17 @@ static json_bool validate_keyslots_array(struct crypt_device *cd, - jobj = json_object_array_get_idx(jarr, i); - if (!json_object_is_type(jobj, json_type_string)) { - log_dbg(cd, "Illegal value type in keyslots array at index %d.", i); -- return FALSE; -+ return 0; - } - - if (!json_contains(cd, jobj_keys, "", "Keyslots section", - json_object_get_string(jobj), json_type_object)) -- return FALSE; -+ return 0; - - i++; - } - -- return TRUE; -+ return 1; - } - - static json_bool validate_segments_array(struct crypt_device *cd, -@@ -336,17 +338,17 @@ static json_bool validate_segments_array(struct crypt_device *cd, - jobj = json_object_array_get_idx(jarr, i); - if (!json_object_is_type(jobj, json_type_string)) { - log_dbg(cd, "Illegal value type in segments array at index %d.", i); -- return FALSE; -+ return 0; - } - - if (!json_contains(cd, jobj_segments, "", "Segments section", - json_object_get_string(jobj), json_type_object)) -- return FALSE; -+ return 0; - - i++; - } - -- return TRUE; -+ return 1; - } - - static json_bool segment_has_digest(const char *segment_name, json_object *jobj_digests) -@@ -357,10 +359,10 @@ static json_bool segment_has_digest(const char *segment_name, json_object *jobj_ - UNUSED(key); - json_object_object_get_ex(val, "segments", &jobj_segments); - if (LUKS2_array_jobj(jobj_segments, segment_name)) -- return TRUE; -+ return 1; - } - -- return FALSE; -+ return 0; - } - - static json_bool validate_intervals(struct crypt_device *cd, -@@ -372,18 +374,18 @@ static json_bool validate_intervals(struct crypt_device *cd, - while (i < length) { - if (ix[i].offset < 2 * metadata_size) { - log_dbg(cd, "Illegal area offset: %" PRIu64 ".", ix[i].offset); -- return FALSE; -+ return 0; - } - - if (!ix[i].length) { - log_dbg(cd, "Area length must be greater than zero."); -- return FALSE; -+ return 0; - } - - if ((ix[i].offset + ix[i].length) > keyslots_area_end) { - log_dbg(cd, "Area [%" PRIu64 ", %" PRIu64 "] overflows binary keyslots area (ends at offset: %" PRIu64 ").", - ix[i].offset, ix[i].offset + ix[i].length, keyslots_area_end); -- return FALSE; -+ return 0; - } - - for (j = 0; j < length; j++) { -@@ -393,14 +395,14 @@ static json_bool validate_intervals(struct crypt_device *cd, - log_dbg(cd, "Overlapping areas [%" PRIu64 ",%" PRIu64 "] and [%" PRIu64 ",%" PRIu64 "].", - ix[i].offset, ix[i].offset + ix[i].length, - ix[j].offset, ix[j].offset + ix[j].length); -- return FALSE; -+ return 0; - } - } - - i++; - } - -- return TRUE; -+ return 1; - } - - static int LUKS2_keyslot_validate(struct crypt_device *cd, json_object *hdr_jobj, json_object *hdr_keyslot, const char *key) --- -2.26.0 - diff --git a/0002-Avoid-name-clash-with-newer-json-c-library.patch b/0002-Avoid-name-clash-with-newer-json-c-library.patch deleted file mode 100644 index 4c2a617..0000000 --- a/0002-Avoid-name-clash-with-newer-json-c-library.patch +++ /dev/null @@ -1,510 +0,0 @@ -From e6a356974330e3ae21579a5737976e9a2aad1b51 Mon Sep 17 00:00:00 2001 -From: Ondrej Kozina -Date: Tue, 14 Apr 2020 17:24:54 +0200 -Subject: [PATCH 2/8] Avoid name clash with newer json-c library. - -This is partial revert of previous commit and also -fixes wrong decision to name our internal helpers with -json_object prefix. ---- - lib/luks2/luks2_internal.h | 8 +++----- - lib/luks2/luks2_json_format.c | 6 +++--- - lib/luks2/luks2_json_metadata.c | 18 ++++++++---------- - lib/luks2/luks2_keyslot.c | 8 ++++---- - lib/luks2/luks2_keyslot_luks2.c | 16 ++++++++-------- - lib/luks2/luks2_keyslot_reenc.c | 20 ++++++++++---------- - lib/luks2/luks2_luks1_convert.c | 22 +++++++++++----------- - lib/luks2/luks2_reencrypt.c | 16 ++++++++-------- - lib/luks2/luks2_segment.c | 12 ++++++------ - 9 files changed, 61 insertions(+), 65 deletions(-) - -diff --git a/lib/luks2/luks2_internal.h b/lib/luks2/luks2_internal.h -index 939101d..a5bcb1f 100644 ---- a/lib/luks2/luks2_internal.h -+++ b/lib/luks2/luks2_internal.h -@@ -58,11 +58,9 @@ json_object *LUKS2_get_segments_jobj(struct luks2_hdr *hdr); - void hexprint_base64(struct crypt_device *cd, json_object *jobj, - const char *sep, const char *line_sep); - --#if !(defined JSON_C_VERSION_NUM && JSON_C_VERSION_NUM >= ((13 << 8) | 99)) --uint64_t json_object_get_uint64(json_object *jobj); --json_object *json_object_new_uint64(uint64_t value); --#endif --uint32_t json_object_get_uint32(json_object *jobj); -+uint64_t crypt_jobj_get_uint64(json_object *jobj); -+uint32_t crypt_jobj_get_uint32(json_object *jobj); -+json_object *crypt_jobj_new_uint64(uint64_t value); - - int json_object_object_add_by_uint(json_object *jobj, unsigned key, json_object *jobj_val); - void json_object_object_del_by_uint(json_object *jobj, unsigned key); -diff --git a/lib/luks2/luks2_json_format.c b/lib/luks2/luks2_json_format.c -index 0fde2ff..1416766 100644 ---- a/lib/luks2/luks2_json_format.c -+++ b/lib/luks2/luks2_json_format.c -@@ -325,8 +325,8 @@ int LUKS2_generate_hdr( - - json_object_object_add_by_uint(jobj_segments, 0, jobj_segment); - -- json_object_object_add(jobj_config, "json_size", json_object_new_uint64(metadata_size - LUKS2_HDR_BIN_LEN)); -- json_object_object_add(jobj_config, "keyslots_size", json_object_new_uint64(keyslots_size)); -+ json_object_object_add(jobj_config, "json_size", crypt_jobj_new_uint64(metadata_size - LUKS2_HDR_BIN_LEN)); -+ json_object_object_add(jobj_config, "keyslots_size", crypt_jobj_new_uint64(keyslots_size)); - - JSON_DBG(cd, hdr->jobj, "Header JSON:"); - return 0; -@@ -400,6 +400,6 @@ int LUKS2_set_keyslots_size(struct crypt_device *cd, - if (!json_object_object_get_ex(hdr->jobj, "config", &jobj_config)) - return 1; - -- json_object_object_add(jobj_config, "keyslots_size", json_object_new_uint64(keyslots_size)); -+ json_object_object_add(jobj_config, "keyslots_size", crypt_jobj_new_uint64(keyslots_size)); - return 0; - } -diff --git a/lib/luks2/luks2_json_metadata.c b/lib/luks2/luks2_json_metadata.c -index 712c2bb..68da9c2 100644 ---- a/lib/luks2/luks2_json_metadata.c -+++ b/lib/luks2/luks2_json_metadata.c -@@ -219,7 +219,7 @@ int LUKS2_get_default_segment(struct luks2_hdr *hdr) - * json_type_int needs to be validated first. - * See validate_json_uint32() - */ --uint32_t json_object_get_uint32(json_object *jobj) -+uint32_t crypt_jobj_get_uint32(json_object *jobj) - { - return json_object_get_int64(jobj); - } -@@ -241,15 +241,14 @@ static json_bool json_str_to_uint64(json_object *jobj, uint64_t *value) - return 1; - } - --#if !(defined JSON_C_VERSION_NUM && JSON_C_VERSION_NUM >= ((13 << 8) | 99)) --uint64_t json_object_get_uint64(json_object *jobj) -+uint64_t crypt_jobj_get_uint64(json_object *jobj) - { - uint64_t r; - json_str_to_uint64(jobj, &r); - return r; - } - --json_object *json_object_new_uint64(uint64_t value) -+json_object *crypt_jobj_new_uint64(uint64_t value) - { - /* 18446744073709551615 */ - char num[21]; -@@ -263,7 +262,6 @@ json_object *json_object_new_uint64(uint64_t value) - jobj = json_object_new_string(num); - return jobj; - } --#endif - - /* - * Validate helpers -@@ -457,7 +455,7 @@ static int hdr_validate_json_size(struct crypt_device *cd, json_object *hdr_jobj - - json = json_object_to_json_string_ext(hdr_jobj, - JSON_C_TO_STRING_PLAIN | JSON_C_TO_STRING_NOSLASHESCAPE); -- json_area_size = json_object_get_uint64(jobj1); -+ json_area_size = crypt_jobj_get_uint64(jobj1); - json_size = (uint64_t)strlen(json); - - if (hdr_json_size != json_area_size) { -@@ -545,7 +543,7 @@ static int hdr_validate_crypt_segment(struct crypt_device *cd, - return 1; - } - -- sector_size = json_object_get_uint32(jobj_sector_size); -+ sector_size = crypt_jobj_get_uint32(jobj_sector_size); - if (!sector_size || MISALIGNED_512(sector_size)) { - log_dbg(cd, "Illegal sector size: %" PRIu32, sector_size); - return 1; -@@ -1568,7 +1566,7 @@ static void hdr_dump_keyslots(struct crypt_device *cd, json_object *hdr_jobj) - log_std(cd, " %s: %s%s\n", slot, tmps, r == -ENOENT ? " (unbound)" : ""); - - if (json_object_object_get_ex(val, "key_size", &jobj2)) -- log_std(cd, "\tKey: %u bits\n", json_object_get_uint32(jobj2) * 8); -+ log_std(cd, "\tKey: %u bits\n", crypt_jobj_get_uint32(jobj2) * 8); - - log_std(cd, "\tPriority: %s\n", get_priority_desc(val)); - -@@ -1651,7 +1649,7 @@ static void hdr_dump_segments(struct crypt_device *cd, json_object *hdr_jobj) - log_std(cd, "\tcipher: %s\n", json_object_get_string(jobj1)); - - if (json_object_object_get_ex(jobj_segment, "sector_size", &jobj1)) -- log_std(cd, "\tsector: %" PRIu32 " [bytes]\n", json_object_get_uint32(jobj1)); -+ log_std(cd, "\tsector: %" PRIu32 " [bytes]\n", crypt_jobj_get_uint32(jobj1)); - - if (json_object_object_get_ex(jobj_segment, "integrity", &jobj1) && - json_object_object_get_ex(jobj1, "type", &jobj2)) -@@ -1748,7 +1746,7 @@ int LUKS2_get_data_size(struct luks2_hdr *hdr, uint64_t *size, bool *dynamic) - return 0; - } - -- tmp += json_object_get_uint64(jobj_size); -+ tmp += crypt_jobj_get_uint64(jobj_size); - } - - /* impossible, real device size must not be zero */ -diff --git a/lib/luks2/luks2_keyslot.c b/lib/luks2/luks2_keyslot.c -index 97031ad..3b8c889 100644 ---- a/lib/luks2/luks2_keyslot.c -+++ b/lib/luks2/luks2_keyslot.c -@@ -300,11 +300,11 @@ int LUKS2_keyslot_area(struct luks2_hdr *hdr, - - if (!json_object_object_get_ex(jobj_area, "offset", &jobj)) - return -EINVAL; -- *offset = json_object_get_uint64(jobj); -+ *offset = crypt_jobj_get_uint64(jobj); - - if (!json_object_object_get_ex(jobj_area, "size", &jobj)) - return -EINVAL; -- *length = json_object_get_uint64(jobj); -+ *length = crypt_jobj_get_uint64(jobj); - - return 0; - } -@@ -835,8 +835,8 @@ int placeholder_keyslot_alloc(struct crypt_device *cd, - - /* Area object */ - jobj_area = json_object_new_object(); -- json_object_object_add(jobj_area, "offset", json_object_new_uint64(area_offset)); -- json_object_object_add(jobj_area, "size", json_object_new_uint64(area_length)); -+ json_object_object_add(jobj_area, "offset", crypt_jobj_new_uint64(area_offset)); -+ json_object_object_add(jobj_area, "size", crypt_jobj_new_uint64(area_length)); - json_object_object_add(jobj_keyslot, "area", jobj_area); - - json_object_object_add_by_uint(jobj_keyslots, keyslot, jobj_keyslot); -diff --git a/lib/luks2/luks2_keyslot_luks2.c b/lib/luks2/luks2_keyslot_luks2.c -index cf0e53e..156f0c1 100644 ---- a/lib/luks2/luks2_keyslot_luks2.c -+++ b/lib/luks2/luks2_keyslot_luks2.c -@@ -220,7 +220,7 @@ static int luks2_keyslot_set_key(struct crypt_device *cd, - - if (!json_object_object_get_ex(jobj_area, "offset", &jobj2)) - return -EINVAL; -- area_offset = json_object_get_uint64(jobj2); -+ area_offset = crypt_jobj_get_uint64(jobj2); - - if (!json_object_object_get_ex(jobj_area, "encryption", &jobj2)) - return -EINVAL; -@@ -313,7 +313,7 @@ static int luks2_keyslot_get_key(struct crypt_device *cd, - - if (!json_object_object_get_ex(jobj_area, "offset", &jobj2)) - return -EINVAL; -- area_offset = json_object_get_uint64(jobj2); -+ area_offset = crypt_jobj_get_uint64(jobj2); - - if (!json_object_object_get_ex(jobj_area, "encryption", &jobj2)) - return -EINVAL; -@@ -494,8 +494,8 @@ static int luks2_keyslot_alloc(struct crypt_device *cd, - /* Area object */ - jobj_area = json_object_new_object(); - json_object_object_add(jobj_area, "type", json_object_new_string("raw")); -- json_object_object_add(jobj_area, "offset", json_object_new_uint64(area_offset)); -- json_object_object_add(jobj_area, "size", json_object_new_uint64(area_length)); -+ json_object_object_add(jobj_area, "offset", crypt_jobj_new_uint64(area_offset)); -+ json_object_object_add(jobj_area, "size", crypt_jobj_new_uint64(area_length)); - json_object_object_add(jobj_keyslot, "area", jobj_area); - - json_object_object_add_by_uint(jobj_keyslots, keyslot, jobj_keyslot); -@@ -607,7 +607,7 @@ static int luks2_keyslot_dump(struct crypt_device *cd, int keyslot) - log_std(cd, "\tCipher: %s\n", json_object_get_string(jobj1)); - - json_object_object_get_ex(jobj_area, "key_size", &jobj1); -- log_std(cd, "\tCipher key: %u bits\n", json_object_get_uint32(jobj1) * 8); -+ log_std(cd, "\tCipher key: %u bits\n", crypt_jobj_get_uint32(jobj1) * 8); - - json_object_object_get_ex(jobj_kdf, "type", &jobj1); - log_std(cd, "\tPBKDF: %s\n", json_object_get_string(jobj1)); -@@ -617,7 +617,7 @@ static int luks2_keyslot_dump(struct crypt_device *cd, int keyslot) - log_std(cd, "\tHash: %s\n", json_object_get_string(jobj1)); - - json_object_object_get_ex(jobj_kdf, "iterations", &jobj1); -- log_std(cd, "\tIterations: %" PRIu64 "\n", json_object_get_uint64(jobj1)); -+ log_std(cd, "\tIterations: %" PRIu64 "\n", crypt_jobj_get_uint64(jobj1)); - } else { - json_object_object_get_ex(jobj_kdf, "time", &jobj1); - log_std(cd, "\tTime cost: %" PRIu64 "\n", json_object_get_int64(jobj1)); -@@ -640,10 +640,10 @@ static int luks2_keyslot_dump(struct crypt_device *cd, int keyslot) - log_std(cd, "\tAF hash: %s\n", json_object_get_string(jobj1)); - - json_object_object_get_ex(jobj_area, "offset", &jobj1); -- log_std(cd, "\tArea offset:%" PRIu64 " [bytes]\n", json_object_get_uint64(jobj1)); -+ log_std(cd, "\tArea offset:%" PRIu64 " [bytes]\n", crypt_jobj_get_uint64(jobj1)); - - json_object_object_get_ex(jobj_area, "size", &jobj1); -- log_std(cd, "\tArea length:%" PRIu64 " [bytes]\n", json_object_get_uint64(jobj1)); -+ log_std(cd, "\tArea length:%" PRIu64 " [bytes]\n", crypt_jobj_get_uint64(jobj1)); - - return 0; - } -diff --git a/lib/luks2/luks2_keyslot_reenc.c b/lib/luks2/luks2_keyslot_reenc.c -index a09056b..b939467 100644 ---- a/lib/luks2/luks2_keyslot_reenc.c -+++ b/lib/luks2/luks2_keyslot_reenc.c -@@ -67,13 +67,13 @@ int reenc_keyslot_alloc(struct crypt_device *cd, - - if (params->data_shift) { - json_object_object_add(jobj_area, "type", json_object_new_string("datashift")); -- json_object_object_add(jobj_area, "shift_size", json_object_new_uint64(params->data_shift << SECTOR_SHIFT)); -+ json_object_object_add(jobj_area, "shift_size", crypt_jobj_new_uint64(params->data_shift << SECTOR_SHIFT)); - } else - /* except data shift protection, initial setting is irrelevant. Type can be changed during reencryption */ - json_object_object_add(jobj_area, "type", json_object_new_string("none")); - -- json_object_object_add(jobj_area, "offset", json_object_new_uint64(area_offset)); -- json_object_object_add(jobj_area, "size", json_object_new_uint64(area_length)); -+ json_object_object_add(jobj_area, "offset", crypt_jobj_new_uint64(area_offset)); -+ json_object_object_add(jobj_area, "size", crypt_jobj_new_uint64(area_length)); - - json_object_object_add(jobj_keyslot, "type", json_object_new_string("reencrypt")); - json_object_object_add(jobj_keyslot, "key_size", json_object_new_int(1)); /* useless but mandatory */ -@@ -113,8 +113,8 @@ static int reenc_keyslot_store_data(struct crypt_device *cd, - !json_object_object_get_ex(jobj_area, "size", &jobj_length)) - return -EINVAL; - -- area_offset = json_object_get_uint64(jobj_offset); -- area_length = json_object_get_uint64(jobj_length); -+ area_offset = crypt_jobj_get_uint64(jobj_offset); -+ area_length = crypt_jobj_get_uint64(jobj_length); - - if (!area_offset || !area_length || ((uint64_t)buffer_len > area_length)) - return -EINVAL; -@@ -242,14 +242,14 @@ static int reenc_keyslot_dump(struct crypt_device *cd, int keyslot) - log_std(cd, "\t%-12s%d [bytes]\n", "Hash data:", json_object_get_int(jobj1)); - } else if (!strcmp(json_object_get_string(jobj_resilience), "datashift")) { - json_object_object_get_ex(jobj_area, "shift_size", &jobj1); -- log_std(cd, "\t%-12s%" PRIu64 "[bytes]\n", "Shift size:", json_object_get_uint64(jobj1)); -+ log_std(cd, "\t%-12s%" PRIu64 "[bytes]\n", "Shift size:", crypt_jobj_get_uint64(jobj1)); - } - - json_object_object_get_ex(jobj_area, "offset", &jobj1); -- log_std(cd, "\tArea offset:%" PRIu64 " [bytes]\n", json_object_get_uint64(jobj1)); -+ log_std(cd, "\tArea offset:%" PRIu64 " [bytes]\n", crypt_jobj_get_uint64(jobj1)); - - json_object_object_get_ex(jobj_area, "size", &jobj1); -- log_std(cd, "\tArea length:%" PRIu64 " [bytes]\n", json_object_get_uint64(jobj1)); -+ log_std(cd, "\tArea length:%" PRIu64 " [bytes]\n", crypt_jobj_get_uint64(jobj1)); - - return 0; - } -@@ -304,7 +304,7 @@ static int reenc_keyslot_validate(struct crypt_device *cd, json_object *jobj_key - return -EINVAL; - if (!validate_json_uint32(jobj_sector_size)) - return -EINVAL; -- sector_size = json_object_get_uint32(jobj_sector_size); -+ sector_size = crypt_jobj_get_uint32(jobj_sector_size); - if (sector_size < SECTOR_SIZE || NOTPOW2(sector_size)) { - log_dbg(cd, "Invalid sector_size (%" PRIu32 ") for checksum resilience mode.", sector_size); - return -EINVAL; -@@ -313,7 +313,7 @@ static int reenc_keyslot_validate(struct crypt_device *cd, json_object *jobj_key - if (!(jobj_shift_size = json_contains(cd, jobj_area, "type:datashift", "Keyslot area", "shift_size", json_type_string))) - return -EINVAL; - -- shift_size = json_object_get_uint64(jobj_shift_size); -+ shift_size = crypt_jobj_get_uint64(jobj_shift_size); - if (!shift_size) - return -EINVAL; - -diff --git a/lib/luks2/luks2_luks1_convert.c b/lib/luks2/luks2_luks1_convert.c -index ca47e5d..603c44d 100644 ---- a/lib/luks2/luks2_luks1_convert.c -+++ b/lib/luks2/luks2_luks1_convert.c -@@ -91,8 +91,8 @@ static int json_luks1_keyslot(const struct luks_phdr *hdr_v1, int keyslot, struc - } - area_size = offs_b - offs_a; - json_object_object_add(jobj_area, "key_size", json_object_new_int(hdr_v1->keyBytes)); -- json_object_object_add(jobj_area, "offset", json_object_new_uint64(offset)); -- json_object_object_add(jobj_area, "size", json_object_new_uint64(area_size)); -+ json_object_object_add(jobj_area, "offset", crypt_jobj_new_uint64(offset)); -+ json_object_object_add(jobj_area, "size", crypt_jobj_new_uint64(area_size)); - json_object_object_add(keyslot_obj, "area", jobj_area); - - *keyslot_object = keyslot_obj; -@@ -145,7 +145,7 @@ static int json_luks1_segment(const struct luks_phdr *hdr_v1, struct json_object - /* offset field */ - number = (uint64_t)hdr_v1->payloadOffset * SECTOR_SIZE; - -- field = json_object_new_uint64(number); -+ field = crypt_jobj_new_uint64(number); - if (!field) { - json_object_put(segment_obj); - return -ENOMEM; -@@ -401,9 +401,9 @@ static int json_luks1_object(struct luks_phdr *hdr_v1, struct json_object **luks - json_object_object_add(luks1_obj, "config", field); - - json_size = LUKS2_HDR_16K_LEN - LUKS2_HDR_BIN_LEN; -- json_object_object_add(field, "json_size", json_object_new_uint64(json_size)); -+ json_object_object_add(field, "json_size", crypt_jobj_new_uint64(json_size)); - keyslots_size -= (keyslots_size % 4096); -- json_object_object_add(field, "keyslots_size", json_object_new_uint64(keyslots_size)); -+ json_object_object_add(field, "keyslots_size", crypt_jobj_new_uint64(keyslots_size)); - - *luks1_object = luks1_obj; - return 0; -@@ -419,8 +419,8 @@ static void move_keyslot_offset(json_object *jobj, int offset_add) - UNUSED(key); - json_object_object_get_ex(val, "area", &jobj_area); - json_object_object_get_ex(jobj_area, "offset", &jobj2); -- offset = json_object_get_uint64(jobj2) + offset_add; -- json_object_object_add(jobj_area, "offset", json_object_new_uint64(offset)); -+ offset = crypt_jobj_get_uint64(jobj2) + offset_add; -+ json_object_object_add(jobj_area, "offset", crypt_jobj_new_uint64(offset)); - } - } - -@@ -764,7 +764,7 @@ int LUKS2_luks2_to_luks1(struct crypt_device *cd, struct luks2_hdr *hdr2, struct - return -EINVAL; - if (!json_object_object_get_ex(jobj_area, "offset", &jobj1)) - return -EINVAL; -- offset = json_object_get_uint64(jobj1); -+ offset = crypt_jobj_get_uint64(jobj1); - } else { - if (LUKS2_find_area_gap(cd, hdr2, key_size, &offset, &area_length)) - return -EINVAL; -@@ -796,7 +796,7 @@ int LUKS2_luks2_to_luks1(struct crypt_device *cd, struct luks2_hdr *hdr2, struct - - if (!json_object_object_get_ex(jobj_kdf, "iterations", &jobj1)) - continue; -- hdr1->keyblock[i].passwordIterations = json_object_get_uint32(jobj1); -+ hdr1->keyblock[i].passwordIterations = crypt_jobj_get_uint32(jobj1); - - if (!json_object_object_get_ex(jobj_kdf, "salt", &jobj1)) - continue; -@@ -837,7 +837,7 @@ int LUKS2_luks2_to_luks1(struct crypt_device *cd, struct luks2_hdr *hdr2, struct - - if (!json_object_object_get_ex(jobj_digest, "iterations", &jobj1)) - return -EINVAL; -- hdr1->mkDigestIterations = json_object_get_uint32(jobj1); -+ hdr1->mkDigestIterations = crypt_jobj_get_uint32(jobj1); - - if (!json_object_object_get_ex(jobj_digest, "digest", &jobj1)) - return -EINVAL; -@@ -862,7 +862,7 @@ int LUKS2_luks2_to_luks1(struct crypt_device *cd, struct luks2_hdr *hdr2, struct - - if (!json_object_object_get_ex(jobj_segment, "offset", &jobj1)) - return -EINVAL; -- offset = json_object_get_uint64(jobj1) / SECTOR_SIZE; -+ offset = crypt_jobj_get_uint64(jobj1) / SECTOR_SIZE; - if (offset > UINT32_MAX) - return -EINVAL; - /* FIXME: LUKS1 requires offset == 0 || offset >= luks1_hdr_size */ -diff --git a/lib/luks2/luks2_reencrypt.c b/lib/luks2/luks2_reencrypt.c -index 60a007b..68d3194 100644 ---- a/lib/luks2/luks2_reencrypt.c -+++ b/lib/luks2/luks2_reencrypt.c -@@ -165,7 +165,7 @@ static uint32_t reencrypt_alignment(struct luks2_hdr *hdr) - if (!json_object_object_get_ex(jobj_area, "sector_size", &jobj_sector_size)) - return 0; - -- return json_object_get_uint32(jobj_sector_size); -+ return crypt_jobj_get_uint32(jobj_sector_size); - } - - static json_object *_enc_create_segments_shift_after(struct crypt_device *cd, -@@ -200,13 +200,13 @@ static json_object *_enc_create_segments_shift_after(struct crypt_device *cd, - json_segment_remove_flag(jobj_seg_new, "in-reencryption"); - tmp = rh->length; - } else { -- json_object_object_add(jobj_seg_new, "offset", json_object_new_uint64(rh->offset + data_offset)); -- json_object_object_add(jobj_seg_new, "iv_tweak", json_object_new_uint64(rh->offset >> SECTOR_SHIFT)); -+ json_object_object_add(jobj_seg_new, "offset", crypt_jobj_new_uint64(rh->offset + data_offset)); -+ json_object_object_add(jobj_seg_new, "iv_tweak", crypt_jobj_new_uint64(rh->offset >> SECTOR_SHIFT)); - tmp = json_segment_get_size(jobj_seg_new, 0) + rh->length; - } - - /* alter size of new segment, reenc_seg == 0 we're finished */ -- json_object_object_add(jobj_seg_new, "size", reenc_seg > 0 ? json_object_new_uint64(tmp) : json_object_new_string("dynamic")); -+ json_object_object_add(jobj_seg_new, "size", reenc_seg > 0 ? crypt_jobj_new_uint64(tmp) : json_object_new_string("dynamic")); - json_object_object_add_by_uint(jobj_segs_post, reenc_seg, jobj_seg_new); - - return jobj_segs_post; -@@ -256,7 +256,7 @@ static json_object *reencrypt_make_hot_segments_encrypt_shift(struct crypt_devic - jobj_seg_shrunk = NULL; - if (json_object_copy(LUKS2_get_segment_jobj(hdr, sg), &jobj_seg_shrunk)) - goto err; -- json_object_object_add(jobj_seg_shrunk, "size", json_object_new_uint64(segment_size - rh->length)); -+ json_object_object_add(jobj_seg_shrunk, "size", crypt_jobj_new_uint64(segment_size - rh->length)); - json_object_object_add_by_uint(jobj_segs_hot, sg++, jobj_seg_shrunk); - } - -@@ -336,7 +336,7 @@ static json_object *reencrypt_make_post_segments_forward(struct crypt_device *cd - goto err; - jobj_old_seg = jobj_old_seg_copy; - fixed_length = rh->device_size - fixed_length; -- json_object_object_add(jobj_old_seg, "size", json_object_new_uint64(fixed_length)); -+ json_object_object_add(jobj_old_seg, "size", crypt_jobj_new_uint64(fixed_length)); - } else - json_object_get(jobj_old_seg); - json_object_object_add_by_uint(jobj_segs_post, 1, jobj_old_seg); -@@ -491,7 +491,7 @@ static json_object *reencrypt_make_hot_segments_backward(struct crypt_device *cd - if (rh->offset) { - if (json_object_copy(LUKS2_get_segment_jobj(hdr, 0), &jobj_old_seg)) - goto err; -- json_object_object_add(jobj_old_seg, "size", json_object_new_uint64(rh->offset)); -+ json_object_object_add(jobj_old_seg, "size", crypt_jobj_new_uint64(rh->offset)); - - json_object_object_add_by_uint(jobj_segs_hot, sg++, jobj_old_seg); - } -@@ -575,7 +575,7 @@ static uint64_t reencrypt_data_shift(struct luks2_hdr *hdr) - if (!json_object_object_get_ex(jobj_area, "shift_size", &jobj_data_shift)) - return 0; - -- return json_object_get_uint64(jobj_data_shift); -+ return crypt_jobj_get_uint64(jobj_data_shift); - } - - static crypt_reencrypt_mode_info reencrypt_mode(struct luks2_hdr *hdr) -diff --git a/lib/luks2/luks2_segment.c b/lib/luks2/luks2_segment.c -index d71a607..8708ba5 100644 ---- a/lib/luks2/luks2_segment.c -+++ b/lib/luks2/luks2_segment.c -@@ -55,7 +55,7 @@ uint64_t json_segment_get_offset(json_object *jobj_segment, unsigned blockwise) - !json_object_object_get_ex(jobj_segment, "offset", &jobj)) - return 0; - -- return blockwise ? json_object_get_uint64(jobj) >> SECTOR_SHIFT : json_object_get_uint64(jobj); -+ return blockwise ? crypt_jobj_get_uint64(jobj) >> SECTOR_SHIFT : crypt_jobj_get_uint64(jobj); - } - - const char *json_segment_type(json_object *jobj_segment) -@@ -77,7 +77,7 @@ uint64_t json_segment_get_iv_offset(json_object *jobj_segment) - !json_object_object_get_ex(jobj_segment, "iv_tweak", &jobj)) - return 0; - -- return json_object_get_uint64(jobj); -+ return crypt_jobj_get_uint64(jobj); - } - - uint64_t json_segment_get_size(json_object *jobj_segment, unsigned blockwise) -@@ -88,7 +88,7 @@ uint64_t json_segment_get_size(json_object *jobj_segment, unsigned blockwise) - !json_object_object_get_ex(jobj_segment, "size", &jobj)) - return 0; - -- return blockwise ? json_object_get_uint64(jobj) >> SECTOR_SHIFT : json_object_get_uint64(jobj); -+ return blockwise ? crypt_jobj_get_uint64(jobj) >> SECTOR_SHIFT : crypt_jobj_get_uint64(jobj); - } - - const char *json_segment_get_cipher(json_object *jobj_segment) -@@ -229,8 +229,8 @@ static json_object *_segment_create_generic(const char *type, uint64_t offset, c - return NULL; - - json_object_object_add(jobj, "type", json_object_new_string(type)); -- json_object_object_add(jobj, "offset", json_object_new_uint64(offset)); -- json_object_object_add(jobj, "size", length ? json_object_new_uint64(*length) : json_object_new_string("dynamic")); -+ json_object_object_add(jobj, "offset", crypt_jobj_new_uint64(offset)); -+ json_object_object_add(jobj, "size", length ? crypt_jobj_new_uint64(*length) : json_object_new_string("dynamic")); - - return jobj; - } -@@ -252,7 +252,7 @@ json_object *json_segment_create_crypt(uint64_t offset, - if (!jobj) - return NULL; - -- json_object_object_add(jobj, "iv_tweak", json_object_new_uint64(iv_offset)); -+ json_object_object_add(jobj, "iv_tweak", crypt_jobj_new_uint64(iv_offset)); - json_object_object_add(jobj, "encryption", json_object_new_string(cipher)); - json_object_object_add(jobj, "sector_size", json_object_new_int(sector_size)); - if (reencryption) --- -2.26.1 - diff --git a/cryptsetup-2.3.1.tar.sign b/cryptsetup-2.3.1.tar.sign deleted file mode 100644 index 72d336f..0000000 --- a/cryptsetup-2.3.1.tar.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAl5p+RgACgkQ2bBXe9k+ -mPyBoQ//fK3nWpug0VJpWhxwoe0SOj0x/2CYP9bJAwkT33davLiDkkM0pfvq9Y5L -rdbX0JRJemwFwS6V0DuZNDK2b88xEeJpvnNmDWXtKQ2HS9BPNesJJmzgBRY4P06q -bwxUvndnDLP7fAZtEMiLQJYCzuLkGwnEQFMh1GLfAM2H8FM9YZYz/HvezTlDTLYi -9SJ0iF8UF+VR8jPl3hqGQXkiHPVopvMEhwL9kpP1dJdYmeMFVYH/l+3jQ0Qw5de7 -YaqEitsKaT/JT236vSfR/RCFEifswbea+fplQE5a0kVuVmAkaEnL65fS1S9+18Ol -7Vo/8JaXxN6kjVpBVwn57RpWpGiLYXYjTzOtRrAQx7Q0oX3ycCwnii1TEzDvFcJL -aPsZsbNMf6Cgj+iw0htPCoXInaZW52GHIGJc8rR5WKdl3v5Md2vgGV6TTVcMYee+ -KQ2RuQtiDXC9+4OhfTPZ5Rpxn+Dns9xl0hfsmbRJDH1THJncaX1B/0qN8gHtsvMG -/+p9tZ7Ox6EpiIh8CcsyJT83bzgq0FO0Ut8jsh8fM+YKHEISvEFkkGAmykLim/e+ -ef6aYpkxHoGA+jpwmDaXF0LBPY2jAxs6OQxQwuD9i+BDkyMH1arO/AkRkEMqQMY6 -2yyVfu6doOVEACX51zZmB3bBvQLUtjPJh/5hS/0InGOP2Nm3lwA= -=1LIc ------END PGP SIGNATURE----- diff --git a/cryptsetup-2.3.2.tar.sign b/cryptsetup-2.3.2.tar.sign new file mode 100644 index 0000000..caa4fb4 --- /dev/null +++ b/cryptsetup-2.3.2.tar.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAl6q6lwACgkQ2bBXe9k+ +mPwhfBAAqRpYNk0hzMz+lBZrfuwXs2NP8AbUJj5bPRaNOnaMmi7XBDcul4h+zC7Z +B+CDaEDTBGtpGIeIYsSX6jOInG7Atp3cKxJ3YzRLcK/1nNPgZaJHQSzieT4OH06N +ZpoSPPtfes1Zf0AaG9l+G4KW1KLntNfjq25uBiEFafZ8DfA9Xo8dXNKowFNasMbo +r0u/97AvKKJAuwaa2As7UuoVwPph0o7OmKMFHM2sw+fuYhop8FRWW77ZI384lkRs +iBuJLo1aFMRIg8zl39xG07fA9knLY7oCJrZ4fD5RY5u70i2+eE3Jx677MjGar5kC +3xk3v0PrflSB71b+IJy/sCnuDYFxhDcOtB6xXC94jEO7Cu/AIH+DWbIOUIchMZ63 +1HZiXwnOQFTURSRjxbQH+voh/50cP/txXLDaerSXQnET0Bocjj4YswQR6yvdtGNP +O43ByWPQrvsB90nianvnt7dG9Ddil+CJNM/hlZX3MJVzZR7WJJ7+lz6in4bxYlOl +2Fn1LkdtuDMfe143a+R9KiyLXk9lGFY4rEZtiKMZ10zQ32ydezIqPEllT255PEr2 +LCCZ4m5Bi+YaPrCWhIoaTvQubCst5Cga4RfYl8zBokEy01b5qRYHrBTaPRqkvP5U +W/CosGMAE5KmShrdWV3hL2Ej8Dc7cnId1RLDKD2nXlgwnoR23Hw= +=Lo3q +-----END PGP SIGNATURE----- diff --git a/cryptsetup.spec b/cryptsetup.spec index a8cfbc8..841b67b 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,7 +1,7 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup -Version: 2.3.1 -Release: 4%{?dist} +Version: 2.3.2 +Release: 1%{?dist} License: GPLv2+ and LGPLv2+ URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: openssl-devel, popt-devel, device-mapper-devel @@ -18,9 +18,6 @@ Obsoletes: cryptsetup-python3 < 2.1.0 %global upstream_version %{version} Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/cryptsetup-%{upstream_version}.tar.xz -# https://gitlab.com/cryptsetup/cryptsetup/-/commit/604abec333a0efb44fd8bc610aa0b1151dd0f612 -Patch0: 0001-Add-support-for-upcoming-json-c-0.14.0.patch -Patch1: 0002-Avoid-name-clash-with-newer-json-c-library.patch # Following patch has to applied last Patch9999: %{name}-add-system-library-paths.patch @@ -127,6 +124,9 @@ rm -rf %{buildroot}/%{_libdir}/*.la %ghost %attr(700, -, -) %dir /run/cryptsetup %changelog +* Thu Apr 30 2020 Milan Broz - 2.3.2-1 +- Update to cryptsetup 2.3.2. + * Tue Apr 21 2020 Björn Esser - 2.3.1-4 - Rebuild (json-c) diff --git a/sources b/sources index a589b1f..6223baa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cryptsetup-2.3.1.tar.xz) = e6ee77d72eda0b990db894d794a686f22043161b17b5f5c8cd54a64c5751f884a241c76b03bbccd52f74440c609036d50ed8503584bc3a0a011e4854a60dd4bf +SHA512 (cryptsetup-2.3.2.tar.xz) = c5eb41751ca64ff906187f40805705570c261816b014dfcdbf2777f42e53668e32966197092a2235b8f6a7a4e7f9c3f301d82f17c45cfbcff96b9818631d7e5f From 3b71e658f4e1d2f032f32efc45ac91ff0422b344 Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Thu, 30 Apr 2020 18:34:24 +0200 Subject: [PATCH 082/142] Add more rpmlint whitelist entries. --- cryptsetup.rpmlintrc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cryptsetup.rpmlintrc b/cryptsetup.rpmlintrc index 68c240e..9cf27e1 100644 --- a/cryptsetup.rpmlintrc +++ b/cryptsetup.rpmlintrc @@ -1 +1,4 @@ -addFilter(r'spelling-error .* en_US (dm|reencryption|situ|libcryptsetup)') +addFilter(r'spelling-error .* (dm|reencryption|situ|libcryptsetup)') +addFilter(r'obsolete-not-provided python2-cryptsetup|cryptsetup-python3') +addFilter(r'cryptsetup-libs\.[^:]+: (E|W): no-documentation') +addFilter(r'non-standard-dir-perm /run/cryptsetup') From b562aaf797f3ccec9eef9a2d762cf3a2ff28f38f Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Thu, 28 May 2020 12:16:25 +0200 Subject: [PATCH 083/142] Update to version 2.3.3. --- .gitignore | 2 +- cryptsetup-2.3.2.tar.sign | 16 ---------------- cryptsetup-2.3.3.tar.sign | 16 ++++++++++++++++ cryptsetup.spec | 5 ++++- sources | 2 +- 5 files changed, 22 insertions(+), 19 deletions(-) delete mode 100644 cryptsetup-2.3.2.tar.sign create mode 100644 cryptsetup-2.3.3.tar.sign diff --git a/.gitignore b/.gitignore index 80a70af..15df4ba 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/cryptsetup-2.3.2.tar.xz +/cryptsetup-2.3.3.tar.xz diff --git a/cryptsetup-2.3.2.tar.sign b/cryptsetup-2.3.2.tar.sign deleted file mode 100644 index caa4fb4..0000000 --- a/cryptsetup-2.3.2.tar.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAl6q6lwACgkQ2bBXe9k+ -mPwhfBAAqRpYNk0hzMz+lBZrfuwXs2NP8AbUJj5bPRaNOnaMmi7XBDcul4h+zC7Z -B+CDaEDTBGtpGIeIYsSX6jOInG7Atp3cKxJ3YzRLcK/1nNPgZaJHQSzieT4OH06N -ZpoSPPtfes1Zf0AaG9l+G4KW1KLntNfjq25uBiEFafZ8DfA9Xo8dXNKowFNasMbo -r0u/97AvKKJAuwaa2As7UuoVwPph0o7OmKMFHM2sw+fuYhop8FRWW77ZI384lkRs -iBuJLo1aFMRIg8zl39xG07fA9knLY7oCJrZ4fD5RY5u70i2+eE3Jx677MjGar5kC -3xk3v0PrflSB71b+IJy/sCnuDYFxhDcOtB6xXC94jEO7Cu/AIH+DWbIOUIchMZ63 -1HZiXwnOQFTURSRjxbQH+voh/50cP/txXLDaerSXQnET0Bocjj4YswQR6yvdtGNP -O43ByWPQrvsB90nianvnt7dG9Ddil+CJNM/hlZX3MJVzZR7WJJ7+lz6in4bxYlOl -2Fn1LkdtuDMfe143a+R9KiyLXk9lGFY4rEZtiKMZ10zQ32ydezIqPEllT255PEr2 -LCCZ4m5Bi+YaPrCWhIoaTvQubCst5Cga4RfYl8zBokEy01b5qRYHrBTaPRqkvP5U -W/CosGMAE5KmShrdWV3hL2Ej8Dc7cnId1RLDKD2nXlgwnoR23Hw= -=Lo3q ------END PGP SIGNATURE----- diff --git a/cryptsetup-2.3.3.tar.sign b/cryptsetup-2.3.3.tar.sign new file mode 100644 index 0000000..5ee9e56 --- /dev/null +++ b/cryptsetup-2.3.3.tar.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAl7PhzwACgkQ2bBXe9k+ +mPztcBAA02gb3E1NpUBKW/MfAPJzGOat7paq0TjMFwINFiBqG8R/fTzeu310Urdr +87otqMHZuOcJB326+1hTagqBD4R2PcehFOGOEST4OLu0IesNles6acAryw6CRpX+ ++SwGyHGJtlCwP3ciYDP8aNief4B5+A/QR1JD5gw0H9rJBgVnMd1nrnSileUDZwdh +Z5TVwbZ6MTxx+XoAEktRS4/zBtv5s1jHDtaXpqkvtwW4KB7aiuUxTLa7Y4ucj3BR +X6MuFWNdeBonFI+6sDsvOFVrr0tXEeb1RmgwvY6QidsRGsqihhvxOput35jSZBGL +37kw/xNSwJ3pa+mhIvsmssy5rDJ/1fO29TA4RUS721HGBG9+xayC3q3pnHGCFz6U +v0OooIHl05I1R85RntDfcdtmHxIhlr5LqflwdHwzLVwt7DjzUHShPiHOgJe6iXTN +3jQ9GwpWjxRM8ToWPvnKx752AAydAsn+jzDsAj58eIABEvta4gjRZm4BdD5uJnO3 +BwhDDkcpj5GvGoC5lNpkCsttTCYbCc7f8s4vos7xLkRXi7wEhT/W/TIi93qVzil9 +4ZRFHj91XSyac4ULt4wUK4iqZ5+2OfbNIZvDkGo1pMTKKB1MLzBve3bUr0Fz07qE +x0R+ELOSuNtQV4Obb0kDI+Ds5e80NMb5qFgebuG3bp5GNrXwE2E= +=DJUj +-----END PGP SIGNATURE----- diff --git a/cryptsetup.spec b/cryptsetup.spec index 841b67b..24f6770 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,6 +1,6 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup -Version: 2.3.2 +Version: 2.3.3 Release: 1%{?dist} License: GPLv2+ and LGPLv2+ URL: https://gitlab.com/cryptsetup/cryptsetup @@ -124,6 +124,9 @@ rm -rf %{buildroot}/%{_libdir}/*.la %ghost %attr(700, -, -) %dir /run/cryptsetup %changelog +* Thu May 28 2020 Ondrej Kozina - 2.3.3-1 +- Update to cryptsetup 2.3.3. + * Thu Apr 30 2020 Milan Broz - 2.3.2-1 - Update to cryptsetup 2.3.2. diff --git a/sources b/sources index 6223baa..7ec7ab8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cryptsetup-2.3.2.tar.xz) = c5eb41751ca64ff906187f40805705570c261816b014dfcdbf2777f42e53668e32966197092a2235b8f6a7a4e7f9c3f301d82f17c45cfbcff96b9818631d7e5f +SHA512 (cryptsetup-2.3.3.tar.xz) = d613efb80e003364a21832da3fefe3891d36a891119cc0efa970aad40ba135dfcd42b32a0c19c31ad879d4eddf27864beccbea1d4b31a47a4e075bc0f756365c From a6a60efd5daaacf97abb781a75c15cfa0eb99c47 Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Mon, 1 Jun 2020 13:22:37 +0200 Subject: [PATCH 084/142] Drop dist.abicheck from gating tests. Taskotron reached EOL so the test can't be run anymore: https://fedoraproject.org/wiki/Taskotron/Tasks/dist.abicheck --- gating.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/gating.yaml b/gating.yaml index afcf378..e215dbc 100644 --- a/gating.yaml +++ b/gating.yaml @@ -4,5 +4,4 @@ product_versions: - fedora-rawhide decision_context: bodhi_update_push_stable rules: - - !PassingTestCaseRule {test_case_name: dist.abicheck} - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} From ef49ed70ade06b0f14aa2b2fb4a93c504f5c7ca1 Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Tue, 2 Jun 2020 11:39:41 +0200 Subject: [PATCH 085/142] Remove as of now unused 'obsolete' macros. --- cryptsetup.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index 24f6770..2097c60 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -11,10 +11,6 @@ Provides: cryptsetup-luks = %{version}-%{release} Obsoletes: cryptsetup-luks < 1.4.0 Requires: cryptsetup-libs = %{version}-%{release} Requires: libpwquality >= 1.2.0 -# python subpackages were removed in F29; keep the obsoletes until F30 to -# support F28->F30 upgrade path. -Obsoletes: python2-cryptsetup < 2.1.0 -Obsoletes: cryptsetup-python3 < 2.1.0 %global upstream_version %{version} Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/cryptsetup-%{upstream_version}.tar.xz From c8fbf85c51c6fc2223311350d0136dfbd7a2317a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 14:47:05 +0000 Subject: [PATCH 086/142] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cryptsetup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index 2097c60..a50969d 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,7 +1,7 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup Version: 2.3.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ and LGPLv2+ URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: openssl-devel, popt-devel, device-mapper-devel @@ -120,6 +120,9 @@ rm -rf %{buildroot}/%{_libdir}/*.la %ghost %attr(700, -, -) %dir /run/cryptsetup %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 2.3.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Thu May 28 2020 Ondrej Kozina - 2.3.3-1 - Update to cryptsetup 2.3.3. From e38fc3bbc2a0a58c1c6b68fb71f3e783dc51096b Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Thu, 3 Sep 2020 21:00:42 +0200 Subject: [PATCH 087/142] Update to cryptsetup 2.3.4. Fix for CVE-2020-14382 (#1874712) --- .gitignore | 2 +- cryptsetup-2.3.3.tar.sign | 16 ---------------- cryptsetup-2.3.4.tar.sign | 16 ++++++++++++++++ cryptsetup.spec | 8 ++++++-- sources | 2 +- 5 files changed, 24 insertions(+), 20 deletions(-) delete mode 100644 cryptsetup-2.3.3.tar.sign create mode 100644 cryptsetup-2.3.4.tar.sign diff --git a/.gitignore b/.gitignore index 15df4ba..eac3728 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/cryptsetup-2.3.3.tar.xz +/cryptsetup-2.3.4.tar.xz diff --git a/cryptsetup-2.3.3.tar.sign b/cryptsetup-2.3.3.tar.sign deleted file mode 100644 index 5ee9e56..0000000 --- a/cryptsetup-2.3.3.tar.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAl7PhzwACgkQ2bBXe9k+ -mPztcBAA02gb3E1NpUBKW/MfAPJzGOat7paq0TjMFwINFiBqG8R/fTzeu310Urdr -87otqMHZuOcJB326+1hTagqBD4R2PcehFOGOEST4OLu0IesNles6acAryw6CRpX+ -+SwGyHGJtlCwP3ciYDP8aNief4B5+A/QR1JD5gw0H9rJBgVnMd1nrnSileUDZwdh -Z5TVwbZ6MTxx+XoAEktRS4/zBtv5s1jHDtaXpqkvtwW4KB7aiuUxTLa7Y4ucj3BR -X6MuFWNdeBonFI+6sDsvOFVrr0tXEeb1RmgwvY6QidsRGsqihhvxOput35jSZBGL -37kw/xNSwJ3pa+mhIvsmssy5rDJ/1fO29TA4RUS721HGBG9+xayC3q3pnHGCFz6U -v0OooIHl05I1R85RntDfcdtmHxIhlr5LqflwdHwzLVwt7DjzUHShPiHOgJe6iXTN -3jQ9GwpWjxRM8ToWPvnKx752AAydAsn+jzDsAj58eIABEvta4gjRZm4BdD5uJnO3 -BwhDDkcpj5GvGoC5lNpkCsttTCYbCc7f8s4vos7xLkRXi7wEhT/W/TIi93qVzil9 -4ZRFHj91XSyac4ULt4wUK4iqZ5+2OfbNIZvDkGo1pMTKKB1MLzBve3bUr0Fz07qE -x0R+ELOSuNtQV4Obb0kDI+Ds5e80NMb5qFgebuG3bp5GNrXwE2E= -=DJUj ------END PGP SIGNATURE----- diff --git a/cryptsetup-2.3.4.tar.sign b/cryptsetup-2.3.4.tar.sign new file mode 100644 index 0000000..c62ac38 --- /dev/null +++ b/cryptsetup-2.3.4.tar.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAl9RNsoACgkQ2bBXe9k+ +mPxlkg//RvvQ8uWvw9hKtKAz4Q0ZEbprzFVIGpXprYzDcf5HE2vFMsg3OZ+RAUss +RmBk4HRZDH7nboFa+D3gUAFiqqwJvBIEce6jjKu7IQM86lbnwlH4Uu9UWz/hiOCt +wDDfCE96aso8D9ZKQBNrrMmIuJ0kSbQ8PoIvmmVtjcGNhtKna7KV/i+9xbdEaePl +Piu0SO0ZtMBtBribgfsZHuOuuHLYgPA7mfZ1Xwq6hOMw9qjFSDGwmeldyTbP7mM6 +0L7daWn8UJIYhi9BABtpqEC+4ISs7An0bJ3w64k+6hUq7o33sq++gR2qbjIq7rVz +wX1S6VP8Y4dwZY9HRW7GrDsrLg6c5ynAfmEoCPhYRTbkQ1ft9fXRjk06GrDg+9A8 +kKY2m+4rSOoj0hZq+TeWjWNRibwEaUAxf71Dpv7FjYMLr5lpZD9+1GfXxsm5EJMV +O3XwLgwSqypl5rYoQo+ebgpPUqJsxTNg2Uu5dT4oUI8UcTO+5gw5/vTbwBL0a13z +iDlWgSQ267WP0t1Ipsfmfa6RAWLlykmLMt3eBjxhi0UIGRiUfVlS2++Tvm1xBHXa +9ufCYLmiqtjIH82+03pWsfmZ+gTFRHC3TI9H3aZTGqGptG9rrHSvgLMhPTvxhTX9 +FfdZxSY6ZVkatpeyUhSKNtrqPPEoShax/erIvj0d/uaT0BgFA3M= +=NBdh +-----END PGP SIGNATURE----- diff --git a/cryptsetup.spec b/cryptsetup.spec index a50969d..e5635de 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,7 +1,7 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup -Version: 2.3.3 -Release: 2%{?dist} +Version: 2.3.4 +Release: 1%{?dist} License: GPLv2+ and LGPLv2+ URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: openssl-devel, popt-devel, device-mapper-devel @@ -120,6 +120,10 @@ rm -rf %{buildroot}/%{_libdir}/*.la %ghost %attr(700, -, -) %dir /run/cryptsetup %changelog +* Thu Sep 03 2020 Milan Broz - 2.3.4-1 +- Update to cryptsetup 2.3.4. +- Fix for CVE-2020-14382 (#1874712) + * Mon Jul 27 2020 Fedora Release Engineering - 2.3.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 7ec7ab8..01d8f82 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cryptsetup-2.3.3.tar.xz) = d613efb80e003364a21832da3fefe3891d36a891119cc0efa970aad40ba135dfcd42b32a0c19c31ad879d4eddf27864beccbea1d4b31a47a4e075bc0f756365c +SHA512 (cryptsetup-2.3.4.tar.xz) = db0bfd795343e575acb7a80ea2b9d32acf08ac970037e5b158a1e4381976552dc292107ce79e55913f49fcf643d4ea7104ed73de7c1e8d424b83d471d20ab60d From a080f15f27e448beff3a1ab318b862f6d2823eca Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Thu, 17 Dec 2020 04:04:27 +0000 Subject: [PATCH 088/142] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- cryptsetup.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/cryptsetup.spec b/cryptsetup.spec index e5635de..9515ce5 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -7,6 +7,7 @@ URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: openssl-devel, popt-devel, device-mapper-devel BuildRequires: libuuid-devel, gcc, json-c-devel, libargon2-devel BuildRequires: libpwquality-devel, libblkid-devel +BuildRequires: make Provides: cryptsetup-luks = %{version}-%{release} Obsoletes: cryptsetup-luks < 1.4.0 Requires: cryptsetup-libs = %{version}-%{release} From 4d1c36bdb92665b38c70cc708e1a66604140da0b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 02:45:43 +0000 Subject: [PATCH 089/142] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cryptsetup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index 9515ce5..1d3f1eb 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,7 +1,7 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup Version: 2.3.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ and LGPLv2+ URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: openssl-devel, popt-devel, device-mapper-devel @@ -121,6 +121,9 @@ rm -rf %{buildroot}/%{_libdir}/*.la %ghost %attr(700, -, -) %dir /run/cryptsetup %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 2.3.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Thu Sep 03 2020 Milan Broz - 2.3.4-1 - Update to cryptsetup 2.3.4. - Fix for CVE-2020-14382 (#1874712) From 2e030eca12915844dabd8b4b54fdcf4ce92209d5 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Thu, 21 Jan 2021 01:22:59 +0000 Subject: [PATCH 090/142] Spec file cleanup - Remove leading "a" from summary: Most newly created packages don't use a leading "a" or "the" anymore - Remove %license definition: Building works without local definition, even on EPEL 7 - It seems to be strange, that -devel depends on the base package with an executable of the same version rather on -libs (like most other -devel packages do) --- cryptsetup.spec | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index 1d3f1eb..012b449 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,4 +1,4 @@ -Summary: A utility for setting up encrypted disks +Summary: Utility for setting up encrypted disks Name: cryptsetup Version: 2.3.4 Release: 2%{?dist} @@ -23,7 +23,7 @@ The cryptsetup package contains a utility for setting up disk encryption using dm-crypt kernel module. %package devel -Requires: %{name} = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: pkgconfig Summary: Headers and libraries for using encrypted file systems Provides: cryptsetup-luks-devel = %{version}-%{release} @@ -75,33 +75,29 @@ chmod -x misc/dracut_90reencrypt/* %install %make_install -rm -rf %{buildroot}/%{_libdir}/*.la +rm -rf %{buildroot}%{_libdir}/*.la %find_lang cryptsetup %ldconfig_scriptlets -n cryptsetup-libs %files -%{!?_licensedir:%global license %%doc} %license COPYING %doc AUTHORS FAQ docs/*ReleaseNotes %{_mandir}/man8/cryptsetup.8.gz %{_sbindir}/cryptsetup %files -n veritysetup -%{!?_licensedir:%global license %%doc} %license COPYING %{_mandir}/man8/veritysetup.8.gz %{_sbindir}/veritysetup %files -n integritysetup -%{!?_licensedir:%global license %%doc} %license COPYING %{_mandir}/man8/integritysetup.8.gz %{_sbindir}/integritysetup %files reencrypt -%{!?_licensedir:%global license %%doc} %license COPYING %doc misc/dracut_90reencrypt %{_mandir}/man8/cryptsetup-reencrypt.8.gz @@ -114,7 +110,6 @@ rm -rf %{buildroot}/%{_libdir}/*.la %{_libdir}/pkgconfig/libcryptsetup.pc %files libs -f cryptsetup.lang -%{!?_licensedir:%global license %%doc} %license COPYING COPYING.LGPL %{_libdir}/libcryptsetup.so.* %{_tmpfilesdir}/cryptsetup.conf From 1fbe56ee1edb00156068b56250c4bff9602d62d2 Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Thu, 11 Mar 2021 13:58:37 +0100 Subject: [PATCH 091/142] Update to version 2.3.5. --- .gitignore | 2 +- cryptsetup-2.3.4.tar.sign | 16 ---------------- cryptsetup-2.3.5.tar.sign | 16 ++++++++++++++++ cryptsetup.spec | 5 ++++- sources | 2 +- 5 files changed, 22 insertions(+), 19 deletions(-) delete mode 100644 cryptsetup-2.3.4.tar.sign create mode 100644 cryptsetup-2.3.5.tar.sign diff --git a/.gitignore b/.gitignore index eac3728..71fcca4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/cryptsetup-2.3.4.tar.xz +/cryptsetup-2.3.5.tar.xz diff --git a/cryptsetup-2.3.4.tar.sign b/cryptsetup-2.3.4.tar.sign deleted file mode 100644 index c62ac38..0000000 --- a/cryptsetup-2.3.4.tar.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAl9RNsoACgkQ2bBXe9k+ -mPxlkg//RvvQ8uWvw9hKtKAz4Q0ZEbprzFVIGpXprYzDcf5HE2vFMsg3OZ+RAUss -RmBk4HRZDH7nboFa+D3gUAFiqqwJvBIEce6jjKu7IQM86lbnwlH4Uu9UWz/hiOCt -wDDfCE96aso8D9ZKQBNrrMmIuJ0kSbQ8PoIvmmVtjcGNhtKna7KV/i+9xbdEaePl -Piu0SO0ZtMBtBribgfsZHuOuuHLYgPA7mfZ1Xwq6hOMw9qjFSDGwmeldyTbP7mM6 -0L7daWn8UJIYhi9BABtpqEC+4ISs7An0bJ3w64k+6hUq7o33sq++gR2qbjIq7rVz -wX1S6VP8Y4dwZY9HRW7GrDsrLg6c5ynAfmEoCPhYRTbkQ1ft9fXRjk06GrDg+9A8 -kKY2m+4rSOoj0hZq+TeWjWNRibwEaUAxf71Dpv7FjYMLr5lpZD9+1GfXxsm5EJMV -O3XwLgwSqypl5rYoQo+ebgpPUqJsxTNg2Uu5dT4oUI8UcTO+5gw5/vTbwBL0a13z -iDlWgSQ267WP0t1Ipsfmfa6RAWLlykmLMt3eBjxhi0UIGRiUfVlS2++Tvm1xBHXa -9ufCYLmiqtjIH82+03pWsfmZ+gTFRHC3TI9H3aZTGqGptG9rrHSvgLMhPTvxhTX9 -FfdZxSY6ZVkatpeyUhSKNtrqPPEoShax/erIvj0d/uaT0BgFA3M= -=NBdh ------END PGP SIGNATURE----- diff --git a/cryptsetup-2.3.5.tar.sign b/cryptsetup-2.3.5.tar.sign new file mode 100644 index 0000000..25a76a0 --- /dev/null +++ b/cryptsetup-2.3.5.tar.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAmBKB/wACgkQ2bBXe9k+ +mPxiiQ//UJrSk2F3QvdqT8vJvR4Z8rG6Vbg5LvXzryhx+g925dG5CLhPWdMVqKed +QQAheRL+n+Dm9bClaleWnXj1Js8GIYkXIa/Cz7Mj/5kjOHd+73SZq5zBh3NjuaDp +eU+GYvCvuUhzs6pB7MZpUNdYAmFMeQFf1Y9dGA1oQULrdFPb6DFe+Q1IL4g9o92Q +NEFN5yScQeQMpaVVfE3lOl31xObpyuStvd3VNXjouOHGwnFTXY+2TcabOr/WJ5rL +EkDG2H80SWUTOmz6bgLiu5vJQVFisPT+i08GAJfs6ESIV7K1S8MrS3LgwRNIBRMv +8tqY+KdPkZqDa2tgOilF1t43ztt229lQDPIC9mJeeof+qJtfroNkKhZAEQPcqoAo +CXQ0JlMxTTeLq+s14P0eVPLkx5y3VKZoO1fjysrIeKAr918ex7AHyV9GTHeGVAei +GjzASuHWRoi31GgQlx/RL+01pHI6HjRABjajp2xwlKWnUVC5PmSDWN116pm652G+ +qtWl4Uy1rfX3ais0PO/8WCmic8AHJgl0XoE4QOZxaJrR+utA37eekXw52pmoNmOu +ur3g+FGjRcWJ1oP2Kb689207wd+Ym9EibZRAD2J+hHnhXqC/aAmJRUP5lJTjRYUN +7qcHnjY/zyFziRPqWxzih7Pt66GyRPdvOnc4DVxxwNi9hlGTiY4= +=9hRP +-----END PGP SIGNATURE----- diff --git a/cryptsetup.spec b/cryptsetup.spec index 012b449..03bf461 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,6 +1,6 @@ Summary: Utility for setting up encrypted disks Name: cryptsetup -Version: 2.3.4 +Version: 2.3.5 Release: 2%{?dist} License: GPLv2+ and LGPLv2+ URL: https://gitlab.com/cryptsetup/cryptsetup @@ -116,6 +116,9 @@ rm -rf %{buildroot}%{_libdir}/*.la %ghost %attr(700, -, -) %dir /run/cryptsetup %changelog +* Thu Mar 11 2021 Milan Broz - 2.3.5-1 +- Update to cryptsetup 2.3.5. + * Tue Jan 26 2021 Fedora Release Engineering - 2.3.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 01d8f82..5221108 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cryptsetup-2.3.4.tar.xz) = db0bfd795343e575acb7a80ea2b9d32acf08ac970037e5b158a1e4381976552dc292107ce79e55913f49fcf643d4ea7104ed73de7c1e8d424b83d471d20ab60d +SHA512 (cryptsetup-2.3.5.tar.xz) = 60695a445608e2019ffc4f4ea4d7f6819849991bf2862e5648920abccea33990210554fcbf5a512659b513b27d3759fe3c1e64e96f02d9301463a48f2dbf04bf From d59f928251843c05c4336b0f1e6e6eab36452b0a Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Fri, 28 May 2021 12:57:20 +0200 Subject: [PATCH 092/142] Update to version 2.3.6. --- .gitignore | 2 +- cryptsetup-2.3.5.tar.sign | 16 ---------------- cryptsetup-2.3.6.tar.sign | 16 ++++++++++++++++ cryptsetup.spec | 9 ++++++--- gating.yaml | 1 + sources | 2 +- 6 files changed, 25 insertions(+), 21 deletions(-) delete mode 100644 cryptsetup-2.3.5.tar.sign create mode 100644 cryptsetup-2.3.6.tar.sign diff --git a/.gitignore b/.gitignore index 71fcca4..bf63c7d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/cryptsetup-2.3.5.tar.xz +/cryptsetup-2.3.6.tar.xz diff --git a/cryptsetup-2.3.5.tar.sign b/cryptsetup-2.3.5.tar.sign deleted file mode 100644 index 25a76a0..0000000 --- a/cryptsetup-2.3.5.tar.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAmBKB/wACgkQ2bBXe9k+ -mPxiiQ//UJrSk2F3QvdqT8vJvR4Z8rG6Vbg5LvXzryhx+g925dG5CLhPWdMVqKed -QQAheRL+n+Dm9bClaleWnXj1Js8GIYkXIa/Cz7Mj/5kjOHd+73SZq5zBh3NjuaDp -eU+GYvCvuUhzs6pB7MZpUNdYAmFMeQFf1Y9dGA1oQULrdFPb6DFe+Q1IL4g9o92Q -NEFN5yScQeQMpaVVfE3lOl31xObpyuStvd3VNXjouOHGwnFTXY+2TcabOr/WJ5rL -EkDG2H80SWUTOmz6bgLiu5vJQVFisPT+i08GAJfs6ESIV7K1S8MrS3LgwRNIBRMv -8tqY+KdPkZqDa2tgOilF1t43ztt229lQDPIC9mJeeof+qJtfroNkKhZAEQPcqoAo -CXQ0JlMxTTeLq+s14P0eVPLkx5y3VKZoO1fjysrIeKAr918ex7AHyV9GTHeGVAei -GjzASuHWRoi31GgQlx/RL+01pHI6HjRABjajp2xwlKWnUVC5PmSDWN116pm652G+ -qtWl4Uy1rfX3ais0PO/8WCmic8AHJgl0XoE4QOZxaJrR+utA37eekXw52pmoNmOu -ur3g+FGjRcWJ1oP2Kb689207wd+Ym9EibZRAD2J+hHnhXqC/aAmJRUP5lJTjRYUN -7qcHnjY/zyFziRPqWxzih7Pt66GyRPdvOnc4DVxxwNi9hlGTiY4= -=9hRP ------END PGP SIGNATURE----- diff --git a/cryptsetup-2.3.6.tar.sign b/cryptsetup-2.3.6.tar.sign new file mode 100644 index 0000000..3b218c3 --- /dev/null +++ b/cryptsetup-2.3.6.tar.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAmCwxOgACgkQ2bBXe9k+ +mPzlCg//XVdN6WnGhf35DT2f39GpSUimEAmkK/P3xKYGouzlUEac20mzXsNvkv+H +BpTN507H44ThgQENPAaKTea9FkqpZIcoBZcPnTXJOQ/ZIfR+iglb4zF9lR1PuVx7 +PuyVZ7BgMxM6lFvOwt5/bkktCDn8uX0nYvzqf9DXWVFUm973NayqftxsbgPa+4DT +vW2E87sJOM2NLw6psPu3o+wYkKm4N1r+M9JCWNqY8bwvlV5YbW4yBifZl4oU+99l +VXcqgSQunAvEzRPhtwCUxfYNRULx6xknNZVuwl37sSYgDpjjooy+6qjz1PX8g/qa +4/Wc0u2q/QmIUq13D2dFdQIrfDaZEJe8d0/yyaCnxPlCVFOhmr31U08o2pK1zJSK +duUqWVIKQNSFafygrPTeMRhZ1L2iwJZgjuCDyhoJSa62kGvYcLxjEoXjRmeiLXAn +7aVrmbf4tmJUJ8EUden40JM7MxPeKwHfUhE4Aq//qDfPVId7YFdgnBh6PmwUcyRm +HTyNJP8ULFX+u+v9C5YbXxb+h6xb65wzQDY1T1IPEJicIu/kv/syac/9QUkF9yG+ +Gsxaq9Ath2UYp7NW11/LXW0jmWVcM2eOfZi6xg8+vT6HWxG58Qzh//gPoLBpzBOj +E94vQim+q+ky0ePAqi2uEfZUiiID2ns4JYeXoYkxx9aGl/eRrp8= +=AlrZ +-----END PGP SIGNATURE----- diff --git a/cryptsetup.spec b/cryptsetup.spec index 03bf461..d604d98 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,7 +1,7 @@ Summary: Utility for setting up encrypted disks Name: cryptsetup -Version: 2.3.5 -Release: 2%{?dist} +Version: 2.3.6 +Release: 1%{?dist} License: GPLv2+ and LGPLv2+ URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: openssl-devel, popt-devel, device-mapper-devel @@ -116,7 +116,10 @@ rm -rf %{buildroot}%{_libdir}/*.la %ghost %attr(700, -, -) %dir /run/cryptsetup %changelog -* Thu Mar 11 2021 Milan Broz - 2.3.5-1 +* Fri May 28 2021 Milan Broz - 2.3.6-1 +- Update to cryptsetup 2.3.6. + +* Thu Mar 11 2021 Milan Broz - 2.3.5-2 - Update to cryptsetup 2.3.5. * Tue Jan 26 2021 Fedora Release Engineering - 2.3.4-2 diff --git a/gating.yaml b/gating.yaml index e215dbc..8defbe3 100644 --- a/gating.yaml +++ b/gating.yaml @@ -1,6 +1,7 @@ --- !Policy product_versions: - fedora-33 + - fedora-34 - fedora-rawhide decision_context: bodhi_update_push_stable rules: diff --git a/sources b/sources index 5221108..e035a34 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cryptsetup-2.3.5.tar.xz) = 60695a445608e2019ffc4f4ea4d7f6819849991bf2862e5648920abccea33990210554fcbf5a512659b513b27d3759fe3c1e64e96f02d9301463a48f2dbf04bf +SHA512 (cryptsetup-2.3.6.tar.xz) = 5b25cc806140d24181a0e4f0e7b0bd3caa8263aa502e8633b41c980f06ecba2e6acbf9c2d9cc4a785d38ce90d86dd8d22c52b28b9ca4a15824c2e8bdb3656665 From f07e9cc28b4bef3b0a1d0288ece9ac79f85ad94f Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Fri, 2 Jul 2021 15:17:54 +0200 Subject: [PATCH 093/142] Update to version 2.4.0-rc0. - also adds experimental cryptsetup-ssh token subpackage --- .gitignore | 2 +- cryptsetup-2.3.6.tar.sign | 16 -- cryptsetup-2.4.0-Fix-ssh-plugin-test.patch | 24 ++ cryptsetup-2.4.0-rc0.tar.sign | 16 ++ ...s-Do-not-guess-default-pbkdf-anymore.patch | 254 ++++++++++++++++++ cryptsetup.spec | 39 ++- sources | 2 +- tests/tests.yml | 6 + 8 files changed, 329 insertions(+), 30 deletions(-) delete mode 100644 cryptsetup-2.3.6.tar.sign create mode 100644 cryptsetup-2.4.0-Fix-ssh-plugin-test.patch create mode 100644 cryptsetup-2.4.0-rc0.tar.sign create mode 100644 cryptsetup-2.4.0-tests-Do-not-guess-default-pbkdf-anymore.patch diff --git a/.gitignore b/.gitignore index bf63c7d..c5e19c9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/cryptsetup-2.3.6.tar.xz +/cryptsetup-2.4.0-rc0.tar.xz diff --git a/cryptsetup-2.3.6.tar.sign b/cryptsetup-2.3.6.tar.sign deleted file mode 100644 index 3b218c3..0000000 --- a/cryptsetup-2.3.6.tar.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAmCwxOgACgkQ2bBXe9k+ -mPzlCg//XVdN6WnGhf35DT2f39GpSUimEAmkK/P3xKYGouzlUEac20mzXsNvkv+H -BpTN507H44ThgQENPAaKTea9FkqpZIcoBZcPnTXJOQ/ZIfR+iglb4zF9lR1PuVx7 -PuyVZ7BgMxM6lFvOwt5/bkktCDn8uX0nYvzqf9DXWVFUm973NayqftxsbgPa+4DT -vW2E87sJOM2NLw6psPu3o+wYkKm4N1r+M9JCWNqY8bwvlV5YbW4yBifZl4oU+99l -VXcqgSQunAvEzRPhtwCUxfYNRULx6xknNZVuwl37sSYgDpjjooy+6qjz1PX8g/qa -4/Wc0u2q/QmIUq13D2dFdQIrfDaZEJe8d0/yyaCnxPlCVFOhmr31U08o2pK1zJSK -duUqWVIKQNSFafygrPTeMRhZ1L2iwJZgjuCDyhoJSa62kGvYcLxjEoXjRmeiLXAn -7aVrmbf4tmJUJ8EUden40JM7MxPeKwHfUhE4Aq//qDfPVId7YFdgnBh6PmwUcyRm -HTyNJP8ULFX+u+v9C5YbXxb+h6xb65wzQDY1T1IPEJicIu/kv/syac/9QUkF9yG+ -Gsxaq9Ath2UYp7NW11/LXW0jmWVcM2eOfZi6xg8+vT6HWxG58Qzh//gPoLBpzBOj -E94vQim+q+ky0ePAqi2uEfZUiiID2ns4JYeXoYkxx9aGl/eRrp8= -=AlrZ ------END PGP SIGNATURE----- diff --git a/cryptsetup-2.4.0-Fix-ssh-plugin-test.patch b/cryptsetup-2.4.0-Fix-ssh-plugin-test.patch new file mode 100644 index 0000000..42173d4 --- /dev/null +++ b/cryptsetup-2.4.0-Fix-ssh-plugin-test.patch @@ -0,0 +1,24 @@ +From 0eb84931560a833d06fd99bfcbaeaec7ad3b6d13 Mon Sep 17 00:00:00 2001 +From: Ondrej Kozina +Date: Fri, 2 Jul 2021 22:56:45 +0200 +Subject: [PATCH] Fix ssh-plugin test. + +--- + tests/ssh-plugin-test | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/ssh-plugin-test b/tests/ssh-plugin-test +index 70f04be1..e4a3c3b7 100755 +--- a/tests/ssh-plugin-test ++++ b/tests/ssh-plugin-test +@@ -1,6 +1,6 @@ + #!/bin/bash + +-[ -z "$CRUPTSETUP_PATH" ] && { ++[ -z "$CRYPTSETUP_PATH" ] && { + export LD_PRELOAD=./fake_token_path.so + CRYPTSETUP_PATH=".." + } +-- +2.27.0 + diff --git a/cryptsetup-2.4.0-rc0.tar.sign b/cryptsetup-2.4.0-rc0.tar.sign new file mode 100644 index 0000000..1a4971c --- /dev/null +++ b/cryptsetup-2.4.0-rc0.tar.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAmDe/aoACgkQ2bBXe9k+ +mPwLDg/+JV8o1uQf6uWbwtW8u7UiiIf6v/q+2T/CVgxyqZsc48yWb/Ug89AMDXVL +EKawvzjZXlMZyEYLET52wP9GWDpF3S08feaqZ51ECskwhe4CRSNPQ8kfAP6i7YPm +f/hJjU5b7ZU0syDaiqN0lXDRwJP16zSA7unp8XOMHteDsgxHVzY+b/+o9tw3bkKM +a4hbUjxAPNIIrypU9mTuEEu+53TB7bAROXDJytwAr7GZDb1nZ64z3rD5Mzoh49S8 +4TQlm92mA72hiVho+TJwxlLdQ3Ckq4IBTUvoMfzWuWAL5VX/gCtCrc3kKh/ZUW1B +oTSDwmKKUl6AAnkap25oVqERZaRc281cCsUl4uE+UbO1BhzwPW3oJlmCiRIm8q/I +/0TELqPyhyxMOka5hbSxo/LQMaazb+dTmiAitBc4FbkW3dUaxLxewEZ3aSwNtcvR +gW1rxhkWy7nCT3wM9fK2ftkX5+Tlq0ii0W9M7OcwG0bEx9zpyc9RngIwcn1R7+KZ +sPNoLEOw6vKnTWhsWqrEB7le8vOHII0oFqhtmc6xIUB2d1BHSPuwKieWGLhLvs6A +zNwvPl3pSiY+2vRDN7GPylfaKeQMGDRdpGMyHGpQOWm7qHNdYLDEbU023aHK89cK +5R9Sz6qzzR/hzaSt/HN5cMZBVNCKhjqTVdmeYSp7bHWWUXl7XyQ= +=OATs +-----END PGP SIGNATURE----- diff --git a/cryptsetup-2.4.0-tests-Do-not-guess-default-pbkdf-anymore.patch b/cryptsetup-2.4.0-tests-Do-not-guess-default-pbkdf-anymore.patch new file mode 100644 index 0000000..549dea8 --- /dev/null +++ b/cryptsetup-2.4.0-tests-Do-not-guess-default-pbkdf-anymore.patch @@ -0,0 +1,254 @@ +From 9736f533bb90557e4522451b95e357920786f869 Mon Sep 17 00:00:00 2001 +From: Ondrej Kozina +Date: Fri, 2 Jul 2021 21:55:40 +0200 +Subject: [PATCH] tests: Do not guess default pbkdf anymore. + +Instead of guessing get pbkdf defaults via libcryptsetup +API. +--- + tests/api-test-2.c | 109 +++++++++++++++++++++++++++------------------ + 1 file changed, 66 insertions(+), 43 deletions(-) + +diff --git a/tests/api-test-2.c b/tests/api-test-2.c +index fe7363e1..c769e2ed 100644 +--- a/tests/api-test-2.c ++++ b/tests/api-test-2.c +@@ -119,16 +119,6 @@ typedef int32_t key_serial_t; + #define PASS7 "bbb" + #define PASS8 "iii" + +-/* Allow to run without config.h */ +-#ifndef DEFAULT_LUKS1_HASH +- #define DEFAULT_LUKS1_HASH "sha256" +- #define DEFAULT_LUKS1_ITER_TIME 2000 +- #define DEFAULT_LUKS2_ITER_TIME 2000 +- #define DEFAULT_LUKS2_MEMORY_KB 1048576 +- #define DEFAULT_LUKS2_PARALLEL_THREADS 4 +- #define DEFAULT_LUKS2_PBKDF "argon2i" +-#endif +- + static int _fips_mode = 0; + + static char *DEVICE_1 = NULL; +@@ -145,6 +135,14 @@ unsigned int test_progress_steps; + + struct crypt_device *cd = NULL, *cd2 = NULL; + ++static const char *default_luks1_hash = NULL; ++static uint32_t default_luks1_iter_time = 0; ++ ++static const char *default_luks2_pbkdf = NULL; ++static uint32_t default_luks2_iter_time = 0; ++static uint32_t default_luks2_memory_kb = 0; ++static uint32_t default_luks2_parallel_threads = 0; ++ + // Helpers + + static unsigned cpus_online(void) +@@ -167,14 +165,14 @@ static uint32_t adjusted_pbkdf_memory(void) + uint64_t memory_kb; + + if (pagesize <= 0 || pages <= 0) +- return DEFAULT_LUKS2_MEMORY_KB; ++ return default_luks2_memory_kb; + + memory_kb = pagesize / 1024 * pages / 2; + +- if (memory_kb < DEFAULT_LUKS2_MEMORY_KB) ++ if (memory_kb < default_luks2_memory_kb) + return (uint32_t)memory_kb; + +- return DEFAULT_LUKS2_MEMORY_KB; ++ return default_luks2_memory_kb; + } + + static unsigned _min(unsigned a, unsigned b) +@@ -225,6 +223,28 @@ static int get_luks2_offsets(int metadata_device, + return 0; + } + ++static bool get_luks_pbkdf_defaults(void) ++{ ++ const struct crypt_pbkdf_type *pbkdf_defaults = crypt_get_pbkdf_default(CRYPT_LUKS1); ++ ++ if (!pbkdf_defaults) ++ return false; ++ ++ default_luks1_hash = pbkdf_defaults->hash; ++ default_luks1_iter_time = pbkdf_defaults->time_ms; ++ ++ pbkdf_defaults = crypt_get_pbkdf_default(CRYPT_LUKS2); ++ if (!pbkdf_defaults) ++ return false; ++ ++ default_luks2_pbkdf = pbkdf_defaults->type; ++ default_luks2_iter_time = pbkdf_defaults->time_ms; ++ default_luks2_memory_kb = pbkdf_defaults->max_memory_kb; ++ default_luks2_parallel_threads = pbkdf_defaults->parallel_threads; ++ ++ return true; ++} ++ + static void _remove_keyfiles(void) + { + remove(KEYFILE1); +@@ -413,6 +433,9 @@ static int _setup(void) + /* Use default log callback */ + crypt_set_log_callback(NULL, &global_log_callback, NULL); + ++ if (!get_luks_pbkdf_defaults()) ++ return 1; ++ + return 0; + } + +@@ -2541,17 +2564,17 @@ static void Pbkdf(void) + const char *cipher = "aes", *mode="xts-plain64"; + struct crypt_pbkdf_type argon2 = { + .type = CRYPT_KDF_ARGON2I, +- .hash = DEFAULT_LUKS1_HASH, ++ .hash = default_luks1_hash, + .time_ms = 6, + .max_memory_kb = 1024, + .parallel_threads = 1 + }, pbkdf2 = { + .type = CRYPT_KDF_PBKDF2, +- .hash = DEFAULT_LUKS1_HASH, ++ .hash = default_luks1_hash, + .time_ms = 9 + }, bad = { + .type = "hamster_pbkdf", +- .hash = DEFAULT_LUKS1_HASH ++ .hash = default_luks1_hash + }; + struct crypt_params_plain params = { + .hash = "sha1", +@@ -2607,7 +2630,7 @@ static void Pbkdf(void) + OK_(crypt_set_pbkdf_type(cd, &pbkdf2)); + OK_(crypt_set_pbkdf_type(cd, NULL)); + NOTNULL_(pbkdf = crypt_get_pbkdf_type(cd)); +- EQ_(pbkdf->time_ms, DEFAULT_LUKS1_ITER_TIME); ++ EQ_(pbkdf->time_ms, default_luks1_iter_time); + CRYPT_FREE(cd); + // test value set in crypt_set_iteration_time() can be obtained via following crypt_get_pbkdf_type() + OK_(crypt_init(&cd, DMDIR L_DEVICE_OK)); +@@ -2617,7 +2640,7 @@ static void Pbkdf(void) + EQ_(pbkdf->time_ms, 42); + // test crypt_get_pbkdf_type() returns expected values for LUKSv1 + OK_(strcmp(pbkdf->type, CRYPT_KDF_PBKDF2)); +- OK_(strcmp(pbkdf->hash, DEFAULT_LUKS1_HASH)); ++ OK_(strcmp(pbkdf->hash, default_luks1_hash)); + EQ_(pbkdf->max_memory_kb, 0); + EQ_(pbkdf->parallel_threads, 0); + crypt_set_iteration_time(cd, 43); +@@ -2648,11 +2671,11 @@ static void Pbkdf(void) + OK_(crypt_init(&cd, DMDIR L_DEVICE_OK)); + OK_(crypt_format(cd, CRYPT_LUKS2, cipher, mode, NULL, NULL, 32, NULL)); + NOTNULL_(pbkdf = crypt_get_pbkdf_type(cd)); +- OK_(strcmp(pbkdf->type, DEFAULT_LUKS2_PBKDF)); +- OK_(strcmp(pbkdf->hash, DEFAULT_LUKS1_HASH)); +- EQ_(pbkdf->time_ms, DEFAULT_LUKS2_ITER_TIME); ++ OK_(strcmp(pbkdf->type, default_luks2_pbkdf)); ++ OK_(strcmp(pbkdf->hash, default_luks1_hash)); ++ EQ_(pbkdf->time_ms, default_luks2_iter_time); + EQ_(pbkdf->max_memory_kb, adjusted_pbkdf_memory()); +- EQ_(pbkdf->parallel_threads, _min(cpus_online(), DEFAULT_LUKS2_PARALLEL_THREADS)); ++ EQ_(pbkdf->parallel_threads, _min(cpus_online(), default_luks2_parallel_threads)); + // set and verify argon2 type + OK_(crypt_set_pbkdf_type(cd, &argon2)); + NOTNULL_(pbkdf = crypt_get_pbkdf_type(cd)); +@@ -2673,11 +2696,11 @@ static void Pbkdf(void) + crypt_set_iteration_time(cd, 1); // it's supposed to override this call + OK_(crypt_set_pbkdf_type(cd, NULL)); + NOTNULL_(pbkdf = crypt_get_pbkdf_type(cd)); +- OK_(strcmp(pbkdf->type, DEFAULT_LUKS2_PBKDF)); +- OK_(strcmp(pbkdf->hash, DEFAULT_LUKS1_HASH)); +- EQ_(pbkdf->time_ms, DEFAULT_LUKS2_ITER_TIME); ++ OK_(strcmp(pbkdf->type, default_luks2_pbkdf)); ++ OK_(strcmp(pbkdf->hash, default_luks1_hash)); ++ EQ_(pbkdf->time_ms, default_luks2_iter_time); + EQ_(pbkdf->max_memory_kb, adjusted_pbkdf_memory()); +- EQ_(pbkdf->parallel_threads, _min(cpus_online(), DEFAULT_LUKS2_PARALLEL_THREADS)); ++ EQ_(pbkdf->parallel_threads, _min(cpus_online(), default_luks2_parallel_threads)); + // try to pass illegal values + argon2.parallel_threads = 0; + FAIL_(crypt_set_pbkdf_type(cd, &argon2), "Parallel threads can't be 0"); +@@ -2695,7 +2718,7 @@ static void Pbkdf(void) + bad.hash = NULL; + FAIL_(crypt_set_pbkdf_type(cd, &bad), "Hash member is empty"); + bad.type = NULL; +- bad.hash = DEFAULT_LUKS1_HASH; ++ bad.hash = default_luks1_hash; + FAIL_(crypt_set_pbkdf_type(cd, &bad), "Pbkdf type member is empty"); + bad.hash = "hamster_hash"; + FAIL_(crypt_set_pbkdf_type(cd, &pbkdf2), "Unknown hash member"); +@@ -2704,18 +2727,18 @@ static void Pbkdf(void) + OK_(crypt_init(&cd, DMDIR L_DEVICE_OK)); + OK_(crypt_load(cd, CRYPT_LUKS, NULL)); + NOTNULL_(pbkdf = crypt_get_pbkdf_type(cd)); +- OK_(strcmp(pbkdf->type, DEFAULT_LUKS2_PBKDF)); +- OK_(strcmp(pbkdf->hash, DEFAULT_LUKS1_HASH)); +- EQ_(pbkdf->time_ms, DEFAULT_LUKS2_ITER_TIME); ++ OK_(strcmp(pbkdf->type, default_luks2_pbkdf)); ++ OK_(strcmp(pbkdf->hash, default_luks1_hash)); ++ EQ_(pbkdf->time_ms, default_luks2_iter_time); + EQ_(pbkdf->max_memory_kb, adjusted_pbkdf_memory()); +- EQ_(pbkdf->parallel_threads, _min(cpus_online(), DEFAULT_LUKS2_PARALLEL_THREADS)); ++ EQ_(pbkdf->parallel_threads, _min(cpus_online(), default_luks2_parallel_threads)); + crypt_set_iteration_time(cd, 1); + OK_(crypt_load(cd, CRYPT_LUKS, NULL)); +- OK_(strcmp(pbkdf->type, DEFAULT_LUKS2_PBKDF)); +- OK_(strcmp(pbkdf->hash, DEFAULT_LUKS1_HASH)); ++ OK_(strcmp(pbkdf->type, default_luks2_pbkdf)); ++ OK_(strcmp(pbkdf->hash, default_luks1_hash)); + EQ_(pbkdf->time_ms, 1); + EQ_(pbkdf->max_memory_kb, adjusted_pbkdf_memory()); +- EQ_(pbkdf->parallel_threads, _min(cpus_online(), DEFAULT_LUKS2_PARALLEL_THREADS)); ++ EQ_(pbkdf->parallel_threads, _min(cpus_online(), default_luks2_parallel_threads)); + CRYPT_FREE(cd); + + // test crypt_set_pbkdf_type() overwrites invalid value set by crypt_set_iteration_time() +@@ -2766,17 +2789,17 @@ static void Pbkdf(void) + + NOTNULL_(pbkdf = crypt_get_pbkdf_default(CRYPT_LUKS1)); + OK_(strcmp(pbkdf->type, CRYPT_KDF_PBKDF2)); +- EQ_(pbkdf->time_ms, DEFAULT_LUKS1_ITER_TIME); +- OK_(strcmp(pbkdf->hash, DEFAULT_LUKS1_HASH)); ++ EQ_(pbkdf->time_ms, default_luks1_iter_time); ++ OK_(strcmp(pbkdf->hash, default_luks1_hash)); + EQ_(pbkdf->max_memory_kb, 0); + EQ_(pbkdf->parallel_threads, 0); + + NOTNULL_(pbkdf = crypt_get_pbkdf_default(CRYPT_LUKS2)); +- OK_(strcmp(pbkdf->type, DEFAULT_LUKS2_PBKDF)); +- EQ_(pbkdf->time_ms, DEFAULT_LUKS2_ITER_TIME); +- OK_(strcmp(pbkdf->hash, DEFAULT_LUKS1_HASH)); +- EQ_(pbkdf->max_memory_kb, DEFAULT_LUKS2_MEMORY_KB); +- EQ_(pbkdf->parallel_threads, DEFAULT_LUKS2_PARALLEL_THREADS); ++ OK_(strcmp(pbkdf->type, default_luks2_pbkdf)); ++ EQ_(pbkdf->time_ms, default_luks2_iter_time); ++ OK_(strcmp(pbkdf->hash, default_luks1_hash)); ++ EQ_(pbkdf->max_memory_kb, default_luks2_memory_kb); ++ EQ_(pbkdf->parallel_threads, default_luks2_parallel_threads); + + NULL_(pbkdf = crypt_get_pbkdf_default(CRYPT_PLAIN)); + +@@ -3149,13 +3172,13 @@ static void Luks2Requirements(void) + const char *token, *json = "{\"type\":\"test_token\",\"keyslots\":[]}"; + struct crypt_pbkdf_type argon2 = { + .type = CRYPT_KDF_ARGON2I, +- .hash = DEFAULT_LUKS1_HASH, ++ .hash = default_luks1_hash, + .time_ms = 6, + .max_memory_kb = 1024, + .parallel_threads = 1 + }, pbkdf2 = { + .type = CRYPT_KDF_PBKDF2, +- .hash = DEFAULT_LUKS1_HASH, ++ .hash = default_luks1_hash, + .time_ms = 9 + }; + struct crypt_token_params_luks2_keyring params_get, params = { +-- +2.27.0 + diff --git a/cryptsetup.spec b/cryptsetup.spec index d604d98..0c62be9 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,20 +1,20 @@ Summary: Utility for setting up encrypted disks Name: cryptsetup -Version: 2.3.6 +Version: 2.4.0~rc0 Release: 1%{?dist} License: GPLv2+ and LGPLv2+ URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: openssl-devel, popt-devel, device-mapper-devel BuildRequires: libuuid-devel, gcc, json-c-devel, libargon2-devel BuildRequires: libpwquality-devel, libblkid-devel -BuildRequires: make -Provides: cryptsetup-luks = %{version}-%{release} -Obsoletes: cryptsetup-luks < 1.4.0 +BuildRequires: make libssh-devel Requires: cryptsetup-libs = %{version}-%{release} Requires: libpwquality >= 1.2.0 -%global upstream_version %{version} -Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/cryptsetup-%{upstream_version}.tar.xz +%global upstream_version %{version_no_tilde} +Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v2.4/cryptsetup-%{upstream_version}.tar.xz +Patch0: %{name}-2.4.0-tests-Do-not-guess-default-pbkdf-anymore.patch +Patch1: %{name}-2.4.0-Fix-ssh-plugin-test.patch # Following patch has to applied last Patch9999: %{name}-add-system-library-paths.patch @@ -26,8 +26,6 @@ disk encryption using dm-crypt kernel module. Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: pkgconfig Summary: Headers and libraries for using encrypted file systems -Provides: cryptsetup-luks-devel = %{version}-%{release} -Obsoletes: cryptsetup-luks-devel < 1.4.0 %description devel The cryptsetup-devel package contains libraries and header files @@ -35,12 +33,17 @@ used for writing code that makes use of disk encryption. %package libs Summary: Cryptsetup shared library -Provides: cryptsetup-luks-libs = %{version}-%{release} -Obsoletes: cryptsetup-luks-libs < 1.4.0 %description libs This package contains the cryptsetup shared library, libcryptsetup. +%package ssh-token +Summary: Cryptsetup LUKS2 SSH token +Requires: cryptsetup-libs = %{version}-%{release} + +%description ssh-token +This package contains the LUKS2 SSH token. + %package -n veritysetup Summary: A utility for setting up dm-verity volumes Requires: cryptsetup-libs = %{version}-%{release} @@ -67,7 +70,6 @@ can be used for offline reencryption of disk in situ. %prep %autosetup -n cryptsetup-%{upstream_version} -p 1 -chmod -x misc/dracut_90reencrypt/* %build %configure --enable-fips --enable-pwquality --enable-libargon2 @@ -75,7 +77,9 @@ chmod -x misc/dracut_90reencrypt/* %install %make_install +mkdir -p -m 0755 $RPM_BUILD_ROOT%{_libdir}/%{name}/ rm -rf %{buildroot}%{_libdir}/*.la +rm -rf %{buildroot}%{_libdir}/%{name}/*.la %find_lang cryptsetup @@ -99,7 +103,6 @@ rm -rf %{buildroot}%{_libdir}/*.la %files reencrypt %license COPYING -%doc misc/dracut_90reencrypt %{_mandir}/man8/cryptsetup-reencrypt.8.gz %{_sbindir}/cryptsetup-reencrypt @@ -112,10 +115,22 @@ rm -rf %{buildroot}%{_libdir}/*.la %files libs -f cryptsetup.lang %license COPYING COPYING.LGPL %{_libdir}/libcryptsetup.so.* +%dir %{_libdir}/%{name}/ %{_tmpfilesdir}/cryptsetup.conf %ghost %attr(700, -, -) %dir /run/cryptsetup +%files ssh-token +%license COPYING COPYING.LGPL +%{_libdir}/%{name}/libcryptsetup-token-ssh.so +%{_mandir}/man8/cryptsetup-ssh.8.gz +%{_sbindir}/cryptsetup-ssh + %changelog +* Fri Jul 02 2021 Ondrej Kozina - 2.4.0~rc0-1 +- Update to cryptsetup 2.4.0-rc0. +- add experimental cryptsetup-ssh token subpackage +- spec file cleanup + * Fri May 28 2021 Milan Broz - 2.3.6-1 - Update to cryptsetup 2.3.6. diff --git a/sources b/sources index e035a34..3422c2c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cryptsetup-2.3.6.tar.xz) = 5b25cc806140d24181a0e4f0e7b0bd3caa8263aa502e8633b41c980f06ecba2e6acbf9c2d9cc4a785d38ce90d86dd8d22c52b28b9ca4a15824c2e8bdb3656665 +SHA512 (cryptsetup-2.4.0-rc0.tar.xz) = ed80cc7a1763cf0e788bd72eee979640d6133b98a7b294a3fa09c608273eef172c2d56d80802433143d01063a0c142e68ea06465392b273fc2615b8f90273b25 diff --git a/tests/tests.yml b/tests/tests.yml index 2eb23b5..e78cd2b 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -12,10 +12,12 @@ run: make -f Makefile.localtest tests environment: CRYPTSETUP_PATH: /sbin + RUN_SSH_PLUGIN_TEST: 1 required_packages: - cryptsetup - cryptsetup-devel - cryptsetup-reencrypt + - cryptsetup-ssh-token - integritysetup - veritysetup - gcc @@ -27,3 +29,7 @@ - jq - vim-common - sharutils + - openssh + - nmap-ncat + - sshpass + - shadow-utils From 50234b4bda89a5708a11f0acb9f7b0f2bf4beac0 Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Thu, 8 Jul 2021 11:34:48 +0200 Subject: [PATCH 094/142] Add missing test utilities in CI. --- tests/tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/tests.yml b/tests/tests.yml index e78cd2b..e238a80 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -30,6 +30,7 @@ - vim-common - sharutils - openssh + - openssl - nmap-ncat - sshpass - shadow-utils From b9834cab6f905fa01b8282cf312b0261ab06ae1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sat, 10 Jul 2021 11:52:18 +0200 Subject: [PATCH 095/142] Rebuild for versioned symbols in json-c --- cryptsetup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index 0c62be9..58807ed 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,7 +1,7 @@ Summary: Utility for setting up encrypted disks Name: cryptsetup Version: 2.4.0~rc0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ and LGPLv2+ URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: openssl-devel, popt-devel, device-mapper-devel @@ -126,6 +126,9 @@ rm -rf %{buildroot}%{_libdir}/%{name}/*.la %{_sbindir}/cryptsetup-ssh %changelog +* Sat Jul 10 2021 Björn Esser - 2.4.0~rc0-2 +- Rebuild for versioned symbols in json-c + * Fri Jul 02 2021 Ondrej Kozina - 2.4.0~rc0-1 - Update to cryptsetup 2.4.0-rc0. - add experimental cryptsetup-ssh token subpackage From 2408d4ef92791c10d6a51aec1469776ea2b08890 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 20:10:25 +0000 Subject: [PATCH 096/142] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cryptsetup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index 58807ed..a886093 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,7 +1,7 @@ Summary: Utility for setting up encrypted disks Name: cryptsetup Version: 2.4.0~rc0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ and LGPLv2+ URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: openssl-devel, popt-devel, device-mapper-devel @@ -126,6 +126,9 @@ rm -rf %{buildroot}%{_libdir}/%{name}/*.la %{_sbindir}/cryptsetup-ssh %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 2.4.0~rc0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Sat Jul 10 2021 Björn Esser - 2.4.0~rc0-2 - Rebuild for versioned symbols in json-c From dd64a27081a28fa28a0552a3c398acd57d41dec6 Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Fri, 30 Jul 2021 00:08:43 +0200 Subject: [PATCH 097/142] Update to version 2.4.0-rc1. --- .gitignore | 2 +- cryptsetup-2.4.0-Fix-ssh-plugin-test.patch | 24 -- cryptsetup-2.4.0-rc0.tar.sign | 16 -- cryptsetup-2.4.0-rc1.tar.sign | 16 ++ ...s-Do-not-guess-default-pbkdf-anymore.patch | 254 ------------------ cryptsetup.spec | 9 +- sources | 2 +- 7 files changed, 23 insertions(+), 300 deletions(-) delete mode 100644 cryptsetup-2.4.0-Fix-ssh-plugin-test.patch delete mode 100644 cryptsetup-2.4.0-rc0.tar.sign create mode 100644 cryptsetup-2.4.0-rc1.tar.sign delete mode 100644 cryptsetup-2.4.0-tests-Do-not-guess-default-pbkdf-anymore.patch diff --git a/.gitignore b/.gitignore index c5e19c9..b095fe0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/cryptsetup-2.4.0-rc0.tar.xz +/cryptsetup-2.4.0-rc1.tar.xz diff --git a/cryptsetup-2.4.0-Fix-ssh-plugin-test.patch b/cryptsetup-2.4.0-Fix-ssh-plugin-test.patch deleted file mode 100644 index 42173d4..0000000 --- a/cryptsetup-2.4.0-Fix-ssh-plugin-test.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0eb84931560a833d06fd99bfcbaeaec7ad3b6d13 Mon Sep 17 00:00:00 2001 -From: Ondrej Kozina -Date: Fri, 2 Jul 2021 22:56:45 +0200 -Subject: [PATCH] Fix ssh-plugin test. - ---- - tests/ssh-plugin-test | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/ssh-plugin-test b/tests/ssh-plugin-test -index 70f04be1..e4a3c3b7 100755 ---- a/tests/ssh-plugin-test -+++ b/tests/ssh-plugin-test -@@ -1,6 +1,6 @@ - #!/bin/bash - --[ -z "$CRUPTSETUP_PATH" ] && { -+[ -z "$CRYPTSETUP_PATH" ] && { - export LD_PRELOAD=./fake_token_path.so - CRYPTSETUP_PATH=".." - } --- -2.27.0 - diff --git a/cryptsetup-2.4.0-rc0.tar.sign b/cryptsetup-2.4.0-rc0.tar.sign deleted file mode 100644 index 1a4971c..0000000 --- a/cryptsetup-2.4.0-rc0.tar.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAmDe/aoACgkQ2bBXe9k+ -mPwLDg/+JV8o1uQf6uWbwtW8u7UiiIf6v/q+2T/CVgxyqZsc48yWb/Ug89AMDXVL -EKawvzjZXlMZyEYLET52wP9GWDpF3S08feaqZ51ECskwhe4CRSNPQ8kfAP6i7YPm -f/hJjU5b7ZU0syDaiqN0lXDRwJP16zSA7unp8XOMHteDsgxHVzY+b/+o9tw3bkKM -a4hbUjxAPNIIrypU9mTuEEu+53TB7bAROXDJytwAr7GZDb1nZ64z3rD5Mzoh49S8 -4TQlm92mA72hiVho+TJwxlLdQ3Ckq4IBTUvoMfzWuWAL5VX/gCtCrc3kKh/ZUW1B -oTSDwmKKUl6AAnkap25oVqERZaRc281cCsUl4uE+UbO1BhzwPW3oJlmCiRIm8q/I -/0TELqPyhyxMOka5hbSxo/LQMaazb+dTmiAitBc4FbkW3dUaxLxewEZ3aSwNtcvR -gW1rxhkWy7nCT3wM9fK2ftkX5+Tlq0ii0W9M7OcwG0bEx9zpyc9RngIwcn1R7+KZ -sPNoLEOw6vKnTWhsWqrEB7le8vOHII0oFqhtmc6xIUB2d1BHSPuwKieWGLhLvs6A -zNwvPl3pSiY+2vRDN7GPylfaKeQMGDRdpGMyHGpQOWm7qHNdYLDEbU023aHK89cK -5R9Sz6qzzR/hzaSt/HN5cMZBVNCKhjqTVdmeYSp7bHWWUXl7XyQ= -=OATs ------END PGP SIGNATURE----- diff --git a/cryptsetup-2.4.0-rc1.tar.sign b/cryptsetup-2.4.0-rc1.tar.sign new file mode 100644 index 0000000..4348f3b --- /dev/null +++ b/cryptsetup-2.4.0-rc1.tar.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAmEDH9gACgkQ2bBXe9k+ +mPwgSw//cRgUyjZ0bjPSQo1S6dVbNPTh2bMjcAgZ7Y+MJWBLFmS7ltHOw+7JxpZM +KXvo5MDXqCtl1WC5tfqsfCEEbEW/MjeC94hjc3Yl/9yFJVlFh75OcuKzp6vpNcXr +5LAo4nHAp92W+pw9xLsDDc4N3CkaKxmxO0JUwkiHFFv9oic4BwYOCRmG0r0OPkuf +wzFsUBfn+7POQ34qdkpJmaJFo35ellTVbC5tYW1PdHOmB70i4bqFeQ1r3KNfVZa0 +ZHD5ulWBagxfn2bnAaGvoCYofa4V12ZcJz+U4o744R0lqS2rbjKGqa0mpd4w/bxa +5zjT7eJqe6rLqjMbo//jTLB3G47828s3M6U0uBquJZ8sJk5MkdJK2M7Jprwq4eK4 ++wZdRRpXtYiprR24DeE3lR7/83UcMH12IDQRwFPaihOmQxESw3c+qn37X0P6rXtJ +NpX4ux+TT/YJiO8L/u7f6OkC0Zn6p4icEGfo684VNHEhqIUvMueKGYLwsWjHEnHY +/WWTYz5TJcqrWoxxTnD/0/Fpgawa1Dquv7gda0gibYhVpCy9Ti8QBI+0IvnyZ4iW +K2rs3bavygh1GEpVjbOxbgt2cRIhEz1+hyM8RlZnQrHkSGMI/moL5FlFeL28WUkD +DLCWjpXU0jNyrBev4IWuc+fuDaWOElu3AB8vjcoSCA7tTbHGfuE= +=YNRk +-----END PGP SIGNATURE----- diff --git a/cryptsetup-2.4.0-tests-Do-not-guess-default-pbkdf-anymore.patch b/cryptsetup-2.4.0-tests-Do-not-guess-default-pbkdf-anymore.patch deleted file mode 100644 index 549dea8..0000000 --- a/cryptsetup-2.4.0-tests-Do-not-guess-default-pbkdf-anymore.patch +++ /dev/null @@ -1,254 +0,0 @@ -From 9736f533bb90557e4522451b95e357920786f869 Mon Sep 17 00:00:00 2001 -From: Ondrej Kozina -Date: Fri, 2 Jul 2021 21:55:40 +0200 -Subject: [PATCH] tests: Do not guess default pbkdf anymore. - -Instead of guessing get pbkdf defaults via libcryptsetup -API. ---- - tests/api-test-2.c | 109 +++++++++++++++++++++++++++------------------ - 1 file changed, 66 insertions(+), 43 deletions(-) - -diff --git a/tests/api-test-2.c b/tests/api-test-2.c -index fe7363e1..c769e2ed 100644 ---- a/tests/api-test-2.c -+++ b/tests/api-test-2.c -@@ -119,16 +119,6 @@ typedef int32_t key_serial_t; - #define PASS7 "bbb" - #define PASS8 "iii" - --/* Allow to run without config.h */ --#ifndef DEFAULT_LUKS1_HASH -- #define DEFAULT_LUKS1_HASH "sha256" -- #define DEFAULT_LUKS1_ITER_TIME 2000 -- #define DEFAULT_LUKS2_ITER_TIME 2000 -- #define DEFAULT_LUKS2_MEMORY_KB 1048576 -- #define DEFAULT_LUKS2_PARALLEL_THREADS 4 -- #define DEFAULT_LUKS2_PBKDF "argon2i" --#endif -- - static int _fips_mode = 0; - - static char *DEVICE_1 = NULL; -@@ -145,6 +135,14 @@ unsigned int test_progress_steps; - - struct crypt_device *cd = NULL, *cd2 = NULL; - -+static const char *default_luks1_hash = NULL; -+static uint32_t default_luks1_iter_time = 0; -+ -+static const char *default_luks2_pbkdf = NULL; -+static uint32_t default_luks2_iter_time = 0; -+static uint32_t default_luks2_memory_kb = 0; -+static uint32_t default_luks2_parallel_threads = 0; -+ - // Helpers - - static unsigned cpus_online(void) -@@ -167,14 +165,14 @@ static uint32_t adjusted_pbkdf_memory(void) - uint64_t memory_kb; - - if (pagesize <= 0 || pages <= 0) -- return DEFAULT_LUKS2_MEMORY_KB; -+ return default_luks2_memory_kb; - - memory_kb = pagesize / 1024 * pages / 2; - -- if (memory_kb < DEFAULT_LUKS2_MEMORY_KB) -+ if (memory_kb < default_luks2_memory_kb) - return (uint32_t)memory_kb; - -- return DEFAULT_LUKS2_MEMORY_KB; -+ return default_luks2_memory_kb; - } - - static unsigned _min(unsigned a, unsigned b) -@@ -225,6 +223,28 @@ static int get_luks2_offsets(int metadata_device, - return 0; - } - -+static bool get_luks_pbkdf_defaults(void) -+{ -+ const struct crypt_pbkdf_type *pbkdf_defaults = crypt_get_pbkdf_default(CRYPT_LUKS1); -+ -+ if (!pbkdf_defaults) -+ return false; -+ -+ default_luks1_hash = pbkdf_defaults->hash; -+ default_luks1_iter_time = pbkdf_defaults->time_ms; -+ -+ pbkdf_defaults = crypt_get_pbkdf_default(CRYPT_LUKS2); -+ if (!pbkdf_defaults) -+ return false; -+ -+ default_luks2_pbkdf = pbkdf_defaults->type; -+ default_luks2_iter_time = pbkdf_defaults->time_ms; -+ default_luks2_memory_kb = pbkdf_defaults->max_memory_kb; -+ default_luks2_parallel_threads = pbkdf_defaults->parallel_threads; -+ -+ return true; -+} -+ - static void _remove_keyfiles(void) - { - remove(KEYFILE1); -@@ -413,6 +433,9 @@ static int _setup(void) - /* Use default log callback */ - crypt_set_log_callback(NULL, &global_log_callback, NULL); - -+ if (!get_luks_pbkdf_defaults()) -+ return 1; -+ - return 0; - } - -@@ -2541,17 +2564,17 @@ static void Pbkdf(void) - const char *cipher = "aes", *mode="xts-plain64"; - struct crypt_pbkdf_type argon2 = { - .type = CRYPT_KDF_ARGON2I, -- .hash = DEFAULT_LUKS1_HASH, -+ .hash = default_luks1_hash, - .time_ms = 6, - .max_memory_kb = 1024, - .parallel_threads = 1 - }, pbkdf2 = { - .type = CRYPT_KDF_PBKDF2, -- .hash = DEFAULT_LUKS1_HASH, -+ .hash = default_luks1_hash, - .time_ms = 9 - }, bad = { - .type = "hamster_pbkdf", -- .hash = DEFAULT_LUKS1_HASH -+ .hash = default_luks1_hash - }; - struct crypt_params_plain params = { - .hash = "sha1", -@@ -2607,7 +2630,7 @@ static void Pbkdf(void) - OK_(crypt_set_pbkdf_type(cd, &pbkdf2)); - OK_(crypt_set_pbkdf_type(cd, NULL)); - NOTNULL_(pbkdf = crypt_get_pbkdf_type(cd)); -- EQ_(pbkdf->time_ms, DEFAULT_LUKS1_ITER_TIME); -+ EQ_(pbkdf->time_ms, default_luks1_iter_time); - CRYPT_FREE(cd); - // test value set in crypt_set_iteration_time() can be obtained via following crypt_get_pbkdf_type() - OK_(crypt_init(&cd, DMDIR L_DEVICE_OK)); -@@ -2617,7 +2640,7 @@ static void Pbkdf(void) - EQ_(pbkdf->time_ms, 42); - // test crypt_get_pbkdf_type() returns expected values for LUKSv1 - OK_(strcmp(pbkdf->type, CRYPT_KDF_PBKDF2)); -- OK_(strcmp(pbkdf->hash, DEFAULT_LUKS1_HASH)); -+ OK_(strcmp(pbkdf->hash, default_luks1_hash)); - EQ_(pbkdf->max_memory_kb, 0); - EQ_(pbkdf->parallel_threads, 0); - crypt_set_iteration_time(cd, 43); -@@ -2648,11 +2671,11 @@ static void Pbkdf(void) - OK_(crypt_init(&cd, DMDIR L_DEVICE_OK)); - OK_(crypt_format(cd, CRYPT_LUKS2, cipher, mode, NULL, NULL, 32, NULL)); - NOTNULL_(pbkdf = crypt_get_pbkdf_type(cd)); -- OK_(strcmp(pbkdf->type, DEFAULT_LUKS2_PBKDF)); -- OK_(strcmp(pbkdf->hash, DEFAULT_LUKS1_HASH)); -- EQ_(pbkdf->time_ms, DEFAULT_LUKS2_ITER_TIME); -+ OK_(strcmp(pbkdf->type, default_luks2_pbkdf)); -+ OK_(strcmp(pbkdf->hash, default_luks1_hash)); -+ EQ_(pbkdf->time_ms, default_luks2_iter_time); - EQ_(pbkdf->max_memory_kb, adjusted_pbkdf_memory()); -- EQ_(pbkdf->parallel_threads, _min(cpus_online(), DEFAULT_LUKS2_PARALLEL_THREADS)); -+ EQ_(pbkdf->parallel_threads, _min(cpus_online(), default_luks2_parallel_threads)); - // set and verify argon2 type - OK_(crypt_set_pbkdf_type(cd, &argon2)); - NOTNULL_(pbkdf = crypt_get_pbkdf_type(cd)); -@@ -2673,11 +2696,11 @@ static void Pbkdf(void) - crypt_set_iteration_time(cd, 1); // it's supposed to override this call - OK_(crypt_set_pbkdf_type(cd, NULL)); - NOTNULL_(pbkdf = crypt_get_pbkdf_type(cd)); -- OK_(strcmp(pbkdf->type, DEFAULT_LUKS2_PBKDF)); -- OK_(strcmp(pbkdf->hash, DEFAULT_LUKS1_HASH)); -- EQ_(pbkdf->time_ms, DEFAULT_LUKS2_ITER_TIME); -+ OK_(strcmp(pbkdf->type, default_luks2_pbkdf)); -+ OK_(strcmp(pbkdf->hash, default_luks1_hash)); -+ EQ_(pbkdf->time_ms, default_luks2_iter_time); - EQ_(pbkdf->max_memory_kb, adjusted_pbkdf_memory()); -- EQ_(pbkdf->parallel_threads, _min(cpus_online(), DEFAULT_LUKS2_PARALLEL_THREADS)); -+ EQ_(pbkdf->parallel_threads, _min(cpus_online(), default_luks2_parallel_threads)); - // try to pass illegal values - argon2.parallel_threads = 0; - FAIL_(crypt_set_pbkdf_type(cd, &argon2), "Parallel threads can't be 0"); -@@ -2695,7 +2718,7 @@ static void Pbkdf(void) - bad.hash = NULL; - FAIL_(crypt_set_pbkdf_type(cd, &bad), "Hash member is empty"); - bad.type = NULL; -- bad.hash = DEFAULT_LUKS1_HASH; -+ bad.hash = default_luks1_hash; - FAIL_(crypt_set_pbkdf_type(cd, &bad), "Pbkdf type member is empty"); - bad.hash = "hamster_hash"; - FAIL_(crypt_set_pbkdf_type(cd, &pbkdf2), "Unknown hash member"); -@@ -2704,18 +2727,18 @@ static void Pbkdf(void) - OK_(crypt_init(&cd, DMDIR L_DEVICE_OK)); - OK_(crypt_load(cd, CRYPT_LUKS, NULL)); - NOTNULL_(pbkdf = crypt_get_pbkdf_type(cd)); -- OK_(strcmp(pbkdf->type, DEFAULT_LUKS2_PBKDF)); -- OK_(strcmp(pbkdf->hash, DEFAULT_LUKS1_HASH)); -- EQ_(pbkdf->time_ms, DEFAULT_LUKS2_ITER_TIME); -+ OK_(strcmp(pbkdf->type, default_luks2_pbkdf)); -+ OK_(strcmp(pbkdf->hash, default_luks1_hash)); -+ EQ_(pbkdf->time_ms, default_luks2_iter_time); - EQ_(pbkdf->max_memory_kb, adjusted_pbkdf_memory()); -- EQ_(pbkdf->parallel_threads, _min(cpus_online(), DEFAULT_LUKS2_PARALLEL_THREADS)); -+ EQ_(pbkdf->parallel_threads, _min(cpus_online(), default_luks2_parallel_threads)); - crypt_set_iteration_time(cd, 1); - OK_(crypt_load(cd, CRYPT_LUKS, NULL)); -- OK_(strcmp(pbkdf->type, DEFAULT_LUKS2_PBKDF)); -- OK_(strcmp(pbkdf->hash, DEFAULT_LUKS1_HASH)); -+ OK_(strcmp(pbkdf->type, default_luks2_pbkdf)); -+ OK_(strcmp(pbkdf->hash, default_luks1_hash)); - EQ_(pbkdf->time_ms, 1); - EQ_(pbkdf->max_memory_kb, adjusted_pbkdf_memory()); -- EQ_(pbkdf->parallel_threads, _min(cpus_online(), DEFAULT_LUKS2_PARALLEL_THREADS)); -+ EQ_(pbkdf->parallel_threads, _min(cpus_online(), default_luks2_parallel_threads)); - CRYPT_FREE(cd); - - // test crypt_set_pbkdf_type() overwrites invalid value set by crypt_set_iteration_time() -@@ -2766,17 +2789,17 @@ static void Pbkdf(void) - - NOTNULL_(pbkdf = crypt_get_pbkdf_default(CRYPT_LUKS1)); - OK_(strcmp(pbkdf->type, CRYPT_KDF_PBKDF2)); -- EQ_(pbkdf->time_ms, DEFAULT_LUKS1_ITER_TIME); -- OK_(strcmp(pbkdf->hash, DEFAULT_LUKS1_HASH)); -+ EQ_(pbkdf->time_ms, default_luks1_iter_time); -+ OK_(strcmp(pbkdf->hash, default_luks1_hash)); - EQ_(pbkdf->max_memory_kb, 0); - EQ_(pbkdf->parallel_threads, 0); - - NOTNULL_(pbkdf = crypt_get_pbkdf_default(CRYPT_LUKS2)); -- OK_(strcmp(pbkdf->type, DEFAULT_LUKS2_PBKDF)); -- EQ_(pbkdf->time_ms, DEFAULT_LUKS2_ITER_TIME); -- OK_(strcmp(pbkdf->hash, DEFAULT_LUKS1_HASH)); -- EQ_(pbkdf->max_memory_kb, DEFAULT_LUKS2_MEMORY_KB); -- EQ_(pbkdf->parallel_threads, DEFAULT_LUKS2_PARALLEL_THREADS); -+ OK_(strcmp(pbkdf->type, default_luks2_pbkdf)); -+ EQ_(pbkdf->time_ms, default_luks2_iter_time); -+ OK_(strcmp(pbkdf->hash, default_luks1_hash)); -+ EQ_(pbkdf->max_memory_kb, default_luks2_memory_kb); -+ EQ_(pbkdf->parallel_threads, default_luks2_parallel_threads); - - NULL_(pbkdf = crypt_get_pbkdf_default(CRYPT_PLAIN)); - -@@ -3149,13 +3172,13 @@ static void Luks2Requirements(void) - const char *token, *json = "{\"type\":\"test_token\",\"keyslots\":[]}"; - struct crypt_pbkdf_type argon2 = { - .type = CRYPT_KDF_ARGON2I, -- .hash = DEFAULT_LUKS1_HASH, -+ .hash = default_luks1_hash, - .time_ms = 6, - .max_memory_kb = 1024, - .parallel_threads = 1 - }, pbkdf2 = { - .type = CRYPT_KDF_PBKDF2, -- .hash = DEFAULT_LUKS1_HASH, -+ .hash = default_luks1_hash, - .time_ms = 9 - }; - struct crypt_token_params_luks2_keyring params_get, params = { --- -2.27.0 - diff --git a/cryptsetup.spec b/cryptsetup.spec index a886093..7775670 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,7 +1,7 @@ Summary: Utility for setting up encrypted disks Name: cryptsetup -Version: 2.4.0~rc0 -Release: 3%{?dist} +Version: 2.4.0~rc1 +Release: 1%{?dist} License: GPLv2+ and LGPLv2+ URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: openssl-devel, popt-devel, device-mapper-devel @@ -13,8 +13,6 @@ Requires: libpwquality >= 1.2.0 %global upstream_version %{version_no_tilde} Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v2.4/cryptsetup-%{upstream_version}.tar.xz -Patch0: %{name}-2.4.0-tests-Do-not-guess-default-pbkdf-anymore.patch -Patch1: %{name}-2.4.0-Fix-ssh-plugin-test.patch # Following patch has to applied last Patch9999: %{name}-add-system-library-paths.patch @@ -126,6 +124,9 @@ rm -rf %{buildroot}%{_libdir}/%{name}/*.la %{_sbindir}/cryptsetup-ssh %changelog +* Fri Jul 30 2021 Milan Broz - 2.4.0~rc1-1 +- Update to cryptsetup 2.4.0-rc1. + * Wed Jul 21 2021 Fedora Release Engineering - 2.4.0~rc0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 3422c2c..77076f3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cryptsetup-2.4.0-rc0.tar.xz) = ed80cc7a1763cf0e788bd72eee979640d6133b98a7b294a3fa09c608273eef172c2d56d80802433143d01063a0c142e68ea06465392b273fc2615b8f90273b25 +SHA512 (cryptsetup-2.4.0-rc1.tar.xz) = 73f07e7963624111d916f9791617af52bdf614be04da8462603aa17e0b10f28f681eca2bc991c74c9c3804a4ffc9714f7d075242631f5b77a86462bc57bade93 From 0d53e78600542e91a171f8a426cb822f2e218f8d Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Wed, 18 Aug 2021 16:29:29 +0200 Subject: [PATCH 098/142] Update to version 2.4.0. --- .gitignore | 2 +- cryptsetup-2.4.0-rc1.tar.sign | 16 ---------------- cryptsetup-2.4.0.tar.sign | 16 ++++++++++++++++ cryptsetup-add-system-library-paths.patch | 22 ---------------------- cryptsetup.spec | 10 ++++++---- sources | 2 +- 6 files changed, 24 insertions(+), 44 deletions(-) delete mode 100644 cryptsetup-2.4.0-rc1.tar.sign create mode 100644 cryptsetup-2.4.0.tar.sign delete mode 100644 cryptsetup-add-system-library-paths.patch diff --git a/.gitignore b/.gitignore index b095fe0..851604e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/cryptsetup-2.4.0-rc1.tar.xz +/cryptsetup-2.4.0.tar.xz diff --git a/cryptsetup-2.4.0-rc1.tar.sign b/cryptsetup-2.4.0-rc1.tar.sign deleted file mode 100644 index 4348f3b..0000000 --- a/cryptsetup-2.4.0-rc1.tar.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAmEDH9gACgkQ2bBXe9k+ -mPwgSw//cRgUyjZ0bjPSQo1S6dVbNPTh2bMjcAgZ7Y+MJWBLFmS7ltHOw+7JxpZM -KXvo5MDXqCtl1WC5tfqsfCEEbEW/MjeC94hjc3Yl/9yFJVlFh75OcuKzp6vpNcXr -5LAo4nHAp92W+pw9xLsDDc4N3CkaKxmxO0JUwkiHFFv9oic4BwYOCRmG0r0OPkuf -wzFsUBfn+7POQ34qdkpJmaJFo35ellTVbC5tYW1PdHOmB70i4bqFeQ1r3KNfVZa0 -ZHD5ulWBagxfn2bnAaGvoCYofa4V12ZcJz+U4o744R0lqS2rbjKGqa0mpd4w/bxa -5zjT7eJqe6rLqjMbo//jTLB3G47828s3M6U0uBquJZ8sJk5MkdJK2M7Jprwq4eK4 -+wZdRRpXtYiprR24DeE3lR7/83UcMH12IDQRwFPaihOmQxESw3c+qn37X0P6rXtJ -NpX4ux+TT/YJiO8L/u7f6OkC0Zn6p4icEGfo684VNHEhqIUvMueKGYLwsWjHEnHY -/WWTYz5TJcqrWoxxTnD/0/Fpgawa1Dquv7gda0gibYhVpCy9Ti8QBI+0IvnyZ4iW -K2rs3bavygh1GEpVjbOxbgt2cRIhEz1+hyM8RlZnQrHkSGMI/moL5FlFeL28WUkD -DLCWjpXU0jNyrBev4IWuc+fuDaWOElu3AB8vjcoSCA7tTbHGfuE= -=YNRk ------END PGP SIGNATURE----- diff --git a/cryptsetup-2.4.0.tar.sign b/cryptsetup-2.4.0.tar.sign new file mode 100644 index 0000000..9034627 --- /dev/null +++ b/cryptsetup-2.4.0.tar.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAmEdJXMACgkQ2bBXe9k+ +mPwJSg/+OW43g7S4Q/K+vBi8S+RN3Pzqi8ao2K+OmGWK/7FhKWxrXSN7J8gJigxd +uD+NukmQublFtYdfKXj2unF/Fd28YGHCqSfVrFvn2jmcMnlwxSz5220Bic1eai8a +hq0Hve425n5RpTzNtpkBBZQbiLmY25J1wUkygcoEwT+spyFA0d6oZUhTWcAcqa2b +IP9XkVFEociSWpjZfuhJGN5+jSG91JwYKbuNJFZvH1uez6zTLdNDj9+zoxfsrLW4 +BZYh8FQbZq54pUJnX4tafuRm7L/3LjK0DWWq60P3dvzTyj5b/qzORThNMpvCoolN +I7Yfl7PD8j3B2WpgLQ+62jBVSOBjZGOpvj6PbQVizk2ELznF1LkTyneQ1rIwzxRw +xWqHZfFU0Frj16yiNfRDrBKq4QsrYBOGov7q3OP3Xsw3H/C5lNxEOzx9NkC97LlA +ryMiFSOXFHfCvTCXWQi90N311S4Usg/+n4qevwM4MxXmHJ6HfIqOLYMFftrWoiqC +c+86lgZnNFtmFQnD+/Jvfu7AlAE0aLQodDz3w9otF4QfztDwnvnWsrjAntff4u1U +WqL3EK7NGPJELDRvOpLq77l5eCJ1x5Qgma1RN2ag5APgs5IrmKBGz3H0WxEArz4K +IWQ9FAHMMVIcJfblW96mE/zIoTc6dc0quUlpmROTFWKleijMk0I= +=nfsi +-----END PGP SIGNATURE----- diff --git a/cryptsetup-add-system-library-paths.patch b/cryptsetup-add-system-library-paths.patch deleted file mode 100644 index 0a5d753..0000000 --- a/cryptsetup-add-system-library-paths.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -rupN cryptsetup-2.2.0.old/configure cryptsetup-2.2.0/configure ---- cryptsetup-2.2.0.old/configure 2019-08-14 20:45:07.000000000 +0200 -+++ cryptsetup-2.2.0/configure 2019-08-15 09:11:14.775184005 +0200 -@@ -12294,6 +12294,9 @@ fi - # before this can be enabled. - hardcode_into_libs=yes - -+ # Add ABI-specific directories to the system library path. -+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" -+ - # Ideally, we could use ldconfig to report *all* directores which are - # searched for libraries, however this is still not possible. Aside from not - # being certain /sbin/ldconfig is available, command -@@ -12302,7 +12305,7 @@ fi - # appending ld.so.conf contents (and includes) to the search path. - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` -- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" -+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on diff --git a/cryptsetup.spec b/cryptsetup.spec index 7775670..f5fe40b 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,9 +1,10 @@ Summary: Utility for setting up encrypted disks Name: cryptsetup -Version: 2.4.0~rc1 +Version: 2.4.0 Release: 1%{?dist} License: GPLv2+ and LGPLv2+ URL: https://gitlab.com/cryptsetup/cryptsetup +BuildRequires: autoconf, automake, libtool, gettext-devel, BuildRequires: openssl-devel, popt-devel, device-mapper-devel BuildRequires: libuuid-devel, gcc, json-c-devel, libargon2-devel BuildRequires: libpwquality-devel, libblkid-devel @@ -13,8 +14,6 @@ Requires: libpwquality >= 1.2.0 %global upstream_version %{version_no_tilde} Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v2.4/cryptsetup-%{upstream_version}.tar.xz -# Following patch has to applied last -Patch9999: %{name}-add-system-library-paths.patch %description The cryptsetup package contains a utility for setting up @@ -70,12 +69,12 @@ can be used for offline reencryption of disk in situ. %autosetup -n cryptsetup-%{upstream_version} -p 1 %build +./autogen.sh %configure --enable-fips --enable-pwquality --enable-libargon2 %make_build %install %make_install -mkdir -p -m 0755 $RPM_BUILD_ROOT%{_libdir}/%{name}/ rm -rf %{buildroot}%{_libdir}/*.la rm -rf %{buildroot}%{_libdir}/%{name}/*.la @@ -124,6 +123,9 @@ rm -rf %{buildroot}%{_libdir}/%{name}/*.la %{_sbindir}/cryptsetup-ssh %changelog +* Wed Aug 18 2021 Ondrej Kozina - 2.4.0-1 +- Update to cryptsetup 2.4.0. + * Fri Jul 30 2021 Milan Broz - 2.4.0~rc1-1 - Update to cryptsetup 2.4.0-rc1. diff --git a/sources b/sources index 77076f3..2651be0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cryptsetup-2.4.0-rc1.tar.xz) = 73f07e7963624111d916f9791617af52bdf614be04da8462603aa17e0b10f28f681eca2bc991c74c9c3804a4ffc9714f7d075242631f5b77a86462bc57bade93 +SHA512 (cryptsetup-2.4.0.tar.xz) = 9c868b1dee7145f91092160cf977d3ada57a14634b5312d54477e111250975b6f077a92c417373bb7de07244b01ab19553bcce5030ee456ca2c38030e3067186 From c90113a1789692a2788694a8242afaedd4cdcf70 Mon Sep 17 00:00:00 2001 From: Sahana Prasad Date: Tue, 14 Sep 2021 18:59:57 +0200 Subject: [PATCH 099/142] Rebuilt with OpenSSL 3.0.0 --- cryptsetup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index f5fe40b..0d6da24 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,7 +1,7 @@ Summary: Utility for setting up encrypted disks Name: cryptsetup Version: 2.4.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ and LGPLv2+ URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: autoconf, automake, libtool, gettext-devel, @@ -123,6 +123,9 @@ rm -rf %{buildroot}%{_libdir}/%{name}/*.la %{_sbindir}/cryptsetup-ssh %changelog +* Tue Sep 14 2021 Sahana Prasad - 2.4.0-2 +- Rebuilt with OpenSSL 3.0.0 + * Wed Aug 18 2021 Ondrej Kozina - 2.4.0-1 - Update to cryptsetup 2.4.0. From f5b67bbd208393f7726727180375d2612e0c5dfe Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Fri, 17 Sep 2021 11:24:06 +0200 Subject: [PATCH 100/142] Update to cryptsetup 2.4.1. --- .gitignore | 2 +- cryptsetup-2.4.0.tar.sign | 16 ---------------- cryptsetup-2.4.1.tar.sign | 16 ++++++++++++++++ cryptsetup.spec | 7 +++++-- sources | 2 +- 5 files changed, 23 insertions(+), 20 deletions(-) delete mode 100644 cryptsetup-2.4.0.tar.sign create mode 100644 cryptsetup-2.4.1.tar.sign diff --git a/.gitignore b/.gitignore index 851604e..9be593d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/cryptsetup-2.4.0.tar.xz +/cryptsetup-2.4.1.tar.xz diff --git a/cryptsetup-2.4.0.tar.sign b/cryptsetup-2.4.0.tar.sign deleted file mode 100644 index 9034627..0000000 --- a/cryptsetup-2.4.0.tar.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAmEdJXMACgkQ2bBXe9k+ -mPwJSg/+OW43g7S4Q/K+vBi8S+RN3Pzqi8ao2K+OmGWK/7FhKWxrXSN7J8gJigxd -uD+NukmQublFtYdfKXj2unF/Fd28YGHCqSfVrFvn2jmcMnlwxSz5220Bic1eai8a -hq0Hve425n5RpTzNtpkBBZQbiLmY25J1wUkygcoEwT+spyFA0d6oZUhTWcAcqa2b -IP9XkVFEociSWpjZfuhJGN5+jSG91JwYKbuNJFZvH1uez6zTLdNDj9+zoxfsrLW4 -BZYh8FQbZq54pUJnX4tafuRm7L/3LjK0DWWq60P3dvzTyj5b/qzORThNMpvCoolN -I7Yfl7PD8j3B2WpgLQ+62jBVSOBjZGOpvj6PbQVizk2ELznF1LkTyneQ1rIwzxRw -xWqHZfFU0Frj16yiNfRDrBKq4QsrYBOGov7q3OP3Xsw3H/C5lNxEOzx9NkC97LlA -ryMiFSOXFHfCvTCXWQi90N311S4Usg/+n4qevwM4MxXmHJ6HfIqOLYMFftrWoiqC -c+86lgZnNFtmFQnD+/Jvfu7AlAE0aLQodDz3w9otF4QfztDwnvnWsrjAntff4u1U -WqL3EK7NGPJELDRvOpLq77l5eCJ1x5Qgma1RN2ag5APgs5IrmKBGz3H0WxEArz4K -IWQ9FAHMMVIcJfblW96mE/zIoTc6dc0quUlpmROTFWKleijMk0I= -=nfsi ------END PGP SIGNATURE----- diff --git a/cryptsetup-2.4.1.tar.sign b/cryptsetup-2.4.1.tar.sign new file mode 100644 index 0000000..f1c5815 --- /dev/null +++ b/cryptsetup-2.4.1.tar.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAmFBwN8ACgkQ2bBXe9k+ +mPwndA//ZFMeCgbtSnTJugvZhmIBFHCHofq9yBiCDYyL8qEMw0m3BQLqSSaPt6Bd +l1xm4ypuy9Rjen5hKbyRJtSko6tbbArCf+OsJfyy2Yr/r5cvnd0eLNwdIdUPKf/l +3hgRPXBiCHdm63mSWsxM5tUr128Cyj0W4mkn5OmjKPblCd4qgnhNLawn7x7JYoWc +JS6olNYS6c0M7GBuZ7icKCTtGfO1lKYCIBiCfkuNChJTQbvZ7JiqX/OprHYdBqn1 +WXgrrBrBjO8Ai2w9/uCOAWyPOhy1J8pewuHNX2Hh1LNXEu5z+47QexUpwhweq21/ +QzOITbgb0yZPdQXceAGqmZYa0BPfdo08MakTjaYGrO8rGR0XwgEvtpD5L2eMsVle +hhg96f4E3f5/7yrtmsL2hbj2v8enhN39ycvn7u/LsfUyoRciCTNwxV/jHU9/laR5 +tDRLUGE3TiiNtTiMk4MucGRHNrae2d6exIpXhhFHN3nD2flOTFqb6KaQRtbdNmPt +YCMMg4+ZoNzl+YLQYcbkYj4uGGrVosEoAmRl8ROfzPSwHM8mJdUhqGouylTRaQGt +82SaEdlFO2VthoJUZBy05uCHKthXhwiRplp27MMbCOXOjv3rbnqxyQoMDNb4VQQy +7CHF50XrEBLpdnyKFNbKFPKyZToBcBLBaPTnm5lf5eTyJ7whkXI= +=dXjt +-----END PGP SIGNATURE----- diff --git a/cryptsetup.spec b/cryptsetup.spec index 0d6da24..4ce4e9f 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,7 +1,7 @@ Summary: Utility for setting up encrypted disks Name: cryptsetup -Version: 2.4.0 -Release: 2%{?dist} +Version: 2.4.1 +Release: 1%{?dist} License: GPLv2+ and LGPLv2+ URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: autoconf, automake, libtool, gettext-devel, @@ -123,6 +123,9 @@ rm -rf %{buildroot}%{_libdir}/%{name}/*.la %{_sbindir}/cryptsetup-ssh %changelog +* Fri Sep 17 2021 Ondrej Kozina - 2.4.1-1 +- Update to cryptsetup 2.4.1. + * Tue Sep 14 2021 Sahana Prasad - 2.4.0-2 - Rebuilt with OpenSSL 3.0.0 diff --git a/sources b/sources index 2651be0..8e477e0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cryptsetup-2.4.0.tar.xz) = 9c868b1dee7145f91092160cf977d3ada57a14634b5312d54477e111250975b6f077a92c417373bb7de07244b01ab19553bcce5030ee456ca2c38030e3067186 +SHA512 (cryptsetup-2.4.1.tar.xz) = 17fc73c180e41acbd4ebeddebaf54f8baeef09fce7f154aa9c55936a58bda7adcc7b1bb257336c22295d7b5af426fc8dfd0e4e644e4a52098bcb8a2adb562ca7 From eecda64866063d4fad7431dc2f3453caa5ea25f1 Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Thu, 18 Nov 2021 12:16:57 +0100 Subject: [PATCH 101/142] Update to cryptsetup 2.4.2. --- .gitignore | 2 +- cryptsetup-2.4.1.tar.sign | 16 ---------------- cryptsetup-2.4.2.tar.sign | 16 ++++++++++++++++ cryptsetup.spec | 5 ++++- sources | 2 +- 5 files changed, 22 insertions(+), 19 deletions(-) delete mode 100644 cryptsetup-2.4.1.tar.sign create mode 100644 cryptsetup-2.4.2.tar.sign diff --git a/.gitignore b/.gitignore index 9be593d..e2aa25e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/cryptsetup-2.4.1.tar.xz +/cryptsetup-2.4.2.tar.xz diff --git a/cryptsetup-2.4.1.tar.sign b/cryptsetup-2.4.1.tar.sign deleted file mode 100644 index f1c5815..0000000 --- a/cryptsetup-2.4.1.tar.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAmFBwN8ACgkQ2bBXe9k+ -mPwndA//ZFMeCgbtSnTJugvZhmIBFHCHofq9yBiCDYyL8qEMw0m3BQLqSSaPt6Bd -l1xm4ypuy9Rjen5hKbyRJtSko6tbbArCf+OsJfyy2Yr/r5cvnd0eLNwdIdUPKf/l -3hgRPXBiCHdm63mSWsxM5tUr128Cyj0W4mkn5OmjKPblCd4qgnhNLawn7x7JYoWc -JS6olNYS6c0M7GBuZ7icKCTtGfO1lKYCIBiCfkuNChJTQbvZ7JiqX/OprHYdBqn1 -WXgrrBrBjO8Ai2w9/uCOAWyPOhy1J8pewuHNX2Hh1LNXEu5z+47QexUpwhweq21/ -QzOITbgb0yZPdQXceAGqmZYa0BPfdo08MakTjaYGrO8rGR0XwgEvtpD5L2eMsVle -hhg96f4E3f5/7yrtmsL2hbj2v8enhN39ycvn7u/LsfUyoRciCTNwxV/jHU9/laR5 -tDRLUGE3TiiNtTiMk4MucGRHNrae2d6exIpXhhFHN3nD2flOTFqb6KaQRtbdNmPt -YCMMg4+ZoNzl+YLQYcbkYj4uGGrVosEoAmRl8ROfzPSwHM8mJdUhqGouylTRaQGt -82SaEdlFO2VthoJUZBy05uCHKthXhwiRplp27MMbCOXOjv3rbnqxyQoMDNb4VQQy -7CHF50XrEBLpdnyKFNbKFPKyZToBcBLBaPTnm5lf5eTyJ7whkXI= -=dXjt ------END PGP SIGNATURE----- diff --git a/cryptsetup-2.4.2.tar.sign b/cryptsetup-2.4.2.tar.sign new file mode 100644 index 0000000..1856065 --- /dev/null +++ b/cryptsetup-2.4.2.tar.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAmGWMXwACgkQ2bBXe9k+ +mPy4oxAAlEGPQttIqxvhx49XJ8E3Ei1r674Z38Hp/0rr6G0LJGuZ4iknWsvhVKJp +qWdaMPe3I+VLlTDO4q4DLlFsFX9nyHFOBwLeWqBSSmyaaDWNCOlqdU4g3/nC5GFd +C7FRvqfO2dAb09Jtik0YrginXqjkhiEIWgeLCQa7gaa4xBT1AMoesWWtwu7oIjlU +g7IzzwA1DfsAYz0lBW/FxpHkIPUTLyOpyeZMMUU68ytQkN7hoC9flyqpv07aCblf +4fb6iD7mv3yanlElin8fJyKcWkeU5hoBrCCGtfAK2WN6cvXSSdKgdOAGEnhnx6Ln +JopKFHcyNLpfpfRHDTqwhvI5GBogBX0JzCEpL2HobcH4MxSbuYzGCjHQxH5IpmiR +in/V9kiBhK5W2VEai1Gg1gZCprrGU3k+VjMa5DCYBAGWpe32dSU5HrBfb+fJqZgp +7pTJQ6coctFG7hfPLxrjv51bg7EsDWnr9gurslWBdhCFzD5gUr/N6JR8eW6GU+06 +oW2fy6DbRKTqpv0kjaNdVD5EXHkDzStfjBfMJ6srIm3YRdBsVEU6CZJSHaAEfZRm +pI2u2FviUY3DW3cuS2duXtlami1X5hiCTl9iL5s0spkqUpX9tSW/DLh8QUh8BfFb +TT/Zbxo3OnSULKIqTuFfww4b+8FIuX4Wq/VWpzXal543YA0juEw= +=HM++ +-----END PGP SIGNATURE----- diff --git a/cryptsetup.spec b/cryptsetup.spec index 4ce4e9f..5aa0e13 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,6 +1,6 @@ Summary: Utility for setting up encrypted disks Name: cryptsetup -Version: 2.4.1 +Version: 2.4.2 Release: 1%{?dist} License: GPLv2+ and LGPLv2+ URL: https://gitlab.com/cryptsetup/cryptsetup @@ -123,6 +123,9 @@ rm -rf %{buildroot}%{_libdir}/%{name}/*.la %{_sbindir}/cryptsetup-ssh %changelog +* Thu Nov 18 2021 Milan Broz - 2.4.2-1 +- Update to cryptsetup 2.4.2. + * Fri Sep 17 2021 Ondrej Kozina - 2.4.1-1 - Update to cryptsetup 2.4.1. diff --git a/sources b/sources index 8e477e0..76e929b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cryptsetup-2.4.1.tar.xz) = 17fc73c180e41acbd4ebeddebaf54f8baeef09fce7f154aa9c55936a58bda7adcc7b1bb257336c22295d7b5af426fc8dfd0e4e644e4a52098bcb8a2adb562ca7 +SHA512 (cryptsetup-2.4.2.tar.xz) = 9464f180f24dffa4566450041fc88c372baa3334c62724487ccee230c16e87572439dc604766d94144cc1fc13802a4322b378185eca0cc848892821653566848 From 7019be425c87cdce3af380d2e720b78832c33a1c Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Thu, 18 Nov 2021 12:30:34 +0100 Subject: [PATCH 102/142] Add F35 to gating. --- gating.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/gating.yaml b/gating.yaml index 8defbe3..37b06a3 100644 --- a/gating.yaml +++ b/gating.yaml @@ -2,6 +2,7 @@ product_versions: - fedora-33 - fedora-34 + - fedora-35 - fedora-rawhide decision_context: bodhi_update_push_stable rules: From ccb9fcdf26349a763c643a94f01a94929611e074 Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Fri, 19 Nov 2021 01:51:47 +0100 Subject: [PATCH 103/142] Update gating.yml. Set all Fedora versions. Enable gating for testing. --- gating.yaml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/gating.yaml b/gating.yaml index 37b06a3..a72ff3d 100644 --- a/gating.yaml +++ b/gating.yaml @@ -1,9 +1,14 @@ --- !Policy product_versions: - - fedora-33 - - fedora-34 - - fedora-35 - - fedora-rawhide -decision_context: bodhi_update_push_stable + - fedora-* +decision_context: [bodhi_update_push_testing] +subject_type: koji_build +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} +--- !Policy +product_versions: + - fedora-* +decision_context: [bodhi_update_push_stable] +subject_type: koji_build rules: - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} From 7c55210b6888189e4fb058de404b5651f2256049 Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Thu, 13 Jan 2022 11:21:27 +0100 Subject: [PATCH 104/142] Update to cryptsetup 2.4.3. --- .gitignore | 2 +- cryptsetup-2.4.2.tar.sign | 16 ---------------- cryptsetup-2.4.3.tar.sign | 16 ++++++++++++++++ cryptsetup.spec | 5 ++++- sources | 2 +- 5 files changed, 22 insertions(+), 19 deletions(-) delete mode 100644 cryptsetup-2.4.2.tar.sign create mode 100644 cryptsetup-2.4.3.tar.sign diff --git a/.gitignore b/.gitignore index e2aa25e..d6912bc 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/cryptsetup-2.4.2.tar.xz +/cryptsetup-2.4.3.tar.xz diff --git a/cryptsetup-2.4.2.tar.sign b/cryptsetup-2.4.2.tar.sign deleted file mode 100644 index 1856065..0000000 --- a/cryptsetup-2.4.2.tar.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAmGWMXwACgkQ2bBXe9k+ -mPy4oxAAlEGPQttIqxvhx49XJ8E3Ei1r674Z38Hp/0rr6G0LJGuZ4iknWsvhVKJp -qWdaMPe3I+VLlTDO4q4DLlFsFX9nyHFOBwLeWqBSSmyaaDWNCOlqdU4g3/nC5GFd -C7FRvqfO2dAb09Jtik0YrginXqjkhiEIWgeLCQa7gaa4xBT1AMoesWWtwu7oIjlU -g7IzzwA1DfsAYz0lBW/FxpHkIPUTLyOpyeZMMUU68ytQkN7hoC9flyqpv07aCblf -4fb6iD7mv3yanlElin8fJyKcWkeU5hoBrCCGtfAK2WN6cvXSSdKgdOAGEnhnx6Ln -JopKFHcyNLpfpfRHDTqwhvI5GBogBX0JzCEpL2HobcH4MxSbuYzGCjHQxH5IpmiR -in/V9kiBhK5W2VEai1Gg1gZCprrGU3k+VjMa5DCYBAGWpe32dSU5HrBfb+fJqZgp -7pTJQ6coctFG7hfPLxrjv51bg7EsDWnr9gurslWBdhCFzD5gUr/N6JR8eW6GU+06 -oW2fy6DbRKTqpv0kjaNdVD5EXHkDzStfjBfMJ6srIm3YRdBsVEU6CZJSHaAEfZRm -pI2u2FviUY3DW3cuS2duXtlami1X5hiCTl9iL5s0spkqUpX9tSW/DLh8QUh8BfFb -TT/Zbxo3OnSULKIqTuFfww4b+8FIuX4Wq/VWpzXal543YA0juEw= -=HM++ ------END PGP SIGNATURE----- diff --git a/cryptsetup-2.4.3.tar.sign b/cryptsetup-2.4.3.tar.sign new file mode 100644 index 0000000..73478ec --- /dev/null +++ b/cryptsetup-2.4.3.tar.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAmHf9akACgkQ2bBXe9k+ +mPz0zw//cqAJh3wE0zxtfb+2al4cH2oTtPR+/VnnW8s5z9hyBztNZo8ChOXEQqEQ +3l+S0qvJSkCmQT2RNEAdyqMjolU3NKKYi+iZwKUfcYPAABnc0/df9p1l4ykKYmuZ +6EiQCCZITrFkiRl0jVsZ/U92FAU+EdI7dXPVr+H8Ai6eA4HW3NIrZlsUUMdsmkCE +6eqSX3WX1WVpFkv3453JSNG5/byHP4iPEnXdy00+n5qDoWrOEqDL6MDFaljBS2gq +XKIeDfKTe3tQAelPEnIc/Is5Tus2uMkxn+bW9KPviS3tOSW5iDVUNL2DBVdMcuxV +e26mEud9BYyKvajj3wP2TR/BD+ctmwnYSLrfs8aMzE109YI2NuxHD6sWI9d2jrtx +2fMDV20AKGvvt2q4RkIqAkML7S1RQUVdma33I/iBojFu4bXleLBUcwi1vT+G1NMX +rz+bVo5zKa7bfTjjX/T8ATL302Lhpr3yReAR6m2KqX3xbxinwG3BV88fyZjJEFft +zW2JYT3gntkp7GqrxMWjZYNc8AAcpRcabXqb/7NcCBPmS33Kk+/eQiBGEQCw85g7 +MQk7oLKFKT31yJ0TipJExWLOpaWR592wBMl/vx3jAyJjWR1IxajzKD60ZNJHavsn +5PCPtLxXGdbyyagI45Jm1Pa6Me0vcXzYSHnYdPy5tprOfJgzMT4= +=yURq +-----END PGP SIGNATURE----- diff --git a/cryptsetup.spec b/cryptsetup.spec index 5aa0e13..23849d9 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,6 +1,6 @@ Summary: Utility for setting up encrypted disks Name: cryptsetup -Version: 2.4.2 +Version: 2.4.3 Release: 1%{?dist} License: GPLv2+ and LGPLv2+ URL: https://gitlab.com/cryptsetup/cryptsetup @@ -123,6 +123,9 @@ rm -rf %{buildroot}%{_libdir}/%{name}/*.la %{_sbindir}/cryptsetup-ssh %changelog +* Wed Jan 12 2022 Ondrej Kozina - 2.4.3-1 +- Update to cryptsetup 2.4.3. + * Thu Nov 18 2021 Milan Broz - 2.4.2-1 - Update to cryptsetup 2.4.2. diff --git a/sources b/sources index 76e929b..f831562 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cryptsetup-2.4.2.tar.xz) = 9464f180f24dffa4566450041fc88c372baa3334c62724487ccee230c16e87572439dc604766d94144cc1fc13802a4322b378185eca0cc848892821653566848 +SHA512 (cryptsetup-2.4.3.tar.xz) = 2d52498497be37a837126d9cdc9b6331236eccf857c3482fe3347eb88fccc3cd0fd3d8b4490569603e18cfaa462431ae194bce0328f3eafa8bfe3e02e135a26e From 75b94eb5b426d0c544616469f192f6c90b81172a Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Thu, 13 Jan 2022 11:29:01 +0100 Subject: [PATCH 105/142] Fix typo in gating.yaml file. --- gating.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gating.yaml b/gating.yaml index a72ff3d..bb1d8ee 100644 --- a/gating.yaml +++ b/gating.yaml @@ -1,14 +1,14 @@ --- !Policy product_versions: - fedora-* -decision_context: [bodhi_update_push_testing] +decision_contexts: [bodhi_update_push_testing] subject_type: koji_build rules: - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} --- !Policy product_versions: - fedora-* -decision_context: [bodhi_update_push_stable] +decision_contexts: [bodhi_update_push_stable] subject_type: koji_build rules: - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} From 6d4d40328bc80693e5048eb703b8fe5ba7763a59 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 00:03:23 +0000 Subject: [PATCH 106/142] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cryptsetup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index 23849d9..38f8a21 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,7 +1,7 @@ Summary: Utility for setting up encrypted disks Name: cryptsetup Version: 2.4.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ and LGPLv2+ URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: autoconf, automake, libtool, gettext-devel, @@ -123,6 +123,9 @@ rm -rf %{buildroot}%{_libdir}/%{name}/*.la %{_sbindir}/cryptsetup-ssh %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 2.4.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jan 12 2022 Ondrej Kozina - 2.4.3-1 - Update to cryptsetup 2.4.3. From 02d32d11fdb00494a2d2879db0fbca17ff166286 Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Thu, 14 Jul 2022 16:49:51 +0200 Subject: [PATCH 107/142] Update to cryptsetup 2.5.0-rc1. --- .gitignore | 2 +- cryptsetup-2.4.3.tar.sign | 16 ---------------- cryptsetup-2.5.0-rc1.tar.sign | 16 ++++++++++++++++ cryptsetup.spec | 33 +++++++++++++++------------------ sources | 2 +- 5 files changed, 33 insertions(+), 36 deletions(-) delete mode 100644 cryptsetup-2.4.3.tar.sign create mode 100644 cryptsetup-2.5.0-rc1.tar.sign diff --git a/.gitignore b/.gitignore index d6912bc..ed5d48e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/cryptsetup-2.4.3.tar.xz +/cryptsetup-2.5.0-rc1.tar.xz diff --git a/cryptsetup-2.4.3.tar.sign b/cryptsetup-2.4.3.tar.sign deleted file mode 100644 index 73478ec..0000000 --- a/cryptsetup-2.4.3.tar.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAmHf9akACgkQ2bBXe9k+ -mPz0zw//cqAJh3wE0zxtfb+2al4cH2oTtPR+/VnnW8s5z9hyBztNZo8ChOXEQqEQ -3l+S0qvJSkCmQT2RNEAdyqMjolU3NKKYi+iZwKUfcYPAABnc0/df9p1l4ykKYmuZ -6EiQCCZITrFkiRl0jVsZ/U92FAU+EdI7dXPVr+H8Ai6eA4HW3NIrZlsUUMdsmkCE -6eqSX3WX1WVpFkv3453JSNG5/byHP4iPEnXdy00+n5qDoWrOEqDL6MDFaljBS2gq -XKIeDfKTe3tQAelPEnIc/Is5Tus2uMkxn+bW9KPviS3tOSW5iDVUNL2DBVdMcuxV -e26mEud9BYyKvajj3wP2TR/BD+ctmwnYSLrfs8aMzE109YI2NuxHD6sWI9d2jrtx -2fMDV20AKGvvt2q4RkIqAkML7S1RQUVdma33I/iBojFu4bXleLBUcwi1vT+G1NMX -rz+bVo5zKa7bfTjjX/T8ATL302Lhpr3yReAR6m2KqX3xbxinwG3BV88fyZjJEFft -zW2JYT3gntkp7GqrxMWjZYNc8AAcpRcabXqb/7NcCBPmS33Kk+/eQiBGEQCw85g7 -MQk7oLKFKT31yJ0TipJExWLOpaWR592wBMl/vx3jAyJjWR1IxajzKD60ZNJHavsn -5PCPtLxXGdbyyagI45Jm1Pa6Me0vcXzYSHnYdPy5tprOfJgzMT4= -=yURq ------END PGP SIGNATURE----- diff --git a/cryptsetup-2.5.0-rc1.tar.sign b/cryptsetup-2.5.0-rc1.tar.sign new file mode 100644 index 0000000..94b158c --- /dev/null +++ b/cryptsetup-2.5.0-rc1.tar.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAmLQJB4ACgkQ2bBXe9k+ +mPzechAApt7SCkdiPyi4i7tud/KyQRJ5A6mGaCU0Zfm2G3TVioEF7NSQL6YiZK4X +kB20dt+ycY7vKFiEDHWKaBVZc0BXiOw8Byvf/uFE6DHF3+rAHTTf5MKKaq8vL324 +xAVGGL41plhJlrEhzNNtYUBa0oG/2qcXy4EFtonr1HgnPvDVpS78Wmq5XgdZCN9f +kiKlohVFDSXll1IQEa3WrfIu5w0LYe5kIdCYFJ8Q2R/8TVhiZkC5QnpCLbbVZnD0 +R81VNINU7O5ibG4PdOSmzUa+idYfwlDUZwphx01TerK69e7fP8WQJ/7XtiKRbErl +0Rm3fVtrNGI4+F/k4lV1N6/N0im7XJFidfriNuO9E6TPbsBqa8dhmpfrM/XQfgQB +jrzZ2sONl3ZKzaHxXC5Q1SzfMszqAhcPydRbUf4w+YTBzMy5xkbmv6SfGnijAqX7 +9J8/+4g2HYJQCtgWgP4PvDioK7WKWLsvzcR+AbQgzrpyfNIUXSZx7lUXgevKbFJd +8uDKv5v6ZmqYO4Uk/04HiJ/KrBxORRefEhhTEN+FrMWMdsyKumFUn+FEeovpvlNn +CV+OYCdRpyqCti6dVDh/Zv4rhmUxuOVPcSXafduGsnauxemHCCuQ8LkXlqctFEVD +3jRJKiahECIu31b8muJF2z2gkI5BJlDpbkPdiaixJlybITK+kzY= +=kKNv +-----END PGP SIGNATURE----- diff --git a/cryptsetup.spec b/cryptsetup.spec index 38f8a21..248cea5 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,7 +1,7 @@ Summary: Utility for setting up encrypted disks Name: cryptsetup -Version: 2.4.3 -Release: 2%{?dist} +Version: 2.5.0~rc1 +Release: 1%{?dist} License: GPLv2+ and LGPLv2+ URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: autoconf, automake, libtool, gettext-devel, @@ -9,11 +9,14 @@ BuildRequires: openssl-devel, popt-devel, device-mapper-devel BuildRequires: libuuid-devel, gcc, json-c-devel, libargon2-devel BuildRequires: libpwquality-devel, libblkid-devel BuildRequires: make libssh-devel +BuildRequires: asciidoctor Requires: cryptsetup-libs = %{version}-%{release} Requires: libpwquality >= 1.2.0 +Obsoletes: %{name}-reencrypt <= %{version} +Provides: %{name}-reencrypt = %{version} %global upstream_version %{version_no_tilde} -Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v2.4/cryptsetup-%{upstream_version}.tar.xz +Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v2.5/cryptsetup-%{upstream_version}.tar.xz %description The cryptsetup package contains a utility for setting up @@ -57,20 +60,15 @@ Requires: cryptsetup-libs = %{version}-%{release} The integritysetup package contains a utility for setting up disk integrity protection using dm-integrity kernel module. -%package reencrypt -Summary: A utility for offline reencryption of LUKS encrypted disks -Requires: cryptsetup-libs = %{version}-%{release} - -%description reencrypt -This package contains cryptsetup-reencrypt utility which -can be used for offline reencryption of disk in situ. - %prep %autosetup -n cryptsetup-%{upstream_version} -p 1 %build +# force regeneration of manual pages from AsciiDoc +rm -f man/*.8 + ./autogen.sh -%configure --enable-fips --enable-pwquality --enable-libargon2 +%configure --enable-fips --enable-pwquality --enable-libargon2 --enable-asciidoc %make_build %install @@ -84,8 +82,9 @@ rm -rf %{buildroot}%{_libdir}/%{name}/*.la %files %license COPYING -%doc AUTHORS FAQ docs/*ReleaseNotes +%doc AUTHORS FAQ.md docs/*ReleaseNotes %{_mandir}/man8/cryptsetup.8.gz +%{_mandir}/man8/cryptsetup-*.8.gz %{_sbindir}/cryptsetup %files -n veritysetup @@ -98,11 +97,6 @@ rm -rf %{buildroot}%{_libdir}/%{name}/*.la %{_mandir}/man8/integritysetup.8.gz %{_sbindir}/integritysetup -%files reencrypt -%license COPYING -%{_mandir}/man8/cryptsetup-reencrypt.8.gz -%{_sbindir}/cryptsetup-reencrypt - %files devel %doc docs/examples/* %{_includedir}/libcryptsetup.h @@ -123,6 +117,9 @@ rm -rf %{buildroot}%{_libdir}/%{name}/*.la %{_sbindir}/cryptsetup-ssh %changelog +* Thu Jul 14 2022 Ondrej Kozina - 2.5.0~rc1-1 +- Update to cryptsetup 2.5.0-rc1. + * Thu Jan 20 2022 Fedora Release Engineering - 2.4.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index f831562..be9190f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cryptsetup-2.4.3.tar.xz) = 2d52498497be37a837126d9cdc9b6331236eccf857c3482fe3347eb88fccc3cd0fd3d8b4490569603e18cfaa462431ae194bce0328f3eafa8bfe3e02e135a26e +SHA512 (cryptsetup-2.5.0-rc1.tar.xz) = 85e63ee1758bd15120682937309fedb70c11c4254f42cc300e36bacce1a23b02dce27395c6b497793cff6922fb1266ce35f5b9dbfe3740639e694d23c6bb37b2 From 3a88b6b32c6f99c515b9c2a1ce62777a15c72af4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 23:48:56 +0000 Subject: [PATCH 108/142] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cryptsetup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index 248cea5..5bf06c3 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,7 +1,7 @@ Summary: Utility for setting up encrypted disks Name: cryptsetup Version: 2.5.0~rc1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ and LGPLv2+ URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: autoconf, automake, libtool, gettext-devel, @@ -117,6 +117,9 @@ rm -rf %{buildroot}%{_libdir}/%{name}/*.la %{_sbindir}/cryptsetup-ssh %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 2.5.0~rc1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jul 14 2022 Ondrej Kozina - 2.5.0~rc1-1 - Update to cryptsetup 2.5.0-rc1. From 254597858e20eaf4a623eacdca40380eed0b9e14 Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Thu, 28 Jul 2022 18:07:09 +0200 Subject: [PATCH 109/142] Update to cryptsetup 2.5.0. --- .gitignore | 2 +- cryptsetup-2.5.0-rc1.tar.sign | 16 ---------------- cryptsetup-2.5.0.tar.sign | 16 ++++++++++++++++ cryptsetup.spec | 7 +++++-- sources | 2 +- 5 files changed, 23 insertions(+), 20 deletions(-) delete mode 100644 cryptsetup-2.5.0-rc1.tar.sign create mode 100644 cryptsetup-2.5.0.tar.sign diff --git a/.gitignore b/.gitignore index ed5d48e..f13dd2b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/cryptsetup-2.5.0-rc1.tar.xz +/cryptsetup-2.5.0.tar.xz diff --git a/cryptsetup-2.5.0-rc1.tar.sign b/cryptsetup-2.5.0-rc1.tar.sign deleted file mode 100644 index 94b158c..0000000 --- a/cryptsetup-2.5.0-rc1.tar.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAmLQJB4ACgkQ2bBXe9k+ -mPzechAApt7SCkdiPyi4i7tud/KyQRJ5A6mGaCU0Zfm2G3TVioEF7NSQL6YiZK4X -kB20dt+ycY7vKFiEDHWKaBVZc0BXiOw8Byvf/uFE6DHF3+rAHTTf5MKKaq8vL324 -xAVGGL41plhJlrEhzNNtYUBa0oG/2qcXy4EFtonr1HgnPvDVpS78Wmq5XgdZCN9f -kiKlohVFDSXll1IQEa3WrfIu5w0LYe5kIdCYFJ8Q2R/8TVhiZkC5QnpCLbbVZnD0 -R81VNINU7O5ibG4PdOSmzUa+idYfwlDUZwphx01TerK69e7fP8WQJ/7XtiKRbErl -0Rm3fVtrNGI4+F/k4lV1N6/N0im7XJFidfriNuO9E6TPbsBqa8dhmpfrM/XQfgQB -jrzZ2sONl3ZKzaHxXC5Q1SzfMszqAhcPydRbUf4w+YTBzMy5xkbmv6SfGnijAqX7 -9J8/+4g2HYJQCtgWgP4PvDioK7WKWLsvzcR+AbQgzrpyfNIUXSZx7lUXgevKbFJd -8uDKv5v6ZmqYO4Uk/04HiJ/KrBxORRefEhhTEN+FrMWMdsyKumFUn+FEeovpvlNn -CV+OYCdRpyqCti6dVDh/Zv4rhmUxuOVPcSXafduGsnauxemHCCuQ8LkXlqctFEVD -3jRJKiahECIu31b8muJF2z2gkI5BJlDpbkPdiaixJlybITK+kzY= -=kKNv ------END PGP SIGNATURE----- diff --git a/cryptsetup-2.5.0.tar.sign b/cryptsetup-2.5.0.tar.sign new file mode 100644 index 0000000..e5e17bd --- /dev/null +++ b/cryptsetup-2.5.0.tar.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAmLir6MACgkQ2bBXe9k+ +mPz0aRAA1NvR+v5YBgq0+VxkNLWN76sIiFOZ46ASepos5bvzV6QgfHf2Pm4Tdi2j +CHc9Vc6D32w3oww6qQQ3j4XjqDxtRbxa17YEcsoQHT7J0sezaPknv+OM+vT+B8WT +PmoOF6ZoxqmA4hf2psap/4sWB+TNVlJoyksOy/yF5pLdSFT9w/A6DIO+FiufVCxg +Sg8HNcU0rFkLTnHNQiZGFx9lNAy+FJ+5mm+8A8IIbTB4cxuohaz8ZwNjJjIO36jm +H0t4yDQTL7JoV1ONPJ+Fq9OaQP6MBCnSr3uFXwkQoV99geaHmGVbv+jUqqFjosu3 +Usm1hHkqFp+BW8f+XZ0lYYGyGz1bFZHsiCnEdjFLmmMiSqjW+Jo0AdGtqEjx5Ahc +/6D8XyRpb+Wwg9cQyzvcOXgBysWp4dINWQSjsyWqN4AlEOy4UtEbAW4Pm/t2SCnV +xw7eNbCdqa2+tAJTMV5AlQgkk1dYDY9KFNvNkrgkEMlzoeq/3QgkqPo7PqCqixrL +cTlMm8g5IDV95Mnyd2uNng7T/M4E6PLfhApjpSbP0Sk6Hyp1Mp959AKTHJFPE4ZO +R9dTYQ+Jy/2DUKDQoeYtiosq1Yoi4NKueazGAbjvbQT8NXx7DDcS3AYIfxBsdGnv +xmsAHiM8LgjJmFYZNWHHBpWakCUM7LhqbrfLkVlMyprN4ZCzyLM= +=Rmfd +-----END PGP SIGNATURE----- diff --git a/cryptsetup.spec b/cryptsetup.spec index 5bf06c3..133e238 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,7 +1,7 @@ Summary: Utility for setting up encrypted disks Name: cryptsetup -Version: 2.5.0~rc1 -Release: 2%{?dist} +Version: 2.5.0 +Release: 1%{?dist} License: GPLv2+ and LGPLv2+ URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: autoconf, automake, libtool, gettext-devel, @@ -117,6 +117,9 @@ rm -rf %{buildroot}%{_libdir}/%{name}/*.la %{_sbindir}/cryptsetup-ssh %changelog +* Thu Jul 28 2022 Ondrej Kozina - 2.5.0-1 +- Update to cryptsetup 2.5.0. + * Wed Jul 20 2022 Fedora Release Engineering - 2.5.0~rc1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index be9190f..07f59d8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cryptsetup-2.5.0-rc1.tar.xz) = 85e63ee1758bd15120682937309fedb70c11c4254f42cc300e36bacce1a23b02dce27395c6b497793cff6922fb1266ce35f5b9dbfe3740639e694d23c6bb37b2 +SHA512 (cryptsetup-2.5.0.tar.xz) = 868565b75c98f96c32ea45c36abf3fb3254f2c135cb34911f4150156321e6d32e1241446d8c5b58f8266c8bec349c9444ce904560f47216d0e2b04ff48fe5ec5 From 8aa89b30bb8c74d3f2bb2526ab325d23661c40b3 Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Mon, 21 Nov 2022 10:42:00 +0100 Subject: [PATCH 110/142] Update to cryptsetup 2.6.0-rc0. --- .gitignore | 1 + cryptsetup-2.5.0.tar.sign | 16 ---------------- cryptsetup-2.6.0-rc0.tar.sign | 16 ++++++++++++++++ cryptsetup.spec | 7 +++++-- sources | 2 +- 5 files changed, 23 insertions(+), 19 deletions(-) delete mode 100644 cryptsetup-2.5.0.tar.sign create mode 100644 cryptsetup-2.6.0-rc0.tar.sign diff --git a/.gitignore b/.gitignore index f13dd2b..558c749 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /cryptsetup-2.5.0.tar.xz +/cryptsetup-2.6.0-rc0.tar.xz diff --git a/cryptsetup-2.5.0.tar.sign b/cryptsetup-2.5.0.tar.sign deleted file mode 100644 index e5e17bd..0000000 --- a/cryptsetup-2.5.0.tar.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAmLir6MACgkQ2bBXe9k+ -mPz0aRAA1NvR+v5YBgq0+VxkNLWN76sIiFOZ46ASepos5bvzV6QgfHf2Pm4Tdi2j -CHc9Vc6D32w3oww6qQQ3j4XjqDxtRbxa17YEcsoQHT7J0sezaPknv+OM+vT+B8WT -PmoOF6ZoxqmA4hf2psap/4sWB+TNVlJoyksOy/yF5pLdSFT9w/A6DIO+FiufVCxg -Sg8HNcU0rFkLTnHNQiZGFx9lNAy+FJ+5mm+8A8IIbTB4cxuohaz8ZwNjJjIO36jm -H0t4yDQTL7JoV1ONPJ+Fq9OaQP6MBCnSr3uFXwkQoV99geaHmGVbv+jUqqFjosu3 -Usm1hHkqFp+BW8f+XZ0lYYGyGz1bFZHsiCnEdjFLmmMiSqjW+Jo0AdGtqEjx5Ahc -/6D8XyRpb+Wwg9cQyzvcOXgBysWp4dINWQSjsyWqN4AlEOy4UtEbAW4Pm/t2SCnV -xw7eNbCdqa2+tAJTMV5AlQgkk1dYDY9KFNvNkrgkEMlzoeq/3QgkqPo7PqCqixrL -cTlMm8g5IDV95Mnyd2uNng7T/M4E6PLfhApjpSbP0Sk6Hyp1Mp959AKTHJFPE4ZO -R9dTYQ+Jy/2DUKDQoeYtiosq1Yoi4NKueazGAbjvbQT8NXx7DDcS3AYIfxBsdGnv -xmsAHiM8LgjJmFYZNWHHBpWakCUM7LhqbrfLkVlMyprN4ZCzyLM= -=Rmfd ------END PGP SIGNATURE----- diff --git a/cryptsetup-2.6.0-rc0.tar.sign b/cryptsetup-2.6.0-rc0.tar.sign new file mode 100644 index 0000000..f4f35c6 --- /dev/null +++ b/cryptsetup-2.6.0-rc0.tar.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAmN4BgoACgkQ2bBXe9k+ +mPzBTg//RkTMVBFVcUdOzJwu6kuEr4sD7F5x1gNCiqGvEw2Ka9fw2ikhpOvGN8I3 +b8zq5Rfbd0Mz/csE8ugTK2Cyt3BAsd/SnjvDqJoJ82aprrO1zVWmWdeYMB8gCqid +sFyniFP6yxcMWzC+gkHeS/k6FUa/EsrXFgRDB29cyJvizIcr06L5zN75Mc2RLTTZ +RSE3ZU48mf7q8tWKREoU535Ct+u8juwzxOexTydcO0PjeZFQ70oRSf8jtFxId5BF +MVlYBNX1o59e7hBx9HRaRngbGWk5HGhjwTlD18pxsUKTp2v4mAZKQUTnUFHuj5H/ +nkYJ1iuCqWxw8IclQuYjv9ophOrrphGnK7hs/DWDz37fxjPI2nwvA5NRWD/2Yvj9 +lHVIgIjDhtiwuS9kpokCOjUktDYIDBjuRT3GbHPMK2wxERgdDWjlxcr9Us2lyoo3 +wGjSEtJgtBMfAQiqa45ut2ujYMM0JVB8Fa1syxpHWs8J0XPslws8eSGbjaxf3iwP +q5KLs8x7HYERufLMr8C+JzhzPEg5PXUeqP2SCFaCrir89JOVa+fSfWLGpWHpmown +ni9xd+NzR2CGt3AgPGBdIN+83onlRrOEp+W5ScVb1U1L1cM2t6qTkjavxGJStYBj +tQAAuIUpEqqKl9fx2FzOfajrSEUmdQtt3D1hMcvi4Loog4jmpYY= +=tsKh +-----END PGP SIGNATURE----- diff --git a/cryptsetup.spec b/cryptsetup.spec index 133e238..81d8580 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,6 +1,6 @@ Summary: Utility for setting up encrypted disks Name: cryptsetup -Version: 2.5.0 +Version: 2.6.0~rc0 Release: 1%{?dist} License: GPLv2+ and LGPLv2+ URL: https://gitlab.com/cryptsetup/cryptsetup @@ -16,7 +16,7 @@ Obsoletes: %{name}-reencrypt <= %{version} Provides: %{name}-reencrypt = %{version} %global upstream_version %{version_no_tilde} -Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v2.5/cryptsetup-%{upstream_version}.tar.xz +Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v2.6/cryptsetup-%{upstream_version}.tar.xz %description The cryptsetup package contains a utility for setting up @@ -117,6 +117,9 @@ rm -rf %{buildroot}%{_libdir}/%{name}/*.la %{_sbindir}/cryptsetup-ssh %changelog +* Mon Nov 21 2022 Ondrej Kozina - 2.6.0~rc0-1 +- Update to cryptsetup 2.6.0-rc0. + * Thu Jul 28 2022 Ondrej Kozina - 2.5.0-1 - Update to cryptsetup 2.5.0. diff --git a/sources b/sources index 07f59d8..0c1d056 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cryptsetup-2.5.0.tar.xz) = 868565b75c98f96c32ea45c36abf3fb3254f2c135cb34911f4150156321e6d32e1241446d8c5b58f8266c8bec349c9444ce904560f47216d0e2b04ff48fe5ec5 +SHA512 (cryptsetup-2.6.0-rc0.tar.xz) = bc4da983afbcc84b06c7d4b6bd83c4002eb3442aa17b7bddd5c966773b1427aaea210a852f259074ef33e9d56031400089fcf3320fa83b5ca46c072b21e3079f From bf09938c8b1792c5228e03ff17c58998892aead2 Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Mon, 28 Nov 2022 13:00:23 +0100 Subject: [PATCH 111/142] Update to cryptsetup 2.6.0. --- .gitignore | 3 +-- cryptsetup-2.6.0-rc0.tar.sign | 16 ---------------- cryptsetup-2.6.0.tar.sign | 16 ++++++++++++++++ cryptsetup.spec | 5 ++++- sources | 2 +- 5 files changed, 22 insertions(+), 20 deletions(-) delete mode 100644 cryptsetup-2.6.0-rc0.tar.sign create mode 100644 cryptsetup-2.6.0.tar.sign diff --git a/.gitignore b/.gitignore index 558c749..4646924 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -/cryptsetup-2.5.0.tar.xz -/cryptsetup-2.6.0-rc0.tar.xz +/cryptsetup-2.6.0.tar.xz diff --git a/cryptsetup-2.6.0-rc0.tar.sign b/cryptsetup-2.6.0-rc0.tar.sign deleted file mode 100644 index f4f35c6..0000000 --- a/cryptsetup-2.6.0-rc0.tar.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAmN4BgoACgkQ2bBXe9k+ -mPzBTg//RkTMVBFVcUdOzJwu6kuEr4sD7F5x1gNCiqGvEw2Ka9fw2ikhpOvGN8I3 -b8zq5Rfbd0Mz/csE8ugTK2Cyt3BAsd/SnjvDqJoJ82aprrO1zVWmWdeYMB8gCqid -sFyniFP6yxcMWzC+gkHeS/k6FUa/EsrXFgRDB29cyJvizIcr06L5zN75Mc2RLTTZ -RSE3ZU48mf7q8tWKREoU535Ct+u8juwzxOexTydcO0PjeZFQ70oRSf8jtFxId5BF -MVlYBNX1o59e7hBx9HRaRngbGWk5HGhjwTlD18pxsUKTp2v4mAZKQUTnUFHuj5H/ -nkYJ1iuCqWxw8IclQuYjv9ophOrrphGnK7hs/DWDz37fxjPI2nwvA5NRWD/2Yvj9 -lHVIgIjDhtiwuS9kpokCOjUktDYIDBjuRT3GbHPMK2wxERgdDWjlxcr9Us2lyoo3 -wGjSEtJgtBMfAQiqa45ut2ujYMM0JVB8Fa1syxpHWs8J0XPslws8eSGbjaxf3iwP -q5KLs8x7HYERufLMr8C+JzhzPEg5PXUeqP2SCFaCrir89JOVa+fSfWLGpWHpmown -ni9xd+NzR2CGt3AgPGBdIN+83onlRrOEp+W5ScVb1U1L1cM2t6qTkjavxGJStYBj -tQAAuIUpEqqKl9fx2FzOfajrSEUmdQtt3D1hMcvi4Loog4jmpYY= -=tsKh ------END PGP SIGNATURE----- diff --git a/cryptsetup-2.6.0.tar.sign b/cryptsetup-2.6.0.tar.sign new file mode 100644 index 0000000..6b1aae6 --- /dev/null +++ b/cryptsetup-2.6.0.tar.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAmOEnKwACgkQ2bBXe9k+ +mPxHlg//Wt73l0gBiMwNUQdCtXL37+lWwUz2lxhfcs3Ud/tWb5M8/csw449JnF4c +MnTMCX8qz51Sxxq4GEvk0L6+gv8d5w5hdIwZIE6ArQIVx0CH2BcG0qlQ53vcFlcr +wvSVZyiggHsQX0YZgxWwrDX3+WRt+0S+F2tHTwW/1e/XXsb5Tqb2ksQcvFCvM71/ +EhT5BAaEZRC7pfIiDjIXkMGOnjxWpvkiimYzwiFnlt+Veaq4Xie+dWqM/wgrWNpb +UYnD2ZIbQ3IXDTKUhCKoQHUcO743uB0WJf7I5DVNfWPAFmeSRvHrmgqk+Ijl5rnw +WMlKU/3l5f3rXp1H46cfBBmpqmnDz2ikuYYgkHBDmpYr7F1SRpz1OV25V4uctah3 +SZ+Q0LpIiJAWOlgP64lRMYRZBsy0Vlx5sN2Y4OLUlPiRMeB0kcAPtoEN1302bzbs +fGFsFqqImAHnaV+udGH/tHlrjNeJf8Yf3YmMaa46xJgqcLJE+GjIdAQ+IHrzATSg +W4SLu2SZojeJq5rOMVJlYT6Ywg9hKWls7ltJilPqgBiwsDh9LWEWduTTNTzkXNs0 +sye8ZdTJ5k5aT82mJWhh/opeD5D7nS1+A1kLwskcuUL/8Llp+fZw5nZrVWKLb9Ik +8NnlB0S90VDaQUh/bDzNRwH8P/EwdZ/W/iUAPONP48zUbxfd0Vk= +=lIrc +-----END PGP SIGNATURE----- diff --git a/cryptsetup.spec b/cryptsetup.spec index 81d8580..6a5019d 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,6 +1,6 @@ Summary: Utility for setting up encrypted disks Name: cryptsetup -Version: 2.6.0~rc0 +Version: 2.6.0 Release: 1%{?dist} License: GPLv2+ and LGPLv2+ URL: https://gitlab.com/cryptsetup/cryptsetup @@ -117,6 +117,9 @@ rm -rf %{buildroot}%{_libdir}/%{name}/*.la %{_sbindir}/cryptsetup-ssh %changelog +* Mon Nov 28 2022 Ondrej Kozina - 2.6.0-1 +- Update to cryptsetup 2.6.0. + * Mon Nov 21 2022 Ondrej Kozina - 2.6.0~rc0-1 - Update to cryptsetup 2.6.0-rc0. diff --git a/sources b/sources index 0c1d056..34fccf3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cryptsetup-2.6.0-rc0.tar.xz) = bc4da983afbcc84b06c7d4b6bd83c4002eb3442aa17b7bddd5c966773b1427aaea210a852f259074ef33e9d56031400089fcf3320fa83b5ca46c072b21e3079f +SHA512 (cryptsetup-2.6.0.tar.xz) = 64d7b318b58fe96143ac7a12476852a38cc30126ef431b4687d0f3f399d56f6569c716e0311cfc2802e4f025520ee41edc17c82c2421da7cc56788478e646983 From 2008a1e6a9fa5c631b04d8af7622287d3ac78c09 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 00:45:13 +0000 Subject: [PATCH 112/142] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cryptsetup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index 6a5019d..c552a2d 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,7 +1,7 @@ Summary: Utility for setting up encrypted disks Name: cryptsetup Version: 2.6.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ and LGPLv2+ URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: autoconf, automake, libtool, gettext-devel, @@ -117,6 +117,9 @@ rm -rf %{buildroot}%{_libdir}/%{name}/*.la %{_sbindir}/cryptsetup-ssh %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 2.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Mon Nov 28 2022 Ondrej Kozina - 2.6.0-1 - Update to cryptsetup 2.6.0. From fbffe47c32e8ccf8a0d16a11a0af307ffe031f3d Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Fri, 10 Feb 2023 11:35:01 +0100 Subject: [PATCH 113/142] Update to cryptsetup 2.6.1. --- .gitignore | 2 +- cryptsetup-2.6.0.tar.sign | 16 ---------------- cryptsetup-2.6.1.tar.sign | 16 ++++++++++++++++ cryptsetup.spec | 7 +++++-- sources | 2 +- 5 files changed, 23 insertions(+), 20 deletions(-) delete mode 100644 cryptsetup-2.6.0.tar.sign create mode 100644 cryptsetup-2.6.1.tar.sign diff --git a/.gitignore b/.gitignore index 4646924..51ebba4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/cryptsetup-2.6.0.tar.xz +/cryptsetup-2.6.1.tar.xz diff --git a/cryptsetup-2.6.0.tar.sign b/cryptsetup-2.6.0.tar.sign deleted file mode 100644 index 6b1aae6..0000000 --- a/cryptsetup-2.6.0.tar.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAmOEnKwACgkQ2bBXe9k+ -mPxHlg//Wt73l0gBiMwNUQdCtXL37+lWwUz2lxhfcs3Ud/tWb5M8/csw449JnF4c -MnTMCX8qz51Sxxq4GEvk0L6+gv8d5w5hdIwZIE6ArQIVx0CH2BcG0qlQ53vcFlcr -wvSVZyiggHsQX0YZgxWwrDX3+WRt+0S+F2tHTwW/1e/XXsb5Tqb2ksQcvFCvM71/ -EhT5BAaEZRC7pfIiDjIXkMGOnjxWpvkiimYzwiFnlt+Veaq4Xie+dWqM/wgrWNpb -UYnD2ZIbQ3IXDTKUhCKoQHUcO743uB0WJf7I5DVNfWPAFmeSRvHrmgqk+Ijl5rnw -WMlKU/3l5f3rXp1H46cfBBmpqmnDz2ikuYYgkHBDmpYr7F1SRpz1OV25V4uctah3 -SZ+Q0LpIiJAWOlgP64lRMYRZBsy0Vlx5sN2Y4OLUlPiRMeB0kcAPtoEN1302bzbs -fGFsFqqImAHnaV+udGH/tHlrjNeJf8Yf3YmMaa46xJgqcLJE+GjIdAQ+IHrzATSg -W4SLu2SZojeJq5rOMVJlYT6Ywg9hKWls7ltJilPqgBiwsDh9LWEWduTTNTzkXNs0 -sye8ZdTJ5k5aT82mJWhh/opeD5D7nS1+A1kLwskcuUL/8Llp+fZw5nZrVWKLb9Ik -8NnlB0S90VDaQUh/bDzNRwH8P/EwdZ/W/iUAPONP48zUbxfd0Vk= -=lIrc ------END PGP SIGNATURE----- diff --git a/cryptsetup-2.6.1.tar.sign b/cryptsetup-2.6.1.tar.sign new file mode 100644 index 0000000..fcea83f --- /dev/null +++ b/cryptsetup-2.6.1.tar.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAmPlHwIACgkQ2bBXe9k+ +mPwtxg/+PohA6Ygk3e61i0IZmLdvHO2PJG3JefLxf1QDqImkKcALgUdNrt/qv1SZ +CBtM4pmYXfhIpYzavSPZdAC0nLvKkx66PpQRCk/ZmUSNZJ8IzmoM5MPZhWLspYtK +Z4mVXJz+UVdCAf7ayK7li9A+a947jpVKFlc5hSiQ8SnmkT8X0MhqGPLsO9Z6ndNK ++VpBPozZ1YQ6THYp2so5lF3BW9G6YAkm5XhN6IQreDCdZwF0Y4lff6G9PNHFSLpC +k9yLmvUgDsDNTcEjXeKbtvIlOzjjHfhJkEmyo9jNDWNUSU6wt5RqnCZmd1VbCQyB +HVCKb9Y0Yoz9rvzFBWnU6d1ZCe3aKLrVF89yK6mJ7CYh4CVURMJmIJ+1rEeg2z5n +NhXSLrMMF+Q9P/VNupOMec1DOg2OMRKExps5r7kvDeVOz9FmJoguMxAu1+dt0Ze8 +4b86ii2F+Py2tOy5OzQu7PvQkKbl8dvi8qJM8cEovKIsWiHTp/2Heo0gjXaLJ/kK +v/821T9v3ZO7dmtlhgps9q4xEjWV/u3kWwXXFgEtKby48UVzTGNXsDDdkrVEdy2J +jKBnqO31mGa8ButNRQvZ6rEOPFaCmdpy95/u5v22LhlACdkEwt5Cky0t6NMKSpvp +sSgVzYmU6Pk5RdOzZCt1pyIPwEfJa1y5N1k/kuBasdqPw95RRsM= +=m/Re +-----END PGP SIGNATURE----- diff --git a/cryptsetup.spec b/cryptsetup.spec index c552a2d..87d8e25 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,7 +1,7 @@ Summary: Utility for setting up encrypted disks Name: cryptsetup -Version: 2.6.0 -Release: 2%{?dist} +Version: 2.6.1 +Release: 1%{?dist} License: GPLv2+ and LGPLv2+ URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: autoconf, automake, libtool, gettext-devel, @@ -117,6 +117,9 @@ rm -rf %{buildroot}%{_libdir}/%{name}/*.la %{_sbindir}/cryptsetup-ssh %changelog +* Fri Feb 10 2023 Ondrej Kozina - 2.6.1-1 +- Update to cryptsetup 2.6.1. + * Thu Jan 19 2023 Fedora Release Engineering - 2.6.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index 34fccf3..1a0f590 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cryptsetup-2.6.0.tar.xz) = 64d7b318b58fe96143ac7a12476852a38cc30126ef431b4687d0f3f399d56f6569c716e0311cfc2802e4f025520ee41edc17c82c2421da7cc56788478e646983 +SHA512 (cryptsetup-2.6.1.tar.xz) = 0cbddbf33cbac2b834ed7e2dd47a9fc787131031a1c729f373f5c974600a838097e9cc0555f13719fc79c384a2a34b404f94ba4cc2f35f0bb1d70aef2233fd18 From 9288569539f5a6cc6d3353567cf513cf0702dc7b Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Tue, 23 May 2023 10:04:04 +0200 Subject: [PATCH 114/142] Update license to SPDX format. See https://gitlab.com/fedora/legal/fedora-license-data/-/issues/224 --- cryptsetup.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index 87d8e25..184a02a 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -2,7 +2,7 @@ Summary: Utility for setting up encrypted disks Name: cryptsetup Version: 2.6.1 Release: 1%{?dist} -License: GPLv2+ and LGPLv2+ +License: GPL-2.0-or-later WITH cryptsetup-OpenSSL-exception AND LGPL-2.1-or-later WITH cryptsetup-OpenSSL-exception URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: autoconf, automake, libtool, gettext-devel, BuildRequires: openssl-devel, popt-devel, device-mapper-devel From f0d6efb51a755086bb6e19173d9ca45a5c74fb41 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 15 Jun 2023 17:47:44 -0400 Subject: [PATCH 115/142] Drop libargon2 dependency in RHEL builds libargon2 is unwanted in RHEL as a standalone library. Based on c9s: https://gitlab.com/redhat/centos-stream/rpms/cryptsetup/-/commit/78394d6d393579c11cced2e26e3b7da1c54f5142 --- cryptsetup.spec | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index 184a02a..635b586 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,15 +1,18 @@ Summary: Utility for setting up encrypted disks Name: cryptsetup Version: 2.6.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL-2.0-or-later WITH cryptsetup-OpenSSL-exception AND LGPL-2.1-or-later WITH cryptsetup-OpenSSL-exception URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: autoconf, automake, libtool, gettext-devel, BuildRequires: openssl-devel, popt-devel, device-mapper-devel -BuildRequires: libuuid-devel, gcc, json-c-devel, libargon2-devel +BuildRequires: libuuid-devel, gcc, json-c-devel BuildRequires: libpwquality-devel, libblkid-devel BuildRequires: make libssh-devel BuildRequires: asciidoctor +%if %{undefined rhel} +BuildRequires: libargon2-devel +%endif Requires: cryptsetup-libs = %{version}-%{release} Requires: libpwquality >= 1.2.0 Obsoletes: %{name}-reencrypt <= %{version} @@ -68,7 +71,8 @@ disk integrity protection using dm-integrity kernel module. rm -f man/*.8 ./autogen.sh -%configure --enable-fips --enable-pwquality --enable-libargon2 --enable-asciidoc +%configure --enable-fips --enable-pwquality --enable-asciidoc \ + --enable-%{?rhel:internal-sse-}%{!?rhel:lib}argon2 %make_build %install @@ -117,6 +121,9 @@ rm -rf %{buildroot}%{_libdir}/%{name}/*.la %{_sbindir}/cryptsetup-ssh %changelog +* Thu Jun 15 2023 Yaakov Selkowitz - 2.6.1-2 +- Drop libargon2 dependency in RHEL builds + * Fri Feb 10 2023 Ondrej Kozina - 2.6.1-1 - Update to cryptsetup 2.6.1. From 9afd3d0e89eed08e68978da6ce17fc5a175c7693 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 16:41:50 +0000 Subject: [PATCH 116/142] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cryptsetup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index 635b586..3562d68 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,7 +1,7 @@ Summary: Utility for setting up encrypted disks Name: cryptsetup Version: 2.6.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL-2.0-or-later WITH cryptsetup-OpenSSL-exception AND LGPL-2.1-or-later WITH cryptsetup-OpenSSL-exception URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: autoconf, automake, libtool, gettext-devel, @@ -121,6 +121,9 @@ rm -rf %{buildroot}%{_libdir}/%{name}/*.la %{_sbindir}/cryptsetup-ssh %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 2.6.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jun 15 2023 Yaakov Selkowitz - 2.6.1-2 - Drop libargon2 dependency in RHEL builds From ba38ba9d9136e77079a42aa66ce1284f766c334d Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Wed, 29 Nov 2023 10:54:57 +0100 Subject: [PATCH 117/142] Update to cryptsetup 2.7.0-rc0. --- .gitignore | 2 +- cryptsetup-2.6.1.tar.sign | 16 ---------------- cryptsetup-2.7.0-rc0.tar.sign | 16 ++++++++++++++++ cryptsetup.spec | 7 +++++-- sources | 2 +- tests/tests.yml | 1 - 6 files changed, 23 insertions(+), 21 deletions(-) delete mode 100644 cryptsetup-2.6.1.tar.sign create mode 100644 cryptsetup-2.7.0-rc0.tar.sign diff --git a/.gitignore b/.gitignore index 51ebba4..0ffea07 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/cryptsetup-2.6.1.tar.xz +/cryptsetup-2.7.0-rc0.tar.xz diff --git a/cryptsetup-2.6.1.tar.sign b/cryptsetup-2.6.1.tar.sign deleted file mode 100644 index fcea83f..0000000 --- a/cryptsetup-2.6.1.tar.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAmPlHwIACgkQ2bBXe9k+ -mPwtxg/+PohA6Ygk3e61i0IZmLdvHO2PJG3JefLxf1QDqImkKcALgUdNrt/qv1SZ -CBtM4pmYXfhIpYzavSPZdAC0nLvKkx66PpQRCk/ZmUSNZJ8IzmoM5MPZhWLspYtK -Z4mVXJz+UVdCAf7ayK7li9A+a947jpVKFlc5hSiQ8SnmkT8X0MhqGPLsO9Z6ndNK -+VpBPozZ1YQ6THYp2so5lF3BW9G6YAkm5XhN6IQreDCdZwF0Y4lff6G9PNHFSLpC -k9yLmvUgDsDNTcEjXeKbtvIlOzjjHfhJkEmyo9jNDWNUSU6wt5RqnCZmd1VbCQyB -HVCKb9Y0Yoz9rvzFBWnU6d1ZCe3aKLrVF89yK6mJ7CYh4CVURMJmIJ+1rEeg2z5n -NhXSLrMMF+Q9P/VNupOMec1DOg2OMRKExps5r7kvDeVOz9FmJoguMxAu1+dt0Ze8 -4b86ii2F+Py2tOy5OzQu7PvQkKbl8dvi8qJM8cEovKIsWiHTp/2Heo0gjXaLJ/kK -v/821T9v3ZO7dmtlhgps9q4xEjWV/u3kWwXXFgEtKby48UVzTGNXsDDdkrVEdy2J -jKBnqO31mGa8ButNRQvZ6rEOPFaCmdpy95/u5v22LhlACdkEwt5Cky0t6NMKSpvp -sSgVzYmU6Pk5RdOzZCt1pyIPwEfJa1y5N1k/kuBasdqPw95RRsM= -=m/Re ------END PGP SIGNATURE----- diff --git a/cryptsetup-2.7.0-rc0.tar.sign b/cryptsetup-2.7.0-rc0.tar.sign new file mode 100644 index 0000000..752c85b --- /dev/null +++ b/cryptsetup-2.7.0-rc0.tar.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAmVnAAIACgkQ2bBXe9k+ +mPw65hAAnRkGZTioAdJodfmi04uGBwc+S903d6B26OZqAebdEz+w4LJl8+O326Ev +6EwAwuL10iUN3Hb7RE+vO2xURj0zR6nxczHHP/tbDUd3tqkDkvmsJucrFobkmzj0 +QcPf9i1wM+aOC731Fexr5fhqWcq2HliGrMXzpp8KuX5BSRAMTe5DhZ0+ywWjgFlX +by5Tt1ZCQnBp9dIHdiB9rtb73qBEbYE3gc4RBpFYOLplIojsGmKjRcyJ02H3S+Uh +mD4Et4mYcc9DRPm51C379hrwWRljPFBN3ZNaLY+EC/qYzFKwueEnQFg331vDkSq4 +0l2TePfWzevCAh80RmmQCm0oRR9wUv/Z1BCenClURFeIhepGcLO6PyjuJTBMGVE4 +Bu+o5kAgm7n6eiXQ3KBG+8aSULLTqrFT46NiAUv1Y8zBiRj/kNpQbFxx99No7/+o +PIZtlEpjPCt7cWdjBnWwCW4x48sPjHt41vgEnQxir29H3clZvWAXs7gZHTSIyeBX +EdCbbRsJktTGGeknFByT/vTJV3sF/4eTl9u4dk2puf7tWvoqrH5nu8Vzlu1hbcLN +LoQSZnhBxeDviDEVMHkVkF6264DRt8dhcrXUBgJugGWA+vD+Wgw2y6d0cqwROt3j +bntZHRWRvFNSEm3ELXKUekNU+UPJtL8aTYOx6oyF4zhJnoMPdP4= +=iCq4 +-----END PGP SIGNATURE----- diff --git a/cryptsetup.spec b/cryptsetup.spec index 3562d68..1ef7818 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,7 +1,7 @@ Summary: Utility for setting up encrypted disks Name: cryptsetup -Version: 2.6.1 -Release: 3%{?dist} +Version: 2.7.0~rc0 +Release: 1%{?dist} License: GPL-2.0-or-later WITH cryptsetup-OpenSSL-exception AND LGPL-2.1-or-later WITH cryptsetup-OpenSSL-exception URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: autoconf, automake, libtool, gettext-devel, @@ -121,6 +121,9 @@ rm -rf %{buildroot}%{_libdir}/%{name}/*.la %{_sbindir}/cryptsetup-ssh %changelog +* Wed Nov 29 2023 Ondrej Kozina - 2.7.0~rc0-1 +- Update to cryptsetup 2.7.0-rc0. + * Wed Jul 19 2023 Fedora Release Engineering - 2.6.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 1a0f590..1697a22 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cryptsetup-2.6.1.tar.xz) = 0cbddbf33cbac2b834ed7e2dd47a9fc787131031a1c729f373f5c974600a838097e9cc0555f13719fc79c384a2a34b404f94ba4cc2f35f0bb1d70aef2233fd18 +SHA512 (cryptsetup-2.7.0-rc0.tar.xz) = 06325308808a813319121c0622356cca3686ab3120e900163e3ca6e194a8d62b25ffeef0c46ec70b11403243beaedc782cb45190ca4c488f134d3cd71cd64824 diff --git a/tests/tests.yml b/tests/tests.yml index e238a80..d60e834 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -16,7 +16,6 @@ required_packages: - cryptsetup - cryptsetup-devel - - cryptsetup-reencrypt - cryptsetup-ssh-token - integritysetup - veritysetup From 6db37225d5ad20a39bf6a485f712e62e221c7d3f Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Wed, 20 Dec 2023 16:42:24 +0100 Subject: [PATCH 118/142] Update to cryptsetup 2.7.0-rc1. --- .gitignore | 2 +- cryptsetup-2.7.0-rc0.tar.sign | 16 ---------------- cryptsetup-2.7.0-rc1.tar.sign | 16 ++++++++++++++++ cryptsetup.spec | 7 +++++-- sources | 2 +- 5 files changed, 23 insertions(+), 20 deletions(-) delete mode 100644 cryptsetup-2.7.0-rc0.tar.sign create mode 100644 cryptsetup-2.7.0-rc1.tar.sign diff --git a/.gitignore b/.gitignore index 0ffea07..93de0e1 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/cryptsetup-2.7.0-rc0.tar.xz +/cryptsetup-2.7.0-rc1.tar.xz diff --git a/cryptsetup-2.7.0-rc0.tar.sign b/cryptsetup-2.7.0-rc0.tar.sign deleted file mode 100644 index 752c85b..0000000 --- a/cryptsetup-2.7.0-rc0.tar.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAmVnAAIACgkQ2bBXe9k+ -mPw65hAAnRkGZTioAdJodfmi04uGBwc+S903d6B26OZqAebdEz+w4LJl8+O326Ev -6EwAwuL10iUN3Hb7RE+vO2xURj0zR6nxczHHP/tbDUd3tqkDkvmsJucrFobkmzj0 -QcPf9i1wM+aOC731Fexr5fhqWcq2HliGrMXzpp8KuX5BSRAMTe5DhZ0+ywWjgFlX -by5Tt1ZCQnBp9dIHdiB9rtb73qBEbYE3gc4RBpFYOLplIojsGmKjRcyJ02H3S+Uh -mD4Et4mYcc9DRPm51C379hrwWRljPFBN3ZNaLY+EC/qYzFKwueEnQFg331vDkSq4 -0l2TePfWzevCAh80RmmQCm0oRR9wUv/Z1BCenClURFeIhepGcLO6PyjuJTBMGVE4 -Bu+o5kAgm7n6eiXQ3KBG+8aSULLTqrFT46NiAUv1Y8zBiRj/kNpQbFxx99No7/+o -PIZtlEpjPCt7cWdjBnWwCW4x48sPjHt41vgEnQxir29H3clZvWAXs7gZHTSIyeBX -EdCbbRsJktTGGeknFByT/vTJV3sF/4eTl9u4dk2puf7tWvoqrH5nu8Vzlu1hbcLN -LoQSZnhBxeDviDEVMHkVkF6264DRt8dhcrXUBgJugGWA+vD+Wgw2y6d0cqwROt3j -bntZHRWRvFNSEm3ELXKUekNU+UPJtL8aTYOx6oyF4zhJnoMPdP4= -=iCq4 ------END PGP SIGNATURE----- diff --git a/cryptsetup-2.7.0-rc1.tar.sign b/cryptsetup-2.7.0-rc1.tar.sign new file mode 100644 index 0000000..c935e4c --- /dev/null +++ b/cryptsetup-2.7.0-rc1.tar.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAmWC++sACgkQ2bBXe9k+ +mPykwA//fKdDnevQufTJxynlMeQCLMDVrLjxkBKo4dNkJx0r5jKacE51K1bxENqD +d3vE1wsFYwItZBjlI0Y4rC9R/DNHVzrouTfANq8fb1dsXLRKIdZludimrHM+p1hJ +y2epCVnb4WuxvXfaQoDOPxQpdDGSZw91CUU0e8hmY4+mTzr0zXMv0/ZPSIR1bvz4 +6wVicS3MPJaWMm2jgyiocn+y9OaatoHv5u2XwdhNEanCzWKnrPpeO3nNt3CNPhP6 +bcbKCS/GOdYTHL2SWVvNfLhVshDBmIC/7Is5Eo/rQymCrXg4lI3JrQuJQx9MCS1G +2VUrRtx8JISv3nvlAbJLAOljV0MdJW7+myzvpwWXxfA9urfv5iRClISiSez88QzY ++aipFKRyGcwThAO2Wr8Ls7iMJVGXz32qKJm2yxVZARBP/xo9Qt1M4mdfjmzT1WEg +FuPRTOrhEiZou28oL54uKoiSjeu6E9C2s+pgq2tuHhjtV/3FGucsA/y2UOeSIBNo +RJOnLNeX4md81y8tCoPotrBurZQtxFpOEq0vaRmA894K1/h7gNEL62+dbgCq343x +y2pfA2zWMV14hZL7JQc0mPSX0O5xEJWmN7miYOUeyUHAYi4+Ks62d0YRF9UyuNfn +L1MeFP3Ql/HZMdfa2Y99+GkRs3Zvm/N1gUZcqzqLR33/9/UU6HA= +=1LXV +-----END PGP SIGNATURE----- diff --git a/cryptsetup.spec b/cryptsetup.spec index 1ef7818..5fe30fd 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,6 +1,6 @@ Summary: Utility for setting up encrypted disks Name: cryptsetup -Version: 2.7.0~rc0 +Version: 2.7.0~rc1 Release: 1%{?dist} License: GPL-2.0-or-later WITH cryptsetup-OpenSSL-exception AND LGPL-2.1-or-later WITH cryptsetup-OpenSSL-exception URL: https://gitlab.com/cryptsetup/cryptsetup @@ -19,7 +19,7 @@ Obsoletes: %{name}-reencrypt <= %{version} Provides: %{name}-reencrypt = %{version} %global upstream_version %{version_no_tilde} -Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v2.6/cryptsetup-%{upstream_version}.tar.xz +Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v2.7/cryptsetup-%{upstream_version}.tar.xz %description The cryptsetup package contains a utility for setting up @@ -121,6 +121,9 @@ rm -rf %{buildroot}%{_libdir}/%{name}/*.la %{_sbindir}/cryptsetup-ssh %changelog +* Wed Dec 20 2023 Milan Broz - 2.7.0~rc1-1 +- Update to cryptsetup 2.7.0-rc1. + * Wed Nov 29 2023 Ondrej Kozina - 2.7.0~rc0-1 - Update to cryptsetup 2.7.0-rc0. diff --git a/sources b/sources index 1697a22..b8ec779 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cryptsetup-2.7.0-rc0.tar.xz) = 06325308808a813319121c0622356cca3686ab3120e900163e3ca6e194a8d62b25ffeef0c46ec70b11403243beaedc782cb45190ca4c488f134d3cd71cd64824 +SHA512 (cryptsetup-2.7.0-rc1.tar.xz) = 41ad1a56bd82e5f0d4877cacd81dd29168313b0a3c39074e530f0e55e90c16d5bbdac32ae08f0a75427572e215649539fd669ff099571a5813a7a888bd3c63e8 From 0b42a77b266083e94ffda7573f98a28cd3017439 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 16:27:00 +0000 Subject: [PATCH 119/142] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- cryptsetup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index 5fe30fd..8c0d9da 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,7 +1,7 @@ Summary: Utility for setting up encrypted disks Name: cryptsetup Version: 2.7.0~rc1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL-2.0-or-later WITH cryptsetup-OpenSSL-exception AND LGPL-2.1-or-later WITH cryptsetup-OpenSSL-exception URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: autoconf, automake, libtool, gettext-devel, @@ -121,6 +121,9 @@ rm -rf %{buildroot}%{_libdir}/%{name}/*.la %{_sbindir}/cryptsetup-ssh %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 2.7.0~rc1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Dec 20 2023 Milan Broz - 2.7.0~rc1-1 - Update to cryptsetup 2.7.0-rc1. From ca9fc2f70b352e747e4fd544a8db99298d1e5488 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 08:35:12 +0000 Subject: [PATCH 120/142] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- cryptsetup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index 8c0d9da..eae1ab4 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,7 +1,7 @@ Summary: Utility for setting up encrypted disks Name: cryptsetup Version: 2.7.0~rc1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL-2.0-or-later WITH cryptsetup-OpenSSL-exception AND LGPL-2.1-or-later WITH cryptsetup-OpenSSL-exception URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: autoconf, automake, libtool, gettext-devel, @@ -121,6 +121,9 @@ rm -rf %{buildroot}%{_libdir}/%{name}/*.la %{_sbindir}/cryptsetup-ssh %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 2.7.0~rc1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 2.7.0~rc1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From dc2eee114ec4206c72c22043c6529761272b86e9 Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Wed, 24 Jan 2024 11:43:41 +0100 Subject: [PATCH 121/142] Update to cryptsetup 2.7.0. --- .gitignore | 2 +- cryptsetup-2.7.0-rc1.tar.sign | 16 ---------------- cryptsetup-2.7.0.tar.sign | 16 ++++++++++++++++ cryptsetup.spec | 7 +++++-- sources | 2 +- 5 files changed, 23 insertions(+), 20 deletions(-) delete mode 100644 cryptsetup-2.7.0-rc1.tar.sign create mode 100644 cryptsetup-2.7.0.tar.sign diff --git a/.gitignore b/.gitignore index 93de0e1..a3c97d6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/cryptsetup-2.7.0-rc1.tar.xz +/cryptsetup-2.7.0.tar.xz diff --git a/cryptsetup-2.7.0-rc1.tar.sign b/cryptsetup-2.7.0-rc1.tar.sign deleted file mode 100644 index c935e4c..0000000 --- a/cryptsetup-2.7.0-rc1.tar.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAmWC++sACgkQ2bBXe9k+ -mPykwA//fKdDnevQufTJxynlMeQCLMDVrLjxkBKo4dNkJx0r5jKacE51K1bxENqD -d3vE1wsFYwItZBjlI0Y4rC9R/DNHVzrouTfANq8fb1dsXLRKIdZludimrHM+p1hJ -y2epCVnb4WuxvXfaQoDOPxQpdDGSZw91CUU0e8hmY4+mTzr0zXMv0/ZPSIR1bvz4 -6wVicS3MPJaWMm2jgyiocn+y9OaatoHv5u2XwdhNEanCzWKnrPpeO3nNt3CNPhP6 -bcbKCS/GOdYTHL2SWVvNfLhVshDBmIC/7Is5Eo/rQymCrXg4lI3JrQuJQx9MCS1G -2VUrRtx8JISv3nvlAbJLAOljV0MdJW7+myzvpwWXxfA9urfv5iRClISiSez88QzY -+aipFKRyGcwThAO2Wr8Ls7iMJVGXz32qKJm2yxVZARBP/xo9Qt1M4mdfjmzT1WEg -FuPRTOrhEiZou28oL54uKoiSjeu6E9C2s+pgq2tuHhjtV/3FGucsA/y2UOeSIBNo -RJOnLNeX4md81y8tCoPotrBurZQtxFpOEq0vaRmA894K1/h7gNEL62+dbgCq343x -y2pfA2zWMV14hZL7JQc0mPSX0O5xEJWmN7miYOUeyUHAYi4+Ks62d0YRF9UyuNfn -L1MeFP3Ql/HZMdfa2Y99+GkRs3Zvm/N1gUZcqzqLR33/9/UU6HA= -=1LXV ------END PGP SIGNATURE----- diff --git a/cryptsetup-2.7.0.tar.sign b/cryptsetup-2.7.0.tar.sign new file mode 100644 index 0000000..bb86ed0 --- /dev/null +++ b/cryptsetup-2.7.0.tar.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAmWw5zoACgkQ2bBXe9k+ +mPztwhAAh8ieUWCcw7WwW4lc00ZH77sLc7Ro5J2/0ZAg/HpowOqGqhzJQZ+KJdeF +b6mebw7mKq4PHyzUS7Rba4wQiVEUD2kAQuoyXZJljsxegFOc1LxL/DSOCt7IFJyc +WB+525kPoRrpBWJhGXMn4OcVaelmIJAgDFHcYAccJJTKNgPjDrivpkTAxUsfdTTf +a1F/4I2o7eP5zkWkPqqQIvXzlwQnfD5ulZvnJ30t8E/07CZJ5Hf9iLRa6vruo7Rg +8cJHcOu4MhjuMu+oDvuefj8hM4FyfLU+tt0L7Z3iOZXAGffe+iQUQUyChvN/waEI +R8mpdc89amTHkMTCjYOo2X4sAH9a7mo5L2v+rm5NTZTZn53Gy1Ytbzy2agXY+ebf +DeKTVL3KTMe6KvQUfIqMSrM9oub6o8JDfO+0La9GSkNU/1VvHU5LK3FIomuP8Top +BPfdL8IxSgIityBbby1ZQD97aIgzPZkGsC7/5bVY7mj/LUZxJK61p49U0dlolwss +uzJarjAtDY0iNCfOv/AKZGnVzHAc2cEmVKJ6X243h2NRB5z1snFP8lDtB2AIdcUf +0vEZz1HcwW1de1C0jjQsf9elkeVJfrsFhRhRrEEiHyplR3/uaVwUtrDGOxPsRE+J +SE2sSfURqQPuBKeTO/ymVDt7G0iPd8Ts/BOhQYTn94rsjhONiz8= +=6sya +-----END PGP SIGNATURE----- diff --git a/cryptsetup.spec b/cryptsetup.spec index eae1ab4..12cfa55 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,7 +1,7 @@ Summary: Utility for setting up encrypted disks Name: cryptsetup -Version: 2.7.0~rc1 -Release: 3%{?dist} +Version: 2.7.0 +Release: 1%{?dist} License: GPL-2.0-or-later WITH cryptsetup-OpenSSL-exception AND LGPL-2.1-or-later WITH cryptsetup-OpenSSL-exception URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: autoconf, automake, libtool, gettext-devel, @@ -121,6 +121,9 @@ rm -rf %{buildroot}%{_libdir}/%{name}/*.la %{_sbindir}/cryptsetup-ssh %changelog +* Wed Jan 24 2024 Ondrej Kozina - 2.7.0-1 +- Update to cryptsetup 2.7.0. + * Wed Jan 24 2024 Fedora Release Engineering - 2.7.0~rc1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index b8ec779..5f5107d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cryptsetup-2.7.0-rc1.tar.xz) = 41ad1a56bd82e5f0d4877cacd81dd29168313b0a3c39074e530f0e55e90c16d5bbdac32ae08f0a75427572e215649539fd669ff099571a5813a7a888bd3c63e8 +SHA512 (cryptsetup-2.7.0.tar.xz) = 2654da50920eecbdb3457f8ee2aeed731175574eeb55c1f4b2ddf3c4b3632842b54db1af007057ffd19e6a9bfdc6d471cea77509aec127c07a2f2311e33ab21e From ff6a8fbe3be3bc66644de3ff04c2711e1d0ca88f Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Fri, 9 Feb 2024 10:39:10 +0100 Subject: [PATCH 122/142] Rebuild for OpenSSL 3.2. --- cryptsetup.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index 12cfa55..50ea273 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,7 +1,7 @@ Summary: Utility for setting up encrypted disks Name: cryptsetup Version: 2.7.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL-2.0-or-later WITH cryptsetup-OpenSSL-exception AND LGPL-2.1-or-later WITH cryptsetup-OpenSSL-exception URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: autoconf, automake, libtool, gettext-devel, @@ -10,9 +10,6 @@ BuildRequires: libuuid-devel, gcc, json-c-devel BuildRequires: libpwquality-devel, libblkid-devel BuildRequires: make libssh-devel BuildRequires: asciidoctor -%if %{undefined rhel} -BuildRequires: libargon2-devel -%endif Requires: cryptsetup-libs = %{version}-%{release} Requires: libpwquality >= 1.2.0 Obsoletes: %{name}-reencrypt <= %{version} @@ -72,7 +69,7 @@ rm -f man/*.8 ./autogen.sh %configure --enable-fips --enable-pwquality --enable-asciidoc \ - --enable-%{?rhel:internal-sse-}%{!?rhel:lib}argon2 + %{?rhel:--enable-internal-sse-argon2} %make_build %install @@ -121,6 +118,9 @@ rm -rf %{buildroot}%{_libdir}/%{name}/*.la %{_sbindir}/cryptsetup-ssh %changelog +* Fri Feb 09 2024 Ondrej Kozina - 2.7.0-2 +- Rebuild for OpenSSL Argon2 implementation (OpenSSL 3.2) + * Wed Jan 24 2024 Ondrej Kozina - 2.7.0-1 - Update to cryptsetup 2.7.0. From c8f87d0d2ff6697242f224d4eb6aa68c557aeecf Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Fri, 9 Feb 2024 14:27:06 +0100 Subject: [PATCH 123/142] Do not compile unused internal argon2 implementation. --- ...gon2-OpenSSL-detection-to-not-compil.patch | 61 +++++++++++++++++++ cryptsetup.spec | 6 +- 2 files changed, 65 insertions(+), 2 deletions(-) create mode 100644 cryptsetup-2.7.1-Fix-configure-Argon2-OpenSSL-detection-to-not-compil.patch diff --git a/cryptsetup-2.7.1-Fix-configure-Argon2-OpenSSL-detection-to-not-compil.patch b/cryptsetup-2.7.1-Fix-configure-Argon2-OpenSSL-detection-to-not-compil.patch new file mode 100644 index 0000000..a3556fa --- /dev/null +++ b/cryptsetup-2.7.1-Fix-configure-Argon2-OpenSSL-detection-to-not-compil.patch @@ -0,0 +1,61 @@ +From b417154e71b571607513a768b3cb8e4587f00ba8 Mon Sep 17 00:00:00 2001 +From: Milan Broz +Date: Fri, 9 Feb 2024 12:37:10 +0100 +Subject: [PATCH] Fix configure Argon2 OpenSSL detection to not compile + internal Argon2. + +Code is not called anyway, but should be completely disabled. +Note: there is intentionally no way to disable OpenSSL Argon2 if present. +--- + configure.ac | 4 ++-- + meson.build | 5 ++++- + 2 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 84cef4ba..2e2f7d9e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -346,7 +346,7 @@ AC_DEFUN([CONFIGURE_OPENSSL], [ + + saved_LIBS=$LIBS + AC_CHECK_DECLS([OSSL_get_max_threads], [], [], [#include ]) +- AC_CHECK_DECLS([OSSL_KDF_PARAM_ARGON2_VERSION], [], [], [#include ]) ++ AC_CHECK_DECLS([OSSL_KDF_PARAM_ARGON2_VERSION], [use_internal_argon2=0], [], [#include ]) + LIBS=$saved_LIBS + ]) + +@@ -523,7 +523,7 @@ AC_ARG_ENABLE([libargon2], + + if test $use_internal_argon2 = 0 -o "x$enable_internal_argon2" = "xno" ; then + if test "x$enable_internal_argon2" = "xyes" -o "x$enable_libargon" = "xyes"; then +- AC_MSG_WARN([Argon2 in $with_crypto_backend lib is used; internal Argon2 options are ignored.]) ++ AC_MSG_NOTICE([Argon2 in $with_crypto_backend lib is used; internal Argon2 options are ignored.]) + fi + enable_internal_argon2=no + enable_internal_sse_argon2=no +diff --git a/meson.build b/meson.build +index b26c71c4..2aba2f28 100644 +--- a/meson.build ++++ b/meson.build +@@ -512,6 +512,9 @@ elif get_option('crypto-backend') == 'openssl' + conf.set10('HAVE_DECL_OSSL_KDF_PARAM_ARGON2_VERSION', + cc.has_header_symbol('openssl/core_names.h', 'OSSL_KDF_PARAM_ARGON2_VERSION', + dependencies: crypto_backend_library)) ++ if conf.get('HAVE_DECL_OSSL_KDF_PARAM_ARGON2_VERSION') == 1 ++ use_internal_argon2 = false ++ endif + elif get_option('crypto-backend') == 'nss' + if get_option('fips') + error('nss crypto backend is not supported with FIPS enabled') +@@ -560,7 +563,7 @@ threads = [] + use_internal_sse_argon2 = false + if not use_internal_argon2 or get_option('argon-implementation') == 'none' + if get_option('argon-implementation') == 'internal' or get_option('argon-implementation') == 'libargon2' +- warning('Argon2 in crypto library is used; internal Argon2 options are ignored.') ++ message('Argon2 in crypto library is used; internal Argon2 options are ignored.') + endif + conf.set10('USE_INTERNAL_ARGON2', false, + description: 'Use internal Argon2.') +-- +2.43.0 + diff --git a/cryptsetup.spec b/cryptsetup.spec index 50ea273..7249785 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -18,6 +18,8 @@ Provides: %{name}-reencrypt = %{version} %global upstream_version %{version_no_tilde} Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v2.7/cryptsetup-%{upstream_version}.tar.xz +Patch0: %{name}-2.7.1-Fix-configure-Argon2-OpenSSL-detection-to-not-compil.patch + %description The cryptsetup package contains a utility for setting up disk encryption using dm-crypt kernel module. @@ -68,8 +70,7 @@ disk integrity protection using dm-integrity kernel module. rm -f man/*.8 ./autogen.sh -%configure --enable-fips --enable-pwquality --enable-asciidoc \ - %{?rhel:--enable-internal-sse-argon2} +%configure --enable-fips --enable-pwquality --enable-asciidoc --enable-internal-sse-argon2 %make_build %install @@ -120,6 +121,7 @@ rm -rf %{buildroot}%{_libdir}/%{name}/*.la %changelog * Fri Feb 09 2024 Ondrej Kozina - 2.7.0-2 - Rebuild for OpenSSL Argon2 implementation (OpenSSL 3.2) +- patch: Do not compile unused internal argon2 implementation * Wed Jan 24 2024 Ondrej Kozina - 2.7.0-1 - Update to cryptsetup 2.7.0. From b4576347676e0ff1ed8ce95c03c455fa0983f667 Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Thu, 7 Mar 2024 16:06:47 +0100 Subject: [PATCH 124/142] Update to cryptsetup 2.7.1. --- .gitignore | 2 +- cryptsetup-2.7.0.tar.sign | 16 ----- ...gon2-OpenSSL-detection-to-not-compil.patch | 61 ------------------- cryptsetup-2.7.1.tar.sign | 16 +++++ cryptsetup.spec | 9 +-- sources | 2 +- 6 files changed, 23 insertions(+), 83 deletions(-) delete mode 100644 cryptsetup-2.7.0.tar.sign delete mode 100644 cryptsetup-2.7.1-Fix-configure-Argon2-OpenSSL-detection-to-not-compil.patch create mode 100644 cryptsetup-2.7.1.tar.sign diff --git a/.gitignore b/.gitignore index a3c97d6..168935c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/cryptsetup-2.7.0.tar.xz +/cryptsetup-2.7.1.tar.xz diff --git a/cryptsetup-2.7.0.tar.sign b/cryptsetup-2.7.0.tar.sign deleted file mode 100644 index bb86ed0..0000000 --- a/cryptsetup-2.7.0.tar.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAmWw5zoACgkQ2bBXe9k+ -mPztwhAAh8ieUWCcw7WwW4lc00ZH77sLc7Ro5J2/0ZAg/HpowOqGqhzJQZ+KJdeF -b6mebw7mKq4PHyzUS7Rba4wQiVEUD2kAQuoyXZJljsxegFOc1LxL/DSOCt7IFJyc -WB+525kPoRrpBWJhGXMn4OcVaelmIJAgDFHcYAccJJTKNgPjDrivpkTAxUsfdTTf -a1F/4I2o7eP5zkWkPqqQIvXzlwQnfD5ulZvnJ30t8E/07CZJ5Hf9iLRa6vruo7Rg -8cJHcOu4MhjuMu+oDvuefj8hM4FyfLU+tt0L7Z3iOZXAGffe+iQUQUyChvN/waEI -R8mpdc89amTHkMTCjYOo2X4sAH9a7mo5L2v+rm5NTZTZn53Gy1Ytbzy2agXY+ebf -DeKTVL3KTMe6KvQUfIqMSrM9oub6o8JDfO+0La9GSkNU/1VvHU5LK3FIomuP8Top -BPfdL8IxSgIityBbby1ZQD97aIgzPZkGsC7/5bVY7mj/LUZxJK61p49U0dlolwss -uzJarjAtDY0iNCfOv/AKZGnVzHAc2cEmVKJ6X243h2NRB5z1snFP8lDtB2AIdcUf -0vEZz1HcwW1de1C0jjQsf9elkeVJfrsFhRhRrEEiHyplR3/uaVwUtrDGOxPsRE+J -SE2sSfURqQPuBKeTO/ymVDt7G0iPd8Ts/BOhQYTn94rsjhONiz8= -=6sya ------END PGP SIGNATURE----- diff --git a/cryptsetup-2.7.1-Fix-configure-Argon2-OpenSSL-detection-to-not-compil.patch b/cryptsetup-2.7.1-Fix-configure-Argon2-OpenSSL-detection-to-not-compil.patch deleted file mode 100644 index a3556fa..0000000 --- a/cryptsetup-2.7.1-Fix-configure-Argon2-OpenSSL-detection-to-not-compil.patch +++ /dev/null @@ -1,61 +0,0 @@ -From b417154e71b571607513a768b3cb8e4587f00ba8 Mon Sep 17 00:00:00 2001 -From: Milan Broz -Date: Fri, 9 Feb 2024 12:37:10 +0100 -Subject: [PATCH] Fix configure Argon2 OpenSSL detection to not compile - internal Argon2. - -Code is not called anyway, but should be completely disabled. -Note: there is intentionally no way to disable OpenSSL Argon2 if present. ---- - configure.ac | 4 ++-- - meson.build | 5 ++++- - 2 files changed, 6 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 84cef4ba..2e2f7d9e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -346,7 +346,7 @@ AC_DEFUN([CONFIGURE_OPENSSL], [ - - saved_LIBS=$LIBS - AC_CHECK_DECLS([OSSL_get_max_threads], [], [], [#include ]) -- AC_CHECK_DECLS([OSSL_KDF_PARAM_ARGON2_VERSION], [], [], [#include ]) -+ AC_CHECK_DECLS([OSSL_KDF_PARAM_ARGON2_VERSION], [use_internal_argon2=0], [], [#include ]) - LIBS=$saved_LIBS - ]) - -@@ -523,7 +523,7 @@ AC_ARG_ENABLE([libargon2], - - if test $use_internal_argon2 = 0 -o "x$enable_internal_argon2" = "xno" ; then - if test "x$enable_internal_argon2" = "xyes" -o "x$enable_libargon" = "xyes"; then -- AC_MSG_WARN([Argon2 in $with_crypto_backend lib is used; internal Argon2 options are ignored.]) -+ AC_MSG_NOTICE([Argon2 in $with_crypto_backend lib is used; internal Argon2 options are ignored.]) - fi - enable_internal_argon2=no - enable_internal_sse_argon2=no -diff --git a/meson.build b/meson.build -index b26c71c4..2aba2f28 100644 ---- a/meson.build -+++ b/meson.build -@@ -512,6 +512,9 @@ elif get_option('crypto-backend') == 'openssl' - conf.set10('HAVE_DECL_OSSL_KDF_PARAM_ARGON2_VERSION', - cc.has_header_symbol('openssl/core_names.h', 'OSSL_KDF_PARAM_ARGON2_VERSION', - dependencies: crypto_backend_library)) -+ if conf.get('HAVE_DECL_OSSL_KDF_PARAM_ARGON2_VERSION') == 1 -+ use_internal_argon2 = false -+ endif - elif get_option('crypto-backend') == 'nss' - if get_option('fips') - error('nss crypto backend is not supported with FIPS enabled') -@@ -560,7 +563,7 @@ threads = [] - use_internal_sse_argon2 = false - if not use_internal_argon2 or get_option('argon-implementation') == 'none' - if get_option('argon-implementation') == 'internal' or get_option('argon-implementation') == 'libargon2' -- warning('Argon2 in crypto library is used; internal Argon2 options are ignored.') -+ message('Argon2 in crypto library is used; internal Argon2 options are ignored.') - endif - conf.set10('USE_INTERNAL_ARGON2', false, - description: 'Use internal Argon2.') --- -2.43.0 - diff --git a/cryptsetup-2.7.1.tar.sign b/cryptsetup-2.7.1.tar.sign new file mode 100644 index 0000000..c0fee2c --- /dev/null +++ b/cryptsetup-2.7.1.tar.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAmXp1IIACgkQ2bBXe9k+ +mPyleRAAzPPENxn8hvvqkE32mfHEIib1jMhVFwYGwkGdprnYB7tDDT5stwfe7Pj4 +5hzLtlIidZXQctnG/QjjeDfU3gCqMM2bj6ZdwYWXUxRxsThbx8CuFJDPNUUJuU1P +vByTtH5veIJWusLBmOLmIZXD/haSHFQbqvaR7mV90PHEQZlmCNbs/xAyRQqvl1jl +c+Jj6tAp9KExkj7Gd1+tc0Z/sAaRf9iVUjLLJP2Q3q8rYa/dmRlptEGWhMuCHHCL +KbL8ApxMDl17RtD9ioVJJJKgAjEEcfo5YOf8EFGTUae2SOoRrmHPOvvYOuupEIOz +f4FvAtXF/OgBq8sAq/Yp6Tl47IK/2ODC43V8z/lXUF7qgebs+SqroQEuyIzWvpfi +Pj+JOeaplbZuPphovXO6CD2yWEUDXTMeEaeuehA2OWdrqXF4RwAFF7hb+7bXx4Qp +7P27Y53he5Q4HTZplRnBuU3p9NW7jU23nwoeELnyX0Rlf4ahQ39wwZnHB2xTc4Jl +4YsvkErk13+acnyZUU6u8dGTF/0S0QdihizHjcD0TQ53lFYv1LfTwAEyjHigdggQ +5vcA0ne8Y41+Z1EkqDGWAt39vzSw/RANkMk7f685teere+IdXoLsiVoMJgWGJy1g +0mH6ODjuW7k01SzDw8DjAHfIyFZJ9a1zFYQsuAIkvzS8uECF8js= +=JiO6 +-----END PGP SIGNATURE----- diff --git a/cryptsetup.spec b/cryptsetup.spec index 7249785..4777fb5 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,7 +1,7 @@ Summary: Utility for setting up encrypted disks Name: cryptsetup -Version: 2.7.0 -Release: 2%{?dist} +Version: 2.7.1 +Release: 1%{?dist} License: GPL-2.0-or-later WITH cryptsetup-OpenSSL-exception AND LGPL-2.1-or-later WITH cryptsetup-OpenSSL-exception URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: autoconf, automake, libtool, gettext-devel, @@ -18,8 +18,6 @@ Provides: %{name}-reencrypt = %{version} %global upstream_version %{version_no_tilde} Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v2.7/cryptsetup-%{upstream_version}.tar.xz -Patch0: %{name}-2.7.1-Fix-configure-Argon2-OpenSSL-detection-to-not-compil.patch - %description The cryptsetup package contains a utility for setting up disk encryption using dm-crypt kernel module. @@ -119,6 +117,9 @@ rm -rf %{buildroot}%{_libdir}/%{name}/*.la %{_sbindir}/cryptsetup-ssh %changelog +* Thu Mar 07 2024 Ondrej Kozina - 2.7.1-1 +- Update to cryptsetup 2.7.1. + * Fri Feb 09 2024 Ondrej Kozina - 2.7.0-2 - Rebuild for OpenSSL Argon2 implementation (OpenSSL 3.2) - patch: Do not compile unused internal argon2 implementation diff --git a/sources b/sources index 5f5107d..2e798e1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cryptsetup-2.7.0.tar.xz) = 2654da50920eecbdb3457f8ee2aeed731175574eeb55c1f4b2ddf3c4b3632842b54db1af007057ffd19e6a9bfdc6d471cea77509aec127c07a2f2311e33ab21e +SHA512 (cryptsetup-2.7.1.tar.xz) = 3cf2668e30e6db123ac7158aeee7fc28e4397e77e8bddf32da9af4836f8f61b8dfd71b02a15b87090a80a432eea700ac805956713e67158271eee5cac076ad3d From 8200153168bc5e2c32f21e9ebd1bc34e87d434a7 Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Tue, 9 Apr 2024 13:16:16 +0200 Subject: [PATCH 125/142] Update to cryptsetup 2.7.2. --- .gitignore | 2 +- cryptsetup-2.7.1.tar.sign | 16 ---------------- cryptsetup-2.7.2.tar.sign | 16 ++++++++++++++++ cryptsetup.spec | 5 ++++- sources | 2 +- 5 files changed, 22 insertions(+), 19 deletions(-) delete mode 100644 cryptsetup-2.7.1.tar.sign create mode 100644 cryptsetup-2.7.2.tar.sign diff --git a/.gitignore b/.gitignore index 168935c..f66d6e4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/cryptsetup-2.7.1.tar.xz +/cryptsetup-2.7.2.tar.xz diff --git a/cryptsetup-2.7.1.tar.sign b/cryptsetup-2.7.1.tar.sign deleted file mode 100644 index c0fee2c..0000000 --- a/cryptsetup-2.7.1.tar.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAmXp1IIACgkQ2bBXe9k+ -mPyleRAAzPPENxn8hvvqkE32mfHEIib1jMhVFwYGwkGdprnYB7tDDT5stwfe7Pj4 -5hzLtlIidZXQctnG/QjjeDfU3gCqMM2bj6ZdwYWXUxRxsThbx8CuFJDPNUUJuU1P -vByTtH5veIJWusLBmOLmIZXD/haSHFQbqvaR7mV90PHEQZlmCNbs/xAyRQqvl1jl -c+Jj6tAp9KExkj7Gd1+tc0Z/sAaRf9iVUjLLJP2Q3q8rYa/dmRlptEGWhMuCHHCL -KbL8ApxMDl17RtD9ioVJJJKgAjEEcfo5YOf8EFGTUae2SOoRrmHPOvvYOuupEIOz -f4FvAtXF/OgBq8sAq/Yp6Tl47IK/2ODC43V8z/lXUF7qgebs+SqroQEuyIzWvpfi -Pj+JOeaplbZuPphovXO6CD2yWEUDXTMeEaeuehA2OWdrqXF4RwAFF7hb+7bXx4Qp -7P27Y53he5Q4HTZplRnBuU3p9NW7jU23nwoeELnyX0Rlf4ahQ39wwZnHB2xTc4Jl -4YsvkErk13+acnyZUU6u8dGTF/0S0QdihizHjcD0TQ53lFYv1LfTwAEyjHigdggQ -5vcA0ne8Y41+Z1EkqDGWAt39vzSw/RANkMk7f685teere+IdXoLsiVoMJgWGJy1g -0mH6ODjuW7k01SzDw8DjAHfIyFZJ9a1zFYQsuAIkvzS8uECF8js= -=JiO6 ------END PGP SIGNATURE----- diff --git a/cryptsetup-2.7.2.tar.sign b/cryptsetup-2.7.2.tar.sign new file mode 100644 index 0000000..86ec290 --- /dev/null +++ b/cryptsetup-2.7.2.tar.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAmYVE/0ACgkQ2bBXe9k+ +mPwmmA//TMJkvg4UCte56B9RaCjFgCoD1fJh6NZDlgYWP+J4NFRSgNGSAFVFm59X +JmStGU/UXCe8VqtRXemOu7ngAT9gNKVLtgB3maH2DVbdw5Kn1nFQMDdXON/w62JT +3N7Z+MRvDNEzMTkD+cGw0wd81f1xTdZwKtV5v28WLGyR4rw27PNRhCmjOv2b4fqO +Ytjdi0ydmJwm+xaQ2L1CpF8uDuTZdLqnCZK0tLnWyy8oLvtt2bJMUpjFY6eU6I5w +Gg9oPDoF0XrlXA1q4poMryZloMsYYqjbXlBp2MaNOnuLOFsvU3j0u4Dy+Q/fxuUa +qeljZdz7Aw0pB2dLopLj9wELHgRhlJTAV3mHtKYeu6yX2xafffMCzc0hRAaFNjHu +5D+lGVD7k1CEYNxVR7skuwG5QPiRE9HvIdtdbivxZvdVfurrTPOIUJgy/nhvuDQx +GZ6Hsdj4zOnTvxvFFpMHYv7Xq5XrG4nmWE2d4f1dcA0KJunnNVwDbDfCIms+nAkK +bMF+T6JJZckoD//ZC2AA3mBcfVCq+CJVshI7xK8tBpTZ8b6RgyGhr/+ML5CmD/99 +RFLMlGW+iFpyhIWKh5hxD7VvWBtPZiyUDEBFP1sfxcylP8+NuR09+xM1zUsKAMiG +XSr5q4m8KyTtAhXwbHNGZA3jGpTgeEW9wSxsRIwyin6/uFdkNgY= +=Jadg +-----END PGP SIGNATURE----- diff --git a/cryptsetup.spec b/cryptsetup.spec index 4777fb5..0dabdc0 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,6 +1,6 @@ Summary: Utility for setting up encrypted disks Name: cryptsetup -Version: 2.7.1 +Version: 2.7.2 Release: 1%{?dist} License: GPL-2.0-or-later WITH cryptsetup-OpenSSL-exception AND LGPL-2.1-or-later WITH cryptsetup-OpenSSL-exception URL: https://gitlab.com/cryptsetup/cryptsetup @@ -117,6 +117,9 @@ rm -rf %{buildroot}%{_libdir}/%{name}/*.la %{_sbindir}/cryptsetup-ssh %changelog +* Tue Apr 09 2024 Ondrej Kozina - 2.7.2-1 +- Update to cryptsetup 2.7.2. + * Thu Mar 07 2024 Ondrej Kozina - 2.7.1-1 - Update to cryptsetup 2.7.1. diff --git a/sources b/sources index 2e798e1..feb0483 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cryptsetup-2.7.1.tar.xz) = 3cf2668e30e6db123ac7158aeee7fc28e4397e77e8bddf32da9af4836f8f61b8dfd71b02a15b87090a80a432eea700ac805956713e67158271eee5cac076ad3d +SHA512 (cryptsetup-2.7.2.tar.xz) = 06f42f443b91d1f8af8af999dfedd4051ecb12ba5ef291cf2b44b6a5676e2c5cf1e686e19687f5cb6b1fd524dfc1a208cd25a3798367a480d80eac954aa8d6d4 From ee98d270d991eb306a9d4f5d90a9952cdbaae13f Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Mon, 17 Jun 2024 15:52:45 +0200 Subject: [PATCH 126/142] Update to cryptsetup 2.7.3. --- .gitignore | 2 +- cryptsetup-2.7.2.tar.sign | 16 ---------------- cryptsetup-2.7.3.tar.sign | 16 ++++++++++++++++ cryptsetup.spec | 5 ++++- sources | 2 +- 5 files changed, 22 insertions(+), 19 deletions(-) delete mode 100644 cryptsetup-2.7.2.tar.sign create mode 100644 cryptsetup-2.7.3.tar.sign diff --git a/.gitignore b/.gitignore index f66d6e4..019a6b7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/cryptsetup-2.7.2.tar.xz +/cryptsetup-2.7.3.tar.xz diff --git a/cryptsetup-2.7.2.tar.sign b/cryptsetup-2.7.2.tar.sign deleted file mode 100644 index 86ec290..0000000 --- a/cryptsetup-2.7.2.tar.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAmYVE/0ACgkQ2bBXe9k+ -mPwmmA//TMJkvg4UCte56B9RaCjFgCoD1fJh6NZDlgYWP+J4NFRSgNGSAFVFm59X -JmStGU/UXCe8VqtRXemOu7ngAT9gNKVLtgB3maH2DVbdw5Kn1nFQMDdXON/w62JT -3N7Z+MRvDNEzMTkD+cGw0wd81f1xTdZwKtV5v28WLGyR4rw27PNRhCmjOv2b4fqO -Ytjdi0ydmJwm+xaQ2L1CpF8uDuTZdLqnCZK0tLnWyy8oLvtt2bJMUpjFY6eU6I5w -Gg9oPDoF0XrlXA1q4poMryZloMsYYqjbXlBp2MaNOnuLOFsvU3j0u4Dy+Q/fxuUa -qeljZdz7Aw0pB2dLopLj9wELHgRhlJTAV3mHtKYeu6yX2xafffMCzc0hRAaFNjHu -5D+lGVD7k1CEYNxVR7skuwG5QPiRE9HvIdtdbivxZvdVfurrTPOIUJgy/nhvuDQx -GZ6Hsdj4zOnTvxvFFpMHYv7Xq5XrG4nmWE2d4f1dcA0KJunnNVwDbDfCIms+nAkK -bMF+T6JJZckoD//ZC2AA3mBcfVCq+CJVshI7xK8tBpTZ8b6RgyGhr/+ML5CmD/99 -RFLMlGW+iFpyhIWKh5hxD7VvWBtPZiyUDEBFP1sfxcylP8+NuR09+xM1zUsKAMiG -XSr5q4m8KyTtAhXwbHNGZA3jGpTgeEW9wSxsRIwyin6/uFdkNgY= -=Jadg ------END PGP SIGNATURE----- diff --git a/cryptsetup-2.7.3.tar.sign b/cryptsetup-2.7.3.tar.sign new file mode 100644 index 0000000..4b80961 --- /dev/null +++ b/cryptsetup-2.7.3.tar.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAmZwLt8ACgkQ2bBXe9k+ +mPx0jRAApF5+ZBiOniEW25S3n77rk7PZTwxq9GU55T8mvQh5KGZon91kn5vpBMWb +0MKdxaKQCdAhXLicS+276CtNRHjd30xX4HARWBEr3d97IA5PDFhah0gBUI/Hdrtz +b5KKGweIeBg0h35OIhWLyIzhlTNq9CXpFWbZqYFZzl1+eLqVNDc5h55iWR8SpcZ9 +tkobn5x602hJ7WxRw/qVKYVR/24vrsX/6AOAG5kNqhKzK/uhQwaQEO8Ifc8y0k5F +n3TXP0IkKoHUaFh7wPIrFrjRVa9Z47lEE/ndL0XWg/56rcNSRe1uhQmyDmCsUstV +SbYsiA46Al/cJ6eWySe/8VFMClidLy+LrF9JqTbOy6R1WlEVea3ByAQi/snr4zpg +zGEm9ixLe6OAqZy8WliKldu/EJ9Z9Z96ZkLszVer4KLQWXtYDooiRlcXQnsVXqX1 +gVsDgp3VCWkh1qnfmor+UO9bZ4Y8lVEeXf3fgqAer5PFhmI4J3tteVmVJcyaREGJ +w4l2o4p5ni6oC08xeS7SW9zzXB71vSw79WgcguvN9l2q4q8D6/KljEZ9B1/djnBf +fbvyBA1YRPGU/vDRFTFaeXEot1rF1aQdkRg5GcVBDsOVMjV1SpL9YKd+KaaRp1Ug +7FHKT/we9Zo0j6bpfepJHUoUJIOndxTnNGR4PT1dAX+juqn+pqY= +=rzaX +-----END PGP SIGNATURE----- diff --git a/cryptsetup.spec b/cryptsetup.spec index 0dabdc0..097e4d7 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,6 +1,6 @@ Summary: Utility for setting up encrypted disks Name: cryptsetup -Version: 2.7.2 +Version: 2.7.3 Release: 1%{?dist} License: GPL-2.0-or-later WITH cryptsetup-OpenSSL-exception AND LGPL-2.1-or-later WITH cryptsetup-OpenSSL-exception URL: https://gitlab.com/cryptsetup/cryptsetup @@ -117,6 +117,9 @@ rm -rf %{buildroot}%{_libdir}/%{name}/*.la %{_sbindir}/cryptsetup-ssh %changelog +* Mon Jun 17 2024 Ondrej Kozina - 2.7.3-1 +- Update to cryptsetup 2.7.3. + * Tue Apr 09 2024 Ondrej Kozina - 2.7.2-1 - Update to cryptsetup 2.7.2. diff --git a/sources b/sources index feb0483..e325e6f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cryptsetup-2.7.2.tar.xz) = 06f42f443b91d1f8af8af999dfedd4051ecb12ba5ef291cf2b44b6a5676e2c5cf1e686e19687f5cb6b1fd524dfc1a208cd25a3798367a480d80eac954aa8d6d4 +SHA512 (cryptsetup-2.7.3.tar.xz) = 08cff21873aeb7cc5b2561abf5d33cdf0fa814eeaabf6a01f858461726ea9faeef651357da33bce7b347ca2f12d6d02bccdb279893f3749cb781ce1fe5c1571c From f8705c3a126961d9a7a8560211d16f62de00d7f0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 20:17:47 +0000 Subject: [PATCH 127/142] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- cryptsetup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index 097e4d7..aa8db5e 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,7 +1,7 @@ Summary: Utility for setting up encrypted disks Name: cryptsetup Version: 2.7.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL-2.0-or-later WITH cryptsetup-OpenSSL-exception AND LGPL-2.1-or-later WITH cryptsetup-OpenSSL-exception URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: autoconf, automake, libtool, gettext-devel, @@ -117,6 +117,9 @@ rm -rf %{buildroot}%{_libdir}/%{name}/*.la %{_sbindir}/cryptsetup-ssh %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 2.7.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Jun 17 2024 Ondrej Kozina - 2.7.3-1 - Update to cryptsetup 2.7.3. From 733ed32e4a09c7cfb3676e30429f455bfb62772b Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Tue, 30 Jul 2024 17:40:46 +0200 Subject: [PATCH 128/142] Update to cryptsetup 2.7.4. --- .gitignore | 2 +- cryptsetup-2.7.3.tar.sign | 16 ---------------- cryptsetup-2.7.4.tar.sign | 16 ++++++++++++++++ cryptsetup.spec | 7 +++++-- sources | 2 +- 5 files changed, 23 insertions(+), 20 deletions(-) delete mode 100644 cryptsetup-2.7.3.tar.sign create mode 100644 cryptsetup-2.7.4.tar.sign diff --git a/.gitignore b/.gitignore index 019a6b7..7614475 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/cryptsetup-2.7.3.tar.xz +/cryptsetup-2.7.4.tar.xz diff --git a/cryptsetup-2.7.3.tar.sign b/cryptsetup-2.7.3.tar.sign deleted file mode 100644 index 4b80961..0000000 --- a/cryptsetup-2.7.3.tar.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAmZwLt8ACgkQ2bBXe9k+ -mPx0jRAApF5+ZBiOniEW25S3n77rk7PZTwxq9GU55T8mvQh5KGZon91kn5vpBMWb -0MKdxaKQCdAhXLicS+276CtNRHjd30xX4HARWBEr3d97IA5PDFhah0gBUI/Hdrtz -b5KKGweIeBg0h35OIhWLyIzhlTNq9CXpFWbZqYFZzl1+eLqVNDc5h55iWR8SpcZ9 -tkobn5x602hJ7WxRw/qVKYVR/24vrsX/6AOAG5kNqhKzK/uhQwaQEO8Ifc8y0k5F -n3TXP0IkKoHUaFh7wPIrFrjRVa9Z47lEE/ndL0XWg/56rcNSRe1uhQmyDmCsUstV -SbYsiA46Al/cJ6eWySe/8VFMClidLy+LrF9JqTbOy6R1WlEVea3ByAQi/snr4zpg -zGEm9ixLe6OAqZy8WliKldu/EJ9Z9Z96ZkLszVer4KLQWXtYDooiRlcXQnsVXqX1 -gVsDgp3VCWkh1qnfmor+UO9bZ4Y8lVEeXf3fgqAer5PFhmI4J3tteVmVJcyaREGJ -w4l2o4p5ni6oC08xeS7SW9zzXB71vSw79WgcguvN9l2q4q8D6/KljEZ9B1/djnBf -fbvyBA1YRPGU/vDRFTFaeXEot1rF1aQdkRg5GcVBDsOVMjV1SpL9YKd+KaaRp1Ug -7FHKT/we9Zo0j6bpfepJHUoUJIOndxTnNGR4PT1dAX+juqn+pqY= -=rzaX ------END PGP SIGNATURE----- diff --git a/cryptsetup-2.7.4.tar.sign b/cryptsetup-2.7.4.tar.sign new file mode 100644 index 0000000..0590596 --- /dev/null +++ b/cryptsetup-2.7.4.tar.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAmao2IIACgkQ2bBXe9k+ +mPyvyg/9HKVAfgZaUkdY5whMSrYBD4QIzxq0yZSKUObGQEkVpKLQOIknDwFsOor/ +U2E+bMmmvGw6zrJpPWebqHM2+WLxxSzfNhYXR2RIQ2BrtGEp61RvcVgqOgx5Ikz6 +m8RHVFxS7lT4UbYMI5xXokJL2ctiDW4LvsBKYIrP/wGbwde+W50dtnBZnb5p4Krc +H4kSSRebQIhZTKnioGek+UNIA+gAG/bwqG17MaBJYDS2yVHsUk2BslrNUesFFj7W +apuiy95yD00Dt1FES8MZL5eEnfcRe4qSo/4PSIrtE7rR3uBjrIX4mTJMtPpM4COB +x8Uhr9rqANxcRxm21JopS7kS5S7quRUqdYWzgHhCwD9uXdhVzaRHc82Xyg5giUeb +UkYVYQCXUWCG3rORT4Z6JYTiUMspdZywFPYR5lzhsNzazqnjMhymKBDvDRD07pGq +LVEYUiQIx3WJgTdYZ0vhkRorooIe4D7i4rcBEUtqDTtMOZpROVE/9HE/noXCITlz +/8Ve4k8xeTiUItQKNS79amc4u7kUOUAnvfojEUFCY6jsXBLCVDsJYTgs4mK7/PrF +i1/XnLi7a5bkvK3dj0XN8zToG4Meq4A6yv+S1V2c+tBmxH51AbgtfZeiam976PiH +O8JcSart3/xOfQ2UfvF2kNc7EbAUTKQpZjEr3u2UepMWM5HdFJk= +=BZfz +-----END PGP SIGNATURE----- diff --git a/cryptsetup.spec b/cryptsetup.spec index aa8db5e..25f71e8 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,7 +1,7 @@ Summary: Utility for setting up encrypted disks Name: cryptsetup -Version: 2.7.3 -Release: 2%{?dist} +Version: 2.7.4 +Release: 1%{?dist} License: GPL-2.0-or-later WITH cryptsetup-OpenSSL-exception AND LGPL-2.1-or-later WITH cryptsetup-OpenSSL-exception URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: autoconf, automake, libtool, gettext-devel, @@ -117,6 +117,9 @@ rm -rf %{buildroot}%{_libdir}/%{name}/*.la %{_sbindir}/cryptsetup-ssh %changelog +* Tue Jul 30 2024 Ondrej Kozina - 2.7.4-1 +- Update to cryptsetup 2.7.4. + * Wed Jul 17 2024 Fedora Release Engineering - 2.7.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index e325e6f..92ee652 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cryptsetup-2.7.3.tar.xz) = 08cff21873aeb7cc5b2561abf5d33cdf0fa814eeaabf6a01f858461726ea9faeef651357da33bce7b347ca2f12d6d02bccdb279893f3749cb781ce1fe5c1571c +SHA512 (cryptsetup-2.7.4.tar.xz) = 3cc601ab1c4d5fd282f990529d7cb95f59c8aa9beb0ebd11de7ebf78cb35c352bcb8c945a2033cb6c53540b37156fdf2824070d431c752f9f7b029e4ec930c21 From 9c3a9596ae048d95dba742fc00b143b61fccceff Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Tue, 3 Sep 2024 14:01:01 +0200 Subject: [PATCH 129/142] Update to cryptsetup 2.7.5. --- .gitignore | 2 +- cryptsetup-2.7.4.tar.sign | 16 ---------------- cryptsetup-2.7.5.tar.sign | 16 ++++++++++++++++ cryptsetup.spec | 5 ++++- sources | 2 +- 5 files changed, 22 insertions(+), 19 deletions(-) delete mode 100644 cryptsetup-2.7.4.tar.sign create mode 100644 cryptsetup-2.7.5.tar.sign diff --git a/.gitignore b/.gitignore index 7614475..e784048 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/cryptsetup-2.7.4.tar.xz +/cryptsetup-2.7.5.tar.xz diff --git a/cryptsetup-2.7.4.tar.sign b/cryptsetup-2.7.4.tar.sign deleted file mode 100644 index 0590596..0000000 --- a/cryptsetup-2.7.4.tar.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAmao2IIACgkQ2bBXe9k+ -mPyvyg/9HKVAfgZaUkdY5whMSrYBD4QIzxq0yZSKUObGQEkVpKLQOIknDwFsOor/ -U2E+bMmmvGw6zrJpPWebqHM2+WLxxSzfNhYXR2RIQ2BrtGEp61RvcVgqOgx5Ikz6 -m8RHVFxS7lT4UbYMI5xXokJL2ctiDW4LvsBKYIrP/wGbwde+W50dtnBZnb5p4Krc -H4kSSRebQIhZTKnioGek+UNIA+gAG/bwqG17MaBJYDS2yVHsUk2BslrNUesFFj7W -apuiy95yD00Dt1FES8MZL5eEnfcRe4qSo/4PSIrtE7rR3uBjrIX4mTJMtPpM4COB -x8Uhr9rqANxcRxm21JopS7kS5S7quRUqdYWzgHhCwD9uXdhVzaRHc82Xyg5giUeb -UkYVYQCXUWCG3rORT4Z6JYTiUMspdZywFPYR5lzhsNzazqnjMhymKBDvDRD07pGq -LVEYUiQIx3WJgTdYZ0vhkRorooIe4D7i4rcBEUtqDTtMOZpROVE/9HE/noXCITlz -/8Ve4k8xeTiUItQKNS79amc4u7kUOUAnvfojEUFCY6jsXBLCVDsJYTgs4mK7/PrF -i1/XnLi7a5bkvK3dj0XN8zToG4Meq4A6yv+S1V2c+tBmxH51AbgtfZeiam976PiH -O8JcSart3/xOfQ2UfvF2kNc7EbAUTKQpZjEr3u2UepMWM5HdFJk= -=BZfz ------END PGP SIGNATURE----- diff --git a/cryptsetup-2.7.5.tar.sign b/cryptsetup-2.7.5.tar.sign new file mode 100644 index 0000000..cc00fa3 --- /dev/null +++ b/cryptsetup-2.7.5.tar.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAmbW3FUACgkQ2bBXe9k+ +mPwFbA//ZmEE58/+S4mDszoVeBtJAZDpSd0UBm+R6JTqNjwGSQw2KQbRW+qXLWIj +EUKd/xtW8iSDh+cqKFO12RN7BTHMHePt+qB8aw3L1WWbj2rQfLbEv+dQMg36Rweu +AZMR69PDhD8JX2xVV2nD/rrQFHoNfKT9od83QHmaK/knwOvd7ZHJ2sOyMmZvCNE8 +N8/454ERiT8W9hnHxWjsGtkzr81ucGpjbZDYlINaeD728QR64HDHnAkReAHegJt8 +uAejzAz+BGNkSkUFeRLP+3zOYUKBW6Ex/OIBQ4m+rrAR/b3TVNwGPUUAbelHZJWN ++jf+aPzo4Vv1v+Hl92CEbq29czpHyaLRrRNdhs57no7XdUkivJ+gdhr51xjaV9Zq +HnANYLVT+O/PPfFaALg1Qp5hfmhVCaVPLK05ug2qj9jVF0jIahvQsEzq1YfLiZNT +8UtAnV8ULA83GZlh1MDsuEp5815CKjs5dzpUpobStsVIZ6lkHabEFRfxr2Ae+7lw +veqmpNLN1K5+yXA1L8e9BtoxRxeczIS3ImPlYvojpCFgkamwXPqCoI4wVOCbG/Pu +5L1uDk1TAHEgmf4Iy31bPKLDQcv16aLV5S/w4fCWtybbBasax7qNqKTBAIZQp7o2 +C1hkxCcRxaNyMwEoof9myMjv9fn/0xidJ14GlgXpeANbq9jtXQo= +=S6/S +-----END PGP SIGNATURE----- diff --git a/cryptsetup.spec b/cryptsetup.spec index 25f71e8..4077951 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,6 +1,6 @@ Summary: Utility for setting up encrypted disks Name: cryptsetup -Version: 2.7.4 +Version: 2.7.5 Release: 1%{?dist} License: GPL-2.0-or-later WITH cryptsetup-OpenSSL-exception AND LGPL-2.1-or-later WITH cryptsetup-OpenSSL-exception URL: https://gitlab.com/cryptsetup/cryptsetup @@ -117,6 +117,9 @@ rm -rf %{buildroot}%{_libdir}/%{name}/*.la %{_sbindir}/cryptsetup-ssh %changelog +* Tue Sep 03 2024 Ondrej Kozina - 2.7.5-1 +- Update to cryptsetup 2.7.5. + * Tue Jul 30 2024 Ondrej Kozina - 2.7.4-1 - Update to cryptsetup 2.7.4. diff --git a/sources b/sources index 92ee652..6411b72 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cryptsetup-2.7.4.tar.xz) = 3cc601ab1c4d5fd282f990529d7cb95f59c8aa9beb0ebd11de7ebf78cb35c352bcb8c945a2033cb6c53540b37156fdf2824070d431c752f9f7b029e4ec930c21 +SHA512 (cryptsetup-2.7.5.tar.xz) = 13eca93cdb00a143d2ca60b6f66ede5adc4072ca0c4bfebd8454a3541e69d269fcdb4afc97ad799e87a999b2bd46c1f31fa924a3d616d72a3337970b1e718d55 From 2b9d73bf1679126dc9c32d524cfdcfcd3d046c16 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 14:58:52 +0000 Subject: [PATCH 130/142] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- cryptsetup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index 4077951..abbe6a7 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,7 +1,7 @@ Summary: Utility for setting up encrypted disks Name: cryptsetup Version: 2.7.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL-2.0-or-later WITH cryptsetup-OpenSSL-exception AND LGPL-2.1-or-later WITH cryptsetup-OpenSSL-exception URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: autoconf, automake, libtool, gettext-devel, @@ -117,6 +117,9 @@ rm -rf %{buildroot}%{_libdir}/%{name}/*.la %{_sbindir}/cryptsetup-ssh %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 2.7.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Tue Sep 03 2024 Ondrej Kozina - 2.7.5-1 - Update to cryptsetup 2.7.5. From e20cd9935c381be788c31b4eefa032085fe4a16c Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Mon, 16 Jun 2025 14:58:02 +0200 Subject: [PATCH 131/142] Update to cryptsetup 2.8.0-rc1. --- .gitignore | 2 +- cryptsetup-2.7.5.tar.sign | 16 ---------------- cryptsetup-2.8.0-rc1.tar.sign | 16 ++++++++++++++++ cryptsetup.spec | 13 ++++++++----- sources | 2 +- 5 files changed, 26 insertions(+), 23 deletions(-) delete mode 100644 cryptsetup-2.7.5.tar.sign create mode 100644 cryptsetup-2.8.0-rc1.tar.sign diff --git a/.gitignore b/.gitignore index e784048..debefcc 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/cryptsetup-2.7.5.tar.xz +/cryptsetup-2.8.0-rc1.tar.xz diff --git a/cryptsetup-2.7.5.tar.sign b/cryptsetup-2.7.5.tar.sign deleted file mode 100644 index cc00fa3..0000000 --- a/cryptsetup-2.7.5.tar.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAmbW3FUACgkQ2bBXe9k+ -mPwFbA//ZmEE58/+S4mDszoVeBtJAZDpSd0UBm+R6JTqNjwGSQw2KQbRW+qXLWIj -EUKd/xtW8iSDh+cqKFO12RN7BTHMHePt+qB8aw3L1WWbj2rQfLbEv+dQMg36Rweu -AZMR69PDhD8JX2xVV2nD/rrQFHoNfKT9od83QHmaK/knwOvd7ZHJ2sOyMmZvCNE8 -N8/454ERiT8W9hnHxWjsGtkzr81ucGpjbZDYlINaeD728QR64HDHnAkReAHegJt8 -uAejzAz+BGNkSkUFeRLP+3zOYUKBW6Ex/OIBQ4m+rrAR/b3TVNwGPUUAbelHZJWN -+jf+aPzo4Vv1v+Hl92CEbq29czpHyaLRrRNdhs57no7XdUkivJ+gdhr51xjaV9Zq -HnANYLVT+O/PPfFaALg1Qp5hfmhVCaVPLK05ug2qj9jVF0jIahvQsEzq1YfLiZNT -8UtAnV8ULA83GZlh1MDsuEp5815CKjs5dzpUpobStsVIZ6lkHabEFRfxr2Ae+7lw -veqmpNLN1K5+yXA1L8e9BtoxRxeczIS3ImPlYvojpCFgkamwXPqCoI4wVOCbG/Pu -5L1uDk1TAHEgmf4Iy31bPKLDQcv16aLV5S/w4fCWtybbBasax7qNqKTBAIZQp7o2 -C1hkxCcRxaNyMwEoof9myMjv9fn/0xidJ14GlgXpeANbq9jtXQo= -=S6/S ------END PGP SIGNATURE----- diff --git a/cryptsetup-2.8.0-rc1.tar.sign b/cryptsetup-2.8.0-rc1.tar.sign new file mode 100644 index 0000000..ae25029 --- /dev/null +++ b/cryptsetup-2.8.0-rc1.tar.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAmhQDFsACgkQ2bBXe9k+ +mPwisQ//YQmebD7gjHLwcKErE7RryPtiP6C67GoV6etr+77oJvDOZBH0r+VSTp6h +utJA4+4kyzm2P90foC0Mqqtl6LlQfE26CvCYyPpbJ2kcdA8RsO5Yf6xqylI45RQY +XFb+ES47QXRldcPuE1cPg4Xcbx5B75G6FLbigXMp6em0BIfYqGVtmngCYXMGPfJD +twN5ZyC+WL89kAryiL804NYXdF/Au5gAZ03MkQXz8MI+DshXWu4c1kpfks1L6YCW +OEeRJq8VokTQSxwNaW3Zt/Cb6VYb0BQJpQDfW/aZ7YoSrVTmvTb6Jxj4DP0s30Xx +i6dzrCCDaXUYJQJbIqbDB8MllaXILx/YG79ate9AiD411x4AlSblNmHlX94ejGWQ +6sXcYWfw8lyIYNTUmxr1ESU+GhczAk4gnOztgMTbMKH5uaOsjqrziHlhOvzugfnW +BPUX15elwf8ugytxWV3Fx85KrroCNgY0e9WEO+CvspdcE9hl5PfZZJJj9vRrtXml +0Der2x0HkaV6ro7o93TB91VWT+4dKdISgN8uATILQ3F9lB9XC3X+Aeoys4Wd+fdm +9mAYUzmnV0RG/G8CQYKS8f9s+hTncllfTciLscpRHSBUHhaRAl3+RCWa45d5JyZx +GXn4qk3E8TXd83FIgDe8/qRodfqZWFfRV/PGhDeCp9dtFXYgVf4= +=CwCm +-----END PGP SIGNATURE----- diff --git a/cryptsetup.spec b/cryptsetup.spec index abbe6a7..dee6a4f 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,7 +1,7 @@ Summary: Utility for setting up encrypted disks Name: cryptsetup -Version: 2.7.5 -Release: 2%{?dist} +Version: 2.8.0~rc1 +Release: 1%{?dist} License: GPL-2.0-or-later WITH cryptsetup-OpenSSL-exception AND LGPL-2.1-or-later WITH cryptsetup-OpenSSL-exception URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: autoconf, automake, libtool, gettext-devel, @@ -16,7 +16,7 @@ Obsoletes: %{name}-reencrypt <= %{version} Provides: %{name}-reencrypt = %{version} %global upstream_version %{version_no_tilde} -Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v2.7/cryptsetup-%{upstream_version}.tar.xz +Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v2.8/cryptsetup-%{upstream_version}.tar.xz %description The cryptsetup package contains a utility for setting up @@ -104,19 +104,22 @@ rm -rf %{buildroot}%{_libdir}/%{name}/*.la %{_libdir}/pkgconfig/libcryptsetup.pc %files libs -f cryptsetup.lang -%license COPYING COPYING.LGPL +%license COPYING docs/licenses/COPYING.LGPL-2.1-or-later-WITH-cryptsetup-OpenSSL-exception %{_libdir}/libcryptsetup.so.* %dir %{_libdir}/%{name}/ %{_tmpfilesdir}/cryptsetup.conf %ghost %attr(700, -, -) %dir /run/cryptsetup %files ssh-token -%license COPYING COPYING.LGPL +%license COPYING docs/licenses/COPYING.LGPL-2.1-or-later-WITH-cryptsetup-OpenSSL-exception %{_libdir}/%{name}/libcryptsetup-token-ssh.so %{_mandir}/man8/cryptsetup-ssh.8.gz %{_sbindir}/cryptsetup-ssh %changelog +* Mon Jun 16 2025 Milan Broz - 2.8.0~rc1-1 +- Update to cryptsetup 2.8.0-rc1. + * Thu Jan 16 2025 Fedora Release Engineering - 2.7.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index 6411b72..b9df399 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cryptsetup-2.7.5.tar.xz) = 13eca93cdb00a143d2ca60b6f66ede5adc4072ca0c4bfebd8454a3541e69d269fcdb4afc97ad799e87a999b2bd46c1f31fa924a3d616d72a3337970b1e718d55 +SHA512 (cryptsetup-2.8.0-rc1.tar.xz) = a1b405d265ca78bf967dba86e11bf1a1102352a82848f9529f66ba1c5a9cb3665c7fd30250e7ae2552ab76b56ae918a44ece6a65c685cb0e66a798675015cc34 From d18a84d8ae76878278daf63801eed473f7e86d58 Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Tue, 24 Jun 2025 17:33:28 +0200 Subject: [PATCH 132/142] Migrate sti tests to tmt. --- {tests/.fmf => .fmf}/version | 0 gating.yaml | 14 ------------- plans/cryptsetup.fmf | 40 ++++++++++++++++++++++++++++++++++++ plans/env.yaml | 3 +++ plans/run-local-tests.sh | 17 +++++++++++++++ tests/provision.fmf | 5 ----- tests/tests.yml | 35 ------------------------------- 7 files changed, 60 insertions(+), 54 deletions(-) rename {tests/.fmf => .fmf}/version (100%) delete mode 100644 gating.yaml create mode 100644 plans/cryptsetup.fmf create mode 100644 plans/env.yaml create mode 100755 plans/run-local-tests.sh delete mode 100644 tests/provision.fmf delete mode 100644 tests/tests.yml diff --git a/tests/.fmf/version b/.fmf/version similarity index 100% rename from tests/.fmf/version rename to .fmf/version diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index bb1d8ee..0000000 --- a/gating.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- !Policy -product_versions: - - fedora-* -decision_contexts: [bodhi_update_push_testing] -subject_type: koji_build -rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} ---- !Policy -product_versions: - - fedora-* -decision_contexts: [bodhi_update_push_stable] -subject_type: koji_build -rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} diff --git a/plans/cryptsetup.fmf b/plans/cryptsetup.fmf new file mode 100644 index 0000000..a9c4a20 --- /dev/null +++ b/plans/cryptsetup.fmf @@ -0,0 +1,40 @@ +summary: cryptsetup upstream test suite +environment-file: + - plans/env.yaml + +prepare: + - how: feature + epel: enabled + - how: install + package: + - cryptsetup + - cryptsetup-devel + - cryptsetup-ssh-token + - integritysetup + - veritysetup + - gcc + - make + - kernel-headers + - device-mapper-devel + - expect + - keyutils + - jq + - sharutils + - glibc + - vim-common + - sharutils + - openssh + - openssl + - nmap-ncat + - sshpass + - shadow-utils + - koji + +execute: + how: tmt + script: exec plans/run-local-tests.sh + duration: 2h + +provision: + hardware: + memory: ">= 3 GB" diff --git a/plans/env.yaml b/plans/env.yaml new file mode 100644 index 0000000..e49cc03 --- /dev/null +++ b/plans/env.yaml @@ -0,0 +1,3 @@ +--- + CRYPTSETUP_PATH: /sbin + RUN_SSH_PLUGIN_TEST: 1 diff --git a/plans/run-local-tests.sh b/plans/run-local-tests.sh new file mode 100755 index 0000000..3817457 --- /dev/null +++ b/plans/run-local-tests.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +set -eux +set -o pipefail + +if [[ -n "${KOJI_TASK_ID:-}" ]]; then + koji download-task --noprogress --arch="src" "$KOJI_TASK_ID" +else + echo "No koji task ID provided" + exit 1 +fi + +mkdir cryptsetup-sources +rpm2cpio cryptsetup-*.src.rpm | cpio --to-stdout --extract './*.tar.xz' | tar xJ --strip-components=1 -C cryptsetup-sources +pushd cryptsetup-sources/tests +make -f Makefile.localtest tests +popd diff --git a/tests/provision.fmf b/tests/provision.fmf deleted file mode 100644 index 952b5a6..0000000 --- a/tests/provision.fmf +++ /dev/null @@ -1,5 +0,0 @@ ---- -standard-inventory-qcow2: - qemu: - m: 3G - diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index d60e834..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,35 +0,0 @@ -- hosts: localhost - roles: - - role: standard-test-source - tags: - - classic - - role: standard-test-basic - tags: - - classic - tests: - - upstream_test_suite: - dir: source/tests - run: make -f Makefile.localtest tests - environment: - CRYPTSETUP_PATH: /sbin - RUN_SSH_PLUGIN_TEST: 1 - required_packages: - - cryptsetup - - cryptsetup-devel - - cryptsetup-ssh-token - - integritysetup - - veritysetup - - gcc - - make - - kernel-headers - - device-mapper-devel - - expect - - keyutils - - jq - - vim-common - - sharutils - - openssh - - openssl - - nmap-ncat - - sshpass - - shadow-utils From fc6dd0743d0559e6f230f2e099ee6f7df86a7662 Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Wed, 25 Jun 2025 10:39:12 +0200 Subject: [PATCH 133/142] Update to cryptsetup 2.8.0 --- .gitignore | 2 +- cryptsetup-2.8.0-rc1.tar.sign | 16 ---------------- cryptsetup-2.8.0.tar.sign | 16 ++++++++++++++++ cryptsetup.spec | 5 ++++- sources | 2 +- 5 files changed, 22 insertions(+), 19 deletions(-) delete mode 100644 cryptsetup-2.8.0-rc1.tar.sign create mode 100644 cryptsetup-2.8.0.tar.sign diff --git a/.gitignore b/.gitignore index debefcc..c638a1a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/cryptsetup-2.8.0-rc1.tar.xz +/cryptsetup-2.8.0.tar.xz diff --git a/cryptsetup-2.8.0-rc1.tar.sign b/cryptsetup-2.8.0-rc1.tar.sign deleted file mode 100644 index ae25029..0000000 --- a/cryptsetup-2.8.0-rc1.tar.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAmhQDFsACgkQ2bBXe9k+ -mPwisQ//YQmebD7gjHLwcKErE7RryPtiP6C67GoV6etr+77oJvDOZBH0r+VSTp6h -utJA4+4kyzm2P90foC0Mqqtl6LlQfE26CvCYyPpbJ2kcdA8RsO5Yf6xqylI45RQY -XFb+ES47QXRldcPuE1cPg4Xcbx5B75G6FLbigXMp6em0BIfYqGVtmngCYXMGPfJD -twN5ZyC+WL89kAryiL804NYXdF/Au5gAZ03MkQXz8MI+DshXWu4c1kpfks1L6YCW -OEeRJq8VokTQSxwNaW3Zt/Cb6VYb0BQJpQDfW/aZ7YoSrVTmvTb6Jxj4DP0s30Xx -i6dzrCCDaXUYJQJbIqbDB8MllaXILx/YG79ate9AiD411x4AlSblNmHlX94ejGWQ -6sXcYWfw8lyIYNTUmxr1ESU+GhczAk4gnOztgMTbMKH5uaOsjqrziHlhOvzugfnW -BPUX15elwf8ugytxWV3Fx85KrroCNgY0e9WEO+CvspdcE9hl5PfZZJJj9vRrtXml -0Der2x0HkaV6ro7o93TB91VWT+4dKdISgN8uATILQ3F9lB9XC3X+Aeoys4Wd+fdm -9mAYUzmnV0RG/G8CQYKS8f9s+hTncllfTciLscpRHSBUHhaRAl3+RCWa45d5JyZx -GXn4qk3E8TXd83FIgDe8/qRodfqZWFfRV/PGhDeCp9dtFXYgVf4= -=CwCm ------END PGP SIGNATURE----- diff --git a/cryptsetup-2.8.0.tar.sign b/cryptsetup-2.8.0.tar.sign new file mode 100644 index 0000000..1bf750e --- /dev/null +++ b/cryptsetup-2.8.0.tar.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAmhaZNcACgkQ2bBXe9k+ +mPzlnQ//QW9L3cA+GZqhKF8tzjXTiKC15f9aljTYyX2vFoSV8B9m1D9UbycYvE0l +oae42flXRUKMSZIBvVydUn3d8Z8D56y5Jcmzt9BGl73EE9SX5b9C8W/z6iICpPpj +JoxMAN16zbV2vdoi0XESQRsVRSxepFQO9NfrGYIyJh23vXFBwOKseDLjuDWKD88N +4tsfrAc5/kpj0rxPqLztgqBuwlbUCIR9oLmbhtHiTNCGyL/ndlMLaWQ1iHr7Ujwn +3Haax9Z2bjNcCSNTeitWE+ICVTYTwFy2lEe1E6gHwqpAbkxsjXxyufcYEjBCFn8E +oZgKxxG+rkNPoo3qCJzlqSXyFW41Qb5BaYjGcG3mCyr6i7Ye8RlSkVsi5lUJQjb2 +GXLp0x69YygxTi2mrjSl0teWR56lHgAyYLMdc5HmsM5C0fYxXlUBfzg8vLdJ0wut +XPllh9g3B2HI41iZnKWw9zXViMB60ZymxfUzMLxybywJqVpi/MzoGhDXsoQqIBq2 +wgLg54V8O93DQpMJXB7N93vm2ASI31figfCdmW47SivPEiISQA9hgpuNwpy1tvG7 +a9Mllytle0ytIYkdqRvMRXwaSAv63Q/pd8MefiivDdj1GOcmkLpo+njsCkp+IoAF ++DWXMcDOS19fuPxMiLPdXf7m0dTZfjMpG5C8uCNpf84LlWcLKEs= +=U/wu +-----END PGP SIGNATURE----- diff --git a/cryptsetup.spec b/cryptsetup.spec index dee6a4f..8277849 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,6 +1,6 @@ Summary: Utility for setting up encrypted disks Name: cryptsetup -Version: 2.8.0~rc1 +Version: 2.8.0 Release: 1%{?dist} License: GPL-2.0-or-later WITH cryptsetup-OpenSSL-exception AND LGPL-2.1-or-later WITH cryptsetup-OpenSSL-exception URL: https://gitlab.com/cryptsetup/cryptsetup @@ -117,6 +117,9 @@ rm -rf %{buildroot}%{_libdir}/%{name}/*.la %{_sbindir}/cryptsetup-ssh %changelog +* Tue Jun 24 2025 Ondrej Kozina - 2.8.0-1 +- Update to cryptsetup 2.8.0. + * Mon Jun 16 2025 Milan Broz - 2.8.0~rc1-1 - Update to cryptsetup 2.8.0-rc1. diff --git a/sources b/sources index b9df399..9eebd7c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cryptsetup-2.8.0-rc1.tar.xz) = a1b405d265ca78bf967dba86e11bf1a1102352a82848f9529f66ba1c5a9cb3665c7fd30250e7ae2552ab76b56ae918a44ece6a65c685cb0e66a798675015cc34 +SHA512 (cryptsetup-2.8.0.tar.xz) = 4a41720fdf7f35693b31e68ef6dda7dbdd050252e7f33f3889f9272b708d40b8bde8ecca5e0c917d51bd3f2c82a7bd304829d56bc8ac423ca005155611f42211 From 39d542f69ef490baa31b584a4782e5e55d21cd7e Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Wed, 9 Jul 2025 10:06:02 +0200 Subject: [PATCH 134/142] Simplify tmt tests. let's remove the koji task download step. It would be wrong if we patch tests sources anyway. --- plans/cryptsetup.fmf | 13 +++++++++---- plans/run-local-tests.sh | 11 +---------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/plans/cryptsetup.fmf b/plans/cryptsetup.fmf index a9c4a20..4e29a25 100644 --- a/plans/cryptsetup.fmf +++ b/plans/cryptsetup.fmf @@ -28,12 +28,17 @@ prepare: - nmap-ncat - sshpass - shadow-utils - - koji + +discover: + how: shell + dist-git-source: true + tests: + - name: upstream-tier0 + duration: 2h + test: exec plans/run-local-tests.sh execute: - how: tmt - script: exec plans/run-local-tests.sh - duration: 2h + - how: tmt provision: hardware: diff --git a/plans/run-local-tests.sh b/plans/run-local-tests.sh index 3817457..5468317 100755 --- a/plans/run-local-tests.sh +++ b/plans/run-local-tests.sh @@ -3,15 +3,6 @@ set -eux set -o pipefail -if [[ -n "${KOJI_TASK_ID:-}" ]]; then - koji download-task --noprogress --arch="src" "$KOJI_TASK_ID" -else - echo "No koji task ID provided" - exit 1 -fi - -mkdir cryptsetup-sources -rpm2cpio cryptsetup-*.src.rpm | cpio --to-stdout --extract './*.tar.xz' | tar xJ --strip-components=1 -C cryptsetup-sources -pushd cryptsetup-sources/tests +pushd $TMT_SOURCE_DIR/cryptsetup-*/tests make -f Makefile.localtest tests popd From d648ac497033ffe7a71fad98dec3dfeba4ab8828 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 18:53:25 +0000 Subject: [PATCH 135/142] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- cryptsetup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index 8277849..595209f 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,7 +1,7 @@ Summary: Utility for setting up encrypted disks Name: cryptsetup Version: 2.8.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL-2.0-or-later WITH cryptsetup-OpenSSL-exception AND LGPL-2.1-or-later WITH cryptsetup-OpenSSL-exception URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: autoconf, automake, libtool, gettext-devel, @@ -117,6 +117,9 @@ rm -rf %{buildroot}%{_libdir}/%{name}/*.la %{_sbindir}/cryptsetup-ssh %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 2.8.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Jun 24 2025 Ondrej Kozina - 2.8.0-1 - Update to cryptsetup 2.8.0. From a9c87cf5e73b7dce613e8b505afc2c8917aab2bc Mon Sep 17 00:00:00 2001 From: Kristina Hanicova Date: Wed, 20 Aug 2025 11:22:40 +0200 Subject: [PATCH 136/142] Update to cryptsetup 2.8.1. --- .gitignore | 2 +- cryptsetup-2.8.0.tar.sign | 16 ---------------- cryptsetup-2.8.1.tar.sign | 16 ++++++++++++++++ cryptsetup.spec | 7 +++++-- sources | 2 +- 5 files changed, 23 insertions(+), 20 deletions(-) delete mode 100644 cryptsetup-2.8.0.tar.sign create mode 100644 cryptsetup-2.8.1.tar.sign diff --git a/.gitignore b/.gitignore index c638a1a..e1655e0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/cryptsetup-2.8.0.tar.xz +/cryptsetup-2.8.1.tar.xz diff --git a/cryptsetup-2.8.0.tar.sign b/cryptsetup-2.8.0.tar.sign deleted file mode 100644 index 1bf750e..0000000 --- a/cryptsetup-2.8.0.tar.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAmhaZNcACgkQ2bBXe9k+ -mPzlnQ//QW9L3cA+GZqhKF8tzjXTiKC15f9aljTYyX2vFoSV8B9m1D9UbycYvE0l -oae42flXRUKMSZIBvVydUn3d8Z8D56y5Jcmzt9BGl73EE9SX5b9C8W/z6iICpPpj -JoxMAN16zbV2vdoi0XESQRsVRSxepFQO9NfrGYIyJh23vXFBwOKseDLjuDWKD88N -4tsfrAc5/kpj0rxPqLztgqBuwlbUCIR9oLmbhtHiTNCGyL/ndlMLaWQ1iHr7Ujwn -3Haax9Z2bjNcCSNTeitWE+ICVTYTwFy2lEe1E6gHwqpAbkxsjXxyufcYEjBCFn8E -oZgKxxG+rkNPoo3qCJzlqSXyFW41Qb5BaYjGcG3mCyr6i7Ye8RlSkVsi5lUJQjb2 -GXLp0x69YygxTi2mrjSl0teWR56lHgAyYLMdc5HmsM5C0fYxXlUBfzg8vLdJ0wut -XPllh9g3B2HI41iZnKWw9zXViMB60ZymxfUzMLxybywJqVpi/MzoGhDXsoQqIBq2 -wgLg54V8O93DQpMJXB7N93vm2ASI31figfCdmW47SivPEiISQA9hgpuNwpy1tvG7 -a9Mllytle0ytIYkdqRvMRXwaSAv63Q/pd8MefiivDdj1GOcmkLpo+njsCkp+IoAF -+DWXMcDOS19fuPxMiLPdXf7m0dTZfjMpG5C8uCNpf84LlWcLKEs= -=U/wu ------END PGP SIGNATURE----- diff --git a/cryptsetup-2.8.1.tar.sign b/cryptsetup-2.8.1.tar.sign new file mode 100644 index 0000000..4459bed --- /dev/null +++ b/cryptsetup-2.8.1.tar.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAmikPjAACgkQ2bBXe9k+ +mPzw4hAAqew2XZt7qfeHXNrx4Qx+5fh8J6kNBByMoBBBoNV778MUeE35hZ57L+0G +fCRJTcWvZX9WUomSY3L/n1h/kGrk/G59clBNXyBo/VlqGy4TnDIyX/5RfN93Ysfr +XzdZptH7PFLnhf6R9Y6bkRTCVdutW6WSW+CTeB6LnQHR97y2Jz/L+qTpExs9ujk9 +FMuMI2bO+i5QaisvAqS7/z0ba18xdgNqplj8DUFygtuJiUeshtW/RHBr21Y762Ut +ZaliJbkww/XbI0CVyjoT0OrgRIpqr1tb1AwPNCU81MgCrB5q5pYOdcGkuRGIGKSG ++BC2qrHqlbNIu8SOu6JZ7mq2gkiyzz+Gg7AuKsvV9HPFkFEd40SIE2xNMxgwZtwB +jW9d07Cg90qGcKLqESwb5bNXRFxw8aBXHaaZraC5mAoYfOXaQAL+FlBtbcsADoFy +7TJEDyqC47nRB7dC0c8Cd7rqZ7nFWenf7oPXK87wFDIRDdv7OTtwD03fQdhy7j6N ++jX1vVH/xRDpEpcUTQyuo3CO/gN5w2TWPKHYFBkAV3qvQOTLKZXQCxyYNfSBfFmJ +IyeRPYb/Euk46jX+xpCeoP540YAL6BoLTHyis5wjjM9jTXTMKFa5ZivrMlWaRKS5 +pp4EIpJlxuE8kGmKvMgPO3kgS4w3akjNpfdkeRWAPKaVVMzBY1Y= +=tRD6 +-----END PGP SIGNATURE----- diff --git a/cryptsetup.spec b/cryptsetup.spec index 595209f..fc439d9 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,7 +1,7 @@ Summary: Utility for setting up encrypted disks Name: cryptsetup -Version: 2.8.0 -Release: 2%{?dist} +Version: 2.8.1 +Release: 1%{?dist} License: GPL-2.0-or-later WITH cryptsetup-OpenSSL-exception AND LGPL-2.1-or-later WITH cryptsetup-OpenSSL-exception URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: autoconf, automake, libtool, gettext-devel, @@ -117,6 +117,9 @@ rm -rf %{buildroot}%{_libdir}/%{name}/*.la %{_sbindir}/cryptsetup-ssh %changelog +* Wed Aug 20 2025 Kristina Hanicova - 2.8.1-1 +- Update to cryptsetup 2.8.1. + * Wed Jul 23 2025 Fedora Release Engineering - 2.8.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sources b/sources index 9eebd7c..9832dc9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cryptsetup-2.8.0.tar.xz) = 4a41720fdf7f35693b31e68ef6dda7dbdd050252e7f33f3889f9272b708d40b8bde8ecca5e0c917d51bd3f2c82a7bd304829d56bc8ac423ca005155611f42211 +SHA512 (cryptsetup-2.8.1.tar.xz) = a5171e18c55bfbc57330f2d46ab06b5ac6957392a77aef74c3d1c5295eb39962d1db19ddd3420ea1154d730b361d09e72bf5315c7a3d56eb36cee9c2531bca5d From a529067c727f090089dd8e08d98dd9505cb976b8 Mon Sep 17 00:00:00 2001 From: Kristina Hanicova Date: Thu, 2 Oct 2025 13:34:36 +0200 Subject: [PATCH 137/142] Add rpmautospec. --- changelog | 660 +++++++++++++++++++++++++++++++++++++++++++++++ cryptsetup.spec | 663 +----------------------------------------------- 2 files changed, 662 insertions(+), 661 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..1d8a8f0 --- /dev/null +++ b/changelog @@ -0,0 +1,660 @@ +* Wed Aug 20 2025 Kristina Hanicova - 2.8.1-1 +- Update to cryptsetup 2.8.1. + +* Wed Jul 23 2025 Fedora Release Engineering - 2.8.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Tue Jun 24 2025 Ondrej Kozina - 2.8.0-1 +- Update to cryptsetup 2.8.0. + +* Mon Jun 16 2025 Milan Broz - 2.8.0~rc1-1 +- Update to cryptsetup 2.8.0-rc1. + +* Thu Jan 16 2025 Fedora Release Engineering - 2.7.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Tue Sep 03 2024 Ondrej Kozina - 2.7.5-1 +- Update to cryptsetup 2.7.5. + +* Tue Jul 30 2024 Ondrej Kozina - 2.7.4-1 +- Update to cryptsetup 2.7.4. + +* Wed Jul 17 2024 Fedora Release Engineering - 2.7.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Mon Jun 17 2024 Ondrej Kozina - 2.7.3-1 +- Update to cryptsetup 2.7.3. + +* Tue Apr 09 2024 Ondrej Kozina - 2.7.2-1 +- Update to cryptsetup 2.7.2. + +* Thu Mar 07 2024 Ondrej Kozina - 2.7.1-1 +- Update to cryptsetup 2.7.1. + +* Fri Feb 09 2024 Ondrej Kozina - 2.7.0-2 +- Rebuild for OpenSSL Argon2 implementation (OpenSSL 3.2) +- patch: Do not compile unused internal argon2 implementation + +* Wed Jan 24 2024 Ondrej Kozina - 2.7.0-1 +- Update to cryptsetup 2.7.0. + +* Wed Jan 24 2024 Fedora Release Engineering - 2.7.0~rc1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 2.7.0~rc1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Dec 20 2023 Milan Broz - 2.7.0~rc1-1 +- Update to cryptsetup 2.7.0-rc1. + +* Wed Nov 29 2023 Ondrej Kozina - 2.7.0~rc0-1 +- Update to cryptsetup 2.7.0-rc0. + +* Wed Jul 19 2023 Fedora Release Engineering - 2.6.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jun 15 2023 Yaakov Selkowitz - 2.6.1-2 +- Drop libargon2 dependency in RHEL builds + +* Fri Feb 10 2023 Ondrej Kozina - 2.6.1-1 +- Update to cryptsetup 2.6.1. + +* Thu Jan 19 2023 Fedora Release Engineering - 2.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Mon Nov 28 2022 Ondrej Kozina - 2.6.0-1 +- Update to cryptsetup 2.6.0. + +* Mon Nov 21 2022 Ondrej Kozina - 2.6.0~rc0-1 +- Update to cryptsetup 2.6.0-rc0. + +* Thu Jul 28 2022 Ondrej Kozina - 2.5.0-1 +- Update to cryptsetup 2.5.0. + +* Wed Jul 20 2022 Fedora Release Engineering - 2.5.0~rc1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jul 14 2022 Ondrej Kozina - 2.5.0~rc1-1 +- Update to cryptsetup 2.5.0-rc1. + +* Thu Jan 20 2022 Fedora Release Engineering - 2.4.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jan 12 2022 Ondrej Kozina - 2.4.3-1 +- Update to cryptsetup 2.4.3. + +* Thu Nov 18 2021 Milan Broz - 2.4.2-1 +- Update to cryptsetup 2.4.2. + +* Fri Sep 17 2021 Ondrej Kozina - 2.4.1-1 +- Update to cryptsetup 2.4.1. + +* Tue Sep 14 2021 Sahana Prasad - 2.4.0-2 +- Rebuilt with OpenSSL 3.0.0 + +* Wed Aug 18 2021 Ondrej Kozina - 2.4.0-1 +- Update to cryptsetup 2.4.0. + +* Fri Jul 30 2021 Milan Broz - 2.4.0~rc1-1 +- Update to cryptsetup 2.4.0-rc1. + +* Wed Jul 21 2021 Fedora Release Engineering - 2.4.0~rc0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Sat Jul 10 2021 Björn Esser - 2.4.0~rc0-2 +- Rebuild for versioned symbols in json-c + +* Fri Jul 02 2021 Ondrej Kozina - 2.4.0~rc0-1 +- Update to cryptsetup 2.4.0-rc0. +- add experimental cryptsetup-ssh token subpackage +- spec file cleanup + +* Fri May 28 2021 Milan Broz - 2.3.6-1 +- Update to cryptsetup 2.3.6. + +* Thu Mar 11 2021 Milan Broz - 2.3.5-2 +- Update to cryptsetup 2.3.5. + +* Tue Jan 26 2021 Fedora Release Engineering - 2.3.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Thu Sep 03 2020 Milan Broz - 2.3.4-1 +- Update to cryptsetup 2.3.4. +- Fix for CVE-2020-14382 (#1874712) + +* Mon Jul 27 2020 Fedora Release Engineering - 2.3.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Thu May 28 2020 Ondrej Kozina - 2.3.3-1 +- Update to cryptsetup 2.3.3. + +* Thu Apr 30 2020 Milan Broz - 2.3.2-1 +- Update to cryptsetup 2.3.2. + +* Tue Apr 21 2020 Björn Esser - 2.3.1-4 +- Rebuild (json-c) + +* Thu Apr 16 2020 Milan Broz - 2.3.1-3 +- Fix broken json-c patch (#1824878). + +* Tue Apr 14 2020 Björn Esser - 2.3.1-2 +- Add support for upcoming json-c 0.14.0 +- Use %%make_build, %%make_install and %%autosetup macros + +* Thu Mar 12 2020 Ondrej Kozina - 2.3.1-1 +- Update to cryptsetup 2.3.1. + +* Sun Feb 02 2020 Milan Broz - 2.3.0-1 +- Update to cryptsetup 2.3.0. + +* Tue Jan 28 2020 Fedora Release Engineering - 2.3.0-0.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sun Jan 12 2020 Milan Broz - 2.3.0-0.1 +- Update to cryptsetup 2.3.0-rc0. + +* Fri Nov 01 2019 Ondrej Kozina - 2.2.2-1 +- Update to cryptsetup 2.2.2. + +* Fri Sep 06 2019 Ondrej Kozina - 2.2.1-1 +- Update to cryptsetup 2.2.1. + +* Thu Aug 15 2019 Milan Broz - 2.2.0-1 +- Update to cryptsetup 2.2.0. + +* Wed Jul 24 2019 Fedora Release Engineering - 2.2.0-0.3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Jun 14 2019 Ondrej Kozina - 2.2.0-0.2 +- Update to cryptsetup 2.2.0-rc1. + +* Fri May 03 2019 Ondrej Kozina - 2.2.0-0.1 +- Update to cryptsetup 2.2.0-rc0. + +* Thu Apr 04 2019 Kalev Lember - 2.1.0-3 +- Add back python2-cryptsetup and cryptsetup-python3 obsoletes + +* Mon Mar 18 2019 Milan Broz - 2.1.0-2 +- Rebuild for new libargon2 soname. + +* Fri Feb 08 2019 Ondrej Kozina - 2.1.0-1 +- Update to cryptsetup 2.1.0. +- Drop python specific bits from spec file (python was removed + from upstream project) + +* Thu Jan 31 2019 Fedora Release Engineering - 2.0.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Jan 22 2019 Ondrej Kozina - 2.0.6-2 +- Switch default metadata format to LUKS2. +- Resolves: #1668013 + +* Mon Dec 03 2018 Ondrej Kozina - 2.0.6-1 +- Update to cryptsetup 2.0.6. + +* Mon Oct 29 2018 Ondrej Kozina - 2.0.5-1 +- Update to cryptsetup 2.0.5. + +* Fri Aug 03 2018 Ondrej Kozina - 2.0.4-1 +- Update to cryptsetup 2.0.4. +- patch: Add Fedora system library paths in configure. + +* Tue Jul 17 2018 Ondrej Kozina - 2.0.3-6 +- Remove libgcrypt dependency from cryptsetup-libs package. + +* Tue Jul 17 2018 Ondrej Kozina - 2.0.3-5 +- Replace sed script with --disable-rpath configure option. +- Switch cryptsetup to openssl crypto backend. +- Spec file cleanup. + +* Thu Jul 12 2018 Fedora Release Engineering - 2.0.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri May 04 2018 Ondrej Kozina - 2.0.3-3 +- Fix obsolete macro for python3 subpackage. + +* Fri May 04 2018 Ondrej Kozina - 2.0.3-2 +- Add missing 'Obsoletes' macros for python subpackages. + +* Fri May 04 2018 Milan Broz - 2.0.3-1 +- Update to cryptsetup 2.0.3. + +* Wed Apr 25 2018 Ondrej Kozina - 2.0.2-3 +- Add conditions for python sub-packages + +* Tue Mar 27 2018 Björn Esser - 2.0.2-2 +- Rebuilt for libjson-c.so.4 (json-c v0.13.1) on fc28 + +* Wed Mar 07 2018 Milan Broz - 2.0.2-1 +- Update to cryptsetup 2.0.2. + +* Tue Mar 06 2018 Björn Esser - 2.0.1-3 +- Rebuilt for libjson-c.so.4 (json-c v0.13.1) + +* Wed Feb 07 2018 Fedora Release Engineering - 2.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Sun Jan 21 2018 Milan Broz - 2.0.1-1 +- Update to cryptsetup 2.0.1. + +* Thu Jan 04 2018 Ondrej Kozina - 2.0.0-3 +- Override locking path to /run/cryptsetup (going to be new default) +- Claim ownership of the locking directory + +* Fri Dec 15 2017 Iryna Shcherbina - 2.0.0-2 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + +* Tue Dec 12 2017 Ondrej Kozina - 2.0.0-1 +- Update to cryptsetup 2.0.0 (final). + +* Sun Dec 10 2017 Björn Esser - 2.0.0-0.6 +- Rebuilt for libjson-c.so.3 + +* Mon Nov 20 2017 Milan Broz - 2.0.0-0.5 +- Link to system libargon2 instead of using bundled code. + +* Thu Nov 09 2017 Ondrej Kozina - 2.0.0-0.4 +- Drop the legacy library. + +* Wed Nov 08 2017 Ondrej Kozina - 2.0.0-0.3 +- Temporary build providing legacy library. + +* Tue Nov 07 2017 Ondrej Kozina - 2.0.0-0.2 +- Update to cryptsetup 2.0.0-rc1 (with libcryptsetup soname bump). +- Added integritysetup subpackage. + +* Sun Aug 20 2017 Zbigniew Jędrzejewski-Szmek - 1.7.5-5 +- Add Provides for the old name without %%_isa + +* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 1.7.5-4 +- Python 2 binary package renamed to python2-cryptsetup + See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 + +* Wed Aug 02 2017 Fedora Release Engineering - 1.7.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1.7.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Thu Apr 27 2017 Milan Broz - 1.7.5-1 +- Update to cryptsetup 1.7.5. + +* Wed Mar 15 2017 Milan Broz - 1.7.4-1 +- Update to cryptsetup 1.7.4. + +* Fri Feb 10 2017 Fedora Release Engineering - 1.7.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon Dec 19 2016 Miro Hrončok - 1.7.3-2 +- Rebuild for Python 3.6 + +* Sun Oct 30 2016 Milan Broz - 1.7.3-1 +- Update to cryptsetup 1.7.3. + +* Tue Jul 19 2016 Fedora Release Engineering - 1.7.2-3 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Mon Jun 13 2016 Milan Broz - 1.7.2-2 +- Rebuilt for compatible symbol changes in glibc. + +* Sat Jun 04 2016 Milan Broz - 1.7.2-1 +- Update to cryptsetup 1.7.2. + +* Sun Feb 28 2016 Milan Broz - 1.7.1-1 +- Update to cryptsetup 1.7.1. + +* Wed Feb 03 2016 Fedora Release Engineering - 1.7.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Nov 10 2015 Fedora Release Engineering - 1.7.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 + +* Tue Nov 03 2015 Milan Broz - 1.7.0-1 +- Update to cryptsetup 1.7.0. +- Switch to sha256 as default hash. +- Increase default PBKDF2 iteration time to 2 seconds. + +* Tue Sep 08 2015 Milan Broz - 1.6.8-2 +- Update to cryptsetup 1.6.8. + +* Wed Jun 17 2015 Fedora Release Engineering - 1.6.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Mar 23 2015 Milan Broz - 1.6.7-1 +- Update to cryptsetup 1.6.7. +- Remove no longer needed fipscheck library dependence. +- Change URL to new homepage. + +* Sat Aug 16 2014 Milan Broz - 1.6.6-1 +- Update to cryptsetup 1.6.6. + +* Sat Aug 16 2014 Fedora Release Engineering - 1.6.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Fri Jul 11 2014 Tom Callaway - 1.6.5-2 +- fix license handling + +* Sun Jun 29 2014 Milan Broz - 1.6.5-1 +- Update to cryptsetup 1.6.5. +- Add cryptsetup-python3 subpackage. + +* Sat Jun 07 2014 Fedora Release Engineering - 1.6.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun Mar 02 2014 Milan Broz - 1.6.4-2 +- Require libgcrypt 1.6.1 (with fixed PBKDF2 and Whirlpool hash). + +* Thu Feb 27 2014 Milan Broz - 1.6.4-1 +- Update to cryptsetup 1.6.4. + +* Tue Jan 07 2014 Ondrej Kozina - 1.6.3-2 +- remove useless hmac checksum + +* Fri Dec 13 2013 Milan Broz - 1.6.3-1 +- Update to cryptsetup 1.6.3. + +* Sun Aug 04 2013 Milan Broz - 1.6.2-1 +- Update to cryptsetup 1.6.2. + +* Sat Aug 03 2013 Fedora Release Engineering - 1.6.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Sun Mar 31 2013 Milan Broz - 1.6.1-1 +- Update to cryptsetup 1.6.1. +- Install ReleaseNotes files instead of empty Changelog file. + +* Wed Feb 13 2013 Fedora Release Engineering - 1.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Mon Jan 14 2013 Milan Broz - 1.6.0-1 +- Update to cryptsetup 1.6.0. +- Change default LUKS encryption mode to aes-xts-plain64 (AES128). +- Force use of gcrypt PBKDF2 instead of internal implementation. + +* Sat Dec 29 2012 Milan Broz - 1.6.0-0.1 +- Update to cryptsetup 1.6.0-rc1. +- Relax license to GPLv2+ according to new release. +- Compile cryptsetup with libpwquality support. + +* Tue Oct 16 2012 Milan Broz - 1.5.1-1 +- Update to cryptsetup 1.5.1. + +* Wed Jul 18 2012 Fedora Release Engineering - 1.5.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Jul 10 2012 Milan Broz - 1.5.0-1 +- Update to cryptsetup 1.5.0. + +* Wed Jun 20 2012 Milan Broz - 1.5.0-0.2 +- Update to cryptsetup 1.5.0-rc2. +- Add cryptsetup-reencrypt subpackage. + +* Mon Jun 11 2012 Milan Broz - 1.5.0-0.1 +- Update to cryptsetup 1.5.0-rc1. +- Add veritysetup subpackage. +- Move localization files to libs subpackage. + +* Thu May 31 2012 Milan Broz - 1.4.3-2 +- Build with fipscheck (verification in fips mode). +- Clean up spec file, use install to /usr. + +* Thu May 31 2012 Milan Broz - 1.4.3-1 +- Update to cryptsetup 1.4.3. + +* Thu Apr 12 2012 Milan Broz - 1.4.2-1 +- Update to cryptsetup 1.4.2. + +* Fri Jan 13 2012 Fedora Release Engineering - 1.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Wed Nov 09 2011 Milan Broz - 1.4.1-1 +- Update to cryptsetup 1.4.1. +- Add Python cryptsetup bindings. +- Obsolete separate python-cryptsetup package. + +* Wed Oct 26 2011 Milan Broz - 1.4.0-1 +- Update to cryptsetup 1.4.0. + +* Mon Oct 10 2011 Milan Broz - 1.4.0-0.1 +- Update to cryptsetup 1.4.0-rc1. +- Rename package back from cryptsetup-luks to cryptsetup. + +* Wed Jun 22 2011 Milan Broz - 1.3.1-2 +- Fix return code for status command when device doesn't exist. + +* Tue May 24 2011 Milan Broz - 1.3.1-1 +- Update to cryptsetup 1.3.1. + +* Tue Apr 05 2011 Milan Broz - 1.3.0-1 +- Update to cryptsetup 1.3.0. + +* Tue Mar 22 2011 Milan Broz - 1.3.0-0.2 +- Update to cryptsetup 1.3.0-rc2 + +* Mon Mar 14 2011 Milan Broz - 1.3.0-0.1 +- Update to cryptsetup 1.3.0-rc1 + +* Tue Feb 08 2011 Fedora Release Engineering - 1.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Dec 20 2010 Milan Broz - 1.2.0-1 +- Update to cryptsetup 1.2.0 + +* Thu Nov 25 2010 Milan Broz - 1.2.0-0.2 +- Fix crypt_activate_by_keyfile() to work with PLAIN devices. + +* Tue Nov 16 2010 Milan Broz - 1.2.0-0.1 +- Add FAQ to documentation. +- Update to cryptsetup 1.2.0-rc1 + +* Sat Jul 03 2010 Milan Broz - 1.1.3-1 +- Update to cryptsetup 1.1.3 + +* Mon Jun 07 2010 Milan Broz - 1.1.2-2 +- Fix alignment ioctl use. +- Fix API activation calls to handle NULL device name. + +* Sun May 30 2010 Milan Broz - 1.1.2-1 +- Update to cryptsetup 1.1.2 +- Fix luksOpen handling of new line char on stdin. + +* Sun May 23 2010 Milan Broz - 1.1.1-1 +- Update to cryptsetup 1.1.1 +- Fix luksClose for stacked LUKS/LVM devices. + +* Mon May 03 2010 Milan Broz - 1.1.1-0.2 +- Update to cryptsetup 1.1.1-rc2. + +* Sat May 01 2010 Milan Broz - 1.1.1-0.1 +- Update to cryptsetup 1.1.1-rc1. + +* Sun Jan 17 2010 Milan Broz - 1.1.0-1 +- Update to cryptsetup 1.1.0. + +* Fri Jan 15 2010 Milan Broz - 1.1.0-0.6 +- Fix gcrypt initialisation. +- Fix backward compatibility for hash algorithm (uppercase). + +* Wed Dec 30 2009 Milan Broz - 1.1.0-0.5 +- Update to cryptsetup 1.1.0-rc4 + +* Mon Nov 16 2009 Milan Broz - 1.1.0-0.4 +- Update to cryptsetup 1.1.0-rc3 + +* Thu Oct 01 2009 Milan Broz - 1.1.0-0.3 +- Update to cryptsetup 1.1.0-rc2 +- Fix libcryptsetup to properly export only versioned symbols. + +* Tue Sep 29 2009 Milan Broz - 1.1.0-0.2 +- Update to cryptsetup 1.1.0-rc1 +- Add luksHeaderBackup and luksHeaderRestore commands. + +* Fri Sep 11 2009 Milan Broz - 1.1.0-0.1 +- Update to new upstream testing version with new API interface. +- Add luksSuspend and luksResume commands. +- Introduce pkgconfig. + +* Fri Jul 24 2009 Fedora Release Engineering - 1.0.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Jul 22 2009 Milan Broz - 1.0.7-1 +- Update to upstream final release. +- Split libs subpackage. +- Remove rpath setting from cryptsetup binary. + +* Wed Jul 15 2009 Till Maas - 1.0.7-0.2 +- update BR because of libuuid splitout from e2fsprogs + +* Mon Jun 22 2009 Milan Broz - 1.0.7-0.1 +- Update to new upstream 1.0.7-rc1. + +- Wipe old fs headers to not confuse blkid (#468062) +* Tue Feb 24 2009 Fedora Release Engineering - 1.0.6-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Thu Oct 30 2008 Milan Broz - 1.0.6-6 +- Wipe old fs headers to not confuse blkid (#468062) + +* Tue Sep 23 2008 Milan Broz - 1.0.6-5 +- Change new project home page. +- Print more descriptive messages for initialization errors. +- Refresh patches to versions commited upstream. + +* Sat Sep 06 2008 Milan Broz - 1.0.6-4 +- Fix close of zero decriptor. +- Fix udevsettle delays - use temporary crypt device remapping. + +* Wed May 28 2008 Till Maas - 1.0.6-3 +- remove a duplicate sentence from the manpage (RH #448705) +- add patch metadata about upstream status + +* Tue Apr 15 2008 Bill Nottinghm - 1.0.6-2 +- Add the device to the luksOpen prompt (#433406) +- Use iconv, not recode (#442574) + +* Thu Mar 13 2008 Till Maas - 1.0.6-1 +- Update to latest version +- remove patches that have been merged upstream + +* Mon Mar 03 2008 Till Maas - 1.0.6-0.1.pre2 +- Update to new version with several bugfixes +- remove patches that have been merged upstream +- add patch from cryptsetup newsgroup +- fix typo / missing luksRemoveKey in manpage (patch) + +* Tue Feb 19 2008 Fedora Release Engineering - 1.0.5-9 +- Autorebuild for GCC 4.3 + +* Sat Jan 19 2008 Peter Jones - 1.0.5-8 +- Rebuild for broken deps. + +* Thu Aug 30 2007 Till Maas - 1.0.5-7 +- update URL +- update license tag +- recode ChangeLog from latin1 to uf8 +- add smp_mflags to make + +* Fri Aug 24 2007 Till Maas - 1.0.5-6 +- cleanup BuildRequires: +- removed versions, packages in Fedora are new enough +- changed popt to popt-devel + +* Thu Aug 23 2007 Till Maas - 1.0.5-5 +- fix devel subpackage requires +- remove empty NEWS README +- remove uneeded INSTALL +- remove uneeded ldconfig requires +- add readonly detection patch + +* Wed Aug 08 2007 Till Maas - 1.0.5-4 +- disable patch2, libsepol is now detected by configure +- move libcryptsetup.so to %%{_libdir} instead of /%%{_lib} + +* Fri Jul 27 2007 Till Maas - 1.0.5-3 +- Use /%%{_lib} instead of /lib to use /lib64 on 64bit archs + +* Thu Jul 26 2007 Till Maas - 1.0.5-2 +- Use /lib as libdir (#243228) +- sync header and library (#215349) +- do not use %%makeinstall (recommended by PackageGuidelines) +- select sbindir with %%configure instead with make +- add TODO + +* Wed Jun 13 2007 Jeremy Katz - 1.0.5-1 +- update to 1.0.5 + +* Mon Jun 04 2007 Peter Jones - 1.0.3-5 +- Don't build static any more. + +* Mon Feb 05 2007 Alasdair Kergon - 1.0.3-4 +- Add build dependency on new device-mapper-devel package. +- Add preun and post ldconfig requirements. +- Update BuildRoot. + +* Wed Nov 1 2006 Peter Jones - 1.0.3-3 +- Require newer libselinux (#213414) + +* Wed Jul 12 2006 Jesse Keating - 1.0.3-2.1 +- rebuild + +* Wed Jun 7 2006 Jeremy Katz - 1.0.3-2 +- put shared libs in the right subpackages + +* Fri Apr 7 2006 Bill Nottingham 1.0.3-1 +- update to final 1.0.3 + +* Mon Feb 27 2006 Bill Nottingham 1.0.3-0.rc2 +- update to 1.0.3rc2, fixes bug with HAL & encrypted devices (#182658) + +* Wed Feb 22 2006 Bill Nottingham 1.0.3-0.rc1 +- update to 1.0.3rc1, reverts changes to default encryption type + +* Tue Feb 21 2006 Bill Nottingham 1.0.2-1 +- update to 1.0.2, fix incompatiblity with old cryptsetup (#176726) + +* Mon Feb 20 2006 Karsten Hopp 1.0.1-5 +- BuildRequires: libselinux-devel + +* Fri Feb 10 2006 Jesse Keating - 1.0.1-4.2.1 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jesse Keating - 1.0.1-4.2 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Mon Dec 5 2005 Bill Nottingham 1.0.1-4 +- rebuild against new libdevmapper + +* Thu Oct 13 2005 Florian La Roche +- add -lsepol to rebuild on current fc5 + +* Mon Aug 22 2005 Karel Zak 1.0.1-2 +- fix cryptsetup help for isLuks action + +* Fri Jul 1 2005 Bill Nottingham 1.0.1-1 +- update to 1.0.1 - fixes incompatiblity with previous cryptsetup for + piped passwords + +* Thu Jun 16 2005 Bill Nottingham 1.0-2 +- add patch for 32/64 bit compatibility (#160445, ) + +* Tue Mar 29 2005 Bill Nottingham 1.0-1 +- update to 1.0 + +* Thu Mar 10 2005 Bill Nottingham 0.993-1 +- switch to cryptsetup-luks, for LUKS support + +* Tue Oct 12 2004 Bill Nottingham 0.1-4 +- oops, make that *everything* static (#129926) + +* Tue Aug 31 2004 Bill Nottingham 0.1-3 +- link some things static, move to /sbin (#129926) + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Fri Apr 16 2004 Bill Nottingham 0.1-1 +- initial packaging diff --git a/cryptsetup.spec b/cryptsetup.spec index fc439d9..4f64fac 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,7 +1,7 @@ Summary: Utility for setting up encrypted disks Name: cryptsetup Version: 2.8.1 -Release: 1%{?dist} +Release: %autorelease License: GPL-2.0-or-later WITH cryptsetup-OpenSSL-exception AND LGPL-2.1-or-later WITH cryptsetup-OpenSSL-exception URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: autoconf, automake, libtool, gettext-devel, @@ -117,663 +117,4 @@ rm -rf %{buildroot}%{_libdir}/%{name}/*.la %{_sbindir}/cryptsetup-ssh %changelog -* Wed Aug 20 2025 Kristina Hanicova - 2.8.1-1 -- Update to cryptsetup 2.8.1. - -* Wed Jul 23 2025 Fedora Release Engineering - 2.8.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Tue Jun 24 2025 Ondrej Kozina - 2.8.0-1 -- Update to cryptsetup 2.8.0. - -* Mon Jun 16 2025 Milan Broz - 2.8.0~rc1-1 -- Update to cryptsetup 2.8.0-rc1. - -* Thu Jan 16 2025 Fedora Release Engineering - 2.7.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Tue Sep 03 2024 Ondrej Kozina - 2.7.5-1 -- Update to cryptsetup 2.7.5. - -* Tue Jul 30 2024 Ondrej Kozina - 2.7.4-1 -- Update to cryptsetup 2.7.4. - -* Wed Jul 17 2024 Fedora Release Engineering - 2.7.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Mon Jun 17 2024 Ondrej Kozina - 2.7.3-1 -- Update to cryptsetup 2.7.3. - -* Tue Apr 09 2024 Ondrej Kozina - 2.7.2-1 -- Update to cryptsetup 2.7.2. - -* Thu Mar 07 2024 Ondrej Kozina - 2.7.1-1 -- Update to cryptsetup 2.7.1. - -* Fri Feb 09 2024 Ondrej Kozina - 2.7.0-2 -- Rebuild for OpenSSL Argon2 implementation (OpenSSL 3.2) -- patch: Do not compile unused internal argon2 implementation - -* Wed Jan 24 2024 Ondrej Kozina - 2.7.0-1 -- Update to cryptsetup 2.7.0. - -* Wed Jan 24 2024 Fedora Release Engineering - 2.7.0~rc1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 2.7.0~rc1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Dec 20 2023 Milan Broz - 2.7.0~rc1-1 -- Update to cryptsetup 2.7.0-rc1. - -* Wed Nov 29 2023 Ondrej Kozina - 2.7.0~rc0-1 -- Update to cryptsetup 2.7.0-rc0. - -* Wed Jul 19 2023 Fedora Release Engineering - 2.6.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jun 15 2023 Yaakov Selkowitz - 2.6.1-2 -- Drop libargon2 dependency in RHEL builds - -* Fri Feb 10 2023 Ondrej Kozina - 2.6.1-1 -- Update to cryptsetup 2.6.1. - -* Thu Jan 19 2023 Fedora Release Engineering - 2.6.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Mon Nov 28 2022 Ondrej Kozina - 2.6.0-1 -- Update to cryptsetup 2.6.0. - -* Mon Nov 21 2022 Ondrej Kozina - 2.6.0~rc0-1 -- Update to cryptsetup 2.6.0-rc0. - -* Thu Jul 28 2022 Ondrej Kozina - 2.5.0-1 -- Update to cryptsetup 2.5.0. - -* Wed Jul 20 2022 Fedora Release Engineering - 2.5.0~rc1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Jul 14 2022 Ondrej Kozina - 2.5.0~rc1-1 -- Update to cryptsetup 2.5.0-rc1. - -* Thu Jan 20 2022 Fedora Release Engineering - 2.4.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jan 12 2022 Ondrej Kozina - 2.4.3-1 -- Update to cryptsetup 2.4.3. - -* Thu Nov 18 2021 Milan Broz - 2.4.2-1 -- Update to cryptsetup 2.4.2. - -* Fri Sep 17 2021 Ondrej Kozina - 2.4.1-1 -- Update to cryptsetup 2.4.1. - -* Tue Sep 14 2021 Sahana Prasad - 2.4.0-2 -- Rebuilt with OpenSSL 3.0.0 - -* Wed Aug 18 2021 Ondrej Kozina - 2.4.0-1 -- Update to cryptsetup 2.4.0. - -* Fri Jul 30 2021 Milan Broz - 2.4.0~rc1-1 -- Update to cryptsetup 2.4.0-rc1. - -* Wed Jul 21 2021 Fedora Release Engineering - 2.4.0~rc0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Sat Jul 10 2021 Björn Esser - 2.4.0~rc0-2 -- Rebuild for versioned symbols in json-c - -* Fri Jul 02 2021 Ondrej Kozina - 2.4.0~rc0-1 -- Update to cryptsetup 2.4.0-rc0. -- add experimental cryptsetup-ssh token subpackage -- spec file cleanup - -* Fri May 28 2021 Milan Broz - 2.3.6-1 -- Update to cryptsetup 2.3.6. - -* Thu Mar 11 2021 Milan Broz - 2.3.5-2 -- Update to cryptsetup 2.3.5. - -* Tue Jan 26 2021 Fedora Release Engineering - 2.3.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Thu Sep 03 2020 Milan Broz - 2.3.4-1 -- Update to cryptsetup 2.3.4. -- Fix for CVE-2020-14382 (#1874712) - -* Mon Jul 27 2020 Fedora Release Engineering - 2.3.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Thu May 28 2020 Ondrej Kozina - 2.3.3-1 -- Update to cryptsetup 2.3.3. - -* Thu Apr 30 2020 Milan Broz - 2.3.2-1 -- Update to cryptsetup 2.3.2. - -* Tue Apr 21 2020 Björn Esser - 2.3.1-4 -- Rebuild (json-c) - -* Thu Apr 16 2020 Milan Broz - 2.3.1-3 -- Fix broken json-c patch (#1824878). - -* Tue Apr 14 2020 Björn Esser - 2.3.1-2 -- Add support for upcoming json-c 0.14.0 -- Use %%make_build, %%make_install and %%autosetup macros - -* Thu Mar 12 2020 Ondrej Kozina - 2.3.1-1 -- Update to cryptsetup 2.3.1. - -* Sun Feb 02 2020 Milan Broz - 2.3.0-1 -- Update to cryptsetup 2.3.0. - -* Tue Jan 28 2020 Fedora Release Engineering - 2.3.0-0.2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sun Jan 12 2020 Milan Broz - 2.3.0-0.1 -- Update to cryptsetup 2.3.0-rc0. - -* Fri Nov 01 2019 Ondrej Kozina - 2.2.2-1 -- Update to cryptsetup 2.2.2. - -* Fri Sep 06 2019 Ondrej Kozina - 2.2.1-1 -- Update to cryptsetup 2.2.1. - -* Thu Aug 15 2019 Milan Broz - 2.2.0-1 -- Update to cryptsetup 2.2.0. - -* Wed Jul 24 2019 Fedora Release Engineering - 2.2.0-0.3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Jun 14 2019 Ondrej Kozina - 2.2.0-0.2 -- Update to cryptsetup 2.2.0-rc1. - -* Fri May 03 2019 Ondrej Kozina - 2.2.0-0.1 -- Update to cryptsetup 2.2.0-rc0. - -* Thu Apr 04 2019 Kalev Lember - 2.1.0-3 -- Add back python2-cryptsetup and cryptsetup-python3 obsoletes - -* Mon Mar 18 2019 Milan Broz - 2.1.0-2 -- Rebuild for new libargon2 soname. - -* Fri Feb 08 2019 Ondrej Kozina - 2.1.0-1 -- Update to cryptsetup 2.1.0. -- Drop python specific bits from spec file (python was removed - from upstream project) - -* Thu Jan 31 2019 Fedora Release Engineering - 2.0.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Tue Jan 22 2019 Ondrej Kozina - 2.0.6-2 -- Switch default metadata format to LUKS2. -- Resolves: #1668013 - -* Mon Dec 03 2018 Ondrej Kozina - 2.0.6-1 -- Update to cryptsetup 2.0.6. - -* Mon Oct 29 2018 Ondrej Kozina - 2.0.5-1 -- Update to cryptsetup 2.0.5. - -* Fri Aug 03 2018 Ondrej Kozina - 2.0.4-1 -- Update to cryptsetup 2.0.4. -- patch: Add Fedora system library paths in configure. - -* Tue Jul 17 2018 Ondrej Kozina - 2.0.3-6 -- Remove libgcrypt dependency from cryptsetup-libs package. - -* Tue Jul 17 2018 Ondrej Kozina - 2.0.3-5 -- Replace sed script with --disable-rpath configure option. -- Switch cryptsetup to openssl crypto backend. -- Spec file cleanup. - -* Thu Jul 12 2018 Fedora Release Engineering - 2.0.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri May 04 2018 Ondrej Kozina - 2.0.3-3 -- Fix obsolete macro for python3 subpackage. - -* Fri May 04 2018 Ondrej Kozina - 2.0.3-2 -- Add missing 'Obsoletes' macros for python subpackages. - -* Fri May 04 2018 Milan Broz - 2.0.3-1 -- Update to cryptsetup 2.0.3. - -* Wed Apr 25 2018 Ondrej Kozina - 2.0.2-3 -- Add conditions for python sub-packages - -* Tue Mar 27 2018 Björn Esser - 2.0.2-2 -- Rebuilt for libjson-c.so.4 (json-c v0.13.1) on fc28 - -* Wed Mar 07 2018 Milan Broz - 2.0.2-1 -- Update to cryptsetup 2.0.2. - -* Tue Mar 06 2018 Björn Esser - 2.0.1-3 -- Rebuilt for libjson-c.so.4 (json-c v0.13.1) - -* Wed Feb 07 2018 Fedora Release Engineering - 2.0.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sun Jan 21 2018 Milan Broz - 2.0.1-1 -- Update to cryptsetup 2.0.1. - -* Thu Jan 04 2018 Ondrej Kozina - 2.0.0-3 -- Override locking path to /run/cryptsetup (going to be new default) -- Claim ownership of the locking directory - -* Fri Dec 15 2017 Iryna Shcherbina - 2.0.0-2 -- Update Python 2 dependency declarations to new packaging standards - (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) - -* Tue Dec 12 2017 Ondrej Kozina - 2.0.0-1 -- Update to cryptsetup 2.0.0 (final). - -* Sun Dec 10 2017 Björn Esser - 2.0.0-0.6 -- Rebuilt for libjson-c.so.3 - -* Mon Nov 20 2017 Milan Broz - 2.0.0-0.5 -- Link to system libargon2 instead of using bundled code. - -* Thu Nov 09 2017 Ondrej Kozina - 2.0.0-0.4 -- Drop the legacy library. - -* Wed Nov 08 2017 Ondrej Kozina - 2.0.0-0.3 -- Temporary build providing legacy library. - -* Tue Nov 07 2017 Ondrej Kozina - 2.0.0-0.2 -- Update to cryptsetup 2.0.0-rc1 (with libcryptsetup soname bump). -- Added integritysetup subpackage. - -* Sun Aug 20 2017 Zbigniew Jędrzejewski-Szmek - 1.7.5-5 -- Add Provides for the old name without %%_isa - -* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 1.7.5-4 -- Python 2 binary package renamed to python2-cryptsetup - See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 - -* Wed Aug 02 2017 Fedora Release Engineering - 1.7.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 1.7.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Thu Apr 27 2017 Milan Broz - 1.7.5-1 -- Update to cryptsetup 1.7.5. - -* Wed Mar 15 2017 Milan Broz - 1.7.4-1 -- Update to cryptsetup 1.7.4. - -* Fri Feb 10 2017 Fedora Release Engineering - 1.7.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Dec 19 2016 Miro Hrončok - 1.7.3-2 -- Rebuild for Python 3.6 - -* Sun Oct 30 2016 Milan Broz - 1.7.3-1 -- Update to cryptsetup 1.7.3. - -* Tue Jul 19 2016 Fedora Release Engineering - 1.7.2-3 -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages - -* Mon Jun 13 2016 Milan Broz - 1.7.2-2 -- Rebuilt for compatible symbol changes in glibc. - -* Sat Jun 04 2016 Milan Broz - 1.7.2-1 -- Update to cryptsetup 1.7.2. - -* Sun Feb 28 2016 Milan Broz - 1.7.1-1 -- Update to cryptsetup 1.7.1. - -* Wed Feb 03 2016 Fedora Release Engineering - 1.7.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Nov 10 2015 Fedora Release Engineering - 1.7.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 - -* Tue Nov 03 2015 Milan Broz - 1.7.0-1 -- Update to cryptsetup 1.7.0. -- Switch to sha256 as default hash. -- Increase default PBKDF2 iteration time to 2 seconds. - -* Tue Sep 08 2015 Milan Broz - 1.6.8-2 -- Update to cryptsetup 1.6.8. - -* Wed Jun 17 2015 Fedora Release Engineering - 1.6.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Mar 23 2015 Milan Broz - 1.6.7-1 -- Update to cryptsetup 1.6.7. -- Remove no longer needed fipscheck library dependence. -- Change URL to new homepage. - -* Sat Aug 16 2014 Milan Broz - 1.6.6-1 -- Update to cryptsetup 1.6.6. - -* Sat Aug 16 2014 Fedora Release Engineering - 1.6.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Fri Jul 11 2014 Tom Callaway - 1.6.5-2 -- fix license handling - -* Sun Jun 29 2014 Milan Broz - 1.6.5-1 -- Update to cryptsetup 1.6.5. -- Add cryptsetup-python3 subpackage. - -* Sat Jun 07 2014 Fedora Release Engineering - 1.6.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Mar 02 2014 Milan Broz - 1.6.4-2 -- Require libgcrypt 1.6.1 (with fixed PBKDF2 and Whirlpool hash). - -* Thu Feb 27 2014 Milan Broz - 1.6.4-1 -- Update to cryptsetup 1.6.4. - -* Tue Jan 07 2014 Ondrej Kozina - 1.6.3-2 -- remove useless hmac checksum - -* Fri Dec 13 2013 Milan Broz - 1.6.3-1 -- Update to cryptsetup 1.6.3. - -* Sun Aug 04 2013 Milan Broz - 1.6.2-1 -- Update to cryptsetup 1.6.2. - -* Sat Aug 03 2013 Fedora Release Engineering - 1.6.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Sun Mar 31 2013 Milan Broz - 1.6.1-1 -- Update to cryptsetup 1.6.1. -- Install ReleaseNotes files instead of empty Changelog file. - -* Wed Feb 13 2013 Fedora Release Engineering - 1.6.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Mon Jan 14 2013 Milan Broz - 1.6.0-1 -- Update to cryptsetup 1.6.0. -- Change default LUKS encryption mode to aes-xts-plain64 (AES128). -- Force use of gcrypt PBKDF2 instead of internal implementation. - -* Sat Dec 29 2012 Milan Broz - 1.6.0-0.1 -- Update to cryptsetup 1.6.0-rc1. -- Relax license to GPLv2+ according to new release. -- Compile cryptsetup with libpwquality support. - -* Tue Oct 16 2012 Milan Broz - 1.5.1-1 -- Update to cryptsetup 1.5.1. - -* Wed Jul 18 2012 Fedora Release Engineering - 1.5.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Tue Jul 10 2012 Milan Broz - 1.5.0-1 -- Update to cryptsetup 1.5.0. - -* Wed Jun 20 2012 Milan Broz - 1.5.0-0.2 -- Update to cryptsetup 1.5.0-rc2. -- Add cryptsetup-reencrypt subpackage. - -* Mon Jun 11 2012 Milan Broz - 1.5.0-0.1 -- Update to cryptsetup 1.5.0-rc1. -- Add veritysetup subpackage. -- Move localization files to libs subpackage. - -* Thu May 31 2012 Milan Broz - 1.4.3-2 -- Build with fipscheck (verification in fips mode). -- Clean up spec file, use install to /usr. - -* Thu May 31 2012 Milan Broz - 1.4.3-1 -- Update to cryptsetup 1.4.3. - -* Thu Apr 12 2012 Milan Broz - 1.4.2-1 -- Update to cryptsetup 1.4.2. - -* Fri Jan 13 2012 Fedora Release Engineering - 1.4.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Wed Nov 09 2011 Milan Broz - 1.4.1-1 -- Update to cryptsetup 1.4.1. -- Add Python cryptsetup bindings. -- Obsolete separate python-cryptsetup package. - -* Wed Oct 26 2011 Milan Broz - 1.4.0-1 -- Update to cryptsetup 1.4.0. - -* Mon Oct 10 2011 Milan Broz - 1.4.0-0.1 -- Update to cryptsetup 1.4.0-rc1. -- Rename package back from cryptsetup-luks to cryptsetup. - -* Wed Jun 22 2011 Milan Broz - 1.3.1-2 -- Fix return code for status command when device doesn't exist. - -* Tue May 24 2011 Milan Broz - 1.3.1-1 -- Update to cryptsetup 1.3.1. - -* Tue Apr 05 2011 Milan Broz - 1.3.0-1 -- Update to cryptsetup 1.3.0. - -* Tue Mar 22 2011 Milan Broz - 1.3.0-0.2 -- Update to cryptsetup 1.3.0-rc2 - -* Mon Mar 14 2011 Milan Broz - 1.3.0-0.1 -- Update to cryptsetup 1.3.0-rc1 - -* Tue Feb 08 2011 Fedora Release Engineering - 1.2.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Mon Dec 20 2010 Milan Broz - 1.2.0-1 -- Update to cryptsetup 1.2.0 - -* Thu Nov 25 2010 Milan Broz - 1.2.0-0.2 -- Fix crypt_activate_by_keyfile() to work with PLAIN devices. - -* Tue Nov 16 2010 Milan Broz - 1.2.0-0.1 -- Add FAQ to documentation. -- Update to cryptsetup 1.2.0-rc1 - -* Sat Jul 03 2010 Milan Broz - 1.1.3-1 -- Update to cryptsetup 1.1.3 - -* Mon Jun 07 2010 Milan Broz - 1.1.2-2 -- Fix alignment ioctl use. -- Fix API activation calls to handle NULL device name. - -* Sun May 30 2010 Milan Broz - 1.1.2-1 -- Update to cryptsetup 1.1.2 -- Fix luksOpen handling of new line char on stdin. - -* Sun May 23 2010 Milan Broz - 1.1.1-1 -- Update to cryptsetup 1.1.1 -- Fix luksClose for stacked LUKS/LVM devices. - -* Mon May 03 2010 Milan Broz - 1.1.1-0.2 -- Update to cryptsetup 1.1.1-rc2. - -* Sat May 01 2010 Milan Broz - 1.1.1-0.1 -- Update to cryptsetup 1.1.1-rc1. - -* Sun Jan 17 2010 Milan Broz - 1.1.0-1 -- Update to cryptsetup 1.1.0. - -* Fri Jan 15 2010 Milan Broz - 1.1.0-0.6 -- Fix gcrypt initialisation. -- Fix backward compatibility for hash algorithm (uppercase). - -* Wed Dec 30 2009 Milan Broz - 1.1.0-0.5 -- Update to cryptsetup 1.1.0-rc4 - -* Mon Nov 16 2009 Milan Broz - 1.1.0-0.4 -- Update to cryptsetup 1.1.0-rc3 - -* Thu Oct 01 2009 Milan Broz - 1.1.0-0.3 -- Update to cryptsetup 1.1.0-rc2 -- Fix libcryptsetup to properly export only versioned symbols. - -* Tue Sep 29 2009 Milan Broz - 1.1.0-0.2 -- Update to cryptsetup 1.1.0-rc1 -- Add luksHeaderBackup and luksHeaderRestore commands. - -* Fri Sep 11 2009 Milan Broz - 1.1.0-0.1 -- Update to new upstream testing version with new API interface. -- Add luksSuspend and luksResume commands. -- Introduce pkgconfig. - -* Fri Jul 24 2009 Fedora Release Engineering - 1.0.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Jul 22 2009 Milan Broz - 1.0.7-1 -- Update to upstream final release. -- Split libs subpackage. -- Remove rpath setting from cryptsetup binary. - -* Wed Jul 15 2009 Till Maas - 1.0.7-0.2 -- update BR because of libuuid splitout from e2fsprogs - -* Mon Jun 22 2009 Milan Broz - 1.0.7-0.1 -- Update to new upstream 1.0.7-rc1. - -- Wipe old fs headers to not confuse blkid (#468062) -* Tue Feb 24 2009 Fedora Release Engineering - 1.0.6-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Thu Oct 30 2008 Milan Broz - 1.0.6-6 -- Wipe old fs headers to not confuse blkid (#468062) - -* Tue Sep 23 2008 Milan Broz - 1.0.6-5 -- Change new project home page. -- Print more descriptive messages for initialization errors. -- Refresh patches to versions commited upstream. - -* Sat Sep 06 2008 Milan Broz - 1.0.6-4 -- Fix close of zero decriptor. -- Fix udevsettle delays - use temporary crypt device remapping. - -* Wed May 28 2008 Till Maas - 1.0.6-3 -- remove a duplicate sentence from the manpage (RH #448705) -- add patch metadata about upstream status - -* Tue Apr 15 2008 Bill Nottinghm - 1.0.6-2 -- Add the device to the luksOpen prompt (#433406) -- Use iconv, not recode (#442574) - -* Thu Mar 13 2008 Till Maas - 1.0.6-1 -- Update to latest version -- remove patches that have been merged upstream - -* Mon Mar 03 2008 Till Maas - 1.0.6-0.1.pre2 -- Update to new version with several bugfixes -- remove patches that have been merged upstream -- add patch from cryptsetup newsgroup -- fix typo / missing luksRemoveKey in manpage (patch) - -* Tue Feb 19 2008 Fedora Release Engineering - 1.0.5-9 -- Autorebuild for GCC 4.3 - -* Sat Jan 19 2008 Peter Jones - 1.0.5-8 -- Rebuild for broken deps. - -* Thu Aug 30 2007 Till Maas - 1.0.5-7 -- update URL -- update license tag -- recode ChangeLog from latin1 to uf8 -- add smp_mflags to make - -* Fri Aug 24 2007 Till Maas - 1.0.5-6 -- cleanup BuildRequires: -- removed versions, packages in Fedora are new enough -- changed popt to popt-devel - -* Thu Aug 23 2007 Till Maas - 1.0.5-5 -- fix devel subpackage requires -- remove empty NEWS README -- remove uneeded INSTALL -- remove uneeded ldconfig requires -- add readonly detection patch - -* Wed Aug 08 2007 Till Maas - 1.0.5-4 -- disable patch2, libsepol is now detected by configure -- move libcryptsetup.so to %%{_libdir} instead of /%%{_lib} - -* Fri Jul 27 2007 Till Maas - 1.0.5-3 -- Use /%%{_lib} instead of /lib to use /lib64 on 64bit archs - -* Thu Jul 26 2007 Till Maas - 1.0.5-2 -- Use /lib as libdir (#243228) -- sync header and library (#215349) -- do not use %%makeinstall (recommended by PackageGuidelines) -- select sbindir with %%configure instead with make -- add TODO - -* Wed Jun 13 2007 Jeremy Katz - 1.0.5-1 -- update to 1.0.5 - -* Mon Jun 04 2007 Peter Jones - 1.0.3-5 -- Don't build static any more. - -* Mon Feb 05 2007 Alasdair Kergon - 1.0.3-4 -- Add build dependency on new device-mapper-devel package. -- Add preun and post ldconfig requirements. -- Update BuildRoot. - -* Wed Nov 1 2006 Peter Jones - 1.0.3-3 -- Require newer libselinux (#213414) - -* Wed Jul 12 2006 Jesse Keating - 1.0.3-2.1 -- rebuild - -* Wed Jun 7 2006 Jeremy Katz - 1.0.3-2 -- put shared libs in the right subpackages - -* Fri Apr 7 2006 Bill Nottingham 1.0.3-1 -- update to final 1.0.3 - -* Mon Feb 27 2006 Bill Nottingham 1.0.3-0.rc2 -- update to 1.0.3rc2, fixes bug with HAL & encrypted devices (#182658) - -* Wed Feb 22 2006 Bill Nottingham 1.0.3-0.rc1 -- update to 1.0.3rc1, reverts changes to default encryption type - -* Tue Feb 21 2006 Bill Nottingham 1.0.2-1 -- update to 1.0.2, fix incompatiblity with old cryptsetup (#176726) - -* Mon Feb 20 2006 Karsten Hopp 1.0.1-5 -- BuildRequires: libselinux-devel - -* Fri Feb 10 2006 Jesse Keating - 1.0.1-4.2.1 -- bump again for double-long bug on ppc(64) - -* Tue Feb 07 2006 Jesse Keating - 1.0.1-4.2 -- rebuilt for new gcc4.1 snapshot and glibc changes - -* Fri Dec 09 2005 Jesse Keating -- rebuilt - -* Mon Dec 5 2005 Bill Nottingham 1.0.1-4 -- rebuild against new libdevmapper - -* Thu Oct 13 2005 Florian La Roche -- add -lsepol to rebuild on current fc5 - -* Mon Aug 22 2005 Karel Zak 1.0.1-2 -- fix cryptsetup help for isLuks action - -* Fri Jul 1 2005 Bill Nottingham 1.0.1-1 -- update to 1.0.1 - fixes incompatiblity with previous cryptsetup for - piped passwords - -* Thu Jun 16 2005 Bill Nottingham 1.0-2 -- add patch for 32/64 bit compatibility (#160445, ) - -* Tue Mar 29 2005 Bill Nottingham 1.0-1 -- update to 1.0 - -* Thu Mar 10 2005 Bill Nottingham 0.993-1 -- switch to cryptsetup-luks, for LUKS support - -* Tue Oct 12 2004 Bill Nottingham 0.1-4 -- oops, make that *everything* static (#129926) - -* Tue Aug 31 2004 Bill Nottingham 0.1-3 -- link some things static, move to /sbin (#129926) - -* Tue Jun 15 2004 Elliot Lee -- rebuilt - -* Fri Apr 16 2004 Bill Nottingham 0.1-1 -- initial packaging +%autochangelog From 0e00f1ede7abd90cbeee8502babd933bb36422c0 Mon Sep 17 00:00:00 2001 From: Kristina Hanicova Date: Thu, 2 Oct 2025 13:46:17 +0200 Subject: [PATCH 138/142] Revert "Add rpmautospec." This reverts commit a529067c727f090089dd8e08d98dd9505cb976b8. --- changelog | 660 ----------------------------------------------- cryptsetup.spec | 663 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 661 insertions(+), 662 deletions(-) delete mode 100644 changelog diff --git a/changelog b/changelog deleted file mode 100644 index 1d8a8f0..0000000 --- a/changelog +++ /dev/null @@ -1,660 +0,0 @@ -* Wed Aug 20 2025 Kristina Hanicova - 2.8.1-1 -- Update to cryptsetup 2.8.1. - -* Wed Jul 23 2025 Fedora Release Engineering - 2.8.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Tue Jun 24 2025 Ondrej Kozina - 2.8.0-1 -- Update to cryptsetup 2.8.0. - -* Mon Jun 16 2025 Milan Broz - 2.8.0~rc1-1 -- Update to cryptsetup 2.8.0-rc1. - -* Thu Jan 16 2025 Fedora Release Engineering - 2.7.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Tue Sep 03 2024 Ondrej Kozina - 2.7.5-1 -- Update to cryptsetup 2.7.5. - -* Tue Jul 30 2024 Ondrej Kozina - 2.7.4-1 -- Update to cryptsetup 2.7.4. - -* Wed Jul 17 2024 Fedora Release Engineering - 2.7.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Mon Jun 17 2024 Ondrej Kozina - 2.7.3-1 -- Update to cryptsetup 2.7.3. - -* Tue Apr 09 2024 Ondrej Kozina - 2.7.2-1 -- Update to cryptsetup 2.7.2. - -* Thu Mar 07 2024 Ondrej Kozina - 2.7.1-1 -- Update to cryptsetup 2.7.1. - -* Fri Feb 09 2024 Ondrej Kozina - 2.7.0-2 -- Rebuild for OpenSSL Argon2 implementation (OpenSSL 3.2) -- patch: Do not compile unused internal argon2 implementation - -* Wed Jan 24 2024 Ondrej Kozina - 2.7.0-1 -- Update to cryptsetup 2.7.0. - -* Wed Jan 24 2024 Fedora Release Engineering - 2.7.0~rc1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 2.7.0~rc1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Dec 20 2023 Milan Broz - 2.7.0~rc1-1 -- Update to cryptsetup 2.7.0-rc1. - -* Wed Nov 29 2023 Ondrej Kozina - 2.7.0~rc0-1 -- Update to cryptsetup 2.7.0-rc0. - -* Wed Jul 19 2023 Fedora Release Engineering - 2.6.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jun 15 2023 Yaakov Selkowitz - 2.6.1-2 -- Drop libargon2 dependency in RHEL builds - -* Fri Feb 10 2023 Ondrej Kozina - 2.6.1-1 -- Update to cryptsetup 2.6.1. - -* Thu Jan 19 2023 Fedora Release Engineering - 2.6.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Mon Nov 28 2022 Ondrej Kozina - 2.6.0-1 -- Update to cryptsetup 2.6.0. - -* Mon Nov 21 2022 Ondrej Kozina - 2.6.0~rc0-1 -- Update to cryptsetup 2.6.0-rc0. - -* Thu Jul 28 2022 Ondrej Kozina - 2.5.0-1 -- Update to cryptsetup 2.5.0. - -* Wed Jul 20 2022 Fedora Release Engineering - 2.5.0~rc1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Jul 14 2022 Ondrej Kozina - 2.5.0~rc1-1 -- Update to cryptsetup 2.5.0-rc1. - -* Thu Jan 20 2022 Fedora Release Engineering - 2.4.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jan 12 2022 Ondrej Kozina - 2.4.3-1 -- Update to cryptsetup 2.4.3. - -* Thu Nov 18 2021 Milan Broz - 2.4.2-1 -- Update to cryptsetup 2.4.2. - -* Fri Sep 17 2021 Ondrej Kozina - 2.4.1-1 -- Update to cryptsetup 2.4.1. - -* Tue Sep 14 2021 Sahana Prasad - 2.4.0-2 -- Rebuilt with OpenSSL 3.0.0 - -* Wed Aug 18 2021 Ondrej Kozina - 2.4.0-1 -- Update to cryptsetup 2.4.0. - -* Fri Jul 30 2021 Milan Broz - 2.4.0~rc1-1 -- Update to cryptsetup 2.4.0-rc1. - -* Wed Jul 21 2021 Fedora Release Engineering - 2.4.0~rc0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Sat Jul 10 2021 Björn Esser - 2.4.0~rc0-2 -- Rebuild for versioned symbols in json-c - -* Fri Jul 02 2021 Ondrej Kozina - 2.4.0~rc0-1 -- Update to cryptsetup 2.4.0-rc0. -- add experimental cryptsetup-ssh token subpackage -- spec file cleanup - -* Fri May 28 2021 Milan Broz - 2.3.6-1 -- Update to cryptsetup 2.3.6. - -* Thu Mar 11 2021 Milan Broz - 2.3.5-2 -- Update to cryptsetup 2.3.5. - -* Tue Jan 26 2021 Fedora Release Engineering - 2.3.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Thu Sep 03 2020 Milan Broz - 2.3.4-1 -- Update to cryptsetup 2.3.4. -- Fix for CVE-2020-14382 (#1874712) - -* Mon Jul 27 2020 Fedora Release Engineering - 2.3.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Thu May 28 2020 Ondrej Kozina - 2.3.3-1 -- Update to cryptsetup 2.3.3. - -* Thu Apr 30 2020 Milan Broz - 2.3.2-1 -- Update to cryptsetup 2.3.2. - -* Tue Apr 21 2020 Björn Esser - 2.3.1-4 -- Rebuild (json-c) - -* Thu Apr 16 2020 Milan Broz - 2.3.1-3 -- Fix broken json-c patch (#1824878). - -* Tue Apr 14 2020 Björn Esser - 2.3.1-2 -- Add support for upcoming json-c 0.14.0 -- Use %%make_build, %%make_install and %%autosetup macros - -* Thu Mar 12 2020 Ondrej Kozina - 2.3.1-1 -- Update to cryptsetup 2.3.1. - -* Sun Feb 02 2020 Milan Broz - 2.3.0-1 -- Update to cryptsetup 2.3.0. - -* Tue Jan 28 2020 Fedora Release Engineering - 2.3.0-0.2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sun Jan 12 2020 Milan Broz - 2.3.0-0.1 -- Update to cryptsetup 2.3.0-rc0. - -* Fri Nov 01 2019 Ondrej Kozina - 2.2.2-1 -- Update to cryptsetup 2.2.2. - -* Fri Sep 06 2019 Ondrej Kozina - 2.2.1-1 -- Update to cryptsetup 2.2.1. - -* Thu Aug 15 2019 Milan Broz - 2.2.0-1 -- Update to cryptsetup 2.2.0. - -* Wed Jul 24 2019 Fedora Release Engineering - 2.2.0-0.3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Jun 14 2019 Ondrej Kozina - 2.2.0-0.2 -- Update to cryptsetup 2.2.0-rc1. - -* Fri May 03 2019 Ondrej Kozina - 2.2.0-0.1 -- Update to cryptsetup 2.2.0-rc0. - -* Thu Apr 04 2019 Kalev Lember - 2.1.0-3 -- Add back python2-cryptsetup and cryptsetup-python3 obsoletes - -* Mon Mar 18 2019 Milan Broz - 2.1.0-2 -- Rebuild for new libargon2 soname. - -* Fri Feb 08 2019 Ondrej Kozina - 2.1.0-1 -- Update to cryptsetup 2.1.0. -- Drop python specific bits from spec file (python was removed - from upstream project) - -* Thu Jan 31 2019 Fedora Release Engineering - 2.0.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Tue Jan 22 2019 Ondrej Kozina - 2.0.6-2 -- Switch default metadata format to LUKS2. -- Resolves: #1668013 - -* Mon Dec 03 2018 Ondrej Kozina - 2.0.6-1 -- Update to cryptsetup 2.0.6. - -* Mon Oct 29 2018 Ondrej Kozina - 2.0.5-1 -- Update to cryptsetup 2.0.5. - -* Fri Aug 03 2018 Ondrej Kozina - 2.0.4-1 -- Update to cryptsetup 2.0.4. -- patch: Add Fedora system library paths in configure. - -* Tue Jul 17 2018 Ondrej Kozina - 2.0.3-6 -- Remove libgcrypt dependency from cryptsetup-libs package. - -* Tue Jul 17 2018 Ondrej Kozina - 2.0.3-5 -- Replace sed script with --disable-rpath configure option. -- Switch cryptsetup to openssl crypto backend. -- Spec file cleanup. - -* Thu Jul 12 2018 Fedora Release Engineering - 2.0.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri May 04 2018 Ondrej Kozina - 2.0.3-3 -- Fix obsolete macro for python3 subpackage. - -* Fri May 04 2018 Ondrej Kozina - 2.0.3-2 -- Add missing 'Obsoletes' macros for python subpackages. - -* Fri May 04 2018 Milan Broz - 2.0.3-1 -- Update to cryptsetup 2.0.3. - -* Wed Apr 25 2018 Ondrej Kozina - 2.0.2-3 -- Add conditions for python sub-packages - -* Tue Mar 27 2018 Björn Esser - 2.0.2-2 -- Rebuilt for libjson-c.so.4 (json-c v0.13.1) on fc28 - -* Wed Mar 07 2018 Milan Broz - 2.0.2-1 -- Update to cryptsetup 2.0.2. - -* Tue Mar 06 2018 Björn Esser - 2.0.1-3 -- Rebuilt for libjson-c.so.4 (json-c v0.13.1) - -* Wed Feb 07 2018 Fedora Release Engineering - 2.0.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sun Jan 21 2018 Milan Broz - 2.0.1-1 -- Update to cryptsetup 2.0.1. - -* Thu Jan 04 2018 Ondrej Kozina - 2.0.0-3 -- Override locking path to /run/cryptsetup (going to be new default) -- Claim ownership of the locking directory - -* Fri Dec 15 2017 Iryna Shcherbina - 2.0.0-2 -- Update Python 2 dependency declarations to new packaging standards - (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) - -* Tue Dec 12 2017 Ondrej Kozina - 2.0.0-1 -- Update to cryptsetup 2.0.0 (final). - -* Sun Dec 10 2017 Björn Esser - 2.0.0-0.6 -- Rebuilt for libjson-c.so.3 - -* Mon Nov 20 2017 Milan Broz - 2.0.0-0.5 -- Link to system libargon2 instead of using bundled code. - -* Thu Nov 09 2017 Ondrej Kozina - 2.0.0-0.4 -- Drop the legacy library. - -* Wed Nov 08 2017 Ondrej Kozina - 2.0.0-0.3 -- Temporary build providing legacy library. - -* Tue Nov 07 2017 Ondrej Kozina - 2.0.0-0.2 -- Update to cryptsetup 2.0.0-rc1 (with libcryptsetup soname bump). -- Added integritysetup subpackage. - -* Sun Aug 20 2017 Zbigniew Jędrzejewski-Szmek - 1.7.5-5 -- Add Provides for the old name without %%_isa - -* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 1.7.5-4 -- Python 2 binary package renamed to python2-cryptsetup - See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 - -* Wed Aug 02 2017 Fedora Release Engineering - 1.7.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 1.7.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Thu Apr 27 2017 Milan Broz - 1.7.5-1 -- Update to cryptsetup 1.7.5. - -* Wed Mar 15 2017 Milan Broz - 1.7.4-1 -- Update to cryptsetup 1.7.4. - -* Fri Feb 10 2017 Fedora Release Engineering - 1.7.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Dec 19 2016 Miro Hrončok - 1.7.3-2 -- Rebuild for Python 3.6 - -* Sun Oct 30 2016 Milan Broz - 1.7.3-1 -- Update to cryptsetup 1.7.3. - -* Tue Jul 19 2016 Fedora Release Engineering - 1.7.2-3 -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages - -* Mon Jun 13 2016 Milan Broz - 1.7.2-2 -- Rebuilt for compatible symbol changes in glibc. - -* Sat Jun 04 2016 Milan Broz - 1.7.2-1 -- Update to cryptsetup 1.7.2. - -* Sun Feb 28 2016 Milan Broz - 1.7.1-1 -- Update to cryptsetup 1.7.1. - -* Wed Feb 03 2016 Fedora Release Engineering - 1.7.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Nov 10 2015 Fedora Release Engineering - 1.7.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 - -* Tue Nov 03 2015 Milan Broz - 1.7.0-1 -- Update to cryptsetup 1.7.0. -- Switch to sha256 as default hash. -- Increase default PBKDF2 iteration time to 2 seconds. - -* Tue Sep 08 2015 Milan Broz - 1.6.8-2 -- Update to cryptsetup 1.6.8. - -* Wed Jun 17 2015 Fedora Release Engineering - 1.6.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Mar 23 2015 Milan Broz - 1.6.7-1 -- Update to cryptsetup 1.6.7. -- Remove no longer needed fipscheck library dependence. -- Change URL to new homepage. - -* Sat Aug 16 2014 Milan Broz - 1.6.6-1 -- Update to cryptsetup 1.6.6. - -* Sat Aug 16 2014 Fedora Release Engineering - 1.6.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Fri Jul 11 2014 Tom Callaway - 1.6.5-2 -- fix license handling - -* Sun Jun 29 2014 Milan Broz - 1.6.5-1 -- Update to cryptsetup 1.6.5. -- Add cryptsetup-python3 subpackage. - -* Sat Jun 07 2014 Fedora Release Engineering - 1.6.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Mar 02 2014 Milan Broz - 1.6.4-2 -- Require libgcrypt 1.6.1 (with fixed PBKDF2 and Whirlpool hash). - -* Thu Feb 27 2014 Milan Broz - 1.6.4-1 -- Update to cryptsetup 1.6.4. - -* Tue Jan 07 2014 Ondrej Kozina - 1.6.3-2 -- remove useless hmac checksum - -* Fri Dec 13 2013 Milan Broz - 1.6.3-1 -- Update to cryptsetup 1.6.3. - -* Sun Aug 04 2013 Milan Broz - 1.6.2-1 -- Update to cryptsetup 1.6.2. - -* Sat Aug 03 2013 Fedora Release Engineering - 1.6.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Sun Mar 31 2013 Milan Broz - 1.6.1-1 -- Update to cryptsetup 1.6.1. -- Install ReleaseNotes files instead of empty Changelog file. - -* Wed Feb 13 2013 Fedora Release Engineering - 1.6.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Mon Jan 14 2013 Milan Broz - 1.6.0-1 -- Update to cryptsetup 1.6.0. -- Change default LUKS encryption mode to aes-xts-plain64 (AES128). -- Force use of gcrypt PBKDF2 instead of internal implementation. - -* Sat Dec 29 2012 Milan Broz - 1.6.0-0.1 -- Update to cryptsetup 1.6.0-rc1. -- Relax license to GPLv2+ according to new release. -- Compile cryptsetup with libpwquality support. - -* Tue Oct 16 2012 Milan Broz - 1.5.1-1 -- Update to cryptsetup 1.5.1. - -* Wed Jul 18 2012 Fedora Release Engineering - 1.5.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Tue Jul 10 2012 Milan Broz - 1.5.0-1 -- Update to cryptsetup 1.5.0. - -* Wed Jun 20 2012 Milan Broz - 1.5.0-0.2 -- Update to cryptsetup 1.5.0-rc2. -- Add cryptsetup-reencrypt subpackage. - -* Mon Jun 11 2012 Milan Broz - 1.5.0-0.1 -- Update to cryptsetup 1.5.0-rc1. -- Add veritysetup subpackage. -- Move localization files to libs subpackage. - -* Thu May 31 2012 Milan Broz - 1.4.3-2 -- Build with fipscheck (verification in fips mode). -- Clean up spec file, use install to /usr. - -* Thu May 31 2012 Milan Broz - 1.4.3-1 -- Update to cryptsetup 1.4.3. - -* Thu Apr 12 2012 Milan Broz - 1.4.2-1 -- Update to cryptsetup 1.4.2. - -* Fri Jan 13 2012 Fedora Release Engineering - 1.4.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Wed Nov 09 2011 Milan Broz - 1.4.1-1 -- Update to cryptsetup 1.4.1. -- Add Python cryptsetup bindings. -- Obsolete separate python-cryptsetup package. - -* Wed Oct 26 2011 Milan Broz - 1.4.0-1 -- Update to cryptsetup 1.4.0. - -* Mon Oct 10 2011 Milan Broz - 1.4.0-0.1 -- Update to cryptsetup 1.4.0-rc1. -- Rename package back from cryptsetup-luks to cryptsetup. - -* Wed Jun 22 2011 Milan Broz - 1.3.1-2 -- Fix return code for status command when device doesn't exist. - -* Tue May 24 2011 Milan Broz - 1.3.1-1 -- Update to cryptsetup 1.3.1. - -* Tue Apr 05 2011 Milan Broz - 1.3.0-1 -- Update to cryptsetup 1.3.0. - -* Tue Mar 22 2011 Milan Broz - 1.3.0-0.2 -- Update to cryptsetup 1.3.0-rc2 - -* Mon Mar 14 2011 Milan Broz - 1.3.0-0.1 -- Update to cryptsetup 1.3.0-rc1 - -* Tue Feb 08 2011 Fedora Release Engineering - 1.2.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Mon Dec 20 2010 Milan Broz - 1.2.0-1 -- Update to cryptsetup 1.2.0 - -* Thu Nov 25 2010 Milan Broz - 1.2.0-0.2 -- Fix crypt_activate_by_keyfile() to work with PLAIN devices. - -* Tue Nov 16 2010 Milan Broz - 1.2.0-0.1 -- Add FAQ to documentation. -- Update to cryptsetup 1.2.0-rc1 - -* Sat Jul 03 2010 Milan Broz - 1.1.3-1 -- Update to cryptsetup 1.1.3 - -* Mon Jun 07 2010 Milan Broz - 1.1.2-2 -- Fix alignment ioctl use. -- Fix API activation calls to handle NULL device name. - -* Sun May 30 2010 Milan Broz - 1.1.2-1 -- Update to cryptsetup 1.1.2 -- Fix luksOpen handling of new line char on stdin. - -* Sun May 23 2010 Milan Broz - 1.1.1-1 -- Update to cryptsetup 1.1.1 -- Fix luksClose for stacked LUKS/LVM devices. - -* Mon May 03 2010 Milan Broz - 1.1.1-0.2 -- Update to cryptsetup 1.1.1-rc2. - -* Sat May 01 2010 Milan Broz - 1.1.1-0.1 -- Update to cryptsetup 1.1.1-rc1. - -* Sun Jan 17 2010 Milan Broz - 1.1.0-1 -- Update to cryptsetup 1.1.0. - -* Fri Jan 15 2010 Milan Broz - 1.1.0-0.6 -- Fix gcrypt initialisation. -- Fix backward compatibility for hash algorithm (uppercase). - -* Wed Dec 30 2009 Milan Broz - 1.1.0-0.5 -- Update to cryptsetup 1.1.0-rc4 - -* Mon Nov 16 2009 Milan Broz - 1.1.0-0.4 -- Update to cryptsetup 1.1.0-rc3 - -* Thu Oct 01 2009 Milan Broz - 1.1.0-0.3 -- Update to cryptsetup 1.1.0-rc2 -- Fix libcryptsetup to properly export only versioned symbols. - -* Tue Sep 29 2009 Milan Broz - 1.1.0-0.2 -- Update to cryptsetup 1.1.0-rc1 -- Add luksHeaderBackup and luksHeaderRestore commands. - -* Fri Sep 11 2009 Milan Broz - 1.1.0-0.1 -- Update to new upstream testing version with new API interface. -- Add luksSuspend and luksResume commands. -- Introduce pkgconfig. - -* Fri Jul 24 2009 Fedora Release Engineering - 1.0.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Jul 22 2009 Milan Broz - 1.0.7-1 -- Update to upstream final release. -- Split libs subpackage. -- Remove rpath setting from cryptsetup binary. - -* Wed Jul 15 2009 Till Maas - 1.0.7-0.2 -- update BR because of libuuid splitout from e2fsprogs - -* Mon Jun 22 2009 Milan Broz - 1.0.7-0.1 -- Update to new upstream 1.0.7-rc1. - -- Wipe old fs headers to not confuse blkid (#468062) -* Tue Feb 24 2009 Fedora Release Engineering - 1.0.6-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Thu Oct 30 2008 Milan Broz - 1.0.6-6 -- Wipe old fs headers to not confuse blkid (#468062) - -* Tue Sep 23 2008 Milan Broz - 1.0.6-5 -- Change new project home page. -- Print more descriptive messages for initialization errors. -- Refresh patches to versions commited upstream. - -* Sat Sep 06 2008 Milan Broz - 1.0.6-4 -- Fix close of zero decriptor. -- Fix udevsettle delays - use temporary crypt device remapping. - -* Wed May 28 2008 Till Maas - 1.0.6-3 -- remove a duplicate sentence from the manpage (RH #448705) -- add patch metadata about upstream status - -* Tue Apr 15 2008 Bill Nottinghm - 1.0.6-2 -- Add the device to the luksOpen prompt (#433406) -- Use iconv, not recode (#442574) - -* Thu Mar 13 2008 Till Maas - 1.0.6-1 -- Update to latest version -- remove patches that have been merged upstream - -* Mon Mar 03 2008 Till Maas - 1.0.6-0.1.pre2 -- Update to new version with several bugfixes -- remove patches that have been merged upstream -- add patch from cryptsetup newsgroup -- fix typo / missing luksRemoveKey in manpage (patch) - -* Tue Feb 19 2008 Fedora Release Engineering - 1.0.5-9 -- Autorebuild for GCC 4.3 - -* Sat Jan 19 2008 Peter Jones - 1.0.5-8 -- Rebuild for broken deps. - -* Thu Aug 30 2007 Till Maas - 1.0.5-7 -- update URL -- update license tag -- recode ChangeLog from latin1 to uf8 -- add smp_mflags to make - -* Fri Aug 24 2007 Till Maas - 1.0.5-6 -- cleanup BuildRequires: -- removed versions, packages in Fedora are new enough -- changed popt to popt-devel - -* Thu Aug 23 2007 Till Maas - 1.0.5-5 -- fix devel subpackage requires -- remove empty NEWS README -- remove uneeded INSTALL -- remove uneeded ldconfig requires -- add readonly detection patch - -* Wed Aug 08 2007 Till Maas - 1.0.5-4 -- disable patch2, libsepol is now detected by configure -- move libcryptsetup.so to %%{_libdir} instead of /%%{_lib} - -* Fri Jul 27 2007 Till Maas - 1.0.5-3 -- Use /%%{_lib} instead of /lib to use /lib64 on 64bit archs - -* Thu Jul 26 2007 Till Maas - 1.0.5-2 -- Use /lib as libdir (#243228) -- sync header and library (#215349) -- do not use %%makeinstall (recommended by PackageGuidelines) -- select sbindir with %%configure instead with make -- add TODO - -* Wed Jun 13 2007 Jeremy Katz - 1.0.5-1 -- update to 1.0.5 - -* Mon Jun 04 2007 Peter Jones - 1.0.3-5 -- Don't build static any more. - -* Mon Feb 05 2007 Alasdair Kergon - 1.0.3-4 -- Add build dependency on new device-mapper-devel package. -- Add preun and post ldconfig requirements. -- Update BuildRoot. - -* Wed Nov 1 2006 Peter Jones - 1.0.3-3 -- Require newer libselinux (#213414) - -* Wed Jul 12 2006 Jesse Keating - 1.0.3-2.1 -- rebuild - -* Wed Jun 7 2006 Jeremy Katz - 1.0.3-2 -- put shared libs in the right subpackages - -* Fri Apr 7 2006 Bill Nottingham 1.0.3-1 -- update to final 1.0.3 - -* Mon Feb 27 2006 Bill Nottingham 1.0.3-0.rc2 -- update to 1.0.3rc2, fixes bug with HAL & encrypted devices (#182658) - -* Wed Feb 22 2006 Bill Nottingham 1.0.3-0.rc1 -- update to 1.0.3rc1, reverts changes to default encryption type - -* Tue Feb 21 2006 Bill Nottingham 1.0.2-1 -- update to 1.0.2, fix incompatiblity with old cryptsetup (#176726) - -* Mon Feb 20 2006 Karsten Hopp 1.0.1-5 -- BuildRequires: libselinux-devel - -* Fri Feb 10 2006 Jesse Keating - 1.0.1-4.2.1 -- bump again for double-long bug on ppc(64) - -* Tue Feb 07 2006 Jesse Keating - 1.0.1-4.2 -- rebuilt for new gcc4.1 snapshot and glibc changes - -* Fri Dec 09 2005 Jesse Keating -- rebuilt - -* Mon Dec 5 2005 Bill Nottingham 1.0.1-4 -- rebuild against new libdevmapper - -* Thu Oct 13 2005 Florian La Roche -- add -lsepol to rebuild on current fc5 - -* Mon Aug 22 2005 Karel Zak 1.0.1-2 -- fix cryptsetup help for isLuks action - -* Fri Jul 1 2005 Bill Nottingham 1.0.1-1 -- update to 1.0.1 - fixes incompatiblity with previous cryptsetup for - piped passwords - -* Thu Jun 16 2005 Bill Nottingham 1.0-2 -- add patch for 32/64 bit compatibility (#160445, ) - -* Tue Mar 29 2005 Bill Nottingham 1.0-1 -- update to 1.0 - -* Thu Mar 10 2005 Bill Nottingham 0.993-1 -- switch to cryptsetup-luks, for LUKS support - -* Tue Oct 12 2004 Bill Nottingham 0.1-4 -- oops, make that *everything* static (#129926) - -* Tue Aug 31 2004 Bill Nottingham 0.1-3 -- link some things static, move to /sbin (#129926) - -* Tue Jun 15 2004 Elliot Lee -- rebuilt - -* Fri Apr 16 2004 Bill Nottingham 0.1-1 -- initial packaging diff --git a/cryptsetup.spec b/cryptsetup.spec index 4f64fac..fc439d9 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,7 +1,7 @@ Summary: Utility for setting up encrypted disks Name: cryptsetup Version: 2.8.1 -Release: %autorelease +Release: 1%{?dist} License: GPL-2.0-or-later WITH cryptsetup-OpenSSL-exception AND LGPL-2.1-or-later WITH cryptsetup-OpenSSL-exception URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: autoconf, automake, libtool, gettext-devel, @@ -117,4 +117,663 @@ rm -rf %{buildroot}%{_libdir}/%{name}/*.la %{_sbindir}/cryptsetup-ssh %changelog -%autochangelog +* Wed Aug 20 2025 Kristina Hanicova - 2.8.1-1 +- Update to cryptsetup 2.8.1. + +* Wed Jul 23 2025 Fedora Release Engineering - 2.8.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Tue Jun 24 2025 Ondrej Kozina - 2.8.0-1 +- Update to cryptsetup 2.8.0. + +* Mon Jun 16 2025 Milan Broz - 2.8.0~rc1-1 +- Update to cryptsetup 2.8.0-rc1. + +* Thu Jan 16 2025 Fedora Release Engineering - 2.7.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Tue Sep 03 2024 Ondrej Kozina - 2.7.5-1 +- Update to cryptsetup 2.7.5. + +* Tue Jul 30 2024 Ondrej Kozina - 2.7.4-1 +- Update to cryptsetup 2.7.4. + +* Wed Jul 17 2024 Fedora Release Engineering - 2.7.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Mon Jun 17 2024 Ondrej Kozina - 2.7.3-1 +- Update to cryptsetup 2.7.3. + +* Tue Apr 09 2024 Ondrej Kozina - 2.7.2-1 +- Update to cryptsetup 2.7.2. + +* Thu Mar 07 2024 Ondrej Kozina - 2.7.1-1 +- Update to cryptsetup 2.7.1. + +* Fri Feb 09 2024 Ondrej Kozina - 2.7.0-2 +- Rebuild for OpenSSL Argon2 implementation (OpenSSL 3.2) +- patch: Do not compile unused internal argon2 implementation + +* Wed Jan 24 2024 Ondrej Kozina - 2.7.0-1 +- Update to cryptsetup 2.7.0. + +* Wed Jan 24 2024 Fedora Release Engineering - 2.7.0~rc1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 2.7.0~rc1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Dec 20 2023 Milan Broz - 2.7.0~rc1-1 +- Update to cryptsetup 2.7.0-rc1. + +* Wed Nov 29 2023 Ondrej Kozina - 2.7.0~rc0-1 +- Update to cryptsetup 2.7.0-rc0. + +* Wed Jul 19 2023 Fedora Release Engineering - 2.6.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jun 15 2023 Yaakov Selkowitz - 2.6.1-2 +- Drop libargon2 dependency in RHEL builds + +* Fri Feb 10 2023 Ondrej Kozina - 2.6.1-1 +- Update to cryptsetup 2.6.1. + +* Thu Jan 19 2023 Fedora Release Engineering - 2.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Mon Nov 28 2022 Ondrej Kozina - 2.6.0-1 +- Update to cryptsetup 2.6.0. + +* Mon Nov 21 2022 Ondrej Kozina - 2.6.0~rc0-1 +- Update to cryptsetup 2.6.0-rc0. + +* Thu Jul 28 2022 Ondrej Kozina - 2.5.0-1 +- Update to cryptsetup 2.5.0. + +* Wed Jul 20 2022 Fedora Release Engineering - 2.5.0~rc1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jul 14 2022 Ondrej Kozina - 2.5.0~rc1-1 +- Update to cryptsetup 2.5.0-rc1. + +* Thu Jan 20 2022 Fedora Release Engineering - 2.4.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jan 12 2022 Ondrej Kozina - 2.4.3-1 +- Update to cryptsetup 2.4.3. + +* Thu Nov 18 2021 Milan Broz - 2.4.2-1 +- Update to cryptsetup 2.4.2. + +* Fri Sep 17 2021 Ondrej Kozina - 2.4.1-1 +- Update to cryptsetup 2.4.1. + +* Tue Sep 14 2021 Sahana Prasad - 2.4.0-2 +- Rebuilt with OpenSSL 3.0.0 + +* Wed Aug 18 2021 Ondrej Kozina - 2.4.0-1 +- Update to cryptsetup 2.4.0. + +* Fri Jul 30 2021 Milan Broz - 2.4.0~rc1-1 +- Update to cryptsetup 2.4.0-rc1. + +* Wed Jul 21 2021 Fedora Release Engineering - 2.4.0~rc0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Sat Jul 10 2021 Björn Esser - 2.4.0~rc0-2 +- Rebuild for versioned symbols in json-c + +* Fri Jul 02 2021 Ondrej Kozina - 2.4.0~rc0-1 +- Update to cryptsetup 2.4.0-rc0. +- add experimental cryptsetup-ssh token subpackage +- spec file cleanup + +* Fri May 28 2021 Milan Broz - 2.3.6-1 +- Update to cryptsetup 2.3.6. + +* Thu Mar 11 2021 Milan Broz - 2.3.5-2 +- Update to cryptsetup 2.3.5. + +* Tue Jan 26 2021 Fedora Release Engineering - 2.3.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Thu Sep 03 2020 Milan Broz - 2.3.4-1 +- Update to cryptsetup 2.3.4. +- Fix for CVE-2020-14382 (#1874712) + +* Mon Jul 27 2020 Fedora Release Engineering - 2.3.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Thu May 28 2020 Ondrej Kozina - 2.3.3-1 +- Update to cryptsetup 2.3.3. + +* Thu Apr 30 2020 Milan Broz - 2.3.2-1 +- Update to cryptsetup 2.3.2. + +* Tue Apr 21 2020 Björn Esser - 2.3.1-4 +- Rebuild (json-c) + +* Thu Apr 16 2020 Milan Broz - 2.3.1-3 +- Fix broken json-c patch (#1824878). + +* Tue Apr 14 2020 Björn Esser - 2.3.1-2 +- Add support for upcoming json-c 0.14.0 +- Use %%make_build, %%make_install and %%autosetup macros + +* Thu Mar 12 2020 Ondrej Kozina - 2.3.1-1 +- Update to cryptsetup 2.3.1. + +* Sun Feb 02 2020 Milan Broz - 2.3.0-1 +- Update to cryptsetup 2.3.0. + +* Tue Jan 28 2020 Fedora Release Engineering - 2.3.0-0.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sun Jan 12 2020 Milan Broz - 2.3.0-0.1 +- Update to cryptsetup 2.3.0-rc0. + +* Fri Nov 01 2019 Ondrej Kozina - 2.2.2-1 +- Update to cryptsetup 2.2.2. + +* Fri Sep 06 2019 Ondrej Kozina - 2.2.1-1 +- Update to cryptsetup 2.2.1. + +* Thu Aug 15 2019 Milan Broz - 2.2.0-1 +- Update to cryptsetup 2.2.0. + +* Wed Jul 24 2019 Fedora Release Engineering - 2.2.0-0.3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Jun 14 2019 Ondrej Kozina - 2.2.0-0.2 +- Update to cryptsetup 2.2.0-rc1. + +* Fri May 03 2019 Ondrej Kozina - 2.2.0-0.1 +- Update to cryptsetup 2.2.0-rc0. + +* Thu Apr 04 2019 Kalev Lember - 2.1.0-3 +- Add back python2-cryptsetup and cryptsetup-python3 obsoletes + +* Mon Mar 18 2019 Milan Broz - 2.1.0-2 +- Rebuild for new libargon2 soname. + +* Fri Feb 08 2019 Ondrej Kozina - 2.1.0-1 +- Update to cryptsetup 2.1.0. +- Drop python specific bits from spec file (python was removed + from upstream project) + +* Thu Jan 31 2019 Fedora Release Engineering - 2.0.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Jan 22 2019 Ondrej Kozina - 2.0.6-2 +- Switch default metadata format to LUKS2. +- Resolves: #1668013 + +* Mon Dec 03 2018 Ondrej Kozina - 2.0.6-1 +- Update to cryptsetup 2.0.6. + +* Mon Oct 29 2018 Ondrej Kozina - 2.0.5-1 +- Update to cryptsetup 2.0.5. + +* Fri Aug 03 2018 Ondrej Kozina - 2.0.4-1 +- Update to cryptsetup 2.0.4. +- patch: Add Fedora system library paths in configure. + +* Tue Jul 17 2018 Ondrej Kozina - 2.0.3-6 +- Remove libgcrypt dependency from cryptsetup-libs package. + +* Tue Jul 17 2018 Ondrej Kozina - 2.0.3-5 +- Replace sed script with --disable-rpath configure option. +- Switch cryptsetup to openssl crypto backend. +- Spec file cleanup. + +* Thu Jul 12 2018 Fedora Release Engineering - 2.0.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri May 04 2018 Ondrej Kozina - 2.0.3-3 +- Fix obsolete macro for python3 subpackage. + +* Fri May 04 2018 Ondrej Kozina - 2.0.3-2 +- Add missing 'Obsoletes' macros for python subpackages. + +* Fri May 04 2018 Milan Broz - 2.0.3-1 +- Update to cryptsetup 2.0.3. + +* Wed Apr 25 2018 Ondrej Kozina - 2.0.2-3 +- Add conditions for python sub-packages + +* Tue Mar 27 2018 Björn Esser - 2.0.2-2 +- Rebuilt for libjson-c.so.4 (json-c v0.13.1) on fc28 + +* Wed Mar 07 2018 Milan Broz - 2.0.2-1 +- Update to cryptsetup 2.0.2. + +* Tue Mar 06 2018 Björn Esser - 2.0.1-3 +- Rebuilt for libjson-c.so.4 (json-c v0.13.1) + +* Wed Feb 07 2018 Fedora Release Engineering - 2.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Sun Jan 21 2018 Milan Broz - 2.0.1-1 +- Update to cryptsetup 2.0.1. + +* Thu Jan 04 2018 Ondrej Kozina - 2.0.0-3 +- Override locking path to /run/cryptsetup (going to be new default) +- Claim ownership of the locking directory + +* Fri Dec 15 2017 Iryna Shcherbina - 2.0.0-2 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + +* Tue Dec 12 2017 Ondrej Kozina - 2.0.0-1 +- Update to cryptsetup 2.0.0 (final). + +* Sun Dec 10 2017 Björn Esser - 2.0.0-0.6 +- Rebuilt for libjson-c.so.3 + +* Mon Nov 20 2017 Milan Broz - 2.0.0-0.5 +- Link to system libargon2 instead of using bundled code. + +* Thu Nov 09 2017 Ondrej Kozina - 2.0.0-0.4 +- Drop the legacy library. + +* Wed Nov 08 2017 Ondrej Kozina - 2.0.0-0.3 +- Temporary build providing legacy library. + +* Tue Nov 07 2017 Ondrej Kozina - 2.0.0-0.2 +- Update to cryptsetup 2.0.0-rc1 (with libcryptsetup soname bump). +- Added integritysetup subpackage. + +* Sun Aug 20 2017 Zbigniew Jędrzejewski-Szmek - 1.7.5-5 +- Add Provides for the old name without %%_isa + +* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 1.7.5-4 +- Python 2 binary package renamed to python2-cryptsetup + See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 + +* Wed Aug 02 2017 Fedora Release Engineering - 1.7.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1.7.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Thu Apr 27 2017 Milan Broz - 1.7.5-1 +- Update to cryptsetup 1.7.5. + +* Wed Mar 15 2017 Milan Broz - 1.7.4-1 +- Update to cryptsetup 1.7.4. + +* Fri Feb 10 2017 Fedora Release Engineering - 1.7.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon Dec 19 2016 Miro Hrončok - 1.7.3-2 +- Rebuild for Python 3.6 + +* Sun Oct 30 2016 Milan Broz - 1.7.3-1 +- Update to cryptsetup 1.7.3. + +* Tue Jul 19 2016 Fedora Release Engineering - 1.7.2-3 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Mon Jun 13 2016 Milan Broz - 1.7.2-2 +- Rebuilt for compatible symbol changes in glibc. + +* Sat Jun 04 2016 Milan Broz - 1.7.2-1 +- Update to cryptsetup 1.7.2. + +* Sun Feb 28 2016 Milan Broz - 1.7.1-1 +- Update to cryptsetup 1.7.1. + +* Wed Feb 03 2016 Fedora Release Engineering - 1.7.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Nov 10 2015 Fedora Release Engineering - 1.7.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 + +* Tue Nov 03 2015 Milan Broz - 1.7.0-1 +- Update to cryptsetup 1.7.0. +- Switch to sha256 as default hash. +- Increase default PBKDF2 iteration time to 2 seconds. + +* Tue Sep 08 2015 Milan Broz - 1.6.8-2 +- Update to cryptsetup 1.6.8. + +* Wed Jun 17 2015 Fedora Release Engineering - 1.6.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Mar 23 2015 Milan Broz - 1.6.7-1 +- Update to cryptsetup 1.6.7. +- Remove no longer needed fipscheck library dependence. +- Change URL to new homepage. + +* Sat Aug 16 2014 Milan Broz - 1.6.6-1 +- Update to cryptsetup 1.6.6. + +* Sat Aug 16 2014 Fedora Release Engineering - 1.6.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Fri Jul 11 2014 Tom Callaway - 1.6.5-2 +- fix license handling + +* Sun Jun 29 2014 Milan Broz - 1.6.5-1 +- Update to cryptsetup 1.6.5. +- Add cryptsetup-python3 subpackage. + +* Sat Jun 07 2014 Fedora Release Engineering - 1.6.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun Mar 02 2014 Milan Broz - 1.6.4-2 +- Require libgcrypt 1.6.1 (with fixed PBKDF2 and Whirlpool hash). + +* Thu Feb 27 2014 Milan Broz - 1.6.4-1 +- Update to cryptsetup 1.6.4. + +* Tue Jan 07 2014 Ondrej Kozina - 1.6.3-2 +- remove useless hmac checksum + +* Fri Dec 13 2013 Milan Broz - 1.6.3-1 +- Update to cryptsetup 1.6.3. + +* Sun Aug 04 2013 Milan Broz - 1.6.2-1 +- Update to cryptsetup 1.6.2. + +* Sat Aug 03 2013 Fedora Release Engineering - 1.6.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Sun Mar 31 2013 Milan Broz - 1.6.1-1 +- Update to cryptsetup 1.6.1. +- Install ReleaseNotes files instead of empty Changelog file. + +* Wed Feb 13 2013 Fedora Release Engineering - 1.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Mon Jan 14 2013 Milan Broz - 1.6.0-1 +- Update to cryptsetup 1.6.0. +- Change default LUKS encryption mode to aes-xts-plain64 (AES128). +- Force use of gcrypt PBKDF2 instead of internal implementation. + +* Sat Dec 29 2012 Milan Broz - 1.6.0-0.1 +- Update to cryptsetup 1.6.0-rc1. +- Relax license to GPLv2+ according to new release. +- Compile cryptsetup with libpwquality support. + +* Tue Oct 16 2012 Milan Broz - 1.5.1-1 +- Update to cryptsetup 1.5.1. + +* Wed Jul 18 2012 Fedora Release Engineering - 1.5.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Jul 10 2012 Milan Broz - 1.5.0-1 +- Update to cryptsetup 1.5.0. + +* Wed Jun 20 2012 Milan Broz - 1.5.0-0.2 +- Update to cryptsetup 1.5.0-rc2. +- Add cryptsetup-reencrypt subpackage. + +* Mon Jun 11 2012 Milan Broz - 1.5.0-0.1 +- Update to cryptsetup 1.5.0-rc1. +- Add veritysetup subpackage. +- Move localization files to libs subpackage. + +* Thu May 31 2012 Milan Broz - 1.4.3-2 +- Build with fipscheck (verification in fips mode). +- Clean up spec file, use install to /usr. + +* Thu May 31 2012 Milan Broz - 1.4.3-1 +- Update to cryptsetup 1.4.3. + +* Thu Apr 12 2012 Milan Broz - 1.4.2-1 +- Update to cryptsetup 1.4.2. + +* Fri Jan 13 2012 Fedora Release Engineering - 1.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Wed Nov 09 2011 Milan Broz - 1.4.1-1 +- Update to cryptsetup 1.4.1. +- Add Python cryptsetup bindings. +- Obsolete separate python-cryptsetup package. + +* Wed Oct 26 2011 Milan Broz - 1.4.0-1 +- Update to cryptsetup 1.4.0. + +* Mon Oct 10 2011 Milan Broz - 1.4.0-0.1 +- Update to cryptsetup 1.4.0-rc1. +- Rename package back from cryptsetup-luks to cryptsetup. + +* Wed Jun 22 2011 Milan Broz - 1.3.1-2 +- Fix return code for status command when device doesn't exist. + +* Tue May 24 2011 Milan Broz - 1.3.1-1 +- Update to cryptsetup 1.3.1. + +* Tue Apr 05 2011 Milan Broz - 1.3.0-1 +- Update to cryptsetup 1.3.0. + +* Tue Mar 22 2011 Milan Broz - 1.3.0-0.2 +- Update to cryptsetup 1.3.0-rc2 + +* Mon Mar 14 2011 Milan Broz - 1.3.0-0.1 +- Update to cryptsetup 1.3.0-rc1 + +* Tue Feb 08 2011 Fedora Release Engineering - 1.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Dec 20 2010 Milan Broz - 1.2.0-1 +- Update to cryptsetup 1.2.0 + +* Thu Nov 25 2010 Milan Broz - 1.2.0-0.2 +- Fix crypt_activate_by_keyfile() to work with PLAIN devices. + +* Tue Nov 16 2010 Milan Broz - 1.2.0-0.1 +- Add FAQ to documentation. +- Update to cryptsetup 1.2.0-rc1 + +* Sat Jul 03 2010 Milan Broz - 1.1.3-1 +- Update to cryptsetup 1.1.3 + +* Mon Jun 07 2010 Milan Broz - 1.1.2-2 +- Fix alignment ioctl use. +- Fix API activation calls to handle NULL device name. + +* Sun May 30 2010 Milan Broz - 1.1.2-1 +- Update to cryptsetup 1.1.2 +- Fix luksOpen handling of new line char on stdin. + +* Sun May 23 2010 Milan Broz - 1.1.1-1 +- Update to cryptsetup 1.1.1 +- Fix luksClose for stacked LUKS/LVM devices. + +* Mon May 03 2010 Milan Broz - 1.1.1-0.2 +- Update to cryptsetup 1.1.1-rc2. + +* Sat May 01 2010 Milan Broz - 1.1.1-0.1 +- Update to cryptsetup 1.1.1-rc1. + +* Sun Jan 17 2010 Milan Broz - 1.1.0-1 +- Update to cryptsetup 1.1.0. + +* Fri Jan 15 2010 Milan Broz - 1.1.0-0.6 +- Fix gcrypt initialisation. +- Fix backward compatibility for hash algorithm (uppercase). + +* Wed Dec 30 2009 Milan Broz - 1.1.0-0.5 +- Update to cryptsetup 1.1.0-rc4 + +* Mon Nov 16 2009 Milan Broz - 1.1.0-0.4 +- Update to cryptsetup 1.1.0-rc3 + +* Thu Oct 01 2009 Milan Broz - 1.1.0-0.3 +- Update to cryptsetup 1.1.0-rc2 +- Fix libcryptsetup to properly export only versioned symbols. + +* Tue Sep 29 2009 Milan Broz - 1.1.0-0.2 +- Update to cryptsetup 1.1.0-rc1 +- Add luksHeaderBackup and luksHeaderRestore commands. + +* Fri Sep 11 2009 Milan Broz - 1.1.0-0.1 +- Update to new upstream testing version with new API interface. +- Add luksSuspend and luksResume commands. +- Introduce pkgconfig. + +* Fri Jul 24 2009 Fedora Release Engineering - 1.0.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Jul 22 2009 Milan Broz - 1.0.7-1 +- Update to upstream final release. +- Split libs subpackage. +- Remove rpath setting from cryptsetup binary. + +* Wed Jul 15 2009 Till Maas - 1.0.7-0.2 +- update BR because of libuuid splitout from e2fsprogs + +* Mon Jun 22 2009 Milan Broz - 1.0.7-0.1 +- Update to new upstream 1.0.7-rc1. + +- Wipe old fs headers to not confuse blkid (#468062) +* Tue Feb 24 2009 Fedora Release Engineering - 1.0.6-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Thu Oct 30 2008 Milan Broz - 1.0.6-6 +- Wipe old fs headers to not confuse blkid (#468062) + +* Tue Sep 23 2008 Milan Broz - 1.0.6-5 +- Change new project home page. +- Print more descriptive messages for initialization errors. +- Refresh patches to versions commited upstream. + +* Sat Sep 06 2008 Milan Broz - 1.0.6-4 +- Fix close of zero decriptor. +- Fix udevsettle delays - use temporary crypt device remapping. + +* Wed May 28 2008 Till Maas - 1.0.6-3 +- remove a duplicate sentence from the manpage (RH #448705) +- add patch metadata about upstream status + +* Tue Apr 15 2008 Bill Nottinghm - 1.0.6-2 +- Add the device to the luksOpen prompt (#433406) +- Use iconv, not recode (#442574) + +* Thu Mar 13 2008 Till Maas - 1.0.6-1 +- Update to latest version +- remove patches that have been merged upstream + +* Mon Mar 03 2008 Till Maas - 1.0.6-0.1.pre2 +- Update to new version with several bugfixes +- remove patches that have been merged upstream +- add patch from cryptsetup newsgroup +- fix typo / missing luksRemoveKey in manpage (patch) + +* Tue Feb 19 2008 Fedora Release Engineering - 1.0.5-9 +- Autorebuild for GCC 4.3 + +* Sat Jan 19 2008 Peter Jones - 1.0.5-8 +- Rebuild for broken deps. + +* Thu Aug 30 2007 Till Maas - 1.0.5-7 +- update URL +- update license tag +- recode ChangeLog from latin1 to uf8 +- add smp_mflags to make + +* Fri Aug 24 2007 Till Maas - 1.0.5-6 +- cleanup BuildRequires: +- removed versions, packages in Fedora are new enough +- changed popt to popt-devel + +* Thu Aug 23 2007 Till Maas - 1.0.5-5 +- fix devel subpackage requires +- remove empty NEWS README +- remove uneeded INSTALL +- remove uneeded ldconfig requires +- add readonly detection patch + +* Wed Aug 08 2007 Till Maas - 1.0.5-4 +- disable patch2, libsepol is now detected by configure +- move libcryptsetup.so to %%{_libdir} instead of /%%{_lib} + +* Fri Jul 27 2007 Till Maas - 1.0.5-3 +- Use /%%{_lib} instead of /lib to use /lib64 on 64bit archs + +* Thu Jul 26 2007 Till Maas - 1.0.5-2 +- Use /lib as libdir (#243228) +- sync header and library (#215349) +- do not use %%makeinstall (recommended by PackageGuidelines) +- select sbindir with %%configure instead with make +- add TODO + +* Wed Jun 13 2007 Jeremy Katz - 1.0.5-1 +- update to 1.0.5 + +* Mon Jun 04 2007 Peter Jones - 1.0.3-5 +- Don't build static any more. + +* Mon Feb 05 2007 Alasdair Kergon - 1.0.3-4 +- Add build dependency on new device-mapper-devel package. +- Add preun and post ldconfig requirements. +- Update BuildRoot. + +* Wed Nov 1 2006 Peter Jones - 1.0.3-3 +- Require newer libselinux (#213414) + +* Wed Jul 12 2006 Jesse Keating - 1.0.3-2.1 +- rebuild + +* Wed Jun 7 2006 Jeremy Katz - 1.0.3-2 +- put shared libs in the right subpackages + +* Fri Apr 7 2006 Bill Nottingham 1.0.3-1 +- update to final 1.0.3 + +* Mon Feb 27 2006 Bill Nottingham 1.0.3-0.rc2 +- update to 1.0.3rc2, fixes bug with HAL & encrypted devices (#182658) + +* Wed Feb 22 2006 Bill Nottingham 1.0.3-0.rc1 +- update to 1.0.3rc1, reverts changes to default encryption type + +* Tue Feb 21 2006 Bill Nottingham 1.0.2-1 +- update to 1.0.2, fix incompatiblity with old cryptsetup (#176726) + +* Mon Feb 20 2006 Karsten Hopp 1.0.1-5 +- BuildRequires: libselinux-devel + +* Fri Feb 10 2006 Jesse Keating - 1.0.1-4.2.1 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jesse Keating - 1.0.1-4.2 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Mon Dec 5 2005 Bill Nottingham 1.0.1-4 +- rebuild against new libdevmapper + +* Thu Oct 13 2005 Florian La Roche +- add -lsepol to rebuild on current fc5 + +* Mon Aug 22 2005 Karel Zak 1.0.1-2 +- fix cryptsetup help for isLuks action + +* Fri Jul 1 2005 Bill Nottingham 1.0.1-1 +- update to 1.0.1 - fixes incompatiblity with previous cryptsetup for + piped passwords + +* Thu Jun 16 2005 Bill Nottingham 1.0-2 +- add patch for 32/64 bit compatibility (#160445, ) + +* Tue Mar 29 2005 Bill Nottingham 1.0-1 +- update to 1.0 + +* Thu Mar 10 2005 Bill Nottingham 0.993-1 +- switch to cryptsetup-luks, for LUKS support + +* Tue Oct 12 2004 Bill Nottingham 0.1-4 +- oops, make that *everything* static (#129926) + +* Tue Aug 31 2004 Bill Nottingham 0.1-3 +- link some things static, move to /sbin (#129926) + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Fri Apr 16 2004 Bill Nottingham 0.1-1 +- initial packaging From 9f8c77c9bdf1a77d69798935a84c66ed947a52d2 Mon Sep 17 00:00:00 2001 From: Kristina Hanicova Date: Thu, 2 Oct 2025 13:34:36 +0200 Subject: [PATCH 139/142] Add rpmautospec. --- changelog | 660 +++++++++++++++++++++++++++++++++++++++++++++++ cryptsetup.spec | 663 +----------------------------------------------- 2 files changed, 662 insertions(+), 661 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..1d8a8f0 --- /dev/null +++ b/changelog @@ -0,0 +1,660 @@ +* Wed Aug 20 2025 Kristina Hanicova - 2.8.1-1 +- Update to cryptsetup 2.8.1. + +* Wed Jul 23 2025 Fedora Release Engineering - 2.8.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Tue Jun 24 2025 Ondrej Kozina - 2.8.0-1 +- Update to cryptsetup 2.8.0. + +* Mon Jun 16 2025 Milan Broz - 2.8.0~rc1-1 +- Update to cryptsetup 2.8.0-rc1. + +* Thu Jan 16 2025 Fedora Release Engineering - 2.7.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Tue Sep 03 2024 Ondrej Kozina - 2.7.5-1 +- Update to cryptsetup 2.7.5. + +* Tue Jul 30 2024 Ondrej Kozina - 2.7.4-1 +- Update to cryptsetup 2.7.4. + +* Wed Jul 17 2024 Fedora Release Engineering - 2.7.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Mon Jun 17 2024 Ondrej Kozina - 2.7.3-1 +- Update to cryptsetup 2.7.3. + +* Tue Apr 09 2024 Ondrej Kozina - 2.7.2-1 +- Update to cryptsetup 2.7.2. + +* Thu Mar 07 2024 Ondrej Kozina - 2.7.1-1 +- Update to cryptsetup 2.7.1. + +* Fri Feb 09 2024 Ondrej Kozina - 2.7.0-2 +- Rebuild for OpenSSL Argon2 implementation (OpenSSL 3.2) +- patch: Do not compile unused internal argon2 implementation + +* Wed Jan 24 2024 Ondrej Kozina - 2.7.0-1 +- Update to cryptsetup 2.7.0. + +* Wed Jan 24 2024 Fedora Release Engineering - 2.7.0~rc1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 2.7.0~rc1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Dec 20 2023 Milan Broz - 2.7.0~rc1-1 +- Update to cryptsetup 2.7.0-rc1. + +* Wed Nov 29 2023 Ondrej Kozina - 2.7.0~rc0-1 +- Update to cryptsetup 2.7.0-rc0. + +* Wed Jul 19 2023 Fedora Release Engineering - 2.6.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jun 15 2023 Yaakov Selkowitz - 2.6.1-2 +- Drop libargon2 dependency in RHEL builds + +* Fri Feb 10 2023 Ondrej Kozina - 2.6.1-1 +- Update to cryptsetup 2.6.1. + +* Thu Jan 19 2023 Fedora Release Engineering - 2.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Mon Nov 28 2022 Ondrej Kozina - 2.6.0-1 +- Update to cryptsetup 2.6.0. + +* Mon Nov 21 2022 Ondrej Kozina - 2.6.0~rc0-1 +- Update to cryptsetup 2.6.0-rc0. + +* Thu Jul 28 2022 Ondrej Kozina - 2.5.0-1 +- Update to cryptsetup 2.5.0. + +* Wed Jul 20 2022 Fedora Release Engineering - 2.5.0~rc1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jul 14 2022 Ondrej Kozina - 2.5.0~rc1-1 +- Update to cryptsetup 2.5.0-rc1. + +* Thu Jan 20 2022 Fedora Release Engineering - 2.4.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jan 12 2022 Ondrej Kozina - 2.4.3-1 +- Update to cryptsetup 2.4.3. + +* Thu Nov 18 2021 Milan Broz - 2.4.2-1 +- Update to cryptsetup 2.4.2. + +* Fri Sep 17 2021 Ondrej Kozina - 2.4.1-1 +- Update to cryptsetup 2.4.1. + +* Tue Sep 14 2021 Sahana Prasad - 2.4.0-2 +- Rebuilt with OpenSSL 3.0.0 + +* Wed Aug 18 2021 Ondrej Kozina - 2.4.0-1 +- Update to cryptsetup 2.4.0. + +* Fri Jul 30 2021 Milan Broz - 2.4.0~rc1-1 +- Update to cryptsetup 2.4.0-rc1. + +* Wed Jul 21 2021 Fedora Release Engineering - 2.4.0~rc0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Sat Jul 10 2021 Björn Esser - 2.4.0~rc0-2 +- Rebuild for versioned symbols in json-c + +* Fri Jul 02 2021 Ondrej Kozina - 2.4.0~rc0-1 +- Update to cryptsetup 2.4.0-rc0. +- add experimental cryptsetup-ssh token subpackage +- spec file cleanup + +* Fri May 28 2021 Milan Broz - 2.3.6-1 +- Update to cryptsetup 2.3.6. + +* Thu Mar 11 2021 Milan Broz - 2.3.5-2 +- Update to cryptsetup 2.3.5. + +* Tue Jan 26 2021 Fedora Release Engineering - 2.3.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Thu Sep 03 2020 Milan Broz - 2.3.4-1 +- Update to cryptsetup 2.3.4. +- Fix for CVE-2020-14382 (#1874712) + +* Mon Jul 27 2020 Fedora Release Engineering - 2.3.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Thu May 28 2020 Ondrej Kozina - 2.3.3-1 +- Update to cryptsetup 2.3.3. + +* Thu Apr 30 2020 Milan Broz - 2.3.2-1 +- Update to cryptsetup 2.3.2. + +* Tue Apr 21 2020 Björn Esser - 2.3.1-4 +- Rebuild (json-c) + +* Thu Apr 16 2020 Milan Broz - 2.3.1-3 +- Fix broken json-c patch (#1824878). + +* Tue Apr 14 2020 Björn Esser - 2.3.1-2 +- Add support for upcoming json-c 0.14.0 +- Use %%make_build, %%make_install and %%autosetup macros + +* Thu Mar 12 2020 Ondrej Kozina - 2.3.1-1 +- Update to cryptsetup 2.3.1. + +* Sun Feb 02 2020 Milan Broz - 2.3.0-1 +- Update to cryptsetup 2.3.0. + +* Tue Jan 28 2020 Fedora Release Engineering - 2.3.0-0.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sun Jan 12 2020 Milan Broz - 2.3.0-0.1 +- Update to cryptsetup 2.3.0-rc0. + +* Fri Nov 01 2019 Ondrej Kozina - 2.2.2-1 +- Update to cryptsetup 2.2.2. + +* Fri Sep 06 2019 Ondrej Kozina - 2.2.1-1 +- Update to cryptsetup 2.2.1. + +* Thu Aug 15 2019 Milan Broz - 2.2.0-1 +- Update to cryptsetup 2.2.0. + +* Wed Jul 24 2019 Fedora Release Engineering - 2.2.0-0.3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Jun 14 2019 Ondrej Kozina - 2.2.0-0.2 +- Update to cryptsetup 2.2.0-rc1. + +* Fri May 03 2019 Ondrej Kozina - 2.2.0-0.1 +- Update to cryptsetup 2.2.0-rc0. + +* Thu Apr 04 2019 Kalev Lember - 2.1.0-3 +- Add back python2-cryptsetup and cryptsetup-python3 obsoletes + +* Mon Mar 18 2019 Milan Broz - 2.1.0-2 +- Rebuild for new libargon2 soname. + +* Fri Feb 08 2019 Ondrej Kozina - 2.1.0-1 +- Update to cryptsetup 2.1.0. +- Drop python specific bits from spec file (python was removed + from upstream project) + +* Thu Jan 31 2019 Fedora Release Engineering - 2.0.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Jan 22 2019 Ondrej Kozina - 2.0.6-2 +- Switch default metadata format to LUKS2. +- Resolves: #1668013 + +* Mon Dec 03 2018 Ondrej Kozina - 2.0.6-1 +- Update to cryptsetup 2.0.6. + +* Mon Oct 29 2018 Ondrej Kozina - 2.0.5-1 +- Update to cryptsetup 2.0.5. + +* Fri Aug 03 2018 Ondrej Kozina - 2.0.4-1 +- Update to cryptsetup 2.0.4. +- patch: Add Fedora system library paths in configure. + +* Tue Jul 17 2018 Ondrej Kozina - 2.0.3-6 +- Remove libgcrypt dependency from cryptsetup-libs package. + +* Tue Jul 17 2018 Ondrej Kozina - 2.0.3-5 +- Replace sed script with --disable-rpath configure option. +- Switch cryptsetup to openssl crypto backend. +- Spec file cleanup. + +* Thu Jul 12 2018 Fedora Release Engineering - 2.0.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri May 04 2018 Ondrej Kozina - 2.0.3-3 +- Fix obsolete macro for python3 subpackage. + +* Fri May 04 2018 Ondrej Kozina - 2.0.3-2 +- Add missing 'Obsoletes' macros for python subpackages. + +* Fri May 04 2018 Milan Broz - 2.0.3-1 +- Update to cryptsetup 2.0.3. + +* Wed Apr 25 2018 Ondrej Kozina - 2.0.2-3 +- Add conditions for python sub-packages + +* Tue Mar 27 2018 Björn Esser - 2.0.2-2 +- Rebuilt for libjson-c.so.4 (json-c v0.13.1) on fc28 + +* Wed Mar 07 2018 Milan Broz - 2.0.2-1 +- Update to cryptsetup 2.0.2. + +* Tue Mar 06 2018 Björn Esser - 2.0.1-3 +- Rebuilt for libjson-c.so.4 (json-c v0.13.1) + +* Wed Feb 07 2018 Fedora Release Engineering - 2.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Sun Jan 21 2018 Milan Broz - 2.0.1-1 +- Update to cryptsetup 2.0.1. + +* Thu Jan 04 2018 Ondrej Kozina - 2.0.0-3 +- Override locking path to /run/cryptsetup (going to be new default) +- Claim ownership of the locking directory + +* Fri Dec 15 2017 Iryna Shcherbina - 2.0.0-2 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + +* Tue Dec 12 2017 Ondrej Kozina - 2.0.0-1 +- Update to cryptsetup 2.0.0 (final). + +* Sun Dec 10 2017 Björn Esser - 2.0.0-0.6 +- Rebuilt for libjson-c.so.3 + +* Mon Nov 20 2017 Milan Broz - 2.0.0-0.5 +- Link to system libargon2 instead of using bundled code. + +* Thu Nov 09 2017 Ondrej Kozina - 2.0.0-0.4 +- Drop the legacy library. + +* Wed Nov 08 2017 Ondrej Kozina - 2.0.0-0.3 +- Temporary build providing legacy library. + +* Tue Nov 07 2017 Ondrej Kozina - 2.0.0-0.2 +- Update to cryptsetup 2.0.0-rc1 (with libcryptsetup soname bump). +- Added integritysetup subpackage. + +* Sun Aug 20 2017 Zbigniew Jędrzejewski-Szmek - 1.7.5-5 +- Add Provides for the old name without %%_isa + +* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 1.7.5-4 +- Python 2 binary package renamed to python2-cryptsetup + See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 + +* Wed Aug 02 2017 Fedora Release Engineering - 1.7.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1.7.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Thu Apr 27 2017 Milan Broz - 1.7.5-1 +- Update to cryptsetup 1.7.5. + +* Wed Mar 15 2017 Milan Broz - 1.7.4-1 +- Update to cryptsetup 1.7.4. + +* Fri Feb 10 2017 Fedora Release Engineering - 1.7.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon Dec 19 2016 Miro Hrončok - 1.7.3-2 +- Rebuild for Python 3.6 + +* Sun Oct 30 2016 Milan Broz - 1.7.3-1 +- Update to cryptsetup 1.7.3. + +* Tue Jul 19 2016 Fedora Release Engineering - 1.7.2-3 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Mon Jun 13 2016 Milan Broz - 1.7.2-2 +- Rebuilt for compatible symbol changes in glibc. + +* Sat Jun 04 2016 Milan Broz - 1.7.2-1 +- Update to cryptsetup 1.7.2. + +* Sun Feb 28 2016 Milan Broz - 1.7.1-1 +- Update to cryptsetup 1.7.1. + +* Wed Feb 03 2016 Fedora Release Engineering - 1.7.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Nov 10 2015 Fedora Release Engineering - 1.7.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 + +* Tue Nov 03 2015 Milan Broz - 1.7.0-1 +- Update to cryptsetup 1.7.0. +- Switch to sha256 as default hash. +- Increase default PBKDF2 iteration time to 2 seconds. + +* Tue Sep 08 2015 Milan Broz - 1.6.8-2 +- Update to cryptsetup 1.6.8. + +* Wed Jun 17 2015 Fedora Release Engineering - 1.6.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Mar 23 2015 Milan Broz - 1.6.7-1 +- Update to cryptsetup 1.6.7. +- Remove no longer needed fipscheck library dependence. +- Change URL to new homepage. + +* Sat Aug 16 2014 Milan Broz - 1.6.6-1 +- Update to cryptsetup 1.6.6. + +* Sat Aug 16 2014 Fedora Release Engineering - 1.6.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Fri Jul 11 2014 Tom Callaway - 1.6.5-2 +- fix license handling + +* Sun Jun 29 2014 Milan Broz - 1.6.5-1 +- Update to cryptsetup 1.6.5. +- Add cryptsetup-python3 subpackage. + +* Sat Jun 07 2014 Fedora Release Engineering - 1.6.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun Mar 02 2014 Milan Broz - 1.6.4-2 +- Require libgcrypt 1.6.1 (with fixed PBKDF2 and Whirlpool hash). + +* Thu Feb 27 2014 Milan Broz - 1.6.4-1 +- Update to cryptsetup 1.6.4. + +* Tue Jan 07 2014 Ondrej Kozina - 1.6.3-2 +- remove useless hmac checksum + +* Fri Dec 13 2013 Milan Broz - 1.6.3-1 +- Update to cryptsetup 1.6.3. + +* Sun Aug 04 2013 Milan Broz - 1.6.2-1 +- Update to cryptsetup 1.6.2. + +* Sat Aug 03 2013 Fedora Release Engineering - 1.6.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Sun Mar 31 2013 Milan Broz - 1.6.1-1 +- Update to cryptsetup 1.6.1. +- Install ReleaseNotes files instead of empty Changelog file. + +* Wed Feb 13 2013 Fedora Release Engineering - 1.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Mon Jan 14 2013 Milan Broz - 1.6.0-1 +- Update to cryptsetup 1.6.0. +- Change default LUKS encryption mode to aes-xts-plain64 (AES128). +- Force use of gcrypt PBKDF2 instead of internal implementation. + +* Sat Dec 29 2012 Milan Broz - 1.6.0-0.1 +- Update to cryptsetup 1.6.0-rc1. +- Relax license to GPLv2+ according to new release. +- Compile cryptsetup with libpwquality support. + +* Tue Oct 16 2012 Milan Broz - 1.5.1-1 +- Update to cryptsetup 1.5.1. + +* Wed Jul 18 2012 Fedora Release Engineering - 1.5.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Jul 10 2012 Milan Broz - 1.5.0-1 +- Update to cryptsetup 1.5.0. + +* Wed Jun 20 2012 Milan Broz - 1.5.0-0.2 +- Update to cryptsetup 1.5.0-rc2. +- Add cryptsetup-reencrypt subpackage. + +* Mon Jun 11 2012 Milan Broz - 1.5.0-0.1 +- Update to cryptsetup 1.5.0-rc1. +- Add veritysetup subpackage. +- Move localization files to libs subpackage. + +* Thu May 31 2012 Milan Broz - 1.4.3-2 +- Build with fipscheck (verification in fips mode). +- Clean up spec file, use install to /usr. + +* Thu May 31 2012 Milan Broz - 1.4.3-1 +- Update to cryptsetup 1.4.3. + +* Thu Apr 12 2012 Milan Broz - 1.4.2-1 +- Update to cryptsetup 1.4.2. + +* Fri Jan 13 2012 Fedora Release Engineering - 1.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Wed Nov 09 2011 Milan Broz - 1.4.1-1 +- Update to cryptsetup 1.4.1. +- Add Python cryptsetup bindings. +- Obsolete separate python-cryptsetup package. + +* Wed Oct 26 2011 Milan Broz - 1.4.0-1 +- Update to cryptsetup 1.4.0. + +* Mon Oct 10 2011 Milan Broz - 1.4.0-0.1 +- Update to cryptsetup 1.4.0-rc1. +- Rename package back from cryptsetup-luks to cryptsetup. + +* Wed Jun 22 2011 Milan Broz - 1.3.1-2 +- Fix return code for status command when device doesn't exist. + +* Tue May 24 2011 Milan Broz - 1.3.1-1 +- Update to cryptsetup 1.3.1. + +* Tue Apr 05 2011 Milan Broz - 1.3.0-1 +- Update to cryptsetup 1.3.0. + +* Tue Mar 22 2011 Milan Broz - 1.3.0-0.2 +- Update to cryptsetup 1.3.0-rc2 + +* Mon Mar 14 2011 Milan Broz - 1.3.0-0.1 +- Update to cryptsetup 1.3.0-rc1 + +* Tue Feb 08 2011 Fedora Release Engineering - 1.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Dec 20 2010 Milan Broz - 1.2.0-1 +- Update to cryptsetup 1.2.0 + +* Thu Nov 25 2010 Milan Broz - 1.2.0-0.2 +- Fix crypt_activate_by_keyfile() to work with PLAIN devices. + +* Tue Nov 16 2010 Milan Broz - 1.2.0-0.1 +- Add FAQ to documentation. +- Update to cryptsetup 1.2.0-rc1 + +* Sat Jul 03 2010 Milan Broz - 1.1.3-1 +- Update to cryptsetup 1.1.3 + +* Mon Jun 07 2010 Milan Broz - 1.1.2-2 +- Fix alignment ioctl use. +- Fix API activation calls to handle NULL device name. + +* Sun May 30 2010 Milan Broz - 1.1.2-1 +- Update to cryptsetup 1.1.2 +- Fix luksOpen handling of new line char on stdin. + +* Sun May 23 2010 Milan Broz - 1.1.1-1 +- Update to cryptsetup 1.1.1 +- Fix luksClose for stacked LUKS/LVM devices. + +* Mon May 03 2010 Milan Broz - 1.1.1-0.2 +- Update to cryptsetup 1.1.1-rc2. + +* Sat May 01 2010 Milan Broz - 1.1.1-0.1 +- Update to cryptsetup 1.1.1-rc1. + +* Sun Jan 17 2010 Milan Broz - 1.1.0-1 +- Update to cryptsetup 1.1.0. + +* Fri Jan 15 2010 Milan Broz - 1.1.0-0.6 +- Fix gcrypt initialisation. +- Fix backward compatibility for hash algorithm (uppercase). + +* Wed Dec 30 2009 Milan Broz - 1.1.0-0.5 +- Update to cryptsetup 1.1.0-rc4 + +* Mon Nov 16 2009 Milan Broz - 1.1.0-0.4 +- Update to cryptsetup 1.1.0-rc3 + +* Thu Oct 01 2009 Milan Broz - 1.1.0-0.3 +- Update to cryptsetup 1.1.0-rc2 +- Fix libcryptsetup to properly export only versioned symbols. + +* Tue Sep 29 2009 Milan Broz - 1.1.0-0.2 +- Update to cryptsetup 1.1.0-rc1 +- Add luksHeaderBackup and luksHeaderRestore commands. + +* Fri Sep 11 2009 Milan Broz - 1.1.0-0.1 +- Update to new upstream testing version with new API interface. +- Add luksSuspend and luksResume commands. +- Introduce pkgconfig. + +* Fri Jul 24 2009 Fedora Release Engineering - 1.0.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Jul 22 2009 Milan Broz - 1.0.7-1 +- Update to upstream final release. +- Split libs subpackage. +- Remove rpath setting from cryptsetup binary. + +* Wed Jul 15 2009 Till Maas - 1.0.7-0.2 +- update BR because of libuuid splitout from e2fsprogs + +* Mon Jun 22 2009 Milan Broz - 1.0.7-0.1 +- Update to new upstream 1.0.7-rc1. + +- Wipe old fs headers to not confuse blkid (#468062) +* Tue Feb 24 2009 Fedora Release Engineering - 1.0.6-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Thu Oct 30 2008 Milan Broz - 1.0.6-6 +- Wipe old fs headers to not confuse blkid (#468062) + +* Tue Sep 23 2008 Milan Broz - 1.0.6-5 +- Change new project home page. +- Print more descriptive messages for initialization errors. +- Refresh patches to versions commited upstream. + +* Sat Sep 06 2008 Milan Broz - 1.0.6-4 +- Fix close of zero decriptor. +- Fix udevsettle delays - use temporary crypt device remapping. + +* Wed May 28 2008 Till Maas - 1.0.6-3 +- remove a duplicate sentence from the manpage (RH #448705) +- add patch metadata about upstream status + +* Tue Apr 15 2008 Bill Nottinghm - 1.0.6-2 +- Add the device to the luksOpen prompt (#433406) +- Use iconv, not recode (#442574) + +* Thu Mar 13 2008 Till Maas - 1.0.6-1 +- Update to latest version +- remove patches that have been merged upstream + +* Mon Mar 03 2008 Till Maas - 1.0.6-0.1.pre2 +- Update to new version with several bugfixes +- remove patches that have been merged upstream +- add patch from cryptsetup newsgroup +- fix typo / missing luksRemoveKey in manpage (patch) + +* Tue Feb 19 2008 Fedora Release Engineering - 1.0.5-9 +- Autorebuild for GCC 4.3 + +* Sat Jan 19 2008 Peter Jones - 1.0.5-8 +- Rebuild for broken deps. + +* Thu Aug 30 2007 Till Maas - 1.0.5-7 +- update URL +- update license tag +- recode ChangeLog from latin1 to uf8 +- add smp_mflags to make + +* Fri Aug 24 2007 Till Maas - 1.0.5-6 +- cleanup BuildRequires: +- removed versions, packages in Fedora are new enough +- changed popt to popt-devel + +* Thu Aug 23 2007 Till Maas - 1.0.5-5 +- fix devel subpackage requires +- remove empty NEWS README +- remove uneeded INSTALL +- remove uneeded ldconfig requires +- add readonly detection patch + +* Wed Aug 08 2007 Till Maas - 1.0.5-4 +- disable patch2, libsepol is now detected by configure +- move libcryptsetup.so to %%{_libdir} instead of /%%{_lib} + +* Fri Jul 27 2007 Till Maas - 1.0.5-3 +- Use /%%{_lib} instead of /lib to use /lib64 on 64bit archs + +* Thu Jul 26 2007 Till Maas - 1.0.5-2 +- Use /lib as libdir (#243228) +- sync header and library (#215349) +- do not use %%makeinstall (recommended by PackageGuidelines) +- select sbindir with %%configure instead with make +- add TODO + +* Wed Jun 13 2007 Jeremy Katz - 1.0.5-1 +- update to 1.0.5 + +* Mon Jun 04 2007 Peter Jones - 1.0.3-5 +- Don't build static any more. + +* Mon Feb 05 2007 Alasdair Kergon - 1.0.3-4 +- Add build dependency on new device-mapper-devel package. +- Add preun and post ldconfig requirements. +- Update BuildRoot. + +* Wed Nov 1 2006 Peter Jones - 1.0.3-3 +- Require newer libselinux (#213414) + +* Wed Jul 12 2006 Jesse Keating - 1.0.3-2.1 +- rebuild + +* Wed Jun 7 2006 Jeremy Katz - 1.0.3-2 +- put shared libs in the right subpackages + +* Fri Apr 7 2006 Bill Nottingham 1.0.3-1 +- update to final 1.0.3 + +* Mon Feb 27 2006 Bill Nottingham 1.0.3-0.rc2 +- update to 1.0.3rc2, fixes bug with HAL & encrypted devices (#182658) + +* Wed Feb 22 2006 Bill Nottingham 1.0.3-0.rc1 +- update to 1.0.3rc1, reverts changes to default encryption type + +* Tue Feb 21 2006 Bill Nottingham 1.0.2-1 +- update to 1.0.2, fix incompatiblity with old cryptsetup (#176726) + +* Mon Feb 20 2006 Karsten Hopp 1.0.1-5 +- BuildRequires: libselinux-devel + +* Fri Feb 10 2006 Jesse Keating - 1.0.1-4.2.1 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jesse Keating - 1.0.1-4.2 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Mon Dec 5 2005 Bill Nottingham 1.0.1-4 +- rebuild against new libdevmapper + +* Thu Oct 13 2005 Florian La Roche +- add -lsepol to rebuild on current fc5 + +* Mon Aug 22 2005 Karel Zak 1.0.1-2 +- fix cryptsetup help for isLuks action + +* Fri Jul 1 2005 Bill Nottingham 1.0.1-1 +- update to 1.0.1 - fixes incompatiblity with previous cryptsetup for + piped passwords + +* Thu Jun 16 2005 Bill Nottingham 1.0-2 +- add patch for 32/64 bit compatibility (#160445, ) + +* Tue Mar 29 2005 Bill Nottingham 1.0-1 +- update to 1.0 + +* Thu Mar 10 2005 Bill Nottingham 0.993-1 +- switch to cryptsetup-luks, for LUKS support + +* Tue Oct 12 2004 Bill Nottingham 0.1-4 +- oops, make that *everything* static (#129926) + +* Tue Aug 31 2004 Bill Nottingham 0.1-3 +- link some things static, move to /sbin (#129926) + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Fri Apr 16 2004 Bill Nottingham 0.1-1 +- initial packaging diff --git a/cryptsetup.spec b/cryptsetup.spec index fc439d9..4f64fac 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,7 +1,7 @@ Summary: Utility for setting up encrypted disks Name: cryptsetup Version: 2.8.1 -Release: 1%{?dist} +Release: %autorelease License: GPL-2.0-or-later WITH cryptsetup-OpenSSL-exception AND LGPL-2.1-or-later WITH cryptsetup-OpenSSL-exception URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: autoconf, automake, libtool, gettext-devel, @@ -117,663 +117,4 @@ rm -rf %{buildroot}%{_libdir}/%{name}/*.la %{_sbindir}/cryptsetup-ssh %changelog -* Wed Aug 20 2025 Kristina Hanicova - 2.8.1-1 -- Update to cryptsetup 2.8.1. - -* Wed Jul 23 2025 Fedora Release Engineering - 2.8.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Tue Jun 24 2025 Ondrej Kozina - 2.8.0-1 -- Update to cryptsetup 2.8.0. - -* Mon Jun 16 2025 Milan Broz - 2.8.0~rc1-1 -- Update to cryptsetup 2.8.0-rc1. - -* Thu Jan 16 2025 Fedora Release Engineering - 2.7.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Tue Sep 03 2024 Ondrej Kozina - 2.7.5-1 -- Update to cryptsetup 2.7.5. - -* Tue Jul 30 2024 Ondrej Kozina - 2.7.4-1 -- Update to cryptsetup 2.7.4. - -* Wed Jul 17 2024 Fedora Release Engineering - 2.7.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Mon Jun 17 2024 Ondrej Kozina - 2.7.3-1 -- Update to cryptsetup 2.7.3. - -* Tue Apr 09 2024 Ondrej Kozina - 2.7.2-1 -- Update to cryptsetup 2.7.2. - -* Thu Mar 07 2024 Ondrej Kozina - 2.7.1-1 -- Update to cryptsetup 2.7.1. - -* Fri Feb 09 2024 Ondrej Kozina - 2.7.0-2 -- Rebuild for OpenSSL Argon2 implementation (OpenSSL 3.2) -- patch: Do not compile unused internal argon2 implementation - -* Wed Jan 24 2024 Ondrej Kozina - 2.7.0-1 -- Update to cryptsetup 2.7.0. - -* Wed Jan 24 2024 Fedora Release Engineering - 2.7.0~rc1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 2.7.0~rc1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Dec 20 2023 Milan Broz - 2.7.0~rc1-1 -- Update to cryptsetup 2.7.0-rc1. - -* Wed Nov 29 2023 Ondrej Kozina - 2.7.0~rc0-1 -- Update to cryptsetup 2.7.0-rc0. - -* Wed Jul 19 2023 Fedora Release Engineering - 2.6.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jun 15 2023 Yaakov Selkowitz - 2.6.1-2 -- Drop libargon2 dependency in RHEL builds - -* Fri Feb 10 2023 Ondrej Kozina - 2.6.1-1 -- Update to cryptsetup 2.6.1. - -* Thu Jan 19 2023 Fedora Release Engineering - 2.6.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Mon Nov 28 2022 Ondrej Kozina - 2.6.0-1 -- Update to cryptsetup 2.6.0. - -* Mon Nov 21 2022 Ondrej Kozina - 2.6.0~rc0-1 -- Update to cryptsetup 2.6.0-rc0. - -* Thu Jul 28 2022 Ondrej Kozina - 2.5.0-1 -- Update to cryptsetup 2.5.0. - -* Wed Jul 20 2022 Fedora Release Engineering - 2.5.0~rc1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Jul 14 2022 Ondrej Kozina - 2.5.0~rc1-1 -- Update to cryptsetup 2.5.0-rc1. - -* Thu Jan 20 2022 Fedora Release Engineering - 2.4.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jan 12 2022 Ondrej Kozina - 2.4.3-1 -- Update to cryptsetup 2.4.3. - -* Thu Nov 18 2021 Milan Broz - 2.4.2-1 -- Update to cryptsetup 2.4.2. - -* Fri Sep 17 2021 Ondrej Kozina - 2.4.1-1 -- Update to cryptsetup 2.4.1. - -* Tue Sep 14 2021 Sahana Prasad - 2.4.0-2 -- Rebuilt with OpenSSL 3.0.0 - -* Wed Aug 18 2021 Ondrej Kozina - 2.4.0-1 -- Update to cryptsetup 2.4.0. - -* Fri Jul 30 2021 Milan Broz - 2.4.0~rc1-1 -- Update to cryptsetup 2.4.0-rc1. - -* Wed Jul 21 2021 Fedora Release Engineering - 2.4.0~rc0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Sat Jul 10 2021 Björn Esser - 2.4.0~rc0-2 -- Rebuild for versioned symbols in json-c - -* Fri Jul 02 2021 Ondrej Kozina - 2.4.0~rc0-1 -- Update to cryptsetup 2.4.0-rc0. -- add experimental cryptsetup-ssh token subpackage -- spec file cleanup - -* Fri May 28 2021 Milan Broz - 2.3.6-1 -- Update to cryptsetup 2.3.6. - -* Thu Mar 11 2021 Milan Broz - 2.3.5-2 -- Update to cryptsetup 2.3.5. - -* Tue Jan 26 2021 Fedora Release Engineering - 2.3.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Thu Sep 03 2020 Milan Broz - 2.3.4-1 -- Update to cryptsetup 2.3.4. -- Fix for CVE-2020-14382 (#1874712) - -* Mon Jul 27 2020 Fedora Release Engineering - 2.3.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Thu May 28 2020 Ondrej Kozina - 2.3.3-1 -- Update to cryptsetup 2.3.3. - -* Thu Apr 30 2020 Milan Broz - 2.3.2-1 -- Update to cryptsetup 2.3.2. - -* Tue Apr 21 2020 Björn Esser - 2.3.1-4 -- Rebuild (json-c) - -* Thu Apr 16 2020 Milan Broz - 2.3.1-3 -- Fix broken json-c patch (#1824878). - -* Tue Apr 14 2020 Björn Esser - 2.3.1-2 -- Add support for upcoming json-c 0.14.0 -- Use %%make_build, %%make_install and %%autosetup macros - -* Thu Mar 12 2020 Ondrej Kozina - 2.3.1-1 -- Update to cryptsetup 2.3.1. - -* Sun Feb 02 2020 Milan Broz - 2.3.0-1 -- Update to cryptsetup 2.3.0. - -* Tue Jan 28 2020 Fedora Release Engineering - 2.3.0-0.2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sun Jan 12 2020 Milan Broz - 2.3.0-0.1 -- Update to cryptsetup 2.3.0-rc0. - -* Fri Nov 01 2019 Ondrej Kozina - 2.2.2-1 -- Update to cryptsetup 2.2.2. - -* Fri Sep 06 2019 Ondrej Kozina - 2.2.1-1 -- Update to cryptsetup 2.2.1. - -* Thu Aug 15 2019 Milan Broz - 2.2.0-1 -- Update to cryptsetup 2.2.0. - -* Wed Jul 24 2019 Fedora Release Engineering - 2.2.0-0.3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Jun 14 2019 Ondrej Kozina - 2.2.0-0.2 -- Update to cryptsetup 2.2.0-rc1. - -* Fri May 03 2019 Ondrej Kozina - 2.2.0-0.1 -- Update to cryptsetup 2.2.0-rc0. - -* Thu Apr 04 2019 Kalev Lember - 2.1.0-3 -- Add back python2-cryptsetup and cryptsetup-python3 obsoletes - -* Mon Mar 18 2019 Milan Broz - 2.1.0-2 -- Rebuild for new libargon2 soname. - -* Fri Feb 08 2019 Ondrej Kozina - 2.1.0-1 -- Update to cryptsetup 2.1.0. -- Drop python specific bits from spec file (python was removed - from upstream project) - -* Thu Jan 31 2019 Fedora Release Engineering - 2.0.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Tue Jan 22 2019 Ondrej Kozina - 2.0.6-2 -- Switch default metadata format to LUKS2. -- Resolves: #1668013 - -* Mon Dec 03 2018 Ondrej Kozina - 2.0.6-1 -- Update to cryptsetup 2.0.6. - -* Mon Oct 29 2018 Ondrej Kozina - 2.0.5-1 -- Update to cryptsetup 2.0.5. - -* Fri Aug 03 2018 Ondrej Kozina - 2.0.4-1 -- Update to cryptsetup 2.0.4. -- patch: Add Fedora system library paths in configure. - -* Tue Jul 17 2018 Ondrej Kozina - 2.0.3-6 -- Remove libgcrypt dependency from cryptsetup-libs package. - -* Tue Jul 17 2018 Ondrej Kozina - 2.0.3-5 -- Replace sed script with --disable-rpath configure option. -- Switch cryptsetup to openssl crypto backend. -- Spec file cleanup. - -* Thu Jul 12 2018 Fedora Release Engineering - 2.0.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri May 04 2018 Ondrej Kozina - 2.0.3-3 -- Fix obsolete macro for python3 subpackage. - -* Fri May 04 2018 Ondrej Kozina - 2.0.3-2 -- Add missing 'Obsoletes' macros for python subpackages. - -* Fri May 04 2018 Milan Broz - 2.0.3-1 -- Update to cryptsetup 2.0.3. - -* Wed Apr 25 2018 Ondrej Kozina - 2.0.2-3 -- Add conditions for python sub-packages - -* Tue Mar 27 2018 Björn Esser - 2.0.2-2 -- Rebuilt for libjson-c.so.4 (json-c v0.13.1) on fc28 - -* Wed Mar 07 2018 Milan Broz - 2.0.2-1 -- Update to cryptsetup 2.0.2. - -* Tue Mar 06 2018 Björn Esser - 2.0.1-3 -- Rebuilt for libjson-c.so.4 (json-c v0.13.1) - -* Wed Feb 07 2018 Fedora Release Engineering - 2.0.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sun Jan 21 2018 Milan Broz - 2.0.1-1 -- Update to cryptsetup 2.0.1. - -* Thu Jan 04 2018 Ondrej Kozina - 2.0.0-3 -- Override locking path to /run/cryptsetup (going to be new default) -- Claim ownership of the locking directory - -* Fri Dec 15 2017 Iryna Shcherbina - 2.0.0-2 -- Update Python 2 dependency declarations to new packaging standards - (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) - -* Tue Dec 12 2017 Ondrej Kozina - 2.0.0-1 -- Update to cryptsetup 2.0.0 (final). - -* Sun Dec 10 2017 Björn Esser - 2.0.0-0.6 -- Rebuilt for libjson-c.so.3 - -* Mon Nov 20 2017 Milan Broz - 2.0.0-0.5 -- Link to system libargon2 instead of using bundled code. - -* Thu Nov 09 2017 Ondrej Kozina - 2.0.0-0.4 -- Drop the legacy library. - -* Wed Nov 08 2017 Ondrej Kozina - 2.0.0-0.3 -- Temporary build providing legacy library. - -* Tue Nov 07 2017 Ondrej Kozina - 2.0.0-0.2 -- Update to cryptsetup 2.0.0-rc1 (with libcryptsetup soname bump). -- Added integritysetup subpackage. - -* Sun Aug 20 2017 Zbigniew Jędrzejewski-Szmek - 1.7.5-5 -- Add Provides for the old name without %%_isa - -* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 1.7.5-4 -- Python 2 binary package renamed to python2-cryptsetup - See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 - -* Wed Aug 02 2017 Fedora Release Engineering - 1.7.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 1.7.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Thu Apr 27 2017 Milan Broz - 1.7.5-1 -- Update to cryptsetup 1.7.5. - -* Wed Mar 15 2017 Milan Broz - 1.7.4-1 -- Update to cryptsetup 1.7.4. - -* Fri Feb 10 2017 Fedora Release Engineering - 1.7.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Dec 19 2016 Miro Hrončok - 1.7.3-2 -- Rebuild for Python 3.6 - -* Sun Oct 30 2016 Milan Broz - 1.7.3-1 -- Update to cryptsetup 1.7.3. - -* Tue Jul 19 2016 Fedora Release Engineering - 1.7.2-3 -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages - -* Mon Jun 13 2016 Milan Broz - 1.7.2-2 -- Rebuilt for compatible symbol changes in glibc. - -* Sat Jun 04 2016 Milan Broz - 1.7.2-1 -- Update to cryptsetup 1.7.2. - -* Sun Feb 28 2016 Milan Broz - 1.7.1-1 -- Update to cryptsetup 1.7.1. - -* Wed Feb 03 2016 Fedora Release Engineering - 1.7.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Nov 10 2015 Fedora Release Engineering - 1.7.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 - -* Tue Nov 03 2015 Milan Broz - 1.7.0-1 -- Update to cryptsetup 1.7.0. -- Switch to sha256 as default hash. -- Increase default PBKDF2 iteration time to 2 seconds. - -* Tue Sep 08 2015 Milan Broz - 1.6.8-2 -- Update to cryptsetup 1.6.8. - -* Wed Jun 17 2015 Fedora Release Engineering - 1.6.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Mar 23 2015 Milan Broz - 1.6.7-1 -- Update to cryptsetup 1.6.7. -- Remove no longer needed fipscheck library dependence. -- Change URL to new homepage. - -* Sat Aug 16 2014 Milan Broz - 1.6.6-1 -- Update to cryptsetup 1.6.6. - -* Sat Aug 16 2014 Fedora Release Engineering - 1.6.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Fri Jul 11 2014 Tom Callaway - 1.6.5-2 -- fix license handling - -* Sun Jun 29 2014 Milan Broz - 1.6.5-1 -- Update to cryptsetup 1.6.5. -- Add cryptsetup-python3 subpackage. - -* Sat Jun 07 2014 Fedora Release Engineering - 1.6.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Mar 02 2014 Milan Broz - 1.6.4-2 -- Require libgcrypt 1.6.1 (with fixed PBKDF2 and Whirlpool hash). - -* Thu Feb 27 2014 Milan Broz - 1.6.4-1 -- Update to cryptsetup 1.6.4. - -* Tue Jan 07 2014 Ondrej Kozina - 1.6.3-2 -- remove useless hmac checksum - -* Fri Dec 13 2013 Milan Broz - 1.6.3-1 -- Update to cryptsetup 1.6.3. - -* Sun Aug 04 2013 Milan Broz - 1.6.2-1 -- Update to cryptsetup 1.6.2. - -* Sat Aug 03 2013 Fedora Release Engineering - 1.6.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Sun Mar 31 2013 Milan Broz - 1.6.1-1 -- Update to cryptsetup 1.6.1. -- Install ReleaseNotes files instead of empty Changelog file. - -* Wed Feb 13 2013 Fedora Release Engineering - 1.6.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Mon Jan 14 2013 Milan Broz - 1.6.0-1 -- Update to cryptsetup 1.6.0. -- Change default LUKS encryption mode to aes-xts-plain64 (AES128). -- Force use of gcrypt PBKDF2 instead of internal implementation. - -* Sat Dec 29 2012 Milan Broz - 1.6.0-0.1 -- Update to cryptsetup 1.6.0-rc1. -- Relax license to GPLv2+ according to new release. -- Compile cryptsetup with libpwquality support. - -* Tue Oct 16 2012 Milan Broz - 1.5.1-1 -- Update to cryptsetup 1.5.1. - -* Wed Jul 18 2012 Fedora Release Engineering - 1.5.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Tue Jul 10 2012 Milan Broz - 1.5.0-1 -- Update to cryptsetup 1.5.0. - -* Wed Jun 20 2012 Milan Broz - 1.5.0-0.2 -- Update to cryptsetup 1.5.0-rc2. -- Add cryptsetup-reencrypt subpackage. - -* Mon Jun 11 2012 Milan Broz - 1.5.0-0.1 -- Update to cryptsetup 1.5.0-rc1. -- Add veritysetup subpackage. -- Move localization files to libs subpackage. - -* Thu May 31 2012 Milan Broz - 1.4.3-2 -- Build with fipscheck (verification in fips mode). -- Clean up spec file, use install to /usr. - -* Thu May 31 2012 Milan Broz - 1.4.3-1 -- Update to cryptsetup 1.4.3. - -* Thu Apr 12 2012 Milan Broz - 1.4.2-1 -- Update to cryptsetup 1.4.2. - -* Fri Jan 13 2012 Fedora Release Engineering - 1.4.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Wed Nov 09 2011 Milan Broz - 1.4.1-1 -- Update to cryptsetup 1.4.1. -- Add Python cryptsetup bindings. -- Obsolete separate python-cryptsetup package. - -* Wed Oct 26 2011 Milan Broz - 1.4.0-1 -- Update to cryptsetup 1.4.0. - -* Mon Oct 10 2011 Milan Broz - 1.4.0-0.1 -- Update to cryptsetup 1.4.0-rc1. -- Rename package back from cryptsetup-luks to cryptsetup. - -* Wed Jun 22 2011 Milan Broz - 1.3.1-2 -- Fix return code for status command when device doesn't exist. - -* Tue May 24 2011 Milan Broz - 1.3.1-1 -- Update to cryptsetup 1.3.1. - -* Tue Apr 05 2011 Milan Broz - 1.3.0-1 -- Update to cryptsetup 1.3.0. - -* Tue Mar 22 2011 Milan Broz - 1.3.0-0.2 -- Update to cryptsetup 1.3.0-rc2 - -* Mon Mar 14 2011 Milan Broz - 1.3.0-0.1 -- Update to cryptsetup 1.3.0-rc1 - -* Tue Feb 08 2011 Fedora Release Engineering - 1.2.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Mon Dec 20 2010 Milan Broz - 1.2.0-1 -- Update to cryptsetup 1.2.0 - -* Thu Nov 25 2010 Milan Broz - 1.2.0-0.2 -- Fix crypt_activate_by_keyfile() to work with PLAIN devices. - -* Tue Nov 16 2010 Milan Broz - 1.2.0-0.1 -- Add FAQ to documentation. -- Update to cryptsetup 1.2.0-rc1 - -* Sat Jul 03 2010 Milan Broz - 1.1.3-1 -- Update to cryptsetup 1.1.3 - -* Mon Jun 07 2010 Milan Broz - 1.1.2-2 -- Fix alignment ioctl use. -- Fix API activation calls to handle NULL device name. - -* Sun May 30 2010 Milan Broz - 1.1.2-1 -- Update to cryptsetup 1.1.2 -- Fix luksOpen handling of new line char on stdin. - -* Sun May 23 2010 Milan Broz - 1.1.1-1 -- Update to cryptsetup 1.1.1 -- Fix luksClose for stacked LUKS/LVM devices. - -* Mon May 03 2010 Milan Broz - 1.1.1-0.2 -- Update to cryptsetup 1.1.1-rc2. - -* Sat May 01 2010 Milan Broz - 1.1.1-0.1 -- Update to cryptsetup 1.1.1-rc1. - -* Sun Jan 17 2010 Milan Broz - 1.1.0-1 -- Update to cryptsetup 1.1.0. - -* Fri Jan 15 2010 Milan Broz - 1.1.0-0.6 -- Fix gcrypt initialisation. -- Fix backward compatibility for hash algorithm (uppercase). - -* Wed Dec 30 2009 Milan Broz - 1.1.0-0.5 -- Update to cryptsetup 1.1.0-rc4 - -* Mon Nov 16 2009 Milan Broz - 1.1.0-0.4 -- Update to cryptsetup 1.1.0-rc3 - -* Thu Oct 01 2009 Milan Broz - 1.1.0-0.3 -- Update to cryptsetup 1.1.0-rc2 -- Fix libcryptsetup to properly export only versioned symbols. - -* Tue Sep 29 2009 Milan Broz - 1.1.0-0.2 -- Update to cryptsetup 1.1.0-rc1 -- Add luksHeaderBackup and luksHeaderRestore commands. - -* Fri Sep 11 2009 Milan Broz - 1.1.0-0.1 -- Update to new upstream testing version with new API interface. -- Add luksSuspend and luksResume commands. -- Introduce pkgconfig. - -* Fri Jul 24 2009 Fedora Release Engineering - 1.0.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Jul 22 2009 Milan Broz - 1.0.7-1 -- Update to upstream final release. -- Split libs subpackage. -- Remove rpath setting from cryptsetup binary. - -* Wed Jul 15 2009 Till Maas - 1.0.7-0.2 -- update BR because of libuuid splitout from e2fsprogs - -* Mon Jun 22 2009 Milan Broz - 1.0.7-0.1 -- Update to new upstream 1.0.7-rc1. - -- Wipe old fs headers to not confuse blkid (#468062) -* Tue Feb 24 2009 Fedora Release Engineering - 1.0.6-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Thu Oct 30 2008 Milan Broz - 1.0.6-6 -- Wipe old fs headers to not confuse blkid (#468062) - -* Tue Sep 23 2008 Milan Broz - 1.0.6-5 -- Change new project home page. -- Print more descriptive messages for initialization errors. -- Refresh patches to versions commited upstream. - -* Sat Sep 06 2008 Milan Broz - 1.0.6-4 -- Fix close of zero decriptor. -- Fix udevsettle delays - use temporary crypt device remapping. - -* Wed May 28 2008 Till Maas - 1.0.6-3 -- remove a duplicate sentence from the manpage (RH #448705) -- add patch metadata about upstream status - -* Tue Apr 15 2008 Bill Nottinghm - 1.0.6-2 -- Add the device to the luksOpen prompt (#433406) -- Use iconv, not recode (#442574) - -* Thu Mar 13 2008 Till Maas - 1.0.6-1 -- Update to latest version -- remove patches that have been merged upstream - -* Mon Mar 03 2008 Till Maas - 1.0.6-0.1.pre2 -- Update to new version with several bugfixes -- remove patches that have been merged upstream -- add patch from cryptsetup newsgroup -- fix typo / missing luksRemoveKey in manpage (patch) - -* Tue Feb 19 2008 Fedora Release Engineering - 1.0.5-9 -- Autorebuild for GCC 4.3 - -* Sat Jan 19 2008 Peter Jones - 1.0.5-8 -- Rebuild for broken deps. - -* Thu Aug 30 2007 Till Maas - 1.0.5-7 -- update URL -- update license tag -- recode ChangeLog from latin1 to uf8 -- add smp_mflags to make - -* Fri Aug 24 2007 Till Maas - 1.0.5-6 -- cleanup BuildRequires: -- removed versions, packages in Fedora are new enough -- changed popt to popt-devel - -* Thu Aug 23 2007 Till Maas - 1.0.5-5 -- fix devel subpackage requires -- remove empty NEWS README -- remove uneeded INSTALL -- remove uneeded ldconfig requires -- add readonly detection patch - -* Wed Aug 08 2007 Till Maas - 1.0.5-4 -- disable patch2, libsepol is now detected by configure -- move libcryptsetup.so to %%{_libdir} instead of /%%{_lib} - -* Fri Jul 27 2007 Till Maas - 1.0.5-3 -- Use /%%{_lib} instead of /lib to use /lib64 on 64bit archs - -* Thu Jul 26 2007 Till Maas - 1.0.5-2 -- Use /lib as libdir (#243228) -- sync header and library (#215349) -- do not use %%makeinstall (recommended by PackageGuidelines) -- select sbindir with %%configure instead with make -- add TODO - -* Wed Jun 13 2007 Jeremy Katz - 1.0.5-1 -- update to 1.0.5 - -* Mon Jun 04 2007 Peter Jones - 1.0.3-5 -- Don't build static any more. - -* Mon Feb 05 2007 Alasdair Kergon - 1.0.3-4 -- Add build dependency on new device-mapper-devel package. -- Add preun and post ldconfig requirements. -- Update BuildRoot. - -* Wed Nov 1 2006 Peter Jones - 1.0.3-3 -- Require newer libselinux (#213414) - -* Wed Jul 12 2006 Jesse Keating - 1.0.3-2.1 -- rebuild - -* Wed Jun 7 2006 Jeremy Katz - 1.0.3-2 -- put shared libs in the right subpackages - -* Fri Apr 7 2006 Bill Nottingham 1.0.3-1 -- update to final 1.0.3 - -* Mon Feb 27 2006 Bill Nottingham 1.0.3-0.rc2 -- update to 1.0.3rc2, fixes bug with HAL & encrypted devices (#182658) - -* Wed Feb 22 2006 Bill Nottingham 1.0.3-0.rc1 -- update to 1.0.3rc1, reverts changes to default encryption type - -* Tue Feb 21 2006 Bill Nottingham 1.0.2-1 -- update to 1.0.2, fix incompatiblity with old cryptsetup (#176726) - -* Mon Feb 20 2006 Karsten Hopp 1.0.1-5 -- BuildRequires: libselinux-devel - -* Fri Feb 10 2006 Jesse Keating - 1.0.1-4.2.1 -- bump again for double-long bug on ppc(64) - -* Tue Feb 07 2006 Jesse Keating - 1.0.1-4.2 -- rebuilt for new gcc4.1 snapshot and glibc changes - -* Fri Dec 09 2005 Jesse Keating -- rebuilt - -* Mon Dec 5 2005 Bill Nottingham 1.0.1-4 -- rebuild against new libdevmapper - -* Thu Oct 13 2005 Florian La Roche -- add -lsepol to rebuild on current fc5 - -* Mon Aug 22 2005 Karel Zak 1.0.1-2 -- fix cryptsetup help for isLuks action - -* Fri Jul 1 2005 Bill Nottingham 1.0.1-1 -- update to 1.0.1 - fixes incompatiblity with previous cryptsetup for - piped passwords - -* Thu Jun 16 2005 Bill Nottingham 1.0-2 -- add patch for 32/64 bit compatibility (#160445, ) - -* Tue Mar 29 2005 Bill Nottingham 1.0-1 -- update to 1.0 - -* Thu Mar 10 2005 Bill Nottingham 0.993-1 -- switch to cryptsetup-luks, for LUKS support - -* Tue Oct 12 2004 Bill Nottingham 0.1-4 -- oops, make that *everything* static (#129926) - -* Tue Aug 31 2004 Bill Nottingham 0.1-3 -- link some things static, move to /sbin (#129926) - -* Tue Jun 15 2004 Elliot Lee -- rebuilt - -* Fri Apr 16 2004 Bill Nottingham 0.1-1 -- initial packaging +%autochangelog From 42ab38dabe9516fe17a0a2216f01caf6fce71310 Mon Sep 17 00:00:00 2001 From: Kristina Hanicova Date: Fri, 19 Dec 2025 16:25:24 +0100 Subject: [PATCH 140/142] Update to cryptsetup 2.8.3. --- .gitignore | 2 +- cryptsetup-2.8.1.tar.sign | 16 ---------------- cryptsetup-2.8.3.tar.sign | 16 ++++++++++++++++ cryptsetup.spec | 2 +- sources | 2 +- 5 files changed, 19 insertions(+), 19 deletions(-) delete mode 100644 cryptsetup-2.8.1.tar.sign create mode 100644 cryptsetup-2.8.3.tar.sign diff --git a/.gitignore b/.gitignore index e1655e0..80553bb 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/cryptsetup-2.8.1.tar.xz +/cryptsetup-2.8.3.tar.xz diff --git a/cryptsetup-2.8.1.tar.sign b/cryptsetup-2.8.1.tar.sign deleted file mode 100644 index 4459bed..0000000 --- a/cryptsetup-2.8.1.tar.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAmikPjAACgkQ2bBXe9k+ -mPzw4hAAqew2XZt7qfeHXNrx4Qx+5fh8J6kNBByMoBBBoNV778MUeE35hZ57L+0G -fCRJTcWvZX9WUomSY3L/n1h/kGrk/G59clBNXyBo/VlqGy4TnDIyX/5RfN93Ysfr -XzdZptH7PFLnhf6R9Y6bkRTCVdutW6WSW+CTeB6LnQHR97y2Jz/L+qTpExs9ujk9 -FMuMI2bO+i5QaisvAqS7/z0ba18xdgNqplj8DUFygtuJiUeshtW/RHBr21Y762Ut -ZaliJbkww/XbI0CVyjoT0OrgRIpqr1tb1AwPNCU81MgCrB5q5pYOdcGkuRGIGKSG -+BC2qrHqlbNIu8SOu6JZ7mq2gkiyzz+Gg7AuKsvV9HPFkFEd40SIE2xNMxgwZtwB -jW9d07Cg90qGcKLqESwb5bNXRFxw8aBXHaaZraC5mAoYfOXaQAL+FlBtbcsADoFy -7TJEDyqC47nRB7dC0c8Cd7rqZ7nFWenf7oPXK87wFDIRDdv7OTtwD03fQdhy7j6N -+jX1vVH/xRDpEpcUTQyuo3CO/gN5w2TWPKHYFBkAV3qvQOTLKZXQCxyYNfSBfFmJ -IyeRPYb/Euk46jX+xpCeoP540YAL6BoLTHyis5wjjM9jTXTMKFa5ZivrMlWaRKS5 -pp4EIpJlxuE8kGmKvMgPO3kgS4w3akjNpfdkeRWAPKaVVMzBY1Y= -=tRD6 ------END PGP SIGNATURE----- diff --git a/cryptsetup-2.8.3.tar.sign b/cryptsetup-2.8.3.tar.sign new file mode 100644 index 0000000..7b78e41 --- /dev/null +++ b/cryptsetup-2.8.3.tar.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAmlFSt0ACgkQ2bBXe9k+ +mPyqxw//eUa0VW8r/xgugdTdG83cro4n4QZcEifUoAM2NbnOI1qEQqeL2CgQgCIK +Td2Xi6Jmu5HxqEjRqbpvCo5pjZYpP00OSamvPsKVWbd+wu0C52J37ddV7c7LEKOj +4wrWhVgqq9Eji4UyA/OeaOuOO/3NmSOeM196lv2awnUjLdnj+eedEnF3kxnx36W5 +nTsD5Ht2l1g187TOO2qvSvvSC+RVrxcbK31/e1NAwfOGypgdIF3qyMIa9XZN3SyV +kdHn+dQGTK5J4ubEBuSWeQWelJ5jxj/+yjATxvHxvpdDAd5V7Nsmu2+8x2XiaZbm +ZeCALQKPDE8KQnvO8ez4QuG71ISoJjAlgRJIfFP9AJcskLdswn1TWM75D8wmbI5e +uUxExIpkX/UTGThc3DCm/V4f0muJB1ncEsepHssYG0IeIVlr/5WcThG/OYPxRRfE +WcLxN36ckI6HuqYZCS8SnvncTfcPFRtUVk7+LbCLF5eB+E1uTbVEv1IgRChl2tVZ +vYoJJl8MS/MASykG2wTaIt9kBO/qeRDWyGPvtWJdcep5Uqd0iJKpd2AsB9TYM3U0 +xtoyCE1lUWBe7oYgfHoq9++MF/9hn3Uw+1kZAp1PrNcSjduEHOWNkG/Lzevv+Wgl +jQFFimhxqfT+Pgjlb4MKLS5QRhQOOygg+1uHKeeoh0buZ/NMbeE= +=KsY6 +-----END PGP SIGNATURE----- diff --git a/cryptsetup.spec b/cryptsetup.spec index 4f64fac..c42e933 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,6 +1,6 @@ Summary: Utility for setting up encrypted disks Name: cryptsetup -Version: 2.8.1 +Version: 2.8.3 Release: %autorelease License: GPL-2.0-or-later WITH cryptsetup-OpenSSL-exception AND LGPL-2.1-or-later WITH cryptsetup-OpenSSL-exception URL: https://gitlab.com/cryptsetup/cryptsetup diff --git a/sources b/sources index 9832dc9..6b17819 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cryptsetup-2.8.1.tar.xz) = a5171e18c55bfbc57330f2d46ab06b5ac6957392a77aef74c3d1c5295eb39962d1db19ddd3420ea1154d730b361d09e72bf5315c7a3d56eb36cee9c2531bca5d +SHA512 (cryptsetup-2.8.1.tar.xz) = 6aaf5a7e6d716e581b50fce417dad079022ff15d54e8a93697888b030b8defa03a39fd94725c3a8692cd07147573bd7f1c3c41571c488aabd44e4f9def9673e2 From 6188395be90d1edb2f690c6aff69f986604fa2cc Mon Sep 17 00:00:00 2001 From: Kristina Hanicova Date: Fri, 19 Dec 2025 16:40:43 +0100 Subject: [PATCH 141/142] Update sources. --- sources | 1 + 1 file changed, 1 insertion(+) diff --git a/sources b/sources index 6b17819..56824bf 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (cryptsetup-2.8.1.tar.xz) = 6aaf5a7e6d716e581b50fce417dad079022ff15d54e8a93697888b030b8defa03a39fd94725c3a8692cd07147573bd7f1c3c41571c488aabd44e4f9def9673e2 +SHA512 (cryptsetup-2.8.3.tar.xz) = 6aaf5a7e6d716e581b50fce417dad079022ff15d54e8a93697888b030b8defa03a39fd94725c3a8692cd07147573bd7f1c3c41571c488aabd44e4f9def9673e2 From 2794c7b33a50542fc7b1f94ddbbafeb22b8e9087 Mon Sep 17 00:00:00 2001 From: Kristina Hanicova Date: Fri, 19 Dec 2025 16:53:35 +0100 Subject: [PATCH 142/142] Remove previous version (2.8.1) from sources. --- sources | 1 - 1 file changed, 1 deletion(-) diff --git a/sources b/sources index 56824bf..e31326c 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (cryptsetup-2.8.1.tar.xz) = 6aaf5a7e6d716e581b50fce417dad079022ff15d54e8a93697888b030b8defa03a39fd94725c3a8692cd07147573bd7f1c3c41571c488aabd44e4f9def9673e2 SHA512 (cryptsetup-2.8.3.tar.xz) = 6aaf5a7e6d716e581b50fce417dad079022ff15d54e8a93697888b030b8defa03a39fd94725c3a8692cd07147573bd7f1c3c41571c488aabd44e4f9def9673e2