aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Drewery <bdrewery@FreeBSD.org>2021-11-30 20:46:20 +0000
committerBryan Drewery <bdrewery@FreeBSD.org>2022-03-03 19:25:36 +0000
commitad60ad3528afdeafa5eb9a13a70fea04a0565b0c (patch)
treed7c2f466bf2df0c1a4665b97aacdbc586a3d4495
parent6de74fbb4ca60257de0ec2acbeb0baddcd39e54b (diff)
downloadports-ad60ad3528afdeafa5eb9a13a70fea04a0565b0c.tar.gz
ports-ad60ad3528afdeafa5eb9a13a70fea04a0565b0c.zip
security/openssh-portable: Fix subtle rc script problem.
Invoking 'run_rc_command' taints '$rc_var' with 'keygen' which blocks further processing for something like openssh_oomprotect. Note that openssh_oomprotect is broken in rc.subr until it learns to read a pidfile.
-rw-r--r--security/openssh-portable/Makefile2
-rw-r--r--security/openssh-portable/files/openssh.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile
index b77a243d16cf..aa173a32ce63 100644
--- a/security/openssh-portable/Makefile
+++ b/security/openssh-portable/Makefile
@@ -2,7 +2,7 @@
PORTNAME= openssh
DISTVERSION= 8.8p1
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= security
MASTER_SITES= OPENBSD/OpenSSH/portable
diff --git a/security/openssh-portable/files/openssh.in b/security/openssh-portable/files/openssh.in
index a8c0043e607a..ee179b28faba 100644
--- a/security/openssh-portable/files/openssh.in
+++ b/security/openssh-portable/files/openssh.in
@@ -156,7 +156,7 @@ openssh_checks()
fi
fi
- run_rc_command keygen
+ openssh_keygen
openssh_configtest
}