From nobody Mon Mar 7 23:03:42 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 4743F1A0D0C7; Mon, 7 Mar 2022 23:03:43 +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 4KCDXZ6k2lz4f3x; Mon, 7 Mar 2022 23:03:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646694223; 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=L5ueIR8gseYyMzD7I8F+qgHCL7rfLndME5PgwfJ+QRQ=; b=lTr6hOS2rq88W9IRd0nAXyftiz8TTUIbkSDVTL+4i6c2gjYQTQX94BB8MZCdWSJid/buq1 hA4rg62f2RXLsyGcUGA2yOGWR8cbt/wD28HKL5mXNuXjIAEWHLTIg89omFMDOHJpTxCbfp iBjq4Zee4dBlmWT/MnQoFlTWnW2N+6CPdEdYFQpdQ96SK25BkqpO9OuZYSS0E/FFGcurqu FVQiMSRuilJliLXowFth6oxM+TzOTbkNLAIrvgDZ3JmYwoc/96MlPpxoOELDWpiVGppr1g L6KD22LUCJRpfbQa2yfnAp9GohVtP1vGILrShoEgi64+gIEdZiDxzDj7BZjjjA== 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 99F4911259; Mon, 7 Mar 2022 23:03:42 +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 227N3gVA068026; Mon, 7 Mar 2022 23:03:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 227N3gXg068025; Mon, 7 Mar 2022 23:03:42 GMT (envelope-from git) Date: Mon, 7 Mar 2022 23:03:42 GMT Message-Id: <202203072303.227N3gXg068025@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: a12058fae3bb - main - security/openssh-portable: Again fix procctl(2) usage 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: a12058fae3bb09a1aba41d24383b6f1d93f2b330 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646694223; 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=L5ueIR8gseYyMzD7I8F+qgHCL7rfLndME5PgwfJ+QRQ=; b=SXxES4KwFa3ctw2ynC36gLNkcs+QYIHhWQ59LSuk7lKt6WjA7MzFh5PkLRK1D2mxzg+RM1 xs4i4reIS3+FLgOHAZAeDEFZyv9TVVPAJILivGPKyKfMdIFmWuAUwx6uEo9Y7P4IfgEsO+ jO80IpaVwUqj1qABdpUwZvs/ymcsY3cL3E6YqDL0I+k+lEtkX2dJg8gdT8IvUDnLZQD+xb nTOAJU7DwPBXUjU/nXy9uvW55pxqCnDmUomMQB3RrVHkVN8FhKr0TtpJcHj7WhYPuOxpLR v1fuRkYeLTc82+yuDKQOdkk6Tinf6rbF9hdxJUfANXVeILk9EeLltlty5G9lAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646694223; a=rsa-sha256; cv=none; b=kjt/PwWTY3npjOMyRXUDyScK0EZQO7ljpk15wK5/KUrvtZZ7Bt78tY7/464p+w5ErtmiW4 GTLewDCDNNOUoPJ4GUhW5bS3vc2Pa/ok+vUrXmMv8P4aJ+DaGbjGNPTeCiFvS8MTw05dDa yrcYRf/hTy/pSfHuNFQvhikphagH1UithN1I33b1cdx/dANPiM1anLqGXjip+TrMLl8Gqe ZldZZS6988ZQifrOasTbiSewt/vlv8JJRzm/X43bvnJmRqgbnxK0N7Prq5tCI9m4rJwcNs 870nU50rQFcoQHSMjFkWXmAcq6p+lg96E8b/d5XJaimN8+UQyF2DW6Lra2cEUg== 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=a12058fae3bb09a1aba41d24383b6f1d93f2b330 commit a12058fae3bb09a1aba41d24383b6f1d93f2b330 Author: Bryan Drewery AuthorDate: 2022-03-07 22:49:28 +0000 Commit: Bryan Drewery CommitDate: 2022-03-07 23:02:47 +0000 security/openssh-portable: Again fix procctl(2) usage The 8.9p1 update was supposed to have a fix for incorrect use of procctl(2) but was left out for some reason. A wrong assumption missed keeping it in ae66cffc19f357cbd5. PR: 262352 --- security/openssh-portable/Makefile | 2 +- .../openssh-portable/files/patch-platform-tracing.c | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile index defef139f14e..ee88c6fca548 100644 --- a/security/openssh-portable/Makefile +++ b/security/openssh-portable/Makefile @@ -2,7 +2,7 @@ PORTNAME= openssh DISTVERSION= 8.9p1 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= security MASTER_SITES= OPENBSD/OpenSSH/portable diff --git a/security/openssh-portable/files/patch-platform-tracing.c b/security/openssh-portable/files/patch-platform-tracing.c new file mode 100644 index 000000000000..160def21ac3e --- /dev/null +++ b/security/openssh-portable/files/patch-platform-tracing.c @@ -0,0 +1,21 @@ +--- platform-tracing.c.orig 2022-03-07 14:48:27.152541000 -0800 ++++ platform-tracing.c 2022-03-07 14:56:33.402458000 -0800 +@@ -32,6 +32,9 @@ + #include + #include + #include ++#if defined(HAVE_PROCCTL) ++#include ++#endif + + #include "log.h" + +@@ -42,7 +45,7 @@ platform_disable_tracing(int strict) + /* On FreeBSD, we should make this process untraceable */ + int disable_trace = PROC_TRACE_CTL_DISABLE; + +- if (procctl(P_PID, 0, PROC_TRACE_CTL, &disable_trace) && strict) ++ if (procctl(P_PID, getpid(), PROC_TRACE_CTL, &disable_trace) && strict) + fatal("unable to make the process untraceable: %s", + strerror(errno)); + #endif