Remove SSH token and fix tests

This commit is contained in:
Daniel Zatovic 2024-05-06 12:20:40 +02:00
parent 42c9648451
commit a9767a8fe4
2 changed files with 5 additions and 21 deletions

View File

@ -40,13 +40,6 @@ Summary: Cryptsetup shared library
%description libs %description libs
This package contains the cryptsetup shared library, libcryptsetup. 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 %package -n veritysetup
Summary: A utility for setting up dm-verity volumes Summary: A utility for setting up dm-verity volumes
Requires: cryptsetup-libs = %{version}-%{release} Requires: cryptsetup-libs = %{version}-%{release}
@ -71,7 +64,7 @@ disk integrity protection using dm-integrity kernel module.
rm -f man/*.8 rm -f man/*.8
./autogen.sh ./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 %make_build
%install %install
@ -113,13 +106,11 @@ rm -rf %{buildroot}%{_libdir}/%{name}/*.la
%{_tmpfilesdir}/cryptsetup.conf %{_tmpfilesdir}/cryptsetup.conf
%ghost %attr(700, -, -) %dir /run/cryptsetup %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 %changelog
* Mon May 06 2024 Daniel Zatovic <dzatovic@redhat.com> - 2.7.2-2
- Remove SSH token and fix tests
- Resolves: RHEL-33395
* Tue Apr 30 2024 Daniel Zatovic <dzatovic@redhat.com> - 2.7.2-1 * Tue Apr 30 2024 Daniel Zatovic <dzatovic@redhat.com> - 2.7.2-1
- Update to cryptsetup 2.7.2 - Update to cryptsetup 2.7.2
- Resolves: RHEL-33395 - Resolves: RHEL-33395

View File

@ -12,11 +12,9 @@
run: make -f Makefile.localtest tests run: make -f Makefile.localtest tests
environment: environment:
CRYPTSETUP_PATH: /sbin CRYPTSETUP_PATH: /sbin
RUN_SSH_PLUGIN_TEST: 1
required_packages: required_packages:
- cryptsetup - cryptsetup
- cryptsetup-devel - cryptsetup-devel
- cryptsetup-ssh-token
- integritysetup - integritysetup
- veritysetup - veritysetup
- gcc - gcc
@ -28,8 +26,3 @@
- jq - jq
- vim-common - vim-common
- sharutils - sharutils
- openssh
- openssl
- nmap-ncat
- sshpass
- shadow-utils