rpms/cryptsetup
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Override locking path to /run/cryptsetup.

Browse Source
This commit is contained in:
Ondrej Kozina 2018-01-04 19:00:47 +01:00
parent 8c891f7dd9
commit a7d5c760ee
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cryptsetup.spec
View File

@ -3,7 +3,7 @@
Summary: A utility for setting up encrypted disks Summary: A utility for setting up encrypted disks
Name: cryptsetup Name: cryptsetup
Version: 2.0.0 Version: 2.0.0
Release: 2%{?dist} Release: 3%{?dist}
License: GPLv2+ and LGPLv2+ License: GPLv2+ and LGPLv2+
Group: Applications/System Group: Applications/System
URL: https://gitlab.com/cryptsetup/cryptsetup URL: https://gitlab.com/cryptsetup/cryptsetup
@ -17,6 +17,7 @@ Requires: cryptsetup-libs = %{version}-%{release}
Requires: libpwquality >= 1.2.0 Requires: libpwquality >= 1.2.0
%global upstream_version %{version} %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 Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v2.0/cryptsetup-%{upstream_version}.tar.xz
%description %description
@ -108,14 +109,16 @@ chmod -x misc/dracut_90reencrypt/*
cp -a . %{py3dir} cp -a . %{py3dir}
%build %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 # remove rpath
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool 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 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags} make %{?_smp_mflags}
pushd %{py3dir} 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} make %{?_smp_mflags}
popd popd
@ -170,6 +173,7 @@ popd
%license COPYING COPYING.LGPL %license COPYING COPYING.LGPL
%{_libdir}/libcryptsetup.so.* %{_libdir}/libcryptsetup.so.*
%{_tmpfilesdir}/cryptsetup.conf %{_tmpfilesdir}/cryptsetup.conf
%ghost %dir %{luks2_locking_dir}
%files -n python2-cryptsetup %files -n python2-cryptsetup
%{!?_licensedir:%global license %%doc} %{!?_licensedir:%global license %%doc}
@ -188,6 +192,10 @@ popd
%clean %clean
%changelog %changelog
* Thu Jan 04 2018 Ondrej Kozina <okozina@redhat.com> - 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 <ishcherb@redhat.com> - 2.0.0-2 * Fri Dec 15 2017 Iryna Shcherbina <ishcherb@redhat.com> - 2.0.0-2
- Update Python 2 dependency declarations to new packaging standards - Update Python 2 dependency declarations to new packaging standards
(See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)