From bdc0b97d7467c09ad802ab6b5e385e0d5fd2aee4 Mon Sep 17 00:00:00 2001 From: duyiwei Date: Thu, 1 Sep 2022 17:01:23 +0800 Subject: [PATCH] enable include /etc/ssh/sshd_config.d/*.config --- openssh.spec | 8 +++++++- set-sshd-config.patch | 11 +---------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/openssh.spec b/openssh.spec index 6054337..e896314 100644 --- a/openssh.spec +++ b/openssh.spec @@ -6,7 +6,7 @@ %{?no_gtk2:%global gtk2 0} %global sshd_uid 74 -%global openssh_release 5 +%global openssh_release 6 Name: openssh Version: 8.8p1 @@ -427,6 +427,12 @@ getent passwd sshd >/dev/null || \ %attr(0644,root,root) %{_mandir}/man8/sftp-server.8* %changelog +* Thu Sep 01 2022 duyiwei - 8.8P1-6 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:enable "include /etc/ssh/sshd_config.d/*.config" again + * Sat Jun 25 2022 renmingshuai - 8.8p1-5 - Type:bugfix - CVE:NA diff --git a/set-sshd-config.patch b/set-sshd-config.patch index 1bf951b..2915ce9 100644 --- a/set-sshd-config.patch +++ b/set-sshd-config.patch @@ -11,16 +11,7 @@ Index: b/sshd_config =================================================================== --- a/sshd_config +++ b/sshd_config -@@ -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 +@@ -23,21 +23,22 @@ #ListenAddress 0.0.0.0 #ListenAddress :: -- Gitee