svn commit: r381823 - in head/security/openssh-portable: . files
Bryan Drewery
bdrewery at FreeBSD.org
Sat Mar 21 19:28:42 UTC 2015
Author: bdrewery
Date: Sat Mar 21 19:28:40 2015
New Revision: 381823
URL: https://svnweb.freebsd.org/changeset/ports/381823
QAT: https://qat.redports.org/buildarchive/r381823/
Log:
Fix incorrect reference to ETCSSH from r381709
Modified:
head/security/openssh-portable/Makefile
head/security/openssh-portable/files/openssh.in
Modified: head/security/openssh-portable/Makefile
==============================================================================
--- head/security/openssh-portable/Makefile Sat Mar 21 19:24:28 2015 (r381822)
+++ head/security/openssh-portable/Makefile Sat Mar 21 19:28:40 2015 (r381823)
@@ -3,7 +3,7 @@
PORTNAME= openssh
DISTVERSION= 6.7p1
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= security ipv6
MASTER_SITES= ${MASTER_SITE_OPENBSD}
Modified: head/security/openssh-portable/files/openssh.in
==============================================================================
--- head/security/openssh-portable/files/openssh.in Sat Mar 21 19:24:28 2015 (r381822)
+++ head/security/openssh-portable/files/openssh.in Sat Mar 21 19:28:40 2015 (r381823)
@@ -35,11 +35,11 @@ pidfile=${openssh_pidfile:="/var/run/ssh
openssh_keygen()
{
- if [ -f %%ETCSSH%%/ssh_host_key -a \
- -f %%ETCSSH%%/ssh_host_dsa_key -a \
- -f %%ETCSSH%%/ssh_host_rsa_key -a \
- -f %%ETCSSH%%/ssh_host_ecdsa_key -a \
- -f %%ETCSSH%%/ssh_host_ed25519_key ]; then
+ if [ -f %%ETCDIR%%/ssh_host_key -a \
+ -f %%ETCDIR%%/ssh_host_dsa_key -a \
+ -f %%ETCDIR%%/ssh_host_rsa_key -a \
+ -f %%ETCDIR%%/ssh_host_ecdsa_key -a \
+ -f %%ETCDIR%%/ssh_host_ed25519_key ]; then
return 0
fi
@@ -49,49 +49,49 @@ openssh_keygen()
[ -x %%PREFIX%%/bin/ssh-keygen ] ||
err 1 "%%PREFIX%%/bin/ssh-keygen does not exist."
- if [ -f %%ETCSSH%%/ssh_host_key ]; then
+ if [ -f %%ETCDIR%%/ssh_host_key ]; then
echo "You already have an RSA host key" \
- "in %%ETCSSH%%/ssh_host_key"
+ "in %%ETCDIR%%/ssh_host_key"
echo "Skipping protocol version 1 RSA Key Generation"
else
%%PREFIX%%/bin/ssh-keygen -t rsa1 -b 1024 \
- -f %%ETCSSH%%/ssh_host_key -N ''
+ -f %%ETCDIR%%/ssh_host_key -N ''
fi
- if [ -f %%ETCSSH%%/ssh_host_dsa_key ]; then
+ if [ -f %%ETCDIR%%/ssh_host_dsa_key ]; then
echo "You already have a DSA host key" \
- "in %%ETCSSH%%/ssh_host_dsa_key"
+ "in %%ETCDIR%%/ssh_host_dsa_key"
echo "Skipping protocol version 2 DSA Key Generation"
else
%%PREFIX%%/bin/ssh-keygen -t dsa \
- -f %%ETCSSH%%/ssh_host_dsa_key -N ''
+ -f %%ETCDIR%%/ssh_host_dsa_key -N ''
fi
- if [ -f %%ETCSSH%%/ssh_host_rsa_key ]; then
+ if [ -f %%ETCDIR%%/ssh_host_rsa_key ]; then
echo "You already have a RSA host key" \
- "in %%ETCSSH%%/ssh_host_rsa_key"
+ "in %%ETCDIR%%/ssh_host_rsa_key"
echo "Skipping protocol version 2 RSA Key Generation"
else
%%PREFIX%%/bin/ssh-keygen -t rsa \
- -f %%ETCSSH%%/ssh_host_rsa_key -N ''
+ -f %%ETCDIR%%/ssh_host_rsa_key -N ''
fi
- if [ -f %%ETCSSH%%/ssh_host_ecdsa_key ]; then
+ if [ -f %%ETCDIR%%/ssh_host_ecdsa_key ]; then
echo "You already have a Elliptic Curve DSA host key" \
- "in %%ETCSSH%%/ssh_host_ecdsa_key"
+ "in %%ETCDIR%%/ssh_host_ecdsa_key"
echo "Skipping protocol version 2 Elliptic Curve DSA Key Generation"
else
%%PREFIX%%/bin/ssh-keygen -t ecdsa \
- -f %%ETCSSH%%/ssh_host_ecdsa_key -N ''
+ -f %%ETCDIR%%/ssh_host_ecdsa_key -N ''
fi
- if [ -f %%ETCSSH%%/ssh_host_ed25519_key ]; then
+ if [ -f %%ETCDIR%%/ssh_host_ed25519_key ]; then
echo "You already have a Elliptic Curve ED25519 host key" \
- "in %%ETCSSH%%/ssh_host_ed25519_key"
+ "in %%ETCDIR%%/ssh_host_ed25519_key"
echo "Skipping protocol version 2 Elliptic Curve ED25519 Key Generation"
else
%%PREFIX%%/bin/ssh-keygen -t ed25519 \
- -f %%ETCSSH%%/ssh_host_ed25519_key -N ''
+ -f %%ETCDIR%%/ssh_host_ed25519_key -N ''
fi
}
@@ -105,20 +105,20 @@ openssh_check_same_ports(){
#check if opensshd-portable installed in replacement of base sshd
- if [ "%%ETCSSH%%" = "/etc/ssh" ]; then
+ if [ "%%ETCDIR%%" = "/etc/ssh" ]; then
return 1
fi
self_port=$(awk '$1~/^ListenAddress/ \
{mlen=match($0,":[0-9]*$"); print \
- substr($0,mlen+1,length($0)-mlen)}' %%ETCSSH%%/sshd_config)
+ substr($0,mlen+1,length($0)-mlen)}' %%ETCDIR%%/sshd_config)
if [ -z "$self_port" ]; then
self_port=$(echo $openssh_flags | awk \
'{for (i = 1; i <= NF; i++) if ($i == "-p") \
{i++; printf "%s", $i; break; }; }')
if [ -z "$self_port" ]; then
self_port=$(awk '$1~/^Port/ {print $2}' \
- %%ETCSSH%%/sshd_config)
+ %%ETCDIR%%/sshd_config)
fi
fi
# assume default 22 port
More information about the svn-ports-all
mailing list