Accepting request 1166764 from home:Arnavion

- Fix duplicate loading of dropins. (boo#1222467)

OBS-URL: https://build.opensuse.org/request/show/1166764
OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=262

openssh-9.6p1-crypto-policies.patch

@@ -29,21 +29,6 @@ Index: openssh-9.6p1/ssh_config_suse
 +# Uncomment this if you want to use .local domain
 +# Host *.local
 +
-Index: openssh-9.6p1/sshd_config
-===================================================================
---- openssh-9.6p1.orig/sshd_config
-+++ openssh-9.6p1/sshd_config
-@@ -17,6 +17,10 @@ Include /etc/ssh/sshd_config.d/*.conf
- # default value.
- Include /usr/etc/ssh/sshd_config.d/*.conf
- 
-+# 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
-+
- #Port 22
- #AddressFamily any
- #ListenAddress 0.0.0.0
 Index: openssh-9.6p1/sshd_config_suse_cp
 ===================================================================
 --- /dev/null

openssh.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Apr 11 06:35:21 UTC 2024 - Arnav Singh <opensuse@arnavion.dev>
+
+- Fix duplicate loading of dropins. (boo#1222467)
+
 -------------------------------------------------------------------
 Fri Apr  5 11:10:18 UTC 2024 - Antonio Larrosa <alarrosa@suse.com>