[main] [cryptsetup] Update cryptsetup to 2.4.3 (#1963)
* Update cryptsetup to 2.4.3 * Apply linter suggestions * Update cgmanifest.json * Use prefered name for pkgconf alias * Remove unused macros
This commit is contained in:
Daniel McIlvaney
GitHub
parent
3d198c6ab6
commit
a6a12d30a6
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"Signatures": {
|
||||
"cryptsetup-2.3.3.tar.xz": "3bca4ffe39e2f94cef50f6ea65acb873a6dbce5db34fc6bcefe38b6d095e82df"
|
||||
"cryptsetup-2.4.3.tar.xz": "fc0df945188172264ec5bf1d0bda08264fadc8a3f856d47eba91f31fe354b507"
|
||||
}
|
||||
}
|
||||
|
|
@ -1,69 +1,79 @@
|
|||
%global urlversion 2.3
|
||||
|
||||
%global urlversion 2.4
|
||||
Summary: A utility for setting up encrypted disks
|
||||
Name: cryptsetup
|
||||
Version: 2.3.3
|
||||
Release: 3%{?dist}
|
||||
License: GPLv2+ and LGPLv2+
|
||||
Group: Applications/System
|
||||
Version: 2.4.3
|
||||
Release: 1%{?dist}
|
||||
License: GPLv2+ AND LGPLv2+
|
||||
Vendor: Microsoft Corporation
|
||||
Distribution: Mariner
|
||||
Group: Applications/System
|
||||
URL: https://gitlab.com/cryptsetup/cryptsetup
|
||||
Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v%{urlversion}/%{name}-%{version}.tar.xz
|
||||
Patch0: cryptsetup-add-system-library-paths.patch
|
||||
BuildRequires: openssl-devel, popt-devel, device-mapper-devel
|
||||
BuildRequires: gcc, util-linux
|
||||
BuildRequires: libpwquality-devel, json-c-devel
|
||||
Provides: cryptsetup-luks = %{version}-%{release}
|
||||
BuildRequires: device-mapper-devel
|
||||
BuildRequires: findutils
|
||||
BuildRequires: gcc
|
||||
BuildRequires: gettext-devel
|
||||
BuildRequires: json-c-devel
|
||||
BuildRequires: libblkid-devel
|
||||
BuildRequires: libpwquality-devel
|
||||
BuildRequires: libtool
|
||||
BuildRequires: openssl-devel
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: popt-devel
|
||||
BuildRequires: util-linux
|
||||
Requires: cryptsetup-libs = %{version}-%{release}
|
||||
Requires: libpwquality >= 1.2.0
|
||||
# Currently disabling SSH tokens with --disable-ssh-token until libssh is available
|
||||
#BuildRequires: libssh-devel
|
||||
Provides: cryptsetup-luks = %{version}-%{release}
|
||||
|
||||
%description
|
||||
The cryptsetup package contains a utility for setting up
|
||||
disk encryption using dm-crypt kernel module.
|
||||
|
||||
%package devel
|
||||
Group: Development/Libraries
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: pkg-config
|
||||
Summary: Headers and libraries for using encrypted file systems
|
||||
Provides: cryptsetup-luks-devel = %{version}-%{release}
|
||||
Summary: Headers and libraries for using encrypted file systems
|
||||
Group: Development/Libraries
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: pkgconfig
|
||||
Provides: cryptsetup-luks-devel = %{version}-%{release}
|
||||
|
||||
%description devel
|
||||
The cryptsetup-devel package contains libraries and header files
|
||||
used for writing code that makes use of disk encryption.
|
||||
|
||||
%package libs
|
||||
Group: System Environment/Libraries
|
||||
Requires: json-c
|
||||
Summary: Cryptsetup shared library
|
||||
Provides: cryptsetup-luks-libs = %{version}-%{release}
|
||||
Summary: Cryptsetup shared library
|
||||
Group: System Environment/Libraries
|
||||
Requires: json-c
|
||||
Provides: cryptsetup-luks-libs = %{version}-%{release}
|
||||
|
||||
%description libs
|
||||
This package contains the cryptsetup shared library, libcryptsetup.
|
||||
|
||||
%package -n veritysetup
|
||||
Group: Applications/System
|
||||
Summary: A utility for setting up dm-verity volumes
|
||||
Requires: cryptsetup-libs = %{version}-%{release}
|
||||
Summary: A utility for setting up dm-verity volumes
|
||||
Group: Applications/System
|
||||
Requires: cryptsetup-libs = %{version}-%{release}
|
||||
|
||||
%description -n veritysetup
|
||||
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}
|
||||
Summary: A utility for setting up dm-integrity volumes
|
||||
Group: Applications/System
|
||||
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.
|
||||
Requires: cryptsetup-libs = %{version}-%{release}
|
||||
Summary: A utility for offline reencryption of LUKS encrypted disks.
|
||||
Group: Applications/System
|
||||
Requires: cryptsetup-libs = %{version}-%{release}
|
||||
|
||||
%description reencrypt
|
||||
This package contains cryptsetup-reencrypt utility which
|
||||
|
|
@ -75,40 +85,36 @@ can be used for offline reencryption of disk in situ.
|
|||
chmod -x misc/dracut_90reencrypt/*
|
||||
|
||||
%build
|
||||
%configure --enable-fips --enable-pwquality --enable-internal-sse-argon2 --with-crypto_backend=openssl --with-default-luks-format=LUKS2
|
||||
./autogen.sh
|
||||
%configure --enable-fips --enable-pwquality --enable-internal-sse-argon2 --with-default-luks-format=LUKS2 --disable-ssh-token
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
make install DESTDIR=%{buildroot}
|
||||
rm -rf %{buildroot}/%{_libdir}/*.la
|
||||
find %{buildroot} -type f -name "*.la" -delete -print
|
||||
|
||||
%find_lang cryptsetup
|
||||
|
||||
%post -n cryptsetup-libs -p /sbin/ldconfig
|
||||
|
||||
%postun -n cryptsetup-libs -p /sbin/ldconfig
|
||||
|
||||
%files
|
||||
%{!?_licensedir:%global license %%doc}
|
||||
%license COPYING
|
||||
%doc AUTHORS FAQ docs/*ReleaseNotes
|
||||
%{_mandir}/man8/cryptsetup.8.gz
|
||||
%{_sbindir}/cryptsetup
|
||||
|
||||
%files -n veritysetup
|
||||
%{!?_licensedir:%global license %%doc}
|
||||
%license COPYING
|
||||
%{_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
|
||||
%doc misc/dracut_90reencrypt
|
||||
%{_mandir}/man8/cryptsetup-reencrypt.8.gz
|
||||
|
|
@ -121,15 +127,15 @@ rm -rf %{buildroot}/%{_libdir}/*.la
|
|||
%{_libdir}/pkgconfig/libcryptsetup.pc
|
||||
|
||||
%files libs -f cryptsetup.lang
|
||||
%{!?_licensedir:%global license %%doc}
|
||||
%license COPYING COPYING.LGPL
|
||||
%{_libdir}/libcryptsetup.so.*
|
||||
%{_tmpfilesdir}/cryptsetup.conf
|
||||
%ghost %dir /run/cryptsetup
|
||||
|
||||
%changelog
|
||||
* Thu Dec 16 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 2.3.3-3
|
||||
- Removing the explicit %%clean stage.
|
||||
* Tue Jan 18 2022 Daniel McIlvaney <damcilva@microsoft.com> - 2.4.3-1
|
||||
- Update to version 2.4.3
|
||||
- We currently do not support SSH tokens, re-enable once libssh is available
|
||||
|
||||
* Wed Jun 17 2020 Joe Schmitt <joschmit@microsoft.com> - 2.3.3-2
|
||||
- Fix Source0 URL.
|
||||
|
|
@ -254,6 +260,7 @@ rm -rf %{buildroot}/%{_libdir}/*.la
|
|||
|
||||
* Sun Aug 20 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.7.5-5
|
||||
- Add Provides for the old name without %%_isa
|
||||
|
||||
* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.7.5-4
|
||||
- Python 2 binary package renamed to python2-cryptsetup
|
||||
See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3
|
||||
|
|
@ -495,8 +502,8 @@ rm -rf %{buildroot}/%{_libdir}/*.la
|
|||
|
||||
* Mon Jun 22 2009 Milan Broz <mbroz@redhat.com> - 1.0.7-0.1
|
||||
- Update to new upstream 1.0.7-rc1.
|
||||
|
||||
- Wipe old fs headers to not confuse blkid (#468062)
|
||||
|
||||
* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.6-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
|
|
@ -2377,8 +2377,8 @@
|
|||
"type": "other",
|
||||
"other": {
|
||||
"name": "cryptsetup",
|
||||
"version": "2.3.3",
|
||||
"downloadUrl": "https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/cryptsetup-2.3.3.tar.xz"
|
||||
"version": "2.4.3",
|
||||
"downloadUrl": "https://www.kernel.org/pub/linux/utils/cryptsetup/v2.4/cryptsetup-2.4.3.tar.xz"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
|
|||
Loading…
Reference in New Issue