From 4890123740facb762609fdbcc617c388d5db7fbd Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Thu, 15 Aug 2019 09:22:26 +0200 Subject: [PATCH] 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