From nobody Tue Mar 12 21:37:58 2024 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 4TvRny5bs3z5CZGy; Tue, 12 Mar 2024 21:37:58 +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 4TvRny54GTz4g7h; Tue, 12 Mar 2024 21:37:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710279478; 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=mIQwKxsACvqaPJVkdHI7OYcXYS7viKGx3zbxEP42q9c=; b=MTwl/Cwv5MlcxLHB76ylotqOlMrjKOWGowID4HZf5Qeb6jlj5c/6ndlpPsvhawqRqBVncR UMApEroXh5+niAh5qWoRdd7g6VWaLbxtDCwdPohxuTcN7zamYEkiuBO4/bbI9MGQzZEe4x bNupEPWxIYBcAd3t6Bi7gaKKfl3nwY5fk2rIhc6c2+dIPdJtd+5JQ0f9OeTTTbvLy5OFZ5 RRfAJdScrM/D35x7rZFWeTIdCBaa1bXJd/wOBdzHNrjWShN8wRaon8Ulx3c8H6O+zRzkXn 4463gSirhEM+e0ggwFJ0mS+qqu2uMUa87l9AyZnCnqvjZzyLDyvsHl5tLyq//g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710279478; a=rsa-sha256; cv=none; b=d4ViqwZb7cqmHgzO6QLZOp3zjE1Uyw6MBWZihxXRzN2rH8PKfAduIG7ggoNEn90WZl5BDM IGdbJj7LsIXPyGe5TpqF0DGhBQlKH+DXFyq9fBgc4k+kdkL1xjABU0CpCmdgzRDulETA5d reTC87rrZkPt4FukhdXVDJlR7y2m6AKRiF0ARB4p8MnyiFiTEu8TqM1yGxtjInrZmFiIED gFvfw8FC+4ZGcruKmYIoRu+hGvtUl07n2suoCPdtP30qeBys7JbumR4Up7MxQ27hD0UUEh 6j21MJ91AENlKuPlQCQ93JEWXNDHuMt/jL7pVJ7HlwkwXFfZOcTphmF58o0uwg== 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=1710279478; 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=mIQwKxsACvqaPJVkdHI7OYcXYS7viKGx3zbxEP42q9c=; b=CAY33gh2FHUSIQJGaimfVnZ6A9lOXGU8XUeeaeBd4ezIm64ikP1BJ8hPGD0TLIlj0RglK7 6yd6pLZmLg9wEkdTqIwUCJUcEis1GNt2kiZ3bfGQeCcb7C0p7SdWZu6G/3ZGjRgZT49bBY u7ZcweW8obxalQBQ4VQvJ7z3yvLaRmXPg2g5rHychBHyBMGbXegTdWywL2jEpvCWTpIqEx GPjzvxx5ECQvpZwh2Myqkq1Sk3t+cRE/M3+21EYh4SD5seM/kjfn4ba0qpH0qO4Tm+ET85 UCJ8PPUx9yKalXzg2ymLYzCnZX7Oc/zbjmjjhIWOmWDV+o7RT98KzQ3fN2VtsQ== 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 4TvRny4flNzFtG; Tue, 12 Mar 2024 21:37:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42CLbwvq077676; Tue, 12 Mar 2024 21:37:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42CLbwrG077673; Tue, 12 Mar 2024 21:37:58 GMT (envelope-from git) Date: Tue, 12 Mar 2024 21:37:58 GMT Message-Id: <202403122137.42CLbwrG077673@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: eaec7c228731 - main - net/samba416: Add externalldb flavor 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: 0mp X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eaec7c2287315c50e79b137d94cee66054e4cec6 Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/ports/commit/?id=eaec7c2287315c50e79b137d94cee66054e4cec6 commit eaec7c2287315c50e79b137d94cee66054e4cec6 Author: Xavier Beaudouin AuthorDate: 2024-03-12 21:19:04 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2024-03-12 21:37:48 +0000 net/samba416: Add externalldb flavor Why do we need the externalldb flavor? Compiling tools like security/sssd-devel with Kerberos support often requires a standalone ldb as a dependency. By adding a externalldb flavor, ports can depend on a flavor of Samba that does not depend on its bundled version of ldb. PR: 276835 Approved by: portmgr (maintainer timeout, 2+ weeks) Sponsored by: Klara, Inc. Co-authored-by: Mateusz Piotrowski <0mp@FreeBSD.org> --- net/samba416/Makefile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/net/samba416/Makefile b/net/samba416/Makefile index 65536326cbdb..a3518fbafe51 100644 --- a/net/samba416/Makefile +++ b/net/samba416/Makefile @@ -103,6 +103,10 @@ USE_LDCONFIG= ${SAMBA4_LIBDIR} WAF_CMD= buildtools/bin/waf CONFIGURE_LOG= bin/config.log +FLAVORS= default externalldb +FLAVOR?= ${FLAVORS:[1]} +externalldb_PKGNAMESUFFIX= -externalldb + # Make sure that the right version of Python is used by the tools # https://bugzilla.samba.org/show_bug.cgi?id=7305 SHEBANG_FILES= ${PATCH_WRKSRC}/source4/scripting/bin/* ${PATCH_WRKSRC}/selftest/* @@ -197,7 +201,11 @@ SAMBA4_BUNDLED_CMOCKA?= no SAMBA4_BUNDLED_TALLOC?= no SAMBA4_BUNDLED_TEVENT?= no SAMBA4_BUNDLED_TDB?= no +.if ${FLAVOR:U} != externalldb SAMBA4_BUNDLED_LDB?= yes +.else +SAMBA4_BUNDLED_LDB?= no +.endif # cmocka .if defined(SAMBA4_BUNDLED_CMOCKA) && ${SAMBA4_BUNDLED_CMOCKA} == yes SAMBA4_BUNDLED_LIBS+= cmocka