diff options
| author | Mateusz Piotrowski <0mp@FreeBSD.org> | 2020-11-07 14:46:38 +0000 |
|---|---|---|
| committer | Mateusz Piotrowski <0mp@FreeBSD.org> | 2020-11-07 14:46:38 +0000 |
| commit | a031e3218e679a699607f2f9b27a93433ac4818f (patch) | |
| tree | 2a1e73485bb98bdd007a25fd1bf4184937a6ea77 /security/openssh-portable | |
| parent | 30d19f53eec9f8e238fffbbeca58ba8fb502db29 (diff) | |
| download | ports-a031e3218e679a699607f2f9b27a93433ac4818f.tar.gz ports-a031e3218e679a699607f2f9b27a93433ac4818f.zip | |
Install the moduli file as a @sample
PR: 250559
Submitted by: Michał "rysiek" Woźniak <rysiek % isnic.is>
Approved by: maintainer timeout
Notes
Notes:
svn path=/head/; revision=554395
Diffstat (limited to 'security/openssh-portable')
| -rw-r--r-- | security/openssh-portable/Makefile | 4 | ||||
| -rw-r--r-- | security/openssh-portable/pkg-plist | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile index 8bed64d8347e..0b674a652eb5 100644 --- a/security/openssh-portable/Makefile +++ b/security/openssh-portable/Makefile @@ -3,7 +3,7 @@ PORTNAME= openssh DISTVERSION= 8.2p1 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= security MASTER_SITES= OPENBSD/OpenSSH/portable @@ -191,6 +191,8 @@ post-configure-XMSS-on: @${ECHO_CMD} "#define WITH_XMSS 1" >> ${WRKSRC}/config.h post-install: + ${MV} ${STAGEDIR}${ETCDIR}/moduli \ + ${STAGEDIR}${ETCDIR}/moduli.sample ${MV} ${STAGEDIR}${ETCDIR}/ssh_config \ ${STAGEDIR}${ETCDIR}/ssh_config.sample ${MV} ${STAGEDIR}${ETCDIR}/sshd_config \ diff --git a/security/openssh-portable/pkg-plist b/security/openssh-portable/pkg-plist index 7d6f341bdf3c..ac8db435a973 100644 --- a/security/openssh-portable/pkg-plist +++ b/security/openssh-portable/pkg-plist @@ -5,7 +5,7 @@ bin/ssh-add bin/ssh-agent bin/ssh-keygen bin/ssh-keyscan -%%ETCDIR%%/moduli +@sample %%ETCDIR%%/moduli.sample @sample %%ETCDIR%%/ssh_config.sample @sample %%ETCDIR%%/sshd_config.sample @postexec if [ -f %D/%%ETCDIR%%/ssh_host_ecdsa_key ] && grep -q DSA %D/%%ETCDIR%%/ssh_host_ecdsa_key; then echo; echo "\!/ Warning \!/"; echo; echo "Your %D/%%ETCDIR%%/ssh_host_ecdsa_key is not a valid ECDSA key. It is incorrectly"; echo "a DSA key due to a bug fixed in 2012 in the security/openssh-portable port."; echo; echo "Regenerate a proper one with: rm -f %D/%%ETCDIR%%/ssh_host_ecdsa_key*; service openssh restart"; echo; echo "Clients should not see any key change warning since the ECDSA was not valid and was not actually"; echo "used by the server."; echo; echo "\!/ Warning \!/"; fi |