Date: Wed, 21 Aug 2024 18:00:45 GMT From: Mateusz Piotrowski <0mp@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: c582a52cf7a4 - main - security/sssd2: Use SAMBA_PORT and SAMBA_LDB_PORT Message-ID: <202408211800.47LI0jEx037072@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <kiwi@oav.net> --- 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202408211800.47LI0jEx037072>