From 245fb0ba8bb6e9827f03911f89c58621774b552c Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Nov 08 2017 12:32:52 +0000 Subject: Temporary build providing legacy library. --- diff --git a/.gitignore b/.gitignore index d690276..1a537b9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /cryptsetup-2.0.0-rc1.tar.xz +/cryptsetup-1.7.5.tar.xz diff --git a/cryptsetup.spec b/cryptsetup.spec index 4c5e499..db9237a 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -3,7 +3,7 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup Version: 2.0.0 -Release: 0.2%{?dist} +Release: 0.3%{?dist} License: GPLv2+ and LGPLv2+ Group: Applications/System URL: https://gitlab.com/cryptsetup/cryptsetup @@ -18,6 +18,7 @@ Requires: libpwquality >= 1.2.0 %global upstream_version %{version}-rc1 Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v2.0/cryptsetup-%{upstream_version}.tar.xz +Source1: https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/cryptsetup-1.7.5.tar.xz %description The cryptsetup package contains a utility for setting up @@ -106,9 +107,16 @@ chmod -x misc/dracut_90reencrypt/* # copy the whole directory for the python3 build cp -a . %{py3dir} +%setup -T -a 1 -D -n cryptsetup-%{upstream_version} %build %configure --enable-python --enable-fips --enable-pwquality %{?configure_pbkdf2} +pushd cryptsetup-1.7.5 +%configure --enable-python --enable-fips --enable-pwquality --enable-cryptsetup-reencrypt %{?configure_pbkdf2} +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 # 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 @@ -120,6 +128,9 @@ make %{?_smp_mflags} popd %install +pushd cryptsetup-1.7.5 +make install DESTDIR=%{buildroot} +popd make install DESTDIR=%{buildroot} rm -rf %{buildroot}/%{_libdir}/*.la @@ -188,6 +199,9 @@ popd %clean %changelog +* Wed Nov 08 2017 Ondrej Kozina - 2.0.0-0.3 +- Temporary build providing legacy library. + * Tue Nov 07 2017 Ondrej Kozina - 2.0.0-0.2 - Update to cryptsetup 2.0.0-rc1 (with libcryptsetup soname bump). - Added integritysetup subpackage. diff --git a/sources b/sources index 7125d52..0ce5130 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (cryptsetup-2.0.0-rc1.tar.xz) = 397c45b11dd275c2e7da6442a80a92da0de8888a1b9547ae16ee69681c5b63d95253fe0e80ea20a09d14d06d0e138ad349486999f94ce065140f49dcd1dd8427 +SHA512 (cryptsetup-1.7.5.tar.xz) = d473f7b06d705a3868a70f3767fafc664436b5897ba59025ea1268f815cb80a9076841ff9ff96cc130fb83ba18b03c1eee38cfaf1b471fdd883a3e126b771439