From 584f71f3e8df206f3e63e8c42665013db034bfea Mon Sep 17 00:00:00 2001 From: kircher Date: Fri, 30 Jul 2021 15:14:45 +0800 Subject: [PATCH] Remove-debug-message-from-sigchld-handler --- ...e-debug-message-from-sigchld-handler.patch | 32 +++++++++++++++++++ bugfix-debug3-to-verbose-in-command.patch | 2 +- openssh.spec | 20 ++++++++---- set-sshd-config.patch | 2 +- 4 files changed, 48 insertions(+), 8 deletions(-) create mode 100644 backport-upstream-Remove-debug-message-from-sigchld-handler.patch diff --git a/backport-upstream-Remove-debug-message-from-sigchld-handler.patch b/backport-upstream-Remove-debug-message-from-sigchld-handler.patch new file mode 100644 index 0000000..b6728d8 --- /dev/null +++ b/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" +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 + diff --git a/bugfix-debug3-to-verbose-in-command.patch b/bugfix-debug3-to-verbose-in-command.patch index 93403f5..7589231 100644 --- a/bugfix-debug3-to-verbose-in-command.patch +++ b/bugfix-debug3-to-verbose-in-command.patch @@ -1,5 +1,5 @@ From ed070c21ae68170e1cead6f5be16482d4f73ae2b Mon Sep 17 00:00:00 2001 -From: m00525086 +From: kircher Date: Thu, 5 Mar 2020 21:02:06 +0800 Subject: [PATCH] d2v diff --git a/openssh.spec b/openssh.spec index 904a202..946f3fa 100644 --- a/openssh.spec +++ b/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 - 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 - 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 - 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 - 8.2P1-6 +* Tue Sep 15 2020 liulong - 8.2P1-6 - Type:cves - ID:CVE-2018-15919 - SUG:NA diff --git a/set-sshd-config.patch b/set-sshd-config.patch index 9fe193d..bc20877 100644 --- a/set-sshd-config.patch +++ b/set-sshd-config.patch @@ -1,5 +1,5 @@ From 8f2d1c4f30dd88e36ed4c9b5771c92c878378125 Mon Sep 17 00:00:00 2001 -From: m00525086 +From: kircher Date: Thu, 16 Apr 2020 19:25:27 +0800 Subject: [PATCH] sshd_config -- Gitee