svn commit: r392993 - head/security/openssh-portable-devel
Bryan Drewery
bdrewery at FreeBSD.org
Mon Jul 27 17:09:33 UTC 2015
Author: bdrewery
Date: Mon Jul 27 17:09:31 2015
New Revision: 392993
URL: https://svnweb.freebsd.org/changeset/ports/392993
Log:
Bring over ETCDIR and libedit updates from main port
Modified:
head/security/openssh-portable-devel/Makefile
head/security/openssh-portable-devel/pkg-plist
Modified: head/security/openssh-portable-devel/Makefile
==============================================================================
--- head/security/openssh-portable-devel/Makefile Mon Jul 27 17:06:39 2015 (r392992)
+++ head/security/openssh-portable-devel/Makefile Mon Jul 27 17:09:31 2015 (r392993)
@@ -3,7 +3,7 @@
PORTNAME= openssh
DISTVERSION= 20150624
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= security ipv6
MASTER_SITES= http://www.mindrot.org/openssh_snap/ \
OPENBSD/OpenSSH/portable
@@ -79,8 +79,11 @@ PAM_CONFIGURE_WITH= pam
TCP_WRAPPERS_CONFIGURE_WITH= tcp-wrappers
LIBEDIT_CONFIGURE_WITH= libedit
+LIBEDIT_USES= libedit
BSM_CONFIGURE_ON= --with-audit=bsm
+ETCDIR?= ${PREFIX}/etc/ssh
+
.include <bsd.port.pre.mk>
PATCH_SITES+= http://mirror.shatow.net/freebsd/${PORTNAME}/:DEFAULT,x509,hpn,gsskex
@@ -179,7 +182,6 @@ IGNORE= Overwrite base option is no long
.endif
USE_RC_SUBR= openssh
-ETCDIR= ${PREFIX}/etc/ssh
# After all
CONFIGURE_ARGS+= --sysconfdir=${ETCDIR} --with-privsep-path=${EMPTYDIR}
Modified: head/security/openssh-portable-devel/pkg-plist
==============================================================================
--- head/security/openssh-portable-devel/pkg-plist Mon Jul 27 17:06:39 2015 (r392992)
+++ head/security/openssh-portable-devel/pkg-plist Mon Jul 27 17:09:31 2015 (r392993)
@@ -7,12 +7,10 @@ bin/ssh-add
bin/ssh-agent
bin/ssh-keygen
bin/ssh-keyscan
- at 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
- at 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
- at sample etc/ssh/ssh_config.sample
- at sample etc/ssh/sshd_config.sample
-%%X509%%@dir etc/ssh/ca
+%%ETCDIR%%/moduli
+ at sample %%ETCDIR%%/ssh_config.sample
+ at 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
More information about the svn-ports-all
mailing list