7bccbbd821
- Update to 7.8p1: * no actual changes for the askpass - Format with spec-cleaner - Respect cflags - Use gtk3 rather than gtk2 which is being phased out - Remove the mention of the SLE12 in the README.SUSE - Install firewall rules only when really needed (<SLE15) - Version update to 7.8p1: * For most details see release notes file * ssh-keygen(1): write OpenSSH format private keys by default instead of using OpenSSL's PEM format - Rebase patches to apply on 7.8p1 release: * openssh-7.7p1-fips.patch * openssh-7.7p1-cavstest-kdf.patch * openssh-7.7p1-fips_checks.patch * openssh-7.7p1-gssapi_key_exchange.patch * openssh-7.7p1-audit.patch * openssh-7.7p1-openssl_1.1.0.patch * openssh-7.7p1-ldap.patch * openssh-7.7p1-IPv6_X_forwarding.patch * openssh-7.7p1-sftp_print_diagnostic_messages.patch * openssh-7.7p1-disable_short_DH_parameters.patch * openssh-7.7p1-hostname_changes_when_forwarding_X.patch * openssh-7.7p1-pam_check_locks.patch * openssh-7.7p1-seed-prng.patch * openssh-7.7p1-systemd-notify.patch * openssh-7.7p1-X11_trusted_forwarding.patch - Dropped patches: OBS-URL: https://build.opensuse.org/request/show/642573 OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=153
28 lines
1.3 KiB
Diff
28 lines
1.3 KiB
Diff
# HG changeset patch
|
|
# Parent 8fd4e445c3a5c823568661a4f71b064cbcb217a9
|
|
fix paths and references in sshd man pages
|
|
|
|
diff --git a/openssh-7.7p1/Makefile.in b/openssh-7.7p1/Makefile.in
|
|
--- openssh-7.7p1/Makefile.in
|
|
+++ openssh-7.7p1/Makefile.in
|
|
@@ -127,17 +127,18 @@ MANTYPE = @MANTYPE@
|
|
CONFIGFILES=sshd_config.out ssh_config.out moduli.out
|
|
CONFIGFILES_IN=sshd_config ssh_config moduli
|
|
|
|
PATHSUBS = \
|
|
-e 's|/etc/ssh/ssh_config|$(sysconfdir)/ssh_config|g' \
|
|
-e 's|/etc/ssh/ssh_known_hosts|$(sysconfdir)/ssh_known_hosts|g' \
|
|
-e 's|/etc/ssh/sshd_config|$(sysconfdir)/sshd_config|g' \
|
|
-e 's|/usr/libexec|$(libexecdir)|g' \
|
|
- -e 's|/etc/shosts.equiv|$(sysconfdir)/shosts.equiv|g' \
|
|
+ -e 's|login\.conf|login.defs|g' \
|
|
+ -e 's|/etc/shosts.equiv|$(sysconfdir)/ssh/shosts.equiv|g' \
|
|
-e 's|/etc/ssh/ssh_host_key|$(sysconfdir)/ssh_host_key|g' \
|
|
-e 's|/etc/ssh/ssh_host_ecdsa_key|$(sysconfdir)/ssh_host_ecdsa_key|g' \
|
|
-e 's|/etc/ssh/ssh_host_dsa_key|$(sysconfdir)/ssh_host_dsa_key|g' \
|
|
-e 's|/etc/ssh/ssh_host_rsa_key|$(sysconfdir)/ssh_host_rsa_key|g' \
|
|
-e 's|/etc/ssh/ssh_host_ed25519_key|$(sysconfdir)/ssh_host_ed25519_key|g' \
|
|
-e 's|/var/run/sshd.pid|$(piddir)/sshd.pid|g' \
|
|
-e 's|/etc/moduli|$(sysconfdir)/moduli|g' \
|
|
-e 's|/etc/ssh/moduli|$(sysconfdir)/moduli|g' \
|