From nobody Fri Aug 16 19:44:28 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 4WlsrY0p3rz5TRqR; Fri, 16 Aug 2024 19:44:29 +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 4WlsrY07VYz44CP; Fri, 16 Aug 2024 19:44:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723837469; 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=ygOo1C1uFdqRmpCHsJ+6X142Y2KNUfWUt/IxsZxWbp8=; b=FiPWp43f3bw5wfWUU5n5kVBz7vHEI1gMaYA8nwLdSH9aGLFdbscnK5BYxEX5NCqh49P+tZ GH5ij4Qh8YyQBARplqUQWhPaW+qJxVNPRXsT1EO2BYkt4I36OQU+959s1JbWtslc3GP3ch R2I9I5z0oktcla5uR773jvrYyP/ioYRlcDualw0AJTIOhp4qAdTqUScYTzmMh9v5zfCjax GblgzevnltScfJTcVoKbmAGwJby9Cdh4RyxcgrNjJOj0l2+qb4QMMtw0jjHgSWZyszu0Nu eejZCMnAgUe9SawpYbb0sw39l6Pnb/axh0nUIPMtywCCiH3w5LnqqJu77F0mVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723837469; a=rsa-sha256; cv=none; b=FNjfpjsDq6Iu5YfqWOmeEq1lzQS9YGqSCBRf8WuUpXZoUHPqYJe/+Etd7FO9KBUYaYcydt j8K9HKoBW4/FdJng0gAh5NLsaYj3m51QPvLQhQZ59GTNmowhHxtvQlIpuhfw1Wo754Pznl +cbZNLCOxnp0aeX3OL6Fv/0tjvEqjcB54SXs7aeFTTQRGwNqyiKFrOjPN5NJDtoE215CeV 3Od/aMIh+wBMKtNgltXKu5NCl5chECSCCKM++tYmtZupHtnokr18u3/x5sdjqlOPGkGcTs jJHPMhJERN8FgQYjwe46BOOcUiPjX+cTZ5+Lwuc0bchOZ3OZGzTD+J32EqacDw== 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=1723837469; 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=ygOo1C1uFdqRmpCHsJ+6X142Y2KNUfWUt/IxsZxWbp8=; b=mrC5EcuuQlQuCGZWPO2RInhhHtGNK49B+9ccHiTkdjiq5Fnrcej6s5O+yFKnGCD2m99h6w mG/AjHcNKV7bNwVAiIyPpV648tyIG+8Iyq8yYUGod05GMSLPGuCXNnLDbicFtJN1/AQqSR Eo6h9dosyKQH3jvMt+4P5P0HIxZ8DE9QTU6IK//QghM43fkxfsDM7kQIxi73fcGbR9Z1Vj yAahlFNLEn9LKA2XM451NwndPH6nfwAIUFpfm5Y3fKSrQ9eHzRN+0WASjJKYPz/rQIuend M7jOMoidpqP2pWTDeBBfk4hw/vtHN5Et5XvivgkqZqsm9+HEbbreIqusyrBGmg== 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 4WlsrX6rN2zKlG; Fri, 16 Aug 2024 19:44:28 +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 47GJiSt8003208; Fri, 16 Aug 2024 19:44:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47GJiS6k003205; Fri, 16 Aug 2024 19:44:28 GMT (envelope-from git) Date: Fri, 16 Aug 2024 19:44:28 GMT Message-Id: <202408161944.47GJiS6k003205@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: e75af545d1d1 - main - net/samba419: Use external dependencies by default 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-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: e75af545d1d1c258ce8135c422d62f35235ee0fc Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/ports/commit/?id=e75af545d1d1c258ce8135c422d62f35235ee0fc commit e75af545d1d1c258ce8135c422d62f35235ee0fc Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2024-08-16 19:34:41 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2024-08-16 19:44:10 +0000 net/samba419: Use external dependencies by default The Samba package can be built with the following dependencies bundled in: cmocka, talloc, tevent, tdb, and ldb. This is a handy way of getting the right versions of all those dependencies. Unfortunately, the bundled dependencies conflict with their packaged counterparts, which leads to the build and installation issues with packages like security/sssd2 and net/freeradius3. Building Samba without the bundled dependencies resolves those issues, so let's do that. PR: 280557 Approved by: samba (mikael, 0mp) Sponsored by: Klara, Inc. --- net/samba419/Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/net/samba419/Makefile b/net/samba419/Makefile index e78102f165da..cb3c2130c797 100644 --- a/net/samba419/Makefile +++ b/net/samba419/Makefile @@ -1,5 +1,6 @@ PORTNAME= ${SAMBA4_BASENAME}419 PORTVERSION= ${SAMBA4_VERSION} +PORTREVISION= 1 CATEGORIES?= net MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc DISTNAME= ${SAMBA4_DISTNAME} @@ -191,11 +192,11 @@ BUILD_DEPENDS+= libarchive>=3.1.2:archivers/libarchive RUN_DEPENDS+= libarchive>=3.1.2:archivers/libarchive ### Bundled libraries -SAMBA4_BUNDLED_CMOCKA?= yes -SAMBA4_BUNDLED_TALLOC?= yes -SAMBA4_BUNDLED_TEVENT?= yes -SAMBA4_BUNDLED_TDB?= yes -SAMBA4_BUNDLED_LDB?= yes +SAMBA4_BUNDLED_CMOCKA?= no +SAMBA4_BUNDLED_TALLOC?= no +SAMBA4_BUNDLED_TEVENT?= no +SAMBA4_BUNDLED_TDB?= no +SAMBA4_BUNDLED_LDB?= no # cmocka .if defined(SAMBA4_BUNDLED_CMOCKA) && ${SAMBA4_BUNDLED_CMOCKA} == yes SAMBA4_BUNDLED_LIBS+= cmocka