svn commit: r554395 - head/security/openssh-portable

[Mateusz Piotrowski]

Author: 0mp
Date: Sat Nov  7 14:46:38 2020
New Revision: 554395
URL: https://svnweb.freebsd.org/changeset/ports/554395

Log:
  Install the moduli file as a @sample
  
  PR:		250559
  Submitted by:	Michał "rysiek" Woźniak <rysiek % isnic.is>
  Approved by:	maintainer timeout

Modified:
  head/security/openssh-portable/Makefile
  head/security/openssh-portable/pkg-plist

Modified: head/security/openssh-portable/Makefile
==============================================================================
--- head/security/openssh-portable/Makefile	Sat Nov  7 14:34:07 2020	(r554394)
+++ head/security/openssh-portable/Makefile	Sat Nov  7 14:46:38 2020	(r554395)
@@ -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 \

Modified: head/security/openssh-portable/pkg-plist
==============================================================================
--- head/security/openssh-portable/pkg-plist	Sat Nov  7 14:34:07 2020	(r554394)
+++ head/security/openssh-portable/pkg-plist	Sat Nov  7 14:46:38 2020	(r554395)
@@ -5,7 +5,7 @@ bin/ssh-add
 bin/ssh-agent
 bin/ssh-keygen
 bin/ssh-keyscan
-%%ETCDIR%%/moduli
+ at 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