From nobody Tue Feb 18 21:01:49 2025 X-Original-To: dev-commits-ports-all@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 4YyBlx6G1Wz5pBH0; Tue, 18 Feb 2025 21:01:49 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YyBlx5kr3z3pTT; Tue, 18 Feb 2025 21:01:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739912509; 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=FCVI2I/lcegc8UrUR87nyecJK3TmNB9UNErDwS4hDX4=; b=qKlmsSM3S+ShBx19IDzNlS2x1AATWpq4o5gghdn3GuB78kmPNpKsy7cBajvFlTMuGyMI7w 2nXoWgJe27GTV265QnxYgMP8Q1GTRrTBdINZHaclrx+WXKV8QpdzDvGKRSd2E7JRWjjQFy kzURVYf8a1jGP/BqxwUibqLAYfT89dBXBrJnY7JKfXzKB98rkkzFUtihHfJuCvR2ee6t1u TV1WMpouKxeb88V3UgLx2zSXA/KjrNii+7cUhP2zfdHnwh3XPv7UU6U8aAMQxR2zipsiHB REU/5RAJMPIDOUuQFOPpHUJReKkHsDRiGv4zuRQA2UHpCuUHFsVMMOc6FHCw+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739912509; a=rsa-sha256; cv=none; b=moHRDSoqjLzTXOfJYUYLsDpGLs9QAbKO7ezg1pIqNC+y4y0hshLu7nHXOEY/Buj6rqNfOG O0uSQSgL7+V2E4v+j32d8gFK4Makeze+Gd/QDVMa7ZttLedgWkrUDk65XTs2BYsY2RVB4J qx5xQO1NxvgpWBzpmbDfNWU+y56+iQBm5IKtb66wktoXH6YfUHPf12BbhI+jvC+B50QBx4 SufNFwwLlyzUNskZi/5WwSGUMTbECtk7iR6FU2kbIXAQYeHNGIDfWFhmqt7mJxt754rgM4 /RrbJf0xbTF323VCpOqN+9tJ9rYyml+vOCE4kKF03y/p1sa913L2mtImQHnKsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739912509; 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=FCVI2I/lcegc8UrUR87nyecJK3TmNB9UNErDwS4hDX4=; b=flMhDxSiv9KYldxkqLBbqFE+lvXeY3OIUuPSWk7N1+1G2anzZAGXPynX48xiX6XPWPHdeP gfsJZx29uBCp+cUrAmLH8F1isglwwbf9PCdewj5i+lnk4jAJ6kh20fUFSQyP8+dX1xwLr2 qexYXshHH698/uF+ib8YIlZI+QJ8Oj8ACFV5Ct08py7gNsY/oMrnyx9YFQ3CJySuqef0PX 0D8QUdUw5yGIbmUY5mZWxI/kUdAM+E5/VUiim8YOViQqnPofudPS7OcIHQPpb39UU7xUTs bHhlk2N9ChfS2BTkIeTQmy4AVtdntGHG8HTA4YZOS5rtdSqnubTTiEIDBAv+Ow== 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 4YyBlx59s0zbrx; Tue, 18 Feb 2025 21:01:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51IL1nvW093257; Tue, 18 Feb 2025 21:01:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51IL1nlU093254; Tue, 18 Feb 2025 21:01:49 GMT (envelope-from git) Date: Tue, 18 Feb 2025 21:01:49 GMT Message-Id: <202502182101.51IL1nlU093254@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Brooks Davis Subject: git: 4bfc94008706 - main - security/samhain: don't use sbrk List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4bfc94008706401027f79514540aa47889d4cb29 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=4bfc94008706401027f79514540aa47889d4cb29 commit 4bfc94008706401027f79514540aa47889d4cb29 Author: Brooks Davis AuthorDate: 2023-12-05 23:52:36 +0000 Commit: Brooks Davis CommitDate: 2025-02-18 20:59:20 +0000 security/samhain: don't use sbrk Samhain has an internal malloc implementation that uses sbrk and malloc. There's a fallback during initialization if sbrk fails so replace sbrk calls with a function that return the failure value ((void *)-1). PR: 275646 Approved by: freebsd@gregv.net (maintainer) --- security/samhain/Makefile | 2 +- security/samhain/files/patch-src_dnmalloc.c | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/security/samhain/Makefile b/security/samhain/Makefile index 6638f656c070..c54b2e30c0cb 100644 --- a/security/samhain/Makefile +++ b/security/samhain/Makefile @@ -14,7 +14,7 @@ LICENSE= GPLv2 BROKEN_mips= fails to configure: error: Could not find the libwrap library BROKEN_mips64= fails to configure: error: Could not find the libwrap library -USES= sbrk shebangfix +USES= shebangfix SHEBANG_FILES= scripts/samhainadmin-gpg.pl.in \ scripts/samhainadmin-sig.pl.in diff --git a/security/samhain/files/patch-src_dnmalloc.c b/security/samhain/files/patch-src_dnmalloc.c new file mode 100644 index 000000000000..3ea627f5bf98 --- /dev/null +++ b/security/samhain/files/patch-src_dnmalloc.c @@ -0,0 +1,21 @@ +--- src/dnmalloc.c.orig ++++ src/dnmalloc.c +@@ -660,8 +660,18 @@ + sample version for pre-OSX macos. + */ + ++#ifdef __FreeBSD__ ++static void *nosbrk(ptrdiff_t len __unused) { ++ return MORECORE_FAILURE; ++} ++#endif ++ + #ifndef MORECORE ++#ifdef __FreeBSD__ ++#define MORECORE nosbrk ++#else + #define MORECORE sbrk ++#endif + #endif + +