From nobody Wed Aug 21 18:00:45 2024 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 4WpvJY2kn1z5VGLT; Wed, 21 Aug 2024 18:00:45 +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 4WpvJY2CD1z4nNP; Wed, 21 Aug 2024 18:00:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724263245; 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=EqMQ5fGMYO0GDWiTwnfnEwTGExq0jmjdlyZwuza/mi4=; b=LIsjbxpfI7gdnksjwMvhFZ0H30sp36g/dxam5qUyuUfxAEcdvACDWR7zyps+7u88Lqihqv nNzwdANskj0AaaenuUh2UGPJIyw6gSlvg9FC4ofTnk+OMhhHbaTxodJ531tumIWAljDic0 vz68Z8/sVxnrzEOPodWVYtvcWaAGFSHOKxOCNDkGxpImtHrK7qUfuk2EWkOkhE6CTzHSnY iHhLeCAAu5vaVYwl6vHykvIY8CfFl6XnW/nI3ibFivsrTsSjBF65lfmpRDo658qQkwSjbi PHytJGeN14yZmLqGmEC5fDD4IMp56Jk2eR3mlX4KnREXkWkMiHZ70YEX7g1sUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724263245; a=rsa-sha256; cv=none; b=OjuLFm1MGCBpVss3XJOK5y28PLGdYjp40x5hiAexZ84QHhrae5H0c11QjrR7JvIt0Hvsp2 1XCewM+we5ius+EJVbaIm4KSSycic1Ixk7S03s/CxthlzFRm4ASDk/9yKprzsIqYJZvVQA 6wAJeSKk9vB3TlB03Jn6XnSPLcKbGKvQAcBqhqztL13PwS+qRAJXIy2Bn08ebyUVxzFCeC KbcYw+vqD4YCEBfyqjT/QwyFf5bzZmOK9Vq9nNTmREQjmmgTGpmyYmxDkmVS/5PyDR36nG KNVyfqI0prbv0z+bfBSeiSsJyik9VRrDWallYHAgGYSuEUJb0+YAJrdJuaKj6g== 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=1724263245; 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=EqMQ5fGMYO0GDWiTwnfnEwTGExq0jmjdlyZwuza/mi4=; b=bzWbGoQuozogWtahUMrsKs1hoU/ZQ64LlCS9H568TUh5mUnu+VCR8mBoWKT64nQNvf9Pxo 0ENvp8J3V9VEGP7qMm4rq+hg1+HPiNDvr1vgFnaOdvyUW1mjJ/d04Tuem9Bz9u22/DspHe azCr+x1By7IuddTTaVehADW59B7PZ9bEtFyWJL2IqL/XKtyCNhnsUrekxfrkriLKXaWuMG KJL2ezhUF7/m3/ZyZK1CiFegyXPZ60/29dTsvG79AlMjP+CoKKnpc7vHOkflDTZ1+5+gGd k5aDZWDdw7mAzekzQ1eZtwjsms7FN2jhVWV0vTNeoY3v8FWDm97lamfW+rt5+Q== 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 4WpvJY1R3GztbX; Wed, 21 Aug 2024 18:00:45 +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 47LI0juh037075; Wed, 21 Aug 2024 18:00:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47LI0jEx037072; Wed, 21 Aug 2024 18:00:45 GMT (envelope-from git) Date: Wed, 21 Aug 2024 18:00:45 GMT Message-Id: <202408211800.47LI0jEx037072@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: c582a52cf7a4 - main - security/sssd2: Use SAMBA_PORT and SAMBA_LDB_PORT 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: 0mp X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c582a52cf7a45e1867dc6a40690e6e8539c09cb1 Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/ports/commit/?id=c582a52cf7a45e1867dc6a40690e6e8539c09cb1 commit c582a52cf7a45e1867dc6a40690e6e8539c09cb1 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2024-08-21 17:52:01 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2024-08-21 17:59:32 +0000 security/sssd2: Use SAMBA_PORT and SAMBA_LDB_PORT security/sssd2 can depend on any Samba version we have in the ports tree. However, having the exact version of Samba hardcoded in *_DEPENDS variables makes it hard to use a non-default Samba version. Let the port pick up the default Samba version (and its ldb port) via samba.mk. Since net/samba416 is still the default, nothing really changes for sssd2. However, users can now build sssd2 against net/samba419 if they set DEFAULT_VERSIONS=samba=4.19. PR: 278839 280774 Approved by: portmgr (infrastructure) Sponsored by: Klara, Inc. Co-authored-by: Xavier Beaudouin --- security/sssd2/Makefile | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/security/sssd2/Makefile b/security/sssd2/Makefile index 170ed31cab08..8f15aa67e624 100644 --- a/security/sssd2/Makefile +++ b/security/sssd2/Makefile @@ -35,20 +35,20 @@ LIB_DEPENDS= libcares.so:dns/c-ares \ libjansson.so:devel/jansson \ libjose.so:net/jose \ libkrb5.so:security/krb5 \ - libldb.so:databases/ldb25 \ - libndr-krb5pac.so:net/samba416 \ - libndr-nbt.so:net/samba416 \ - libndr-standard.so:net/samba416 \ - libndr.so:net/samba416 \ + libldb.so:${SAMBA_LDB_PORT} \ + libndr-krb5pac.so:${SAMBA_PORT} \ + libndr-nbt.so:${SAMBA_PORT} \ + libndr-standard.so:${SAMBA_PORT} \ + libndr.so:${SAMBA_PORT} \ libnfs.so:net/libnfs \ libnss3.so:security/nss \ libp11-kit.so:security/p11-kit \ libpcre2-posix.so:devel/pcre2 \ libplds4.so:devel/nspr \ libpopt.so:devel/popt \ - libsamba-util.so:net/samba416 \ + libsamba-util.so:${SAMBA_PORT} \ libsasl2.so:security/cyrus-sasl2 \ - libsmbclient.so:net/samba416 \ + libsmbclient.so:${SAMBA_PORT} \ libtalloc.so:devel/talloc \ libtdb.so:databases/tdb \ libtevent.so:devel/tevent \ @@ -59,7 +59,8 @@ RUN_DEPENDS= adcli:net-mgmt/adcli \ cyrus-sasl-gssapi>0:security/cyrus-sasl2-gssapi USES= autoreconf cpe gettext gmake gssapi:bootstrap,flags,mit iconv ldap \ - libtool localbase:ldflags pathfix pkgconfig python:3.9+ shebangfix ssl + libtool localbase:ldflags pathfix pkgconfig python:3.9+ samba:env \ + shebangfix ssl USE_LDCONFIG= yes GNU_CONFIGURE= yes