Accepting request 999883 from network

OBS-URL: https://build.opensuse.org/request/show/999883
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openssh?expand=0&rev=158

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 @@
+@@ -17,6 +17,13 @@
- # Site-wide defaults for some commonly used options.  For a comprehensive
  # 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

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>
 

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 -d -m 755 %{buildroot}%{_pam_vendordir}
-install -m 644 %{SOURCE2} %{buildroot}%{_distconfdir}/pam.d/sshd
+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