diff options
-rw-r--r-- | cryptsetup.spec | 15 | ||||
-rw-r--r-- | no_pty_tests.patch | 21 |
2 files changed, 18 insertions, 18 deletions
diff --git a/cryptsetup.spec b/cryptsetup.spec index be69d69..b491c8e 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -10,12 +10,12 @@ Summary: LUKS for dm-crypt implemented in cryptsetup Summary(pl.UTF-8): LUKS dla dm-crypta zaimplementowany w cryptsetup Name: cryptsetup -Version: 2.4.3 -Release: 2 +Version: 2.5.0 +Release: 1 License: GPL v2 Group: Base -Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v2.4/%{name}-%{version}.tar.xz -# Source0-md5: 2303d57e78d4977344188a46e125095c +Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v2.5/%{name}-%{version}.tar.xz +# Source0-md5: 0813f29b74f137d566aed14d9d18e58e Patch0: diet.patch Patch1: no_pty_tests.patch URL: https://gitlab.com/cryptsetup/cryptsetup @@ -38,6 +38,7 @@ BuildRequires: libuuid-devel %{?with_passwdqc:BuildRequires: passwdqc-devel} BuildRequires: pkgconfig BuildRequires: popt-devel >= 1.7 +BuildRequires: ruby-asciidoctor BuildRequires: tar >= 1:1.22 BuildRequires: xz %if %{with initrd} @@ -242,9 +243,8 @@ rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(644,root,root,755) -%doc AUTHORS FAQ README.md docs/{ChangeLog.old,v*-ReleaseNotes,on-disk-format.pdf} +%doc AUTHORS FAQ.md 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 @@ -253,8 +253,7 @@ rm -rf $RPM_BUILD_ROOT %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/cryptsetup-*.8* %{_mandir}/man8/integritysetup.8* %{_mandir}/man8/veritysetup.8* %{systemdtmpfilesdir}/cryptsetup.conf diff --git a/no_pty_tests.patch b/no_pty_tests.patch index 4355f1d..b591724 100644 --- a/no_pty_tests.patch +++ b/no_pty_tests.patch @@ -1,11 +1,12 @@ ---- cryptsetup-2.4.3/tests/Makefile.am.orig 2022-01-13 10:23:53.000000000 +0100 -+++ cryptsetup-2.4.3/tests/Makefile.am 2022-01-20 10:56:51.933912924 +0100 -@@ -27,7 +27,7 @@ - endif +--- cryptsetup-2.5.0/tests/Makefile.am.orig 2022-07-28 18:24:24.149696769 +0200 ++++ cryptsetup-2.5.0/tests/Makefile.am 2022-07-28 19:33:26.248465013 +0200 +@@ -24,8 +24,7 @@ + unit-utils-crypt-test \ + unit-wipe-test \ + reencryption-compat-test \ +- luks2-reencryption-test \ +- luks2-reencryption-mangle-test ++ luks2-reencryption-test - if REENCRYPT --TESTS += reencryption-compat-test reencryption-compat-test2 luks2-reencryption-test luks2-reencryption-mangle-test -+TESTS += reencryption-compat-test reencryption-compat-test2 luks2-reencryption-test - endif - - if INTEGRITYSETUP + if VERITYSETUP + TESTS += verity-compat-test |