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

Accepting request 901582 from network

Browse Source 
- Don't move user-modified ssh_config and sshd_config files to
  .rpmsave on upgrade. (forwarded request 901581 from hpjansson)

OBS-URL: https://build.opensuse.org/request/show/901582
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openssh?expand=0&rev=152
This commit is contained in:
Dominique Leuenberger 2021-06-25 13:01:12 +00:00 committed by Git OBS Bridge
commit c24f269798
4 changed files with 49 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
openssh-8.4p1-pam_motd.patch Normal file
View File

@ -0,0 +1,19 @@
Gemeinsame Unterverzeichnisse: openssh-8.4p1.orig/contrib und openssh-8.4p1/contrib.
Gemeinsame Unterverzeichnisse: openssh-8.4p1.orig/.github und openssh-8.4p1/.github.
Gemeinsame Unterverzeichnisse: openssh-8.4p1.orig/m4 und openssh-8.4p1/m4.
Gemeinsame Unterverzeichnisse: openssh-8.4p1.orig/openbsd-compat und openssh-8.4p1/openbsd-compat.
Gemeinsame Unterverzeichnisse: openssh-8.4p1.orig/regress und openssh-8.4p1/regress.
diff -u openssh-8.4p1.orig/sshd_config openssh-8.4p1/sshd_config
--- openssh-8.4p1.orig/sshd_config 2020-09-27 09:25:01.000000000 +0200
+++ openssh-8.4p1/sshd_config 2021-05-18 19:15:39.190701511 +0200
@@ -88,8 +88,8 @@
#X11DisplayOffset 10
#X11UseLocalhost yes
#PermitTTY yes
-#PrintMotd yes
-#PrintLastLog yes
+PrintMotd no
+PrintLastLog no
#TCPKeepAlive yes
#PermitUserEnvironment no
#Compression delayed

12
openssh.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
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>
- Use pam_motd to unify motd message output [bsc#1185897]
(openssh-8.4p1-pam_motd.patch)
-------------------------------------------------------------------
Thu Apr 22 12:02:55 UTC 2021 - Hans Petter Jansson <hpj@suse.com>

16
openssh.spec
View File

@ -109,6 +109,7 @@ Patch44: openssh-fix-ssh-copy-id.patch
Patch45: openssh-8.4p1-ssh_config_d.patch
Patch46: openssh-whitelist-syscalls.patch
Patch47: openssh-8.4p1-vendordir.patch
Patch48: openssh-8.4p1-pam_motd.patch
BuildRequires: audit-devel
BuildRequires: automake
BuildRequires: groff
@ -363,8 +364,9 @@ done
%pre server -f sshd.pre
%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/ssh/sshd_config.rpmsave && mv -v /etc/ssh/sshd_config.rpmsave /etc/ssh/sshd_config.rpmsave.old ||:
%endif
%service_add_pre sshd.service
@ -390,8 +392,20 @@ fi
%posttrans server
# 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/ssh/sshd_config.rpmsave && mv -v /etc/ssh/sshd_config.rpmsave /etc/ssh/sshd_config ||:
%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}
%restart_on_update sshd

4
sshd.pamd
View File

@ -6,5 +6,7 @@ account include common-account
password include common-password
session required pam_loginuid.so
session include common-session
session optional pam_lastlog.so silent noupdate showfailed
session optional pam_keyinit.so force revoke
session optional pam_lastlog.so showfailed
session optional pam_motd.so