From a113dabd0789522133c584ab22fccf0fc26bf192 Mon Sep 17 00:00:00 2001
From: renmingshuai <renmingshuai@huawei.com>
Date: Tue, 3 Jan 2023 19:20:59 +0800
Subject: [PATCH] always make tests

---
 openssh.spec          | 10 +++++++++-
 skip-some-tests.patch | 39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 skip-some-tests.patch

diff --git a/openssh.spec b/openssh.spec
index 477ccc2..ba225c5 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
@@ -105,6 +105,7 @@ Patch72:        backport-upstream-double-free-in-error-path-from-Eusgor-via-G.pa
 Patch73:        add-strict-scp-check-for-CVE-2020-15778.patch
 Patch74:        backport-upstream-ssh-keygen-Y-check-novalidate-requires-name.patch
 Patch75:        backport-upstream-avoid-integer-overflow-of-auth-attempts-har.patch
+Patch76:        skip-some-tests.patch
 
 Requires:       /sbin/nologin
 Requires:       libselinux >= 2.3-5 audit-libs >= 1.0.8
@@ -259,6 +260,7 @@ popd
 %patch73 -p1
 %patch74 -p1
 %patch75 -p1
+%patch76 -p1
 
 autoreconf
 pushd pam_ssh_agent_auth-pam_ssh_agent_auth-0.10.4
@@ -460,6 +462,12 @@ getent passwd sshd >/dev/null || \
 %attr(0644,root,root) %{_mandir}/man8/sftp-server.8*
 
 %changelog
+* Tue Jan 03 2023 renmingshuai<renmingshuai@huawei.com> - 8.8p1-16
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:always make tests
+
 * Thu Dec 29 2022 renmingshuai<renmingshuai@huawei.com> - 8.8p1-15
 - Type:bugfix
 - CVE:NA
diff --git a/skip-some-tests.patch b/skip-some-tests.patch
new file mode 100644
index 0000000..410c99a
--- /dev/null
+++ b/skip-some-tests.patch
@@ -0,0 +1,39 @@
+From 64c8904769459923e0bae2feb51c2fe3619809e3 Mon Sep 17 00:00:00 2001
+From: renmingshuai <renmingshuai@huawei.com>
+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
+
-- 
Gitee