Update to version 2.0.4.
This commit is contained in:
Ondrej Kozina
parent
45d9619c3d
commit
3b2e11ecf4
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
||||
/cryptsetup-2.0.3.tar.xz
|
||||
/cryptsetup-2.0.4.tar.xz
|
||||
|
||||
@ -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-----
|
||||
16
cryptsetup-2.0.4.tar.sign
Normal file
16
cryptsetup-2.0.4.tar.sign
Normal file
@ -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-----
|
||||
22
cryptsetup-add-system-library-paths.patch
Normal file
22
cryptsetup-add-system-library-paths.patch
Normal file
@ -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
|
||||
@ -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 <okozina@redhat.com> - 2.0.4-1
|
||||
- Update to cryptsetup 2.0.4.
|
||||
- patch: Add Fedora system library paths in configure.
|
||||
|
||||
* Tue Jul 17 2018 Ondrej Kozina <okozina@redhat.com> - 2.0.3-6
|
||||
- Remove libgcrypt dependency from cryptsetup-libs package.
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (cryptsetup-2.0.3.tar.xz) = f5ac54aa9614b234f2d1e84758a98914d283b669f4ab5cbe0ed7cdf25ce77f2d1abdf1e5b5010d803971f0e29120954110ee4fcc538137b04fbdc13b7804385e
|
||||
SHA512 (cryptsetup-2.0.4.tar.xz) = 74d442c7c7837da719a14aefa8bf0b5dffbb050acd6fbd140c50d43470c828f79fdcf7cd6acf1c149a4e1129a100059df6216b7d8ca04eb0b070cb8d4ca33e61
|
||||
|
||||
Loading…
Reference in New Issue
Block a user