rpm/openssh
SHA256
1
0
Fork 0
forked from pool/openssh
Code Pull Requests Activity

Accepting request 901581 from home:hpjansson:branches:network

Browse Source 
- Don't move user-modified ssh_config and sshd_config files to
  .rpmsave on upgrade.

OBS-URL: https://build.opensuse.org/request/show/901581
OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=232
This commit is contained in:
Hans Petter Jansson 2021-06-23 19:02:47 +00:00 committed by Git OBS Bridge
parent 76c812ff5e
commit 7b1f29dffd
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openssh.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Jun 23 18:32:20 UTC 2021 - Hans Petter Jansson <hpj@suse.com>
- Don't move user-modified ssh_config and sshd_config files to
.rpmsave on upgrade.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue May 18 17:16:33 UTC 2021 - Thorsten Kukuk <kukuk@suse.com> Tue May 18 17:16:33 UTC 2021 - Thorsten Kukuk <kukuk@suse.com>

15
openssh.spec
View File

@ -364,8 +364,9 @@ done
%pre server -f sshd.pre %pre server -f sshd.pre
%if %{defined _distconfdir} %if %{defined _distconfdir}
# move outdated pam.d/*.rpmsave file away # Prepare for migration to /usr/etc.
test -f /etc/pam.d/sshd.rpmsave && mv -v /etc/pam.d/sshd.rpmsave /etc/pam.d/sshd.rpmsave.old ||: test -f /etc/pam.d/sshd.rpmsave && mv -v /etc/pam.d/sshd.rpmsave /etc/pam.d/sshd.rpmsave.old ||:
test -f /etc/ssh/sshd_config.rpmsave && mv -v /etc/ssh/sshd_config.rpmsave /etc/ssh/sshd_config.rpmsave.old ||:
%endif %endif
%service_add_pre sshd.service %service_add_pre sshd.service
@ -391,8 +392,20 @@ fi
%posttrans server %posttrans server
# Migration to /usr/etc. # Migration to /usr/etc.
test -f /etc/pam.d/sshd.rpmsave && mv -v /etc/pam.d/sshd.rpmsave /etc/pam.d/sshd ||: test -f /etc/pam.d/sshd.rpmsave && mv -v /etc/pam.d/sshd.rpmsave /etc/pam.d/sshd ||:
test -f /etc/ssh/sshd_config.rpmsave && mv -v /etc/ssh/sshd_config.rpmsave /etc/ssh/sshd_config ||:
%endif %endif
%if %{defined _distconfdir}
%pre clients
# Prepare for migration to /usr/etc.
test -f /etc/ssh/ssh_config.rpmsave && mv -v /etc/ssh/ssh_config.rpmsave /etc/ssh/ssh_config.rpmsave.old ||:
%endif
%if %{defined _distconfdir}
%posttrans clients
# Migration to /usr/etc.
test -f /etc/ssh/ssh_config.rpmsave && mv -v /etc/ssh/ssh_config.rpmsave /etc/ssh/ssh_config ||:
%endif
%triggerin -n openssh-fips -- %{name} = %{version}-%{release} %triggerin -n openssh-fips -- %{name} = %{version}-%{release}
%restart_on_update sshd %restart_on_update sshd