From nobody Fri Oct 15 17:10:23 2021 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 2ED9617FCB46; Fri, 15 Oct 2021 17:10:24 +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 4HWCSw0hBNz4gS4; Fri, 15 Oct 2021 17:10:24 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 EB7DD20B6; Fri, 15 Oct 2021 17:10:23 +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 19FHAN2E049751; Fri, 15 Oct 2021 17:10:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19FHANQx049750; Fri, 15 Oct 2021 17:10:23 GMT (envelope-from git) Date: Fri, 15 Oct 2021 17:10:23 GMT Message-Id: <202110151710.19FHANQx049750@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: f4a5ae5fd8ee - main - security/openssh-portable: Fix sftp crash 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: f4a5ae5fd8ee4948c8b7d1c9bfd0e07d33a8aa18 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bdrewery: URL: https://cgit.FreeBSD.org/ports/commit/?id=f4a5ae5fd8ee4948c8b7d1c9bfd0e07d33a8aa18 commit f4a5ae5fd8ee4948c8b7d1c9bfd0e07d33a8aa18 Author: Bryan Drewery AuthorDate: 2021-10-15 16:44:40 +0000 Commit: Bryan Drewery CommitDate: 2021-10-15 17:10:21 +0000 security/openssh-portable: Fix sftp crash This fixes an error trying to disabling process tracing. It has been sent upstream. PR: 259174 Submitted by: mike at sentex dot net --- security/openssh-portable/Makefile | 2 +- .../files/patch-platform-tracing.c | 25 ++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile index 309edc422ff3..b5c9e473c388 100644 --- a/security/openssh-portable/Makefile +++ b/security/openssh-portable/Makefile @@ -2,7 +2,7 @@ PORTNAME= openssh DISTVERSION= 8.8p1 -PORTREVISION= 0 +PORTREVISION= 1 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..54f6db4421ad --- /dev/null +++ b/security/openssh-portable/files/patch-platform-tracing.c @@ -0,0 +1,25 @@ +--- platform-tracing.c.orig 2021-09-26 07:03:19.000000000 -0700 ++++ platform-tracing.c 2021-10-15 10:08:20.537813000 -0700 +@@ -16,6 +16,10 @@ + + #include "includes.h" + ++#if defined(HAVE_PROCCTL) ++#include ++#include ++#endif + #include + #ifdef HAVE_SYS_PROCCTL_H + #include +@@ -40,8 +44,9 @@ 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) +- fatal("unable to make the process untraceable"); ++ if (procctl(P_PID, getpid(), PROC_TRACE_CTL, &disable_trace) && strict) ++ fatal("unable to make the process untraceable: %s for pid %d", ++ strerror(errno), (int)getpid()); + #endif + #if defined(HAVE_PRCTL) && defined(PR_SET_DUMPABLE) + /* Disable ptrace on Linux without sgid bit */