From nobody Thu Mar 03 19:25:52 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 2E5C319FDD3C; Thu, 3 Mar 2022 19:25:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K8gv50g37z4v3J; Thu, 3 Mar 2022 19:25:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646335553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5VetO2mBXnhIRM15LF//q7dEMUtSPJH8ZDlbKJ/U8Iw=; b=G9nBaPC2Oh1J+1qH4hHemCiaVr4MzuUs9uHzDYyYKIjwTlLqk+ZOJdOEjqyzJIJVfYYnb6 SHSXqzjz9Lz4tMlWN1glRlNZcDj9yFogubEze1Boyjn24Ka455fa3v39nNfrpaBqDESWGB XuVsKYo/1+r+zcgOBnyQGwfglyuL2rSyec/IO08rQGUTTFiVacD+P3cTJ2Jv2p4kmpnk+R 84H6SdvuhCKV0URYPrXUQUNrBUHgH3eFNg3QYjO/Fx/lxeJGxin2mR41TKiUjP9RPqKn6v Q1C13bKjiq7MRbjKP3qFNMPbnLB7B487VzWcG2VFVkMYOuuWKqDc0FS3rGNTWQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EA26A1D948; Thu, 3 Mar 2022 19:25:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 223JPqNr004521; Thu, 3 Mar 2022 19:25:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 223JPqC8004520; Thu, 3 Mar 2022 19:25:52 GMT (envelope-from git) Date: Thu, 3 Mar 2022 19:25:52 GMT Message-Id: <202203031925.223JPqC8004520@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bryan Drewery Subject: git: ad60ad3528af - main - security/openssh-portable: Fix subtle rc script problem. List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bdrewery X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ad60ad3528afdeafa5eb9a13a70fea04a0565b0c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646335553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5VetO2mBXnhIRM15LF//q7dEMUtSPJH8ZDlbKJ/U8Iw=; b=idGB95Itt2laN0L9eDc2SYeDVZxnOPYxASCDAn/yFqgjPpy5/+7p0xzD5qRWd4Dj4fnjqP HpBoopdOzzMl5OfkGAd/a/mKqwvcHz6KWF0/B5qC2Z7MblXau7S/Cj2CSOmWqHsOMszc1q CjhIzcxIVN2TmthgPNe+8/6DrfId7RJ7des/ru90+Gqjw9xL7y0K6hCNi8W5jqNm7AoENk gKqAhpePROEQ/bjVTlqVJ4HmUuxav670gqZHjhfkcC/b3xRMEh/dTg0Q4M6l3XiZz2EcTu EZKLp7FISdw3ixU8IjwYDI4hzxanVzfWmtatCWqydf2qd+/Y63AnUzN6gTWSlA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646335553; a=rsa-sha256; cv=none; b=djOCNq2KzDi4+nWPBlV6WCkThrJb/XYLB24oafrO9sLfKUd2ZFDCFyv+syzH4sZZKMSS7S t9ump85wPVHpjPYDvQw2hw6E8d/rzX96WGXbS1avzC6rA5ZOFRag4wnJLUunmyETduwUW/ js766aSg6dFdOAqdLC3GXdSvogYdchxYnv4lncqG1uHYzAIFXY0G2A7yywyz8dXOqV/HpL qGq37xskkXQUB8K9h8XMdH3cUQeYI2Wa4PfulhmqjOznt7JTMihJjJw9PyVSddD/7QJ+Lz VXoEDgutkICi0MBdBOwXTGv/3EKzUGvNmkv5YBMusDPelY+vIUkC6LeGC6aezw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bdrewery: URL: https://cgit.FreeBSD.org/ports/commit/?id=ad60ad3528afdeafa5eb9a13a70fea04a0565b0c commit ad60ad3528afdeafa5eb9a13a70fea04a0565b0c Author: Bryan Drewery AuthorDate: 2021-11-30 20:46:20 +0000 Commit: Bryan Drewery 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 }