up to 2.4.3 (fixes CVE-2021-4122)

[packages/cryptsetup.git] / cryptsetup.spec

diff --git a/cryptsetup.spec b/cryptsetup.spec
index f09460797ebe02ab0848985b7784836f6c2efe55..a1359c1413be28c29b4be24ff55b069132f73338 100644 (file)
--- a/cryptsetup.spec
+++ b/cryptsetup.spec
@@ -10,18 +10,18 @@
 Summary:       LUKS for dm-crypt implemented in cryptsetup
 Summary(pl.UTF-8):     LUKS dla dm-crypta zaimplementowany w cryptsetup
 Name:          cryptsetup
-Version:       2.3.5
+Version:       2.4.3
 Release:       1
 License:       GPL v2
 Group:         Base
-Source0:       https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/%{name}-%{version}.tar.xz
-# Source0-md5: 408620e0df577ec04108ec0bc2b91dee
+Source0:       https://www.kernel.org/pub/linux/utils/cryptsetup/v2.4/%{name}-%{version}.tar.xz
+# Source0-md5: 2303d57e78d4977344188a46e125095c
 Patch0:                diet.patch
 URL:           https://gitlab.com/cryptsetup/cryptsetup
 BuildRequires: autoconf >= 2.67
 BuildRequires: automake >= 1:1.12
 BuildRequires: device-mapper-devel >= 1.02.27
-BuildRequires: gettext-tools >= 0.18.3
+BuildRequires: gettext-tools >= 0.21
 BuildRequires: json-c-devel
 BuildRequires: libargon2-devel >= 20171227
 BuildRequires: libblkid-devel
@@ -30,6 +30,7 @@ BuildRequires:        libgpg-error-devel
 %{?with_pwquality:BuildRequires:       libpwquality-devel >= 1.0.0}
 BuildRequires: libselinux-devel
 BuildRequires: libsepol-devel
+BuildRequires: libssh-devel
 BuildRequires: libtool >= 2:2.0
 BuildRequires: libuuid-devel
 %{!?with_gcrypt:BuildRequires: openssl-devel >= 0.9.8}
@@ -56,6 +57,7 @@ BuildRequires:        popt-static
 BuildRequires: udev-static
        %endif
 %endif
+Requires:      device-mapper >= 1.02.27
 %{?with_gcrypt:Requires:       libgcrypt >= 1.6.1}
 %{?with_pwquality:Requires:    libpwquality >= 1.0.0}
 Requires:      popt >= 1.7
@@ -217,10 +219,12 @@ install -d $RPM_BUILD_ROOT/var/run/cryptsetup
        DESTDIR=$RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT/%{_lib}
-mv -f $RPM_BUILD_ROOT%{_libdir}/libcryptsetup.so.* $RPM_BUILD_ROOT/%{_lib}
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/libcryptsetup.so.* $RPM_BUILD_ROOT/%{_lib}
 ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libcryptsetup.so.*.*.*) \
        $RPM_BUILD_ROOT%{_libdir}/libcryptsetup.so
 
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/cryptsetup/libcryptsetup-*.{la,a}
+
 %if %{with initrd}
 install -d $RPM_BUILD_ROOT%{_libdir}/initrd
 install -p cryptsetup-initrd $RPM_BUILD_ROOT%{_libdir}/initrd/cryptsetup
@@ -236,15 +240,19 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS FAQ README TODO docs/{ChangeLog.old,v*-ReleaseNotes,on-disk-format.pdf}
+%doc AUTHORS FAQ README.md docs/{ChangeLog.old,v*-ReleaseNotes,on-disk-format.pdf}
 %attr(755,root,root) %{_sbindir}/cryptsetup
 %attr(755,root,root) %{_sbindir}/cryptsetup-reencrypt
+%attr(755,root,root) %{_sbindir}/cryptsetup-ssh
 %attr(755,root,root) %{_sbindir}/integritysetup
 %attr(755,root,root) %{_sbindir}/veritysetup
 %attr(755,root,root) /%{_lib}/libcryptsetup.so.*.*.*
 %attr(755,root,root) %ghost /%{_lib}/libcryptsetup.so.12
+%dir %{_libdir}/cryptsetup
+%attr(755,root,root) %{_libdir}/cryptsetup/libcryptsetup-token-ssh.so
 %{_mandir}/man8/cryptsetup.8*
 %{_mandir}/man8/cryptsetup-reencrypt.8*
+%{_mandir}/man8/cryptsetup-ssh.8*
 %{_mandir}/man8/integritysetup.8*
 %{_mandir}/man8/veritysetup.8*
 %{systemdtmpfilesdir}/cryptsetup.conf