From 88b8e8e7aab0e62f6473586ae1cd1c47a830b3e169a372b0487451f36a88f219 Mon Sep 17 00:00:00 2001
From: Hans Petter Jansson <hpj@suse.com>
Date: Wed, 17 Aug 2022 12:48:06 +0000
Subject: [PATCH 1/2] Accepting request 997549 from home:adamm:branches:network

Forgot about the client config, same problem

OBS-URL: https://build.opensuse.org/request/show/997549
OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=240
---
 openssh-8.4p1-ssh_config_d.patch | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/openssh-8.4p1-ssh_config_d.patch b/openssh-8.4p1-ssh_config_d.patch
index 40b162a..7ff6120 100644
--- a/openssh-8.4p1-ssh_config_d.patch
+++ b/openssh-8.4p1-ssh_config_d.patch
@@ -2,20 +2,20 @@ Index: openssh-8.9p1/ssh_config
 ===================================================================
 --- openssh-8.9p1.orig/ssh_config
 +++ openssh-8.9p1/ssh_config
-@@ -16,6 +16,13 @@
- # Site-wide defaults for some commonly used options.  For a comprehensive
+@@ -17,6 +17,13 @@
  # list of available options, their meanings and defaults, please see the
  # ssh_config(5) man page.
-+Include /usr/etc/ssh/ssh_config.d/*.conf
-+
+ 
 +# To modify the system-wide ssh configuration, create a "*.conf" file under
 +# "/etc/ssh/ssh_config.d/" which will be automatically included below.
 +# Don't edit this configuration file itself if possible to avoid update
 +# problems.
 +Include /etc/ssh/ssh_config.d/*.conf
- 
++Include /usr/etc/ssh/ssh_config.d/*.conf
++
  Host *
  #   ForwardAgent no
+ #   ForwardX11 no
 Index: openssh-8.9p1/sshd_config
 ===================================================================
 --- openssh-8.9p1.orig/sshd_config

From cb5c9c99b37996499674408430e09cd92e1d97c95c75255a00c5ac146b6fc723 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Mon, 29 Aug 2022 08:24:07 +0000
Subject: [PATCH 2/2] Accepting request 993701 from home:kukuk:branches:network

- Use %_pam_vendordir

OBS-URL: https://build.opensuse.org/request/show/993701
OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=241
---
 openssh.changes | 5 +++++
 openssh.spec    | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/openssh.changes b/openssh.changes
index 594e18d..dc23d08 100644
--- a/openssh.changes
+++ b/openssh.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Aug  8 07:36:55 UTC 2022 - Thorsten Kukuk <kukuk@suse.com>
+
+- Use %_pam_vendordir
+
 -------------------------------------------------------------------
 Wed Jul  6 12:15:29 UTC 2022 - Adam Majer <adam.majer@suse.de>
 
diff --git a/openssh.spec b/openssh.spec
index 170619c..783c280 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -311,8 +311,8 @@ export LDFLAGS CFLAGS CXXFLAGS CPPFLAGS
 %install
 %make_install
 %if %{defined _distconfdir}
-install -d -m 755 %{buildroot}%{_distconfdir}/pam.d
-install -m 644 %{SOURCE2} %{buildroot}%{_distconfdir}/pam.d/sshd
+install -d -m 755 %{buildroot}%{_pam_vendordir}
+install -m 644 %{SOURCE2} %{buildroot}%{_pam_vendordir}/sshd
 %else
 install -d -m 755 %{buildroot}%{_sysconfdir}/pam.d
 install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pam.d/sshd
@@ -447,7 +447,7 @@ test -f /etc/ssh/ssh_config.rpmsave && mv -v /etc/ssh/ssh_config.rpmsave /etc/ss
 %attr(0755,root,root) %dir /usr/etc/ssh/sshd_config.d
 %attr(0640,root,root) %{_distconfdir}/ssh/sshd_config
 %if %{defined _distconfdir}
-%attr(0644,root,root) %{_distconfdir}/pam.d/sshd
+%attr(0644,root,root) %{_pam_vendordir}/sshd
 %else
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/pam.d/sshd
 %endif