diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2015-06-25 03:35:58 +0800 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2015-06-25 03:35:58 +0800 |
| commit | 4b95bc3c678ec442f9bbd99748acbfe22fd8cd69 (patch) | |
| tree | 4dcc2754b89efcc4d9e58f0a41f503619d6b24aa /security/openssh-portable | |
| parent | 59d06e4d630f8b34af884d1308295ea85384f400 (diff) | |
| download | freebsd-ports-gnome-4b95bc3c678ec442f9bbd99748acbfe22fd8cd69.tar.gz freebsd-ports-gnome-4b95bc3c678ec442f9bbd99748acbfe22fd8cd69.tar.zst freebsd-ports-gnome-4b95bc3c678ec442f9bbd99748acbfe22fd8cd69.zip | |
Support changed ETCDIR in pkg-plist
Diffstat (limited to 'security/openssh-portable')
| -rw-r--r-- | security/openssh-portable/Makefile | 2 | ||||
| -rw-r--r-- | security/openssh-portable/pkg-plist | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile index c2ea076de9ad..bad56e019e4f 100644 --- a/security/openssh-portable/Makefile +++ b/security/openssh-portable/Makefile @@ -3,7 +3,7 @@ PORTNAME= openssh DISTVERSION= 6.8p1 -PORTREVISION= 7 +PORTREVISION= 8 PORTEPOCH= 1 CATEGORIES= security ipv6 MASTER_SITES= OPENBSD/OpenSSH/portable diff --git a/security/openssh-portable/pkg-plist b/security/openssh-portable/pkg-plist index f07bbb896b8e..4acfecc1bacc 100644 --- a/security/openssh-portable/pkg-plist +++ b/security/openssh-portable/pkg-plist @@ -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 |