Update to cryptsetup 2.0.0 rc1

This commit is contained in:
Ondrej Kozina 2017-11-03 10:42:21 +01:00
parent 56cfe01914
commit 544bd280c3
5 changed files with 44 additions and 24 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
/cryptsetup-1.7.5.tar.xz
/cryptsetup-2.0.0-rc1.tar.xz

View File

@ -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-----

View File

@ -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-----

View File

@ -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 <okozina@redhat.com> - 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 <zbyszek@in.waw.pl> - 1.7.5-5
- Add Provides for the old name without %%_isa

View File

@ -1 +1 @@
SHA512 (cryptsetup-1.7.5.tar.xz) = d473f7b06d705a3868a70f3767fafc664436b5897ba59025ea1268f815cb80a9076841ff9ff96cc130fb83ba18b03c1eee38cfaf1b471fdd883a3e126b771439
SHA512 (cryptsetup-2.0.0-rc1.tar.xz) = 397c45b11dd275c2e7da6442a80a92da0de8888a1b9547ae16ee69681c5b63d95253fe0e80ea20a09d14d06d0e138ad349486999f94ce065140f49dcd1dd8427