Date: Wed, 24 Jun 2015 19:35:58 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r390514 - head/security/openssh-portable Message-ID: <201506241935.t5OJZwbp035711@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Wed Jun 24 19:35:58 2015 New Revision: 390514 URL: https://svnweb.freebsd.org/changeset/ports/390514 Log: Support changed ETCDIR in pkg-plist Modified: head/security/openssh-portable/Makefile head/security/openssh-portable/pkg-plist Modified: head/security/openssh-portable/Makefile ============================================================================== --- head/security/openssh-portable/Makefile Wed Jun 24 18:54:36 2015 (r390513) +++ head/security/openssh-portable/Makefile Wed Jun 24 19:35:58 2015 (r390514) @@ -3,7 +3,7 @@ PORTNAME= openssh DISTVERSION= 6.8p1 -PORTREVISION= 7 +PORTREVISION= 8 PORTEPOCH= 1 CATEGORIES= security ipv6 MASTER_SITES= OPENBSD/OpenSSH/portable Modified: head/security/openssh-portable/pkg-plist ============================================================================== --- head/security/openssh-portable/pkg-plist Wed Jun 24 18:54:36 2015 (r390513) +++ head/security/openssh-portable/pkg-plist Wed Jun 24 19:35:58 2015 (r390514) @@ -7,12 +7,10 @@ bin/ssh-add bin/ssh-agent bin/ssh-keygen bin/ssh-keyscan -@exec if [ -f %D/etc/ssh_config -a ! -f %D/etc/ssh/ssh_config ]; then ln %D/etc/ssh_config %D/etc/ssh/ssh_config ; fi -@exec if [ -f %D/etc/sshd_config -a ! -f %D/etc/ssh/sshd_config ]; then ln %D/etc/sshd_config %D/etc/ssh/sshd_config ; fi -etc/ssh/moduli -@sample etc/ssh/ssh_config.sample -@sample etc/ssh/sshd_config.sample -%%X509%%@dir etc/ssh/ca +%%ETCDIR%%/moduli +@sample %%ETCDIR%%/ssh_config.sample +@sample %%ETCDIR%%/sshd_config.sample +%%X509%%@dir %%ETCDIR%%/ca @exec 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 sbin/sshd libexec/sftp-server
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506241935.t5OJZwbp035711>