- updated to 2.4.1, partial PLD merge
authorMarcin Krol <hawk@tld-linux.org>
Sat, 18 Sep 2021 18:22:29 +0000 (20:22 +0200)
committerMarcin Krol <hawk@tld-linux.org>
Sat, 18 Sep 2021 18:22:29 +0000 (20:22 +0200)
cryptsetup.spec

index 6764d1f0e93f48eb00b11ccf2c7ca7349f93f16c..483e719f8cdeb446c695b3ad7fc14843eb293345 100644 (file)
 Summary:       LUKS for dm-crypt implemented in cryptsetup
 Summary(pl.UTF-8):     LUKS dla dm-crypta zaimplementowany w cryptsetup
 Name:          cryptsetup
-Version:       2.3.4
+Version:       2.4.1
 Release:       1
 License:       GPL v2
 Group:         Base
-Source0:       https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/%{name}-%{version}.tar.xz
-# Source0-md5: 911272e73181fdc850bb4d25103a9f83
+Source0:       https://www.kernel.org/pub/linux/utils/cryptsetup/v2.4/%{name}-%{version}.tar.xz
+# Source0-md5: a83f16aba406c53d1b5c5c34b5e563bc
 Patch0:                diet.patch
 URL:           https://gitlab.com/cryptsetup/cryptsetup
 BuildRequires: autoconf >= 2.67
@@ -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}
@@ -174,7 +175,7 @@ CC="%{__cc}"
        --enable-static \
        --enable-static-cryptsetup \
        --with-crypto-backend=gcrypt \
-       --with-luks2-lock-path=/run/%{name}
+       --with-luks2-lock-path=/var/run/%{name}
 
 %{__make} -C lib
 
@@ -201,7 +202,8 @@ mv src/cryptsetup cryptsetup-initrd
        --enable-static \
        --enable-udev \
        %{?with_gcrypt:--with-crypto-backend=gcrypt} \
-       --with-luks2-lock-path=/run/%{name}
+       --with-luks2-lock-path=/var/run/%{name}
+
 %{__make}
 
 %{?with_tests:%{__make} check}
@@ -209,14 +211,18 @@ mv src/cryptsetup cryptsetup-initrd
 %install
 rm -rf $RPM_BUILD_ROOT
 
+install -d $RPM_BUILD_ROOT/var/run/cryptsetup
+
 %{__make} install \
        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
@@ -232,17 +238,22 @@ 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*
+%attr(700,root,root) %dir /var/run/cryptsetup
 
 %files devel
 %defattr(644,root,root,755)