git: fe43ebdf1ccd - main - net/samba422: Fix location of ldb files

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Mateusz Piotrowski <0mp_at_FreeBSD.org>
Date: Wed, 10 Dec 2025 22:31:04 UTC
The branch main has been updated by 0mp:

URL: https://cgit.FreeBSD.org/ports/commit/?id=fe43ebdf1ccdd8e7073f2a14c0dfc654745291ab

commit fe43ebdf1ccdd8e7073f2a14c0dfc654745291ab
Author:     Mateusz Piotrowski <0mp@FreeBSD.org>
AuthorDate: 2025-12-10 22:26:51 +0000
Commit:     Mateusz Piotrowski <0mp@FreeBSD.org>
CommitDate: 2025-12-10 22:29:53 +0000

    net/samba422: Fix location of ldb files
    
    - Use SAMBA_LDB_MODULESDIR consistently
    - Move all AD_DC-related plist entries to pkg-plist.ad_dc
    
    This patch fixes a simple "make package" build with default options.
    
    PR:             291541
    Reported by:    O. Hartmann <ohartmann@walstatt.org>
    Sponsored by:   Klara, Inc.
---
 net/samba422/Makefile        |   5 ++-
 net/samba422/pkg-plist       |  17 +------
 net/samba422/pkg-plist.ad_dc | 103 +++++++++++++++++++++++++------------------
 3 files changed, 63 insertions(+), 62 deletions(-)

diff --git a/net/samba422/Makefile b/net/samba422/Makefile
index 943b69ba505d..e64cd5e26c41 100644
--- a/net/samba422/Makefile
+++ b/net/samba422/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=			${SAMBA4_BASENAME}422
 PORTVERSION=			${SAMBA4_VERSION}
-PORTREVISION=			1
+PORTREVISION=			2
 CATEGORIES?=			net
 MASTER_SITES=			SAMBA/samba/stable SAMBA/samba/rc
 DISTNAME=			${SAMBA4_DISTNAME}
@@ -502,7 +502,7 @@ DEBUG_FLAGS?=			-g -ggdb3 -O0
 # LMDB
 SAMBA4_LMDB_DEPENDS=		lmdb>=0.9.16:databases/lmdb
 PLIST_FILES+=			${SAMBA4_LIBDIR}/private/libldb-mdb-int-private-samba.so \
-				${SAMBA4_MODULEDIR}/ldb/mdb.so
+				${SAMBA_LDB_MODULESDIR}/mdb.so
 .	endif
 .endif
 
@@ -547,6 +547,7 @@ SAMBA4_SUB=			SAMBA4_LOGDIR="${SAMBA4_LOGDIR}" \
 				SAMBA4_LOCKDIR="${SAMBA4_LOCKDIR}" \
 				SAMBA4_LIBDIR="${SAMBA4_LIBDIR}" \
 				SAMBA4_MODULEDIR="${SAMBA4_MODULEDIR}" \
+				SAMBA_LDB_MODULESDIR="${SAMBA_LDB_MODULESDIR}" \
 				SAMBA4_BINDDNSDIR="${SAMBA4_BINDDNSDIR}" \
 				SAMBA4_PRIVATEDIR="${SAMBA4_PRIVATEDIR}" \
 				SAMBA4_CONFDIR="${SAMBA4_CONFDIR}" \
diff --git a/net/samba422/pkg-plist b/net/samba422/pkg-plist
index 3fdc858df46a..d1e06c2eef9e 100644
--- a/net/samba422/pkg-plist
+++ b/net/samba422/pkg-plist
@@ -42,7 +42,6 @@ sbin/smbd
 sbin/winbindd
 include/samba4/credentials.h
 include/samba4/dcerpc.h
-%%AD_DC%%include/samba4/dcerpc_server.h
 include/samba4/gen_ndr/ndr_samr_c.h
 include/samba4/ldb.h
 include/samba4/ldb_errors.h
@@ -137,8 +136,6 @@ include/samba4/wbclient.h
 @dir include/samba4
 %%SAMBA4_LIBDIR%%/libdcerpc-samr.so
 %%SAMBA4_LIBDIR%%/libdcerpc-samr.so.0
-%%AD_DC%%%%SAMBA4_LIBDIR%%/libdcerpc-server.so
-%%AD_DC%%%%SAMBA4_LIBDIR%%/libdcerpc-server.so.0
 %%SAMBA4_LIBDIR%%/libdcerpc.so
 %%SAMBA4_LIBDIR%%/libdcerpc.so.0
 %%SAMBA4_LIBDIR%%/libldb.so
@@ -314,7 +311,6 @@ libexec/samba/samba-dcerpcd
 %%PKGCONFIGDIR%%/wbclient.pc
 %%PKGCONFIGDIR%%/dcerpc.pc
 %%PKGCONFIGDIR%%/dcerpc_samr.pc
-%%AD_DC%%%%PKGCONFIGDIR%%/dcerpc_server.pc
 %%PKGCONFIGDIR%%/ldb.pc
 %%PKGCONFIGDIR%%/samba-credentials.pc
 %%PKGCONFIGDIR%%/samba-hostconfig.pc
@@ -446,18 +442,7 @@ bin/ldbsearch
 %%SAMBA4_LIBDIR%%/private/libldb-key-value-private-samba.so
 %%SAMBA4_LIBDIR%%/private/libldb-tdb-err-map-private-samba.so
 %%SAMBA4_LIBDIR%%/private/libldb-tdb-int-private-samba.so
-%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/count_attrs.so
-%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/asq.so
-%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/ildap.so
-%%LDAP%%%%SAMBA4_MODULEDIR%%/ldb/ldap.so
-%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/ldb.so
-%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/ldbsamba_extensions.so
-%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/paged_searches.so
-%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/rdn_name.so
-%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/sample.so
-%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/server_sort.so
-%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/skel.so
-%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/tdb.so
+%%LDAP%%%%SAMBA_LDB_MODULESDIR%%/ldap.so
 %%MANPAGES%%share/man/man3/ldb.3.gz
 %%MANPAGES%%share/man/man1/ldbadd.1.gz
 %%MANPAGES%%share/man/man1/ldbdel.1.gz
diff --git a/net/samba422/pkg-plist.ad_dc b/net/samba422/pkg-plist.ad_dc
index 52533f83aa75..0050763c9f10 100644
--- a/net/samba422/pkg-plist.ad_dc
+++ b/net/samba422/pkg-plist.ad_dc
@@ -4,6 +4,9 @@ sbin/samba_dnsupdate
 sbin/samba_kcc
 sbin/samba_spnupdate
 sbin/samba_upgradedns
+include/samba4/dcerpc_server.h
+%%SAMBA4_LIBDIR%%/libdcerpc-server.so
+%%SAMBA4_LIBDIR%%/libdcerpc-server.so.0
 %%SAMBA4_LIBDIR%%/private/libad-claims-private-samba.so
 %%SAMBA4_LIBDIR%%/private/libauthn-policy-util-private-samba.so
 %%SAMBA4_LIBDIR%%/private/libdlz-bind9-for-torture-private-samba.so
@@ -23,50 +26,61 @@ sbin/samba_upgradedns
 %%SAMBA4_MODULEDIR%%/bind9/dlz_bind9_18.so
 %%SAMBA4_MODULEDIR%%/bind9/dlz_bind9_20.so
 %%SAMBA4_MODULEDIR%%/gensec/krb5.so
-%%SAMBA4_MODULEDIR%%/ldb/acl.so
-%%SAMBA4_MODULEDIR%%/ldb/aclread.so
-%%SAMBA4_MODULEDIR%%/ldb/anr.so
-%%SAMBA4_MODULEDIR%%/ldb/audit_log.so
-%%SAMBA4_MODULEDIR%%/ldb/descriptor.so
-%%SAMBA4_MODULEDIR%%/ldb/dirsync.so
-%%SAMBA4_MODULEDIR%%/ldb/dns_notify.so
-%%SAMBA4_MODULEDIR%%/ldb/dsdb_notification.so
-%%SAMBA4_MODULEDIR%%/ldb/encrypted_secrets.so
-%%SAMBA4_MODULEDIR%%/ldb/extended_dn_in.so
-%%SAMBA4_MODULEDIR%%/ldb/extended_dn_out.so
-%%SAMBA4_MODULEDIR%%/ldb/extended_dn_store.so
-%%SAMBA4_MODULEDIR%%/ldb/group_audit_log.so
-%%SAMBA4_MODULEDIR%%/ldb/instancetype.so
-%%SAMBA4_MODULEDIR%%/ldb/lazy_commit.so
-%%SAMBA4_MODULEDIR%%/ldb/linked_attributes.so
-%%SAMBA4_MODULEDIR%%/ldb/new_partition.so
-%%SAMBA4_MODULEDIR%%/ldb/objectclass_attrs.so
-%%SAMBA4_MODULEDIR%%/ldb/objectclass.so
-%%SAMBA4_MODULEDIR%%/ldb/objectguid.so
-%%SAMBA4_MODULEDIR%%/ldb/operational.so
-%%SAMBA4_MODULEDIR%%/ldb/paged_results.so
-%%SAMBA4_MODULEDIR%%/ldb/partition.so
-%%SAMBA4_MODULEDIR%%/ldb/password_hash.so
-%%SAMBA4_MODULEDIR%%/ldb/ranged_results.so
-%%SAMBA4_MODULEDIR%%/ldb/repl_meta_data.so
-%%SAMBA4_MODULEDIR%%/ldb/resolve_oids.so
-%%SAMBA4_MODULEDIR%%/ldb/rootdse.so
-%%SAMBA4_MODULEDIR%%/ldb/samba_dsdb.so
-%%SAMBA4_MODULEDIR%%/ldb/samba_secrets.so
-%%SAMBA4_MODULEDIR%%/ldb/samba3sam.so
-%%SAMBA4_MODULEDIR%%/ldb/samba3sid.so
-%%SAMBA4_MODULEDIR%%/ldb/samldb.so
-%%SAMBA4_MODULEDIR%%/ldb/schema_data.so
-%%SAMBA4_MODULEDIR%%/ldb/schema_load.so
-%%SAMBA4_MODULEDIR%%/ldb/secrets_tdb_sync.so
-%%SAMBA4_MODULEDIR%%/ldb/show_deleted.so
-%%SAMBA4_MODULEDIR%%/ldb/subtree_delete.so
-%%SAMBA4_MODULEDIR%%/ldb/subtree_rename.so
-%%SAMBA4_MODULEDIR%%/ldb/tombstone_reanimate.so
-%%SAMBA4_MODULEDIR%%/ldb/unique_object_sids.so
-%%SAMBA4_MODULEDIR%%/ldb/update_keytab.so
-%%SAMBA4_MODULEDIR%%/ldb/vlv.so
-%%SAMBA4_MODULEDIR%%/ldb/wins_ldb.so
+%%SAMBA_LDB_MODULESDIR%%/acl.so
+%%SAMBA_LDB_MODULESDIR%%/aclread.so
+%%SAMBA_LDB_MODULESDIR%%/anr.so
+%%SAMBA_LDB_MODULESDIR%%/asq.so
+%%SAMBA_LDB_MODULESDIR%%/audit_log.so
+%%SAMBA_LDB_MODULESDIR%%/count_attrs.so
+%%SAMBA_LDB_MODULESDIR%%/descriptor.so
+%%SAMBA_LDB_MODULESDIR%%/dirsync.so
+%%SAMBA_LDB_MODULESDIR%%/dns_notify.so
+%%SAMBA_LDB_MODULESDIR%%/dsdb_notification.so
+%%SAMBA_LDB_MODULESDIR%%/encrypted_secrets.so
+%%SAMBA_LDB_MODULESDIR%%/extended_dn_in.so
+%%SAMBA_LDB_MODULESDIR%%/extended_dn_out.so
+%%SAMBA_LDB_MODULESDIR%%/extended_dn_store.so
+%%SAMBA_LDB_MODULESDIR%%/group_audit_log.so
+%%SAMBA_LDB_MODULESDIR%%/ildap.so
+%%SAMBA_LDB_MODULESDIR%%/instancetype.so
+%%SAMBA_LDB_MODULESDIR%%/lazy_commit.so
+%%SAMBA_LDB_MODULESDIR%%/ldb.so
+%%SAMBA_LDB_MODULESDIR%%/ldbsamba_extensions.so
+%%SAMBA_LDB_MODULESDIR%%/linked_attributes.so
+%%SAMBA_LDB_MODULESDIR%%/new_partition.so
+%%SAMBA_LDB_MODULESDIR%%/objectclass.so
+%%SAMBA_LDB_MODULESDIR%%/objectclass_attrs.so
+%%SAMBA_LDB_MODULESDIR%%/objectguid.so
+%%SAMBA_LDB_MODULESDIR%%/operational.so
+%%SAMBA_LDB_MODULESDIR%%/paged_results.so
+%%SAMBA_LDB_MODULESDIR%%/paged_searches.so
+%%SAMBA_LDB_MODULESDIR%%/partition.so
+%%SAMBA_LDB_MODULESDIR%%/password_hash.so
+%%SAMBA_LDB_MODULESDIR%%/ranged_results.so
+%%SAMBA_LDB_MODULESDIR%%/rdn_name.so
+%%SAMBA_LDB_MODULESDIR%%/repl_meta_data.so
+%%SAMBA_LDB_MODULESDIR%%/resolve_oids.so
+%%SAMBA_LDB_MODULESDIR%%/rootdse.so
+%%SAMBA_LDB_MODULESDIR%%/samba3sam.so
+%%SAMBA_LDB_MODULESDIR%%/samba3sid.so
+%%SAMBA_LDB_MODULESDIR%%/samba_dsdb.so
+%%SAMBA_LDB_MODULESDIR%%/samba_secrets.so
+%%SAMBA_LDB_MODULESDIR%%/samldb.so
+%%SAMBA_LDB_MODULESDIR%%/sample.so
+%%SAMBA_LDB_MODULESDIR%%/schema_data.so
+%%SAMBA_LDB_MODULESDIR%%/schema_load.so
+%%SAMBA_LDB_MODULESDIR%%/secrets_tdb_sync.so
+%%SAMBA_LDB_MODULESDIR%%/server_sort.so
+%%SAMBA_LDB_MODULESDIR%%/show_deleted.so
+%%SAMBA_LDB_MODULESDIR%%/skel.so
+%%SAMBA_LDB_MODULESDIR%%/subtree_delete.so
+%%SAMBA_LDB_MODULESDIR%%/subtree_rename.so
+%%SAMBA_LDB_MODULESDIR%%/tdb.so
+%%SAMBA_LDB_MODULESDIR%%/tombstone_reanimate.so
+%%SAMBA_LDB_MODULESDIR%%/unique_object_sids.so
+%%SAMBA_LDB_MODULESDIR%%/update_keytab.so
+%%SAMBA_LDB_MODULESDIR%%/vlv.so
+%%SAMBA_LDB_MODULESDIR%%/wins_ldb.so
 %%SAMBA4_MODULEDIR%%/process_model/prefork.so
 %%SAMBA4_MODULEDIR%%/process_model/standard.so
 %%SAMBA4_MODULEDIR%%/service/cldap.so
@@ -170,6 +184,7 @@ sbin/samba_upgradedns
 %%DATADIR%%/setup/share.ldif
 %%DATADIR%%/setup/spn_update_list
 %%DATADIR%%/setup/ypServ30.ldif
+%%PKGCONFIGDIR%%/dcerpc_server.pc
 @dir %%DATADIR%%/setup/display-specifiers
 @dir %%DATADIR%%/setup/ad-schema
 @dir %%DATADIR%%/setup