*/*: 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
This commit is contained in:
Yasuhiro Kimura 2025-02-05 14:11:54 +09:00
parent 88122c70b3
commit 73895aa5f1
3 changed files with 16 additions and 11 deletions

View file

@ -1,6 +1,6 @@
PORTNAME= freeradius PORTNAME= freeradius
DISTVERSION= 3.2.6 DISTVERSION= 3.2.6
PORTREVISION= 1 PORTREVISION= 2
CATEGORIES= net CATEGORIES= net
MASTER_SITES= https://github.com/FreeRADIUS/freeradius-server/releases/download/release_${DISTVERSION:S/./_/g}/ \ MASTER_SITES= https://github.com/FreeRADIUS/freeradius-server/releases/download/release_${DISTVERSION:S/./_/g}/ \
https://freeradius.org/ftp/pub/radius/%SUBDIR%/ \ 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} BROKEN_SSL_REASON_libressl-devel= ${BROKEN_SSL_REASON_libressl}
LIB_DEPENDS= libgdbm.so:databases/gdbm \ LIB_DEPENDS= libgdbm.so:databases/gdbm \
libtalloc.so:devel/talloc libtalloc.so:${SAMBA_TALLOC_PORT}
FLAVORS= default ldap mysql pgsql sqlite3 FLAVORS= default ldap mysql pgsql sqlite3
FLAVOR?= ${FLAVORS:[1]} FLAVOR?= ${FLAVORS:[1]}
@ -151,9 +151,8 @@ UNBOUND_CONFIGURE_WITH= rlm_unbound
UNBOUND_LIB_DEPENDS= libunbound.so:dns/unbound UNBOUND_LIB_DEPENDS= libunbound.so:dns/unbound
UNIXODBC_CONFIGURE_WITH= rlm_sql_unixodbc UNIXODBC_CONFIGURE_WITH= rlm_sql_unixodbc
UNIXODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC UNIXODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC
WINBIND_USES= samba:build,lib WINBIND_CONFIGURE_ON= --with-winbind-include-dir=${SAMBA_INCLUDEDIR} \
WINBIND_CONFIGURE_ON= --with-winbind-include-dir=${LOCALBASE}/include/samba4 \ --with-winbind-lib-dir=${SAMBA_LIBDIR}
--with-winbind-lib-dir=${LOCALBASE}/lib/samba4
JSON_CONFIGURE_WITH= rlm_json JSON_CONFIGURE_WITH= rlm_json
JSON_CONFIGURE_ON= --with-jsonc-lib-dir=${LOCALBASE}/lib \ JSON_CONFIGURE_ON= --with-jsonc-lib-dir=${LOCALBASE}/lib \
--with-jsonc-include-dir=${LOCALBASE}/include --with-jsonc-include-dir=${LOCALBASE}/include
@ -167,6 +166,12 @@ SUB_LIST+= RUN_AS_USER="yes"
SUB_LIST+= RUN_AS_USER="no" SUB_LIST+= RUN_AS_USER="no"
.endif .endif
.if ${PORT_OPTIONS:MWINBIND}
USES+= samba:build,lib
.else
USES+= samba:env
.endif
# User and group to use if USER option is chosen # User and group to use if USER option is chosen
RADIUS_USER= freeradius RADIUS_USER= freeradius
RADIUS_GROUP= freeradius RADIUS_GROUP= freeradius

View file

@ -1,6 +1,6 @@
PORTNAME= sssd PORTNAME= sssd
PORTVERSION= 2.9.6 PORTVERSION= 2.9.6
PORTREVISION= 1 PORTREVISION= 2
CATEGORIES= security CATEGORIES= security
PKGNAMESUFFIX= 2 PKGNAMESUFFIX= 2
@ -41,9 +41,9 @@ LIB_DEPENDS= libcares.so:dns/c-ares \
libsamba-util.so:${SAMBA_PORT} \ libsamba-util.so:${SAMBA_PORT} \
libsasl2.so:security/cyrus-sasl2 \ libsasl2.so:security/cyrus-sasl2 \
libsmbclient.so:${SAMBA_PORT} \ libsmbclient.so:${SAMBA_PORT} \
libtalloc.so:devel/talloc \ libtalloc.so:${SAMBA_TALLOC_PORT} \
libtdb.so:databases/tdb \ libtdb.so:${SAMBA_TDB_PORT} \
libtevent.so:devel/tevent \ libtevent.so:${SAMBA_TEVENT_PORT} \
libunistring.so:devel/libunistring \ libunistring.so:devel/libunistring \
libuuid.so:misc/e2fsprogs-libuuid libuuid.so:misc/e2fsprogs-libuuid

View file

@ -194,8 +194,8 @@ STACKTRACES_CFLAGS= -g
STACKTRACES_LDFLAGS= -lunwind STACKTRACES_LDFLAGS= -lunwind
STACKTRACES_EXTRA_PATCHES= ${FILESDIR}/extra-patch-gen-stacktrace STACKTRACES_EXTRA_PATCHES= ${FILESDIR}/extra-patch-gen-stacktrace
STACKTRACES_VARS= STRIP="" STACKTRACES_VARS= STRIP=""
TDB_LIB_DEPENDS= libtdb.so:databases/tdb TDB_LIB_DEPENDS= libtdb.so:${SAMBA_TDB_PORT}
TDB_USES= pkgconfig:build TDB_USES= pkgconfig:build samba:env
TDB_CONFIGURE_WITH= tdb TDB_CONFIGURE_WITH= tdb
TDB_VARS= EXTERNAL_ACL+="time_quota session" TDB_VARS= EXTERNAL_ACL+="time_quota session"
TP_IPFW_CONFIGURE_ENABLE= ipfw-transparent TP_IPFW_CONFIGURE_ENABLE= ipfw-transparent