From 5b32b11c805ed0ba7ce74031bd2633813baee38a Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Tue, 29 May 2018 12:01:20 +0200 Subject: [PATCH 1/5] Remove rpath before rebuilding for python3 api. --- cryptsetup.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index 2bc02d4..4f13ef6 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 @@ -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 @@ -232,6 +235,9 @@ popd %clean %changelog +* Tue May 29 2018 Ondrej Kozina - 2.0.3-4 +- Remove rpath before building python3 api. + * Fri May 04 2018 Ondrej Kozina - 2.0.3-3 - Fix obsolete macro for python3 subpackage. From 65a038eb1c97fa295d09d795b7e88d022ef092b1 Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Fri, 3 Aug 2018 14:34:41 +0200 Subject: [PATCH 2/5] Update to version 2.0.4. --- .gitignore | 2 +- cryptsetup-2.0.3.tar.sign | 16 ---------------- cryptsetup-2.0.4.tar.sign | 16 ++++++++++++++++ cryptsetup.spec | 9 ++++++--- sources | 2 +- 5 files changed, 24 insertions(+), 21 deletions(-) delete mode 100644 cryptsetup-2.0.3.tar.sign create mode 100644 cryptsetup-2.0.4.tar.sign 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.spec b/cryptsetup.spec index 4f13ef6..273602d 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -21,14 +21,14 @@ Obsoletes: cryptsetup-python3 Summary: A utility for setting up encrypted disks Name: cryptsetup -Version: 2.0.3 -Release: 4%{?dist} +Version: 2.0.4 +Release: 1%{?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: libselinux-devel, gcc, libblkid-devel %if %{python2_enable} BuildRequires: python2-devel %endif @@ -235,6 +235,9 @@ popd %clean %changelog +* Fri Aug 03 2018 Ondrej Kozina - 2.0.4-1 +- Update to cryptsetup 2.0.4. + * Tue May 29 2018 Ondrej Kozina - 2.0.3-4 - Remove rpath before building python3 api. 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 3c2928ba98200b5a6c54c83d52a4a69cf3a62f92 Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Mon, 29 Oct 2018 11:43:38 +0100 Subject: [PATCH 3/5] Update to version 2.0.5. - Resolves: #1594217 #1643686 --- .gitignore | 1 + cryptsetup.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7336e5a..a8382a5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /cryptsetup-2.0.4.tar.xz +/cryptsetup-2.0.5.tar.xz diff --git a/cryptsetup.spec b/cryptsetup.spec index 273602d..3683cbc 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 @@ -235,6 +235,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. 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 54fa44702acdbe5ce47f5f7cf659f2b6c52e92f7 Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Mon, 3 Dec 2018 15:56:58 +0100 Subject: [PATCH 4/5] Update to cryptsetup 2.0.6. --- cryptsetup-2.0.4.tar.sign | 16 ---------------- cryptsetup-2.0.6.tar.sign | 16 ++++++++++++++++ cryptsetup.spec | 5 ++++- 3 files changed, 20 insertions(+), 17 deletions(-) delete mode 100644 cryptsetup-2.0.4.tar.sign create mode 100644 cryptsetup-2.0.6.tar.sign 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.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 3683cbc..30d6f77 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 @@ -235,6 +235,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. From ad749da71b2a04e89b5c3581a7c84ef62ee66671 Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Mon, 3 Dec 2018 16:04:54 +0100 Subject: [PATCH 5/5] Update source references. --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index a8382a5..9b3882b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /cryptsetup-2.0.4.tar.xz /cryptsetup-2.0.5.tar.xz +/cryptsetup-2.0.6.tar.xz 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