diff --git a/cryptsetup.spec b/cryptsetup.spec index d9192db..147725c 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -40,13 +40,6 @@ Summary: Cryptsetup shared library %description libs This package contains the cryptsetup shared library, libcryptsetup. -%package ssh-token -Summary: Cryptsetup LUKS2 SSH token -Requires: cryptsetup-libs = %{version}-%{release} - -%description ssh-token -This package contains the LUKS2 SSH token. - %package -n veritysetup Summary: A utility for setting up dm-verity volumes Requires: cryptsetup-libs = %{version}-%{release} @@ -71,7 +64,7 @@ disk integrity protection using dm-integrity kernel module. rm -f man/*.8 ./autogen.sh -%configure --enable-fips --enable-pwquality --enable-asciidoc --enable-internal-sse-argon2 +%configure --enable-fips --enable-pwquality --enable-asciidoc --enable-internal-sse-argon2 --disable-ssh-token %make_build %install @@ -113,13 +106,11 @@ rm -rf %{buildroot}%{_libdir}/%{name}/*.la %{_tmpfilesdir}/cryptsetup.conf %ghost %attr(700, -, -) %dir /run/cryptsetup -%files ssh-token -%license COPYING COPYING.LGPL -%{_libdir}/%{name}/libcryptsetup-token-ssh.so -%{_mandir}/man8/cryptsetup-ssh.8.gz -%{_sbindir}/cryptsetup-ssh - %changelog +* Mon May 06 2024 Daniel Zatovic - 2.7.2-2 +- Remove SSH token and fix tests +- Resolves: RHEL-33395 + * Tue Apr 30 2024 Daniel Zatovic - 2.7.2-1 - Update to cryptsetup 2.7.2 - Resolves: RHEL-33395 diff --git a/tests/tests.yml b/tests/tests.yml index d60e834..21e7c29 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -12,11 +12,9 @@ run: make -f Makefile.localtest tests environment: CRYPTSETUP_PATH: /sbin - RUN_SSH_PLUGIN_TEST: 1 required_packages: - cryptsetup - cryptsetup-devel - - cryptsetup-ssh-token - integritysetup - veritysetup - gcc @@ -28,8 +26,3 @@ - jq - vim-common - sharutils - - openssh - - openssl - - nmap-ncat - - sshpass - - shadow-utils