From nobody Thu Feb 06 05:14:15 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 4YpQJ83sdqz5n3b9; Thu, 06 Feb 2025 05:14:16 +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 4YpQJ75s2Nz3R9j; Thu, 06 Feb 2025 05:14:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738818855; 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=im1rRG/dcUY930LStoLM5qQw01IWodqXG5/eedp3uM8=; b=KjVlA4e8NwQd5Biri/1kjX1yRkbDtL2WOB9TM/2IDMKTyxbN/MGQp7j9CHJXgLuZVJQbIv fab2mG/bEvwyc2tvKuyIbWWgsN0lpWonEt6VyyNfj/b/VOmgAGbwAtdYtsdxoijCsmQNKZ 6SsVVLjaP9J/9AoPYXE4BEWxuwqiGOGL3QyalKbnYHDS3VUPYOaI4O+b2v5OC27xWoY3xl fI6eL3q01ENPbFfaxDvxzIN4/s/22ZewutfEM+1ofjSGZzWUMsgtC70Yvbjp2lTsqzgFX8 QtvdukNyt7Xwr8vHQOmsNuEtynwAsF6GR3h6PXJ/lDqmyLdq+bSudu7YxOm2iQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738818855; 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=im1rRG/dcUY930LStoLM5qQw01IWodqXG5/eedp3uM8=; b=rdAd+EfV2SzIJ06N13hC1tAI7ocdRa37AEZpVUAVmwsSwUsJk8B0cBJULA4rKa7coOgLOa 28JJYEofDVa6qU7uL9DPuEQFYa5gaUSGz8j2CHrAU92lEYsM1Wf5kWpnp5Z6tOweHalzIy 4Ul2RxEJK/2i0Bl3SlmshXQZChO1Dg9R/2uTDxBPmN8hlAYYwyOwZuY/5N4udzaltigPrQ EsXihkbvuWCpZ2TCmmaUO0KyHjxx3dgfAidUb//GtOu81fluZzqYDrlTR2UYvAdGif9Y+m vuJ6UYKTXQRSKswu6h69lzbJTpPJbCJ5tpPFnlfalj3J4z+xR1V8Hw0OX3O08Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738818855; a=rsa-sha256; cv=none; b=Mk8t+7KvCvOCa6S/WY2qMumQUOuUzTevnOWiijc+RcztJoi+KA56m/34Y7GPsuCutJU0Xq EFvgDux9ZRTGwVT/L2ZtssrbZzTcWzXpfXB043tOKU6QMS7WPAz1SMgn5ecajN74E8TMdp sLxbYJ1uKVCDS1lkXJu/MQe2Svn0cPS9G7oKVfg6/JeeC+TtF9A5SXWDvfGwufhXyZ+iz3 cxnO1meEKoqOdYFwf4OcLQt3ScmQW/GM0wfJDQwMnpOjVvAn6cIc54IdzzypmfAHMx12jO /40cIm18Aq7NblFGIWnuh82Vpcbj11HMTJrqadEbjhkvEr3BGclQCc6pWF10Hw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YpQJ75H4Gz8Zl; Thu, 06 Feb 2025 05:14:15 +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 5165EFgM040413; Thu, 6 Feb 2025 05:14:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5165EFwS040410; Thu, 6 Feb 2025 05:14:15 GMT (envelope-from git) Date: Thu, 6 Feb 2025 05:14:15 GMT Message-Id: <202502060514.5165EFwS040410@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yasuhiro Kimura Subject: git: 73895aa5f1c5 - main - */*: Update ports so they use SAMBA_*_PORT variables in LIB_DEPENDS 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: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 73895aa5f1c5a657c8073828f7a548054716d2cc Auto-Submitted: auto-generated The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=73895aa5f1c5a657c8073828f7a548054716d2cc commit 73895aa5f1c5a657c8073828f7a548054716d2cc Author: Yasuhiro Kimura AuthorDate: 2025-02-05 05:11:54 +0000 Commit: Yasuhiro Kimura CommitDate: 2025-02-06 05:01:53 +0000 */*: Update ports so they use SAMBA_*_PORT variables in LIB_DEPENDS * Update ports that work with Samba and depend on either of talloc, tdb and tevent so they use SAMBA_*_PORT variables in LIB_DEPENDS. * Bump PORTREVISION. * While here, update WINBIND_CONFIGURE_ON in net/freeradius3/Makefile so it uses SAMBA_INCLUDEDIR and SAMBA_LIBDIR. Reviewed by: 0mp, kiwi Differential Revision: https://reviews.freebsd.org/D48859 --- net/freeradius3/Makefile | 15 ++++++++++----- security/sssd2/Makefile | 8 ++++---- www/squid/Makefile | 4 ++-- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/net/freeradius3/Makefile b/net/freeradius3/Makefile index dab52cd8b438..af32efd4d73b 100644 --- a/net/freeradius3/Makefile +++ b/net/freeradius3/Makefile @@ -1,6 +1,6 @@ PORTNAME= freeradius DISTVERSION= 3.2.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= https://github.com/FreeRADIUS/freeradius-server/releases/download/release_${DISTVERSION:S/./_/g}/ \ https://freeradius.org/ftp/pub/radius/%SUBDIR%/ \ @@ -21,7 +21,7 @@ BROKEN_SSL_REASON_libressl= LibreSSL is no longer supported BROKEN_SSL_REASON_libressl-devel= ${BROKEN_SSL_REASON_libressl} LIB_DEPENDS= libgdbm.so:databases/gdbm \ - libtalloc.so:devel/talloc + libtalloc.so:${SAMBA_TALLOC_PORT} FLAVORS= default ldap mysql pgsql sqlite3 FLAVOR?= ${FLAVORS:[1]} @@ -151,9 +151,8 @@ UNBOUND_CONFIGURE_WITH= rlm_unbound UNBOUND_LIB_DEPENDS= libunbound.so:dns/unbound UNIXODBC_CONFIGURE_WITH= rlm_sql_unixodbc UNIXODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC -WINBIND_USES= samba:build,lib -WINBIND_CONFIGURE_ON= --with-winbind-include-dir=${LOCALBASE}/include/samba4 \ - --with-winbind-lib-dir=${LOCALBASE}/lib/samba4 +WINBIND_CONFIGURE_ON= --with-winbind-include-dir=${SAMBA_INCLUDEDIR} \ + --with-winbind-lib-dir=${SAMBA_LIBDIR} JSON_CONFIGURE_WITH= rlm_json JSON_CONFIGURE_ON= --with-jsonc-lib-dir=${LOCALBASE}/lib \ --with-jsonc-include-dir=${LOCALBASE}/include @@ -167,6 +166,12 @@ SUB_LIST+= RUN_AS_USER="yes" SUB_LIST+= RUN_AS_USER="no" .endif +.if ${PORT_OPTIONS:MWINBIND} +USES+= samba:build,lib +.else +USES+= samba:env +.endif + # User and group to use if USER option is chosen RADIUS_USER= freeradius RADIUS_GROUP= freeradius diff --git a/security/sssd2/Makefile b/security/sssd2/Makefile index b0fc081d536a..d0fbbca0cb92 100644 --- a/security/sssd2/Makefile +++ b/security/sssd2/Makefile @@ -1,6 +1,6 @@ PORTNAME= sssd PORTVERSION= 2.9.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security PKGNAMESUFFIX= 2 @@ -41,9 +41,9 @@ LIB_DEPENDS= libcares.so:dns/c-ares \ libsamba-util.so:${SAMBA_PORT} \ libsasl2.so:security/cyrus-sasl2 \ libsmbclient.so:${SAMBA_PORT} \ - libtalloc.so:devel/talloc \ - libtdb.so:databases/tdb \ - libtevent.so:devel/tevent \ + libtalloc.so:${SAMBA_TALLOC_PORT} \ + libtdb.so:${SAMBA_TDB_PORT} \ + libtevent.so:${SAMBA_TEVENT_PORT} \ libunistring.so:devel/libunistring \ libuuid.so:misc/e2fsprogs-libuuid diff --git a/www/squid/Makefile b/www/squid/Makefile index 4d20dfeb86b2..33b326d4413a 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -194,8 +194,8 @@ STACKTRACES_CFLAGS= -g STACKTRACES_LDFLAGS= -lunwind STACKTRACES_EXTRA_PATCHES= ${FILESDIR}/extra-patch-gen-stacktrace STACKTRACES_VARS= STRIP="" -TDB_LIB_DEPENDS= libtdb.so:databases/tdb -TDB_USES= pkgconfig:build +TDB_LIB_DEPENDS= libtdb.so:${SAMBA_TDB_PORT} +TDB_USES= pkgconfig:build samba:env TDB_CONFIGURE_WITH= tdb TDB_VARS= EXTERNAL_ACL+="time_quota session" TP_IPFW_CONFIGURE_ENABLE= ipfw-transparent