From 6c8ae3051c95d5850686afd4a2fff3c0b85fe8262eb41f7484d22cb59936f8ee Mon Sep 17 00:00:00 2001 From: Hans Petter Jansson Date: Wed, 17 Aug 2022 00:38:45 +0000 Subject: [PATCH] Accepting request 987179 from home:adamm:branches:network - openssh-8.4p1-ssh_config_d.patch: admin overrides should take priority (listed first) over package defaults OBS-URL: https://build.opensuse.org/request/show/987179 OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=239 --- openssh-8.4p1-ssh_config_d.patch | 16 ++++++++++------ openssh.changes | 6 ++++++ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/openssh-8.4p1-ssh_config_d.patch b/openssh-8.4p1-ssh_config_d.patch index cdfb2cc..40b162a 100644 --- a/openssh-8.4p1-ssh_config_d.patch +++ b/openssh-8.4p1-ssh_config_d.patch @@ -20,17 +20,21 @@ Index: openssh-8.9p1/sshd_config =================================================================== --- openssh-8.9p1.orig/sshd_config +++ openssh-8.9p1/sshd_config -@@ -9,6 +9,13 @@ - # OpenSSH is to specify options with their default value where - # possible, but leave them commented. Uncommented options override the - # default value. -+Include /usr/etc/ssh/sshd_config.d/*.conf -+ +@@ -5,10 +5,17 @@ + + # This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin + +# To modify the system-wide sshd configuration, create a "*.conf" file under +# "/etc/ssh/sshd_config.d/" which will be automatically included below. +# Don't edit this configuration file itself if possible to avoid update +# problems. +Include /etc/ssh/sshd_config.d/*.conf ++ + # The strategy used for options in the default sshd_config shipped with + # OpenSSH is to specify options with their default value where + # possible, but leave them commented. Uncommented options override the + # default value. ++Include /usr/etc/ssh/sshd_config.d/*.conf #Port 22 #AddressFamily any diff --git a/openssh.changes b/openssh.changes index 9b76318..594e18d 100644 --- a/openssh.changes +++ b/openssh.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jul 6 12:15:29 UTC 2022 - Adam Majer + +- openssh-8.4p1-ssh_config_d.patch: admin overrides should take + priority (listed first) over package defaults + ------------------------------------------------------------------- Mon Mar 28 15:00:52 UTC 2022 - Ludwig Nussel