Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 24 Oct 2025 00:05:18 GMT
From:      Yasuhiro Kimura <yasu@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 008844e4f1cf - main - net/samba422: Fix plist error after commit 6c23ee846dd4
Message-ID:  <202510240005.59O05IFj084247@gitrepo.freebsd.org>
index | next in thread | raw e-mail 

The branch main has been updated by yasu:

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

commit 008844e4f1cf54e47ec978aa34c48cb3cd016c10
Author:     Yasuhiro Kimura <yasu@FreeBSD.org>
AuthorDate: 2025-10-24 00:02:25 +0000
Commit:     Yasuhiro Kimura <yasu@FreeBSD.org>
CommitDate: 2025-10-24 00:02:25 +0000

    net/samba422: Fix plist error after commit 6c23ee846dd4
    
    After commit 6c23ee846dd4 plist error happens with default options
    setting as below.
    
    ====> Checking for pkg-plist issues (check-plist)
    ===> Parsing plist
    ===> Checking for items in STAGEDIR missing from pkg-plist
    ===> Checking for items in pkg-plist which are not in STAGEDIR
    Error: Missing: lib/samba4/modules/ldb/ldap.so
    ===> Error: Plist issues found.
    *** Error code 1
    
    Stop.
    make: stopped in /usr/ports/net/samba422
    
    While here, use %%SAMBA4_MODULEDIR%% for path of
    lib/samba4/modules/ldb/ldap.so and sort plist.
    
    Fixes:  6c23ee846dd4 net/samba422: Fix plist when AD_DC and LDAP are OFF
---
 net/samba422/pkg-plist       | 2 +-
 net/samba422/pkg-plist.ad_dc | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/net/samba422/pkg-plist b/net/samba422/pkg-plist
index 30ae8b71cba8..4775db591612 100644
--- a/net/samba422/pkg-plist
+++ b/net/samba422/pkg-plist
@@ -184,7 +184,6 @@ include/samba4/wbclient.h
 lib/nss_winbind.so.1
 lib/nss_wins.so.1
 lib/pam_winbind.so
-%%AD_DC%%%%LDAP%%lib/samba4/modules/ldb/ldap.so
 %%CUPS%%libexec/samba/smbspool_krb5_wrapper
 libexec/samba/rpcd_classic
 libexec/samba/rpcd_epmapper
@@ -450,6 +449,7 @@ bin/ldbsearch
 %%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/count_attrs.so
 %%SAMBA4_MODULEDIR%%/ldb/asq.so
 %%SAMBA4_MODULEDIR%%/ldb/ildap.so
+%%LDAP%%%%SAMBA4_MODULEDIR%%/ldb/ldap.so
 %%SAMBA4_MODULEDIR%%/ldb/ldb.so
 %%SAMBA4_MODULEDIR%%/ldb/ldbsamba_extensions.so
 %%SAMBA4_MODULEDIR%%/ldb/paged_searches.so
diff --git a/net/samba422/pkg-plist.ad_dc b/net/samba422/pkg-plist.ad_dc
index 80c90955bc09..52533f83aa75 100644
--- a/net/samba422/pkg-plist.ad_dc
+++ b/net/samba422/pkg-plist.ad_dc
@@ -38,7 +38,6 @@ sbin/samba_upgradedns
 %%SAMBA4_MODULEDIR%%/ldb/group_audit_log.so
 %%SAMBA4_MODULEDIR%%/ldb/instancetype.so
 %%SAMBA4_MODULEDIR%%/ldb/lazy_commit.so
-%%SAMBA4_MODULEDIR%%/ldb/ldap.so
 %%SAMBA4_MODULEDIR%%/ldb/linked_attributes.so
 %%SAMBA4_MODULEDIR%%/ldb/new_partition.so
 %%SAMBA4_MODULEDIR%%/ldb/objectclass_attrs.so
help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202510240005.59O05IFj084247>