Remove-debug-message-from-sigchld-handler

backport-upstream-Remove-debug-message-from-sigchld-handler.patch

@@ -0,0 +1,32 @@
+From a35d3e911e193a652bd09eed40907e3e165b0a7b Mon Sep 17 00:00:00 2001
+From: "dtucker@openbsd.org" <dtucker@openbsd.org>
+Date: Fri, 5 Feb 2021 02:20:23 +0000
+Subject: upstream: Remove debug message from sigchld handler. While this
+works on OpenBSD it can cause problems on other platforms. From kircherlike
+at outlook.com via bz#3259, ok djm@
+
+OpenBSD-Commit_ID: 3e241d7ac1ee77e3de3651780b5dc47b283a7668
+
+Conflict:NA
+Reference:https://anongit.mindrot.org/openssh.git/commit/?id=a35d3e911e193a652bd09eed40907e3e165b0a7b
+
+---
+ sshd.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/sshd.c b/sshd.c
+index c291a5e..23fb202 100644
+--- a/sshd.c
++++ b/sshd.c
+@@ -364,8 +364,6 @@ main_sigchld_handler(int sig)
+ 	pid_t pid;
+ 	int status;
+ 
+-	debug("main_sigchld_handler: %s", strsignal(sig));
+-
+ 	while ((pid = waitpid(-1, &status, WNOHANG)) > 0 ||
+ 	    (pid == -1 && errno == EINTR))
+ 		;
+-- 
+1.8.3.1
+

bugfix-debug3-to-verbose-in-command.patch

@@ -1,5 +1,5 @@
 From ed070c21ae68170e1cead6f5be16482d4f73ae2b Mon Sep 17 00:00:00 2001
-From: m00525086 <majun65@huawei.com>
+From: kircher <majun65@huawei.com>
 Date: Thu, 5 Mar 2020 21:02:06 +0800
 Subject: [PATCH] d2v
 

openssh.spec

@@ -6,7 +6,7 @@
 %{?no_gtk2:%global gtk2 0}
 
 %global sshd_uid    74
-%global openssh_release 12
+%global openssh_release 13
 
 Name:           openssh
 Version:        8.2p1
@@ -93,6 +93,7 @@ Patch60:        CVE-2018-15919.patch
 Patch61:        CVE-2020-14145.patch
 Patch62:        add-strict-scp-check-for-CVE-2020-15778.patch
 Patch63:        backport-move-closefrom-to-before-first-malloc.patch
+Patch64:	backport-upstream-Remove-debug-message-from-sigchld-handler.patch
 
 Requires:       /sbin/nologin
 Requires:       libselinux >= 2.3-5 audit-libs >= 1.0.8
@@ -258,6 +259,7 @@ popd
 %patch61 -p1
 %patch62 -p1
 %patch63 -p1
+%patch64 -p1
 
 autoreconf
 pushd pam_ssh_agent_auth-0.10.3
@@ -472,20 +474,26 @@ getent passwd sshd >/dev/null || \
 %attr(0644,root,root) %{_mandir}/man8/sftp-server.8*
 
 %changelog
+* Fri Jul 30 2021 kircher<majun65@huawei.com> - 8.2P1-13
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:remove debug message from sigchld handler
+
 * Tue Jul 20 2021 seuzw<930zhaowei@163.com> - 8.2P1-12
 - Type:bugfix
 - CVE:NA
 - SUG:NA
-- DESC:move classfrom to before first malloc
+- DESC:move closefrom to before first malloc
 
 * Fri Jul 09 2021 panchenbo<panchenbo@uniontech.com> - 8.2P1-11
 - fix pam_ssh_agent_auth.8.gz conflicts
 
 * Thu May 20 2021 seuzw<930zhaowei@163.com> - 8.2P1-10
-- Type:cves
-- CVE:CVE-2020-15778
+- Type:bigfix
+- CVE:NA
 - SUG:NA
-- DESC:add strict-scp-check for CVE-2020-15778
+- DESC:add strict-scp-check for check command injection
 
 * Mon Jan 4 2021 chxssg<chxssg@qq.com> - 8.2P1-9
 - Type:cves
@@ -505,7 +513,7 @@ getent passwd sshd >/dev/null || \
 - SUG:NA
 - DESC:keep pam_ssh_agent_auth change release number with openssh
 
-* Thu Sep 15 2020 liulong<liulong20@huawei.com> - 8.2P1-6
+* Tue Sep 15 2020 liulong<liulong20@huawei.com> - 8.2P1-6
 - Type:cves
 - ID:CVE-2018-15919
 - SUG:NA

set-sshd-config.patch

@@ -1,5 +1,5 @@
 From 8f2d1c4f30dd88e36ed4c9b5771c92c878378125 Mon Sep 17 00:00:00 2001
-From: m00525086 <majun65@huawei.com>
+From: kircher <majun65@huawei.com>
 Date: Thu, 16 Apr 2020 19:25:27 +0800
 Subject: [PATCH] sshd_config