Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 3 Mar 2022 19:25:52 GMT
From:      Bryan Drewery <bdrewery@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: ad60ad3528af - main - security/openssh-portable: Fix subtle rc script problem.
Message-ID:  <202203031925.223JPqC8004520@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by bdrewery:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ad60ad3528afdeafa5eb9a13a70fea04a0565b0c

commit ad60ad3528afdeafa5eb9a13a70fea04a0565b0c
Author:     Bryan Drewery <bdrewery@FreeBSD.org>
AuthorDate: 2021-11-30 20:46:20 +0000
Commit:     Bryan Drewery <bdrewery@FreeBSD.org>
CommitDate: 2022-03-03 19:25:36 +0000

    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.
---
 security/openssh-portable/Makefile         | 2 +-
 security/openssh-portable/files/openssh.in | 2 +-
 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
 }
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202203031925.223JPqC8004520>