diff --git a/openssh.spec b/openssh.spec index 6d8e0a9..3e7f80e 100644 --- a/openssh.spec +++ b/openssh.spec @@ -6,7 +6,7 @@ %{?no_gtk2:%global gtk2 0} %global sshd_uid 74 -%global openssh_release 3 +%global openssh_release 4 Name: openssh Version: 8.8p1 @@ -422,6 +422,12 @@ getent passwd sshd >/dev/null || \ %attr(0644,root,root) %{_mandir}/man8/sftp-server.8* %changelog +* Thu May 05 2022 seuzw<930zhaowei@163.com> - 8.8p1-4 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:fix incorrect sftp-server binary path in /etc/ssh/sshd_config + * Wed Mar 09 2022 duyiwei - 8.8P1-3 - Type:bugfix - CVE:NA diff --git a/set-sshd-config.patch b/set-sshd-config.patch index eda9818..1bf951b 100644 --- a/set-sshd-config.patch +++ b/set-sshd-config.patch @@ -7,11 +7,20 @@ Subject: [PATCH] set sshd_config | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) -diff --git a/sshd_config b/sshd_config -index 42ecf9b..67739b2 100644 +Index: b/sshd_config +=================================================================== --- a/sshd_config +++ b/sshd_config -@@ -23,21 +23,22 @@ +@@ -12,7 +12,7 @@ + + # To modify the system-wide sshd configuration, create a *.conf file under + # /etc/ssh/sshd_config.d/ which will be automatically included below +-Include /etc/ssh/sshd_config.d/*.conf ++#Include /etc/ssh/sshd_config.d/*.conf + + # If you want to change the port on a SELinux system, you have to tell + # SELinux about this change. +@@ -23,21 +23,22 @@ Include /etc/ssh/sshd_config.d/*.conf #ListenAddress 0.0.0.0 #ListenAddress :: @@ -83,7 +92,7 @@ index 42ecf9b..67739b2 100644 #PrintLastLog yes #TCPKeepAlive yes #PermitUserEnvironment no -@@ -119,8 +120,13 @@ AuthorizedKeysFile .ssh/authorized_keys +@@ -119,6 +120,11 @@ AuthorizedKeysFile .ssh/authorized_keys # no default banner path #Banner none @@ -93,11 +102,5 @@ index 42ecf9b..67739b2 100644 +AcceptEnv XMODIFIERS + # override default of no subsystems --Subsystem sftp /usr/libexec/sftp-server -+Subsystem sftp /usr/libexec/openssh/sftp-server + Subsystem sftp /usr/libexec/sftp-server - # Example of overriding settings on a per-user basis - #Match User anoncvs --- -1.8.3.1 -