Update from upstream: gnutls sigalgs, check

- gnutls: explicitly enable ECDSA-SECPNNNR1-SHANNN
- packaging: adapt to the RHEL-9 %check-time testing tools availability

Resolves: bz1979200, bz1978841
This commit is contained in:
Alexander Sosedkin 2021-07-07 15:52:45 +02:00
parent 7c076748f3
commit 5466f912c0
2 changed files with 7 additions and 9 deletions

View File

@ -1,5 +1,5 @@
%global git_date 20210628 %global git_date 20210707
%global git_commit dd7d273d76b0739fcff5d95c39d7486bdb9b7410 %global git_commit 29f6c0bcee409d498574c094bc43f044caa98ab9
%{?git_commit:%global git_commit_hash %(c=%{git_commit}; echo ${c:0:7})} %{?git_commit:%global git_commit_hash %(c=%{git_commit}; echo ${c:0:7})}
%global _python_bytecompile_extra 0 %global _python_bytecompile_extra 0
@ -27,9 +27,6 @@ BuildRequires: perl(File::pushd), perl(File::Temp), perl(File::Copy)
BuildRequires: perl(File::Which) BuildRequires: perl(File::Which)
BuildRequires: python3-devel >= 3.6 BuildRequires: python3-devel >= 3.6
BuildRequires: python3-pytest BuildRequires: python3-pytest
# BuildRequires: python3-pylint # CentOS 9 Stream doesn't have it
# BuildRequires: python3-flake8 # CentOS 9 Stream doesn't have it
BuildRequires: python3-coverage
BuildRequires: make BuildRequires: make
Conflicts: openssl < 1.1.1h Conflicts: openssl < 1.1.1h
@ -99,9 +96,6 @@ done
%py_byte_compile %{__python3} %{buildroot}%{_datadir}/crypto-policies/python %py_byte_compile %{__python3} %{buildroot}%{_datadir}/crypto-policies/python
%check %check
export OLD_GNUTLS=1 # FIXME: remove once gnutls-3.7.2-3 is in buildroot
sed -i 's|test: \(.*\) runflake8|test: \1|' Makefile # CentOS 9 Stream has no flake8
sed -i 's|test: \(.*\) runpylint|test: \1|' Makefile # CentOS 9 Stream has no pylint
make ON_RHEL9=1 test %{?_smp_mflags} make ON_RHEL9=1 test %{?_smp_mflags}
%post -p <lua> %post -p <lua>
@ -192,6 +186,10 @@ end
%{_mandir}/man8/fips-finish-install.8* %{_mandir}/man8/fips-finish-install.8*
%changelog %changelog
* Wed Jul 07 2021 Alexander Sosedkin <asosedkin@redhat.com> - 20210707-1.git29f6c0b
- gnutls: explicitly enable ECDSA-SECPNNNR1-SHANNN
- packaging: adapt to the RHEL-9 %check-time testing tools availability
* Mon Jun 28 2021 Alexander Sosedkin <asosedkin@redhat.com> - 20210628-1.gitdd7d273 * Mon Jun 28 2021 Alexander Sosedkin <asosedkin@redhat.com> - 20210628-1.gitdd7d273
- implement scoped policies, e.g., cipher@SSH = ... - implement scoped policies, e.g., cipher@SSH = ...
- implement algorithm globbing, e.g., cipher@SSH = -*-CBC - implement algorithm globbing, e.g., cipher@SSH = -*-CBC

View File

@ -1 +1 @@
SHA512 (crypto-policies-gitdd7d273.tar.gz) = 9797e6c6b95ab4cb13e30016ac76b3bbdc5e23b42848ea11e81e91d433f62a5f1c3c6992f83760e69a5c3529e13d18b2f843e097e5be1afeb2b31dc1b39e94c0 SHA512 (crypto-policies-git29f6c0b.tar.gz) = 907bbd6f1123f7df52b691d2bd603d348dfc1810191f56b4cb0044765ef0c313d58d4a8cab581bdc464e41168a5382125d9f1df4fa53c6c9f76a6c9c6f10a892