diff --git a/openssh.spec b/openssh.spec index 6b9590b82d98b859782e94eb9b6c7cda116cbb8a..ebfb3b8d9c76b883695c1654514346340d0fb9fd 100644 --- a/openssh.spec +++ b/openssh.spec @@ -6,7 +6,7 @@ %{?no_gtk2:%global gtk2 0} %global sshd_uid 74 -%global openssh_release 15 +%global openssh_release 16 Name: openssh Version: 8.8p1 @@ -106,6 +106,7 @@ Patch73: backport-upstream-better-debugging-for-connect_next.patch Patch74: add-loongarch.patch Patch75: backport-upstream-ssh-keygen-Y-check-novalidate-requires-name.patch Patch76: backport-upstream-avoid-integer-overflow-of-auth-attempts-har.patch +Patch77: skip-some-tests.patch Requires: /sbin/nologin Requires: libselinux >= 2.3-5 audit-libs >= 1.0.8 @@ -260,6 +261,7 @@ popd %patch74 -p1 %patch75 -p1 %patch76 -p1 +%patch77 -p1 autoreconf pushd pam_ssh_agent_auth-pam_ssh_agent_auth-0.10.4 @@ -331,10 +333,7 @@ make popd %check -#to run tests use "--with check" -%if %{?_with_check:1}%{!?_with_check:0} make tests -%endif %install mkdir -p -m755 $RPM_BUILD_ROOT%{_sysconfdir}/ssh @@ -461,6 +460,12 @@ getent passwd sshd >/dev/null || \ %attr(0644,root,root) %{_mandir}/man8/sftp-server.8* %changelog +* Tue Jan 03 2023 renmingshuai - 8.8p1-16 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:always make tests + * Thu Dec 29 2022 renmingshuai - 8.8p1-15 - Type:bugfix - CVE:NA diff --git a/skip-some-tests.patch b/skip-some-tests.patch new file mode 100644 index 0000000000000000000000000000000000000000..410c99a233a620e19ef358f32cec4c3577dff8fa --- /dev/null +++ b/skip-some-tests.patch @@ -0,0 +1,39 @@ +From 64c8904769459923e0bae2feb51c2fe3619809e3 Mon Sep 17 00:00:00 2001 +From: renmingshuai +Date: Tue, 3 Jan 2023 10:41:01 +0800 +Subject: [PATCH] skip some tests + +--- + regress/Makefile | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/regress/Makefile b/regress/Makefile +index 99f64a7..105e825 100644 +--- a/regress/Makefile ++++ b/regress/Makefile +@@ -53,7 +53,6 @@ LTESTS= connect \ + keygen-sshfp \ + key-options \ + scp \ +- scp3 \ + scp-uri \ + sftp \ + sftp-chroot \ +@@ -66,14 +65,12 @@ LTESTS= connect \ + reconfigure \ + dynamic-forward \ + forwarding \ +- multiplex \ + reexec \ + brokenkeys \ + sshcfgparse \ + cfgparse \ + cfgmatch \ + cfgmatchlisten \ +- percent \ + addrmatch \ + localcommand \ + forcecommand \ +-- +2.23.0 +