CVS commit: pkgsrc/net/samba4

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/net/samba4
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Thu, 24 Oct 2024 17:23:43 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Oct 24 17:23:43 UTC 2024

Modified Files:
        pkgsrc/net/samba4: Makefile PLIST buildlink3.mk distinfo options.mk
        pkgsrc/net/samba4/patches: patch-source4_scripting_wscript__build

Log Message:
samba4: updated to 4.21.1

Changes since 4.21.0

o  Ralph Boehme <slow%samba.org@localhost>
   * BUG 15624: DH reconnect error handling can lead to stale sharemode entries.
   * BUG 15695: "inherit permissions = yes" triggers assert() in vfs_default
     when creating a stream.

o  Alexander Bokovoy <ab%samba.org@localhost>
   * BUG 15715: Samba 4.21.0 broke FreeIPA domain member integration.

o  Andréas Leroux <aleroux%tranquil.it@localhost>
   * BUG 15692: Missing conversion for msDS-UserTGTLifetime, msDS-
     ComputerTGTLifetime and msDS-ServiceTGTLifetime on "samba-tool
     domain auth policy modify".

o  Stefan Metzmacher <metze%samba.org@localhost>
   * BUG 15280: irpc_destructor may crash during shutdown.
   * BUG 15624: DH reconnect error handling can lead to stale sharemode entries.
   * BUG 15649: Durable handle is not granted when a previous OPEN exists with
     NoOplock.
   * BUG 15651: Durable handle is granted but reconnect fails.
   * BUG 15708: Disconnected durable handles with RH lease should not be purged
     by a new non conflicting open.
   * BUG 15714: net ads testjoin and other commands use the wrong secrets.tdb in
     a cluster.
   * BUG 15726: 4.21 using --with-system-mitkrb5 requires MIT krb5 1.16 as rfc
     8009 etypes are used.

o  Christof Schmitt <cs%samba.org@localhost>
   * BUG 15730: VFS_OPEN_HOW_WITH_BACKUP_INTENT breaks shadow_copy2.

o  Andreas Schneider <asn%samba.org@localhost>
   * BUG 15643: Samba 4.20.0 DLZ module crashes BIND on startup.
   * BUG 15721: Cannot build libldb lmdb backend on a build without AD DC.

o  Jones Syue <jonessyue%qnap.com@localhost>
   * BUG 15706: Consistent log level for sighup handler.

4.21.0
https://www.samba.org/samba/history/samba-4.21.0.html


To generate a diff of this commit:
cvs rdiff -u -r1.187 -r1.188 pkgsrc/net/samba4/Makefile
cvs rdiff -u -r1.57 -r1.58 pkgsrc/net/samba4/PLIST
cvs rdiff -u -r1.20 -r1.21 pkgsrc/net/samba4/buildlink3.mk
cvs rdiff -u -r1.108 -r1.109 pkgsrc/net/samba4/distinfo
cvs rdiff -u -r1.19 -r1.20 pkgsrc/net/samba4/options.mk
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/net/samba4/patches/patch-source4_scripting_wscript__build

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/samba4/Makefile
diff -u pkgsrc/net/samba4/Makefile:1.187 pkgsrc/net/samba4/Makefile:1.188
--- pkgsrc/net/samba4/Makefile:1.187    Sat Sep 21 09:16:21 2024
+++ pkgsrc/net/samba4/Makefile  Thu Oct 24 17:23:43 2024
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.187 2024/09/21 09:16:21 wiz Exp $
+# $NetBSD: Makefile,v 1.188 2024/10/24 17:23:43 adam Exp $
 
-DISTNAME=      samba-4.20.5
+DISTNAME=      samba-4.21.1
 CATEGORIES=    net
 MASTER_SITES=  https://download.samba.org/pub/samba/stable/
 
@@ -11,8 +11,6 @@ LICENSE=      gnu-gpl-v3
 
 CONFLICTS+=    ja-samba-[0-9]* winbind-[0-9]*
 
-PYTHON_VERSIONS_INCOMPATIBLE=  27
-
 GCC_REQD+=     4.4
 TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
 TOOL_DEPENDS+= docbook-xml-[0-9]*:../../textproc/docbook-xml
@@ -207,9 +205,8 @@ REPLACE_PYTHON+=    source4/scripting/bin/*
 .endif
 .include "../../archivers/libarchive/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
-BUILDLINK_API_DEPENDS.ldb+=    ldb>=2.9.1
-.include "../../databases/ldb/buildlink3.mk"
 .include "../../databases/lmdb/buildlink3.mk"
+.include "../../databases/tdb/buildlink3.mk"
 .include "../../devel/cmocka/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
@@ -218,8 +215,8 @@ BUILDLINK_API_DEPENDS.talloc+=      talloc>=2
 .include "../../devel/talloc/buildlink3.mk"
 .include "../../devel/tevent/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../lang/python/batteries-included.mk"
 .include "../../lang/python/application.mk"
+.include "../../lang/python/batteries-included.mk"
 .include "../../lang/python/extension.mk"
 .include "../../security/gnutls/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"

Index: pkgsrc/net/samba4/PLIST
diff -u pkgsrc/net/samba4/PLIST:1.57 pkgsrc/net/samba4/PLIST:1.58
--- pkgsrc/net/samba4/PLIST:1.57        Thu Jun 27 09:50:27 2024
+++ pkgsrc/net/samba4/PLIST     Thu Oct 24 17:23:43 2024
@@ -1,8 +1,14 @@
-@comment $NetBSD: PLIST,v 1.57 2024/06/27 09:50:27 adam Exp $
+@comment $NetBSD: PLIST,v 1.58 2024/10/24 17:23:43 adam Exp $
 bin/cifsdd
 bin/dbwrap_tool
 bin/dumpmscat
 bin/gentest
+bin/ldbadd
+bin/ldbdel
+bin/ldbedit
+bin/ldbmodify
+bin/ldbrename
+bin/ldbsearch
 bin/locktest
 bin/masktest
 bin/mdsearch
@@ -44,9 +50,6 @@ include/core/ntstatus.h
 include/core/ntstatus_gen.h
 include/core/werror.h
 include/core/werror_gen.h
-include/credentials.h
-include/dcerpc.h
-${PLIST.ads}include/dcerpc_server.h
 include/dcesrv_core.h
 include/domain_credentials.h
 include/gen_ndr/atsvc.h
@@ -67,7 +70,6 @@ include/gen_ndr/ndr_krb5pac.h
 include/gen_ndr/ndr_misc.h
 include/gen_ndr/ndr_nbt.h
 include/gen_ndr/ndr_samr.h
-include/gen_ndr/ndr_samr_c.h
 include/gen_ndr/ndr_svcctl.h
 include/gen_ndr/ndr_svcctl_c.h
 include/gen_ndr/netlogon.h
@@ -87,9 +89,7 @@ include/ndr/ndr_krb5pac.h
 include/ndr/ndr_nbt.h
 include/ndr/ndr_svcctl.h
 include/netapi.h
-include/param.h
 include/passdb.h
-include/policy.h
 include/rpc_common.h
 include/samba/session.h
 include/samba/version.h
@@ -113,9 +113,6 @@ include/util/idtree.h
 include/util/idtree_random.h
 include/util/signal.h
 include/util/substitute.h
-include/util/tevent_ntstatus.h
-include/util/tevent_unix.h
-include/util/tevent_werror.h
 include/util/tfork.h
 include/util/time.h
 include/util_ldb.h
@@ -123,18 +120,9 @@ include/wbclient.h
 lib/libdcerpc-binding.so
 lib/libdcerpc-binding.so.0
 lib/libdcerpc-binding.so.0.0.1
-lib/libdcerpc-samr.so
-lib/libdcerpc-samr.so.0
-lib/libdcerpc-samr.so.0.0.1
 lib/libdcerpc-server-core.so
 lib/libdcerpc-server-core.so.0
 lib/libdcerpc-server-core.so.0.0.1
-${PLIST.ads}lib/libdcerpc-server.so
-${PLIST.ads}lib/libdcerpc-server.so.0
-${PLIST.ads}lib/libdcerpc-server.so.0.0.1
-lib/libdcerpc.so
-lib/libdcerpc.so.0
-lib/libdcerpc.so.0.0.1
 lib/libndr-krb5pac.so
 lib/libndr-krb5pac.so.0
 lib/libndr-krb5pac.so.0.0.1
@@ -145,33 +133,21 @@ lib/libndr-standard.so
 lib/libndr-standard.so.0
 lib/libndr-standard.so.0.0.1
 lib/libndr.so
-lib/libndr.so.4
-lib/libndr.so.4.0.0
+lib/libndr.so.5
+lib/libndr.so.5.0.0
 lib/libnetapi.so
 lib/libnetapi.so.1
 lib/libnetapi.so.1.0.0
 lib/libnss_winbind.so
-lib/libsamba-credentials.so
-lib/libsamba-credentials.so.1
-lib/libsamba-credentials.so.1.0.0
 lib/libsamba-errors.so
 lib/libsamba-errors.so.1
 lib/libsamba-errors.so.1.0.0
-lib/libsamba-hostconfig.so
-lib/libsamba-hostconfig.so.0
-lib/libsamba-hostconfig.so.0.0.1
 lib/libsamba-passdb.so
 lib/libsamba-passdb.so.0
-lib/libsamba-passdb.so.0.28.0
-lib/libsamba-policy.so
-lib/libsamba-policy.so.0
-lib/libsamba-policy.so.0.0.1
+lib/libsamba-passdb.so.0.29.0
 lib/libsamba-util.so
 lib/libsamba-util.so.0
 lib/libsamba-util.so.0.0.1
-lib/libsamdb.so
-lib/libsamdb.so.0
-lib/libsamdb.so.0.0.1
 lib/libsmbclient.so
 lib/libsmbclient.so.0
 lib/libsmbclient.so.0.8.0
@@ -181,27 +157,19 @@ lib/libsmbconf.so.0.0.1
 ${PLIST.ldap}lib/libsmbldap.so
 ${PLIST.ldap}lib/libsmbldap.so.2
 ${PLIST.ldap}lib/libsmbldap.so.2.1.0
-lib/libtevent-util.so
-lib/libtevent-util.so.0
-lib/libtevent-util.so.0.0.1
 lib/libwbclient.so
 lib/libwbclient.so.0
 lib/libwbclient.so.0.16
-lib/pkgconfig/dcerpc.pc
-lib/pkgconfig/dcerpc_samr.pc
-${PLIST.ads}lib/pkgconfig/dcerpc_server.pc
 lib/pkgconfig/ndr.pc
 lib/pkgconfig/ndr_krb5pac.pc
 lib/pkgconfig/ndr_nbt.pc
 lib/pkgconfig/ndr_standard.pc
 lib/pkgconfig/netapi.pc
-lib/pkgconfig/samba-credentials.pc
-lib/pkgconfig/samba-hostconfig.pc
-lib/pkgconfig/samba-policy.pc
 lib/pkgconfig/samba-util.pc
-lib/pkgconfig/samdb.pc
 lib/pkgconfig/smbclient.pc
 lib/pkgconfig/wbclient.pc
+${PYSITELIB}/_ldb_text.py
+${PYSITELIB}/ldb.so
 ${PYSITELIB}/samba/__init__.py
 ${PYSITELIB}/samba/_glue.so
 ${PYSITELIB}/samba/_ldb.so
@@ -265,6 +233,29 @@ ${PLIST.ads}${PYSITELIB}/samba/dckeytab.
 ${PYSITELIB}/samba/descriptor.py
 ${PYSITELIB}/samba/dnsresolver.py
 ${PYSITELIB}/samba/dnsserver.py
+${PYSITELIB}/samba/domain/__init__.py
+${PYSITELIB}/samba/domain/models/__init__.py
+${PYSITELIB}/samba/domain/models/auth_policy.py
+${PYSITELIB}/samba/domain/models/auth_silo.py
+${PYSITELIB}/samba/domain/models/claim_type.py
+${PYSITELIB}/samba/domain/models/computer.py
+${PYSITELIB}/samba/domain/models/constants.py
+${PYSITELIB}/samba/domain/models/container.py
+${PYSITELIB}/samba/domain/models/exceptions.py
+${PYSITELIB}/samba/domain/models/fields.py
+${PYSITELIB}/samba/domain/models/gmsa.py
+${PYSITELIB}/samba/domain/models/group.py
+${PYSITELIB}/samba/domain/models/model.py
+${PYSITELIB}/samba/domain/models/org.py
+${PYSITELIB}/samba/domain/models/person.py
+${PYSITELIB}/samba/domain/models/query.py
+${PYSITELIB}/samba/domain/models/registry.py
+${PYSITELIB}/samba/domain/models/schema.py
+${PYSITELIB}/samba/domain/models/site.py
+${PYSITELIB}/samba/domain/models/subnet.py
+${PYSITELIB}/samba/domain/models/types.py
+${PYSITELIB}/samba/domain/models/user.py
+${PYSITELIB}/samba/domain/models/value_type.py
 ${PYSITELIB}/samba/domain_update.py
 ${PYSITELIB}/samba/drs_utils.py
 ${PYSITELIB}/samba/dsdb.so
@@ -321,6 +312,7 @@ ${PYSITELIB}/samba/kcc/graph_utils.py
 ${PYSITELIB}/samba/kcc/kcc_utils.py
 ${PYSITELIB}/samba/kcc/ldif_import_export.py
 ${PYSITELIB}/samba/logger.py
+${PYSITELIB}/samba/lsa_utils.py
 ${PYSITELIB}/samba/mdb_util.py
 ${PYSITELIB}/samba/messaging.so
 ${PYSITELIB}/samba/ms_display_specifiers.py
@@ -340,9 +332,16 @@ ${PYSITELIB}/samba/netcmd/delegation.py
 ${PYSITELIB}/samba/netcmd/dns.py
 ${PYSITELIB}/samba/netcmd/domain/__init__.py
 ${PYSITELIB}/samba/netcmd/domain/auth/__init__.py
-${PYSITELIB}/samba/netcmd/domain/auth/policy.py
-${PYSITELIB}/samba/netcmd/domain/auth/silo.py
-${PYSITELIB}/samba/netcmd/domain/auth/silo_member.py
+${PYSITELIB}/samba/netcmd/domain/auth/policy/__init__.py
+${PYSITELIB}/samba/netcmd/domain/auth/policy/computer_allowed_to_authenticate_to.py
+${PYSITELIB}/samba/netcmd/domain/auth/policy/policy.py
+${PYSITELIB}/samba/netcmd/domain/auth/policy/service_allowed_to_authenticate_from.py
+${PYSITELIB}/samba/netcmd/domain/auth/policy/service_allowed_to_authenticate_to.py
+${PYSITELIB}/samba/netcmd/domain/auth/policy/user_allowed_to_authenticate_from.py
+${PYSITELIB}/samba/netcmd/domain/auth/policy/user_allowed_to_authenticate_to.py
+${PYSITELIB}/samba/netcmd/domain/auth/silo/__init__.py
+${PYSITELIB}/samba/netcmd/domain/auth/silo/member.py
+${PYSITELIB}/samba/netcmd/domain/auth/silo/silo.py
 ${PYSITELIB}/samba/netcmd/domain/backup.py
 ${PYSITELIB}/samba/netcmd/domain/claim/__init__.py
 ${PYSITELIB}/samba/netcmd/domain/claim/claim_type.py
@@ -354,23 +353,11 @@ ${PYSITELIB}/samba/netcmd/domain/demote.
 ${PYSITELIB}/samba/netcmd/domain/functional_prep.py
 ${PYSITELIB}/samba/netcmd/domain/info.py
 ${PYSITELIB}/samba/netcmd/domain/join.py
+${PYSITELIB}/samba/netcmd/domain/kds/__init__.py
+${PYSITELIB}/samba/netcmd/domain/kds/root_key.py
 ${PYSITELIB}/samba/netcmd/domain/keytab.py
 ${PYSITELIB}/samba/netcmd/domain/leave.py
 ${PYSITELIB}/samba/netcmd/domain/level.py
-${PYSITELIB}/samba/netcmd/domain/models/__init__.py
-${PYSITELIB}/samba/netcmd/domain/models/auth_policy.py
-${PYSITELIB}/samba/netcmd/domain/models/auth_silo.py
-${PYSITELIB}/samba/netcmd/domain/models/claim_type.py
-${PYSITELIB}/samba/netcmd/domain/models/exceptions.py
-${PYSITELIB}/samba/netcmd/domain/models/fields.py
-${PYSITELIB}/samba/netcmd/domain/models/group.py
-${PYSITELIB}/samba/netcmd/domain/models/model.py
-${PYSITELIB}/samba/netcmd/domain/models/query.py
-${PYSITELIB}/samba/netcmd/domain/models/schema.py
-${PYSITELIB}/samba/netcmd/domain/models/site.py
-${PYSITELIB}/samba/netcmd/domain/models/subnet.py
-${PYSITELIB}/samba/netcmd/domain/models/user.py
-${PYSITELIB}/samba/netcmd/domain/models/value_type.py
 ${PYSITELIB}/samba/netcmd/domain/passwordsettings.py
 ${PYSITELIB}/samba/netcmd/domain/provision.py
 ${PYSITELIB}/samba/netcmd/domain/samba3upgrade.py
@@ -394,6 +381,9 @@ ${PYSITELIB}/samba/netcmd/processes.py
 ${PYSITELIB}/samba/netcmd/pso.py
 ${PYSITELIB}/samba/netcmd/rodc.py
 ${PYSITELIB}/samba/netcmd/schema.py
+${PYSITELIB}/samba/netcmd/service_account/__init__.py
+${PYSITELIB}/samba/netcmd/service_account/group_msa_membership.py
+${PYSITELIB}/samba/netcmd/service_account/service_account.py
 ${PYSITELIB}/samba/netcmd/shell.py
 ${PYSITELIB}/samba/netcmd/sites.py
 ${PYSITELIB}/samba/netcmd/spn.py
@@ -479,6 +469,7 @@ ${PYSITELIB}/samba/tests/blackbox/bug136
 ${PYSITELIB}/samba/tests/blackbox/check_output.py
 ${PYSITELIB}/samba/tests/blackbox/claims.py
 ${PYSITELIB}/samba/tests/blackbox/downgradedatabase.py
+${PYSITELIB}/samba/tests/blackbox/gmsa.py
 ${PYSITELIB}/samba/tests/blackbox/http_chunk.py
 ${PYSITELIB}/samba/tests/blackbox/http_content.py
 ${PYSITELIB}/samba/tests/blackbox/mdsearch.py
@@ -511,10 +502,10 @@ ${PYSITELIB}/samba/tests/dcerpc/__init__
 ${PYSITELIB}/samba/tests/dcerpc/array.py
 ${PYSITELIB}/samba/tests/dcerpc/bare.py
 ${PYSITELIB}/samba/tests/dcerpc/binding.py
-${PYSITELIB}/samba/tests/dcerpc/createtrustrelax.py
 ${PYSITELIB}/samba/tests/dcerpc/dnsserver.py
 ${PYSITELIB}/samba/tests/dcerpc/integer.py
 ${PYSITELIB}/samba/tests/dcerpc/lsa.py
+${PYSITELIB}/samba/tests/dcerpc/lsa_utils.py
 ${PYSITELIB}/samba/tests/dcerpc/mdssvc.py
 ${PYSITELIB}/samba/tests/dcerpc/misc.py
 ${PYSITELIB}/samba/tests/dcerpc/raw_protocol.py
@@ -545,6 +536,8 @@ ${PYSITELIB}/samba/tests/dsdb.py
 ${PYSITELIB}/samba/tests/dsdb_api.py
 ${PYSITELIB}/samba/tests/dsdb_dns.py
 ${PYSITELIB}/samba/tests/dsdb_lock.py
+${PYSITELIB}/samba/tests/dsdb_quiet_env_tests.py
+${PYSITELIB}/samba/tests/dsdb_quiet_provision_tests.py
 ${PYSITELIB}/samba/tests/dsdb_schema_attributes.py
 ${PYSITELIB}/samba/tests/emulate/__init__.py
 ${PYSITELIB}/samba/tests/emulate/traffic.py
@@ -579,6 +572,7 @@ ${PYSITELIB}/samba/tests/krb5/device_tes
 ${PYSITELIB}/samba/tests/krb5/etype_tests.py
 ${PYSITELIB}/samba/tests/krb5/fast_tests.py
 ${PYSITELIB}/samba/tests/krb5/gkdi_tests.py
+${PYSITELIB}/samba/tests/krb5/gmsa_tests.py
 ${PYSITELIB}/samba/tests/krb5/group_tests.py
 ${PYSITELIB}/samba/tests/krb5/kcrypto.py
 ${PYSITELIB}/samba/tests/krb5/kdc_base_test.py
@@ -673,6 +667,7 @@ ${PYSITELIB}/samba/tests/samba_tool/dnsc
 ${PYSITELIB}/samba/tests/samba_tool/domain_auth_policy.py
 ${PYSITELIB}/samba/tests/samba_tool/domain_auth_silo.py
 ${PYSITELIB}/samba/tests/samba_tool/domain_claim.py
+${PYSITELIB}/samba/tests/samba_tool/domain_kds_root_key.py
 ${PYSITELIB}/samba/tests/samba_tool/domain_models.py
 ${PYSITELIB}/samba/tests/samba_tool/drs_clone_dc_data_lmdb_size.py
 ${PYSITELIB}/samba/tests/samba_tool/dsacl.py
@@ -695,6 +690,7 @@ ${PYSITELIB}/samba/tests/samba_tool/prov
 ${PYSITELIB}/samba/tests/samba_tool/provision_userPassword_crypt.py
 ${PYSITELIB}/samba/tests/samba_tool/rodc.py
 ${PYSITELIB}/samba/tests/samba_tool/schema.py
+${PYSITELIB}/samba/tests/samba_tool/service_account.py
 ${PYSITELIB}/samba/tests/samba_tool/silo_base.py
 ${PYSITELIB}/samba/tests/samba_tool/sites.py
 ${PYSITELIB}/samba/tests/samba_tool/timecmd.py
@@ -739,7 +735,6 @@ ${PYSITELIB}/samba/tests/upgradeprovisio
 ${PYSITELIB}/samba/tests/upgradeprovisionneeddc.py
 ${PYSITELIB}/samba/tests/usage.py
 ${PYSITELIB}/samba/tests/xattr.py
-${PYSITELIB}/samba/trust_utils.py
 ${PYSITELIB}/samba/upgrade.py
 ${PYSITELIB}/samba/upgradehelpers.py
 ${PYSITELIB}/samba/uptodateness.py
@@ -765,6 +760,7 @@ lib/samba/krb5/winbind_krb5_locator.${SO
 ${PLIST.ads}lib/samba/ldb/acl.${SOEXT}
 ${PLIST.ads}lib/samba/ldb/aclread.${SOEXT}
 ${PLIST.ads}lib/samba/ldb/anr.${SOEXT}
+${PLIST.ads}lib/samba/ldb/asq.${SOEXT}
 ${PLIST.ads}lib/samba/ldb/audit_log.${SOEXT}
 ${PLIST.ads}lib/samba/ldb/count_attrs.${SOEXT}
 ${PLIST.ads}lib/samba/ldb/descriptor.${SOEXT}
@@ -776,20 +772,25 @@ ${PLIST.ads}lib/samba/ldb/extended_dn_in
 ${PLIST.ads}lib/samba/ldb/extended_dn_out.${SOEXT}
 ${PLIST.ads}lib/samba/ldb/extended_dn_store.${SOEXT}
 ${PLIST.ads}lib/samba/ldb/group_audit_log.${SOEXT}
-lib/samba/ldb/ildap.${SOEXT}
+${PLIST.ads}lib/samba/ldb/ildap.${SOEXT}
 ${PLIST.ads}lib/samba/ldb/instancetype.${SOEXT}
 ${PLIST.ads}lib/samba/ldb/lazy_commit.${SOEXT}
-lib/samba/ldb/ldbsamba_extensions.${SOEXT}
+${PLIST.ads}lib/samba/ldb/ldap.${SOEXT}
+${PLIST.ads}lib/samba/ldb/ldb.${SOEXT}
+${PLIST.ads}lib/samba/ldb/ldbsamba_extensions.${SOEXT}
 ${PLIST.ads}lib/samba/ldb/linked_attributes.${SOEXT}
+${PLIST.ads}lib/samba/ldb/mdb.${SOEXT}
 ${PLIST.ads}lib/samba/ldb/new_partition.${SOEXT}
 ${PLIST.ads}lib/samba/ldb/objectclass.${SOEXT}
 ${PLIST.ads}lib/samba/ldb/objectclass_attrs.${SOEXT}
 ${PLIST.ads}lib/samba/ldb/objectguid.${SOEXT}
 ${PLIST.ads}lib/samba/ldb/operational.${SOEXT}
 ${PLIST.ads}lib/samba/ldb/paged_results.${SOEXT}
+${PLIST.ads}lib/samba/ldb/paged_searches.${SOEXT}
 ${PLIST.ads}lib/samba/ldb/partition.${SOEXT}
 ${PLIST.ads}lib/samba/ldb/password_hash.${SOEXT}
 ${PLIST.ads}lib/samba/ldb/ranged_results.${SOEXT}
+${PLIST.ads}lib/samba/ldb/rdn_name.${SOEXT}
 ${PLIST.ads}lib/samba/ldb/repl_meta_data.${SOEXT}
 ${PLIST.ads}lib/samba/ldb/resolve_oids.${SOEXT}
 ${PLIST.ads}lib/samba/ldb/rootdse.${SOEXT}
@@ -798,18 +799,22 @@ ${PLIST.ads}lib/samba/ldb/samba3sid.${SO
 ${PLIST.ads}lib/samba/ldb/samba_dsdb.${SOEXT}
 ${PLIST.ads}lib/samba/ldb/samba_secrets.${SOEXT}
 ${PLIST.ads}lib/samba/ldb/samldb.${SOEXT}
+${PLIST.ads}lib/samba/ldb/sample.${SOEXT}
 ${PLIST.ads}lib/samba/ldb/schema_data.${SOEXT}
 ${PLIST.ads}lib/samba/ldb/schema_load.${SOEXT}
 ${PLIST.ads}lib/samba/ldb/secrets_tdb_sync.${SOEXT}
+${PLIST.ads}lib/samba/ldb/server_sort.${SOEXT}
 ${PLIST.ads}lib/samba/ldb/show_deleted.${SOEXT}
+${PLIST.ads}lib/samba/ldb/skel.${SOEXT}
 ${PLIST.ads}lib/samba/ldb/subtree_delete.${SOEXT}
 ${PLIST.ads}lib/samba/ldb/subtree_rename.${SOEXT}
+${PLIST.ads}lib/samba/ldb/tdb.${SOEXT}
 ${PLIST.ads}lib/samba/ldb/tombstone_reanimate.${SOEXT}
 ${PLIST.ads}lib/samba/ldb/unique_object_sids.${SOEXT}
 ${PLIST.ads}lib/samba/ldb/update_keytab.${SOEXT}
 ${PLIST.ads}lib/samba/ldb/vlv.${SOEXT}
 ${PLIST.ads}lib/samba/ldb/wins_ldb.${SOEXT}
-lib/samba/nss_info/hash.${SOEXT}
+${PLIST.ads}lib/samba/nss_info/hash.${SOEXT}
 ${PLIST.ads}lib/samba/nss_info/rfc2307.${SOEXT}
 ${PLIST.ads}lib/samba/nss_info/sfu.${SOEXT}
 ${PLIST.ads}lib/samba/nss_info/sfu20.${SOEXT}
@@ -847,8 +852,11 @@ lib/samba/private/libcommon-auth-private
 lib/samba/private/libdb-glue-private-samba.so
 lib/samba/private/libdbwrap-private-samba.so
 lib/samba/private/libdcerpc-pkt-auth-private-samba.so
+lib/samba/private/libdcerpc-private-samba.so
 lib/samba/private/libdcerpc-samba-private-samba.so
 lib/samba/private/libdcerpc-samba4-private-samba.so
+lib/samba/private/libdcerpc-samr-private-samba.so
+lib/samba/private/libdcerpc-server-private-samba.so
 lib/samba/private/libdfs-server-ad-private-samba.so
 lib/samba/private/libdlz-bind9-for-torture-private-samba.so
 lib/samba/private/libdnsserver-common-private-samba.so
@@ -875,6 +883,12 @@ lib/samba/private/libiov-buf-private-sam
 lib/samba/private/libkdc-private-samba.so
 lib/samba/private/libkrb5-private-samba.so
 lib/samba/private/libkrb5samba-private-samba.so
+lib/samba/private/libldb-cmdline-private-samba.so
+lib/samba/private/libldb-key-value-private-samba.so
+lib/samba/private/libldb-mdb-int-private-samba.so
+lib/samba/private/libldb-private-samba.so
+lib/samba/private/libldb-tdb-err-map-private-samba.so
+lib/samba/private/libldb-tdb-int-private-samba.so
 lib/samba/private/libldbsamba-private-samba.so
 lib/samba/private/liblibcli-lsa3-private-samba.so
 lib/samba/private/liblibcli-netlogon3-private-samba.so
@@ -895,18 +909,24 @@ lib/samba/private/libposix-eadb-private-
 lib/samba/private/libprinter-driver-private-samba.so
 lib/samba/private/libprinting-migrate-private-samba.so
 lib/samba/private/libprocess-model-private-samba.so
+lib/samba/private/libpyldb-util-private-samba.so
 lib/samba/private/libregistry-private-samba.so
 lib/samba/private/libreplace-private-samba.so
 lib/samba/private/libroken-private-samba.so
 lib/samba/private/libsamba-cluster-support-private-samba.so
+lib/samba/private/libsamba-credentials-private-samba.so
 lib/samba/private/libsamba-debug-private-samba.so
+lib/samba/private/libsamba-hostconfig-private-samba.so
 lib/samba/private/libsamba-modules-private-samba.so
+lib/samba/private/libsamba-net-join-private-samba.so
 lib/samba/private/libsamba-net-private-samba.so
+lib/samba/private/libsamba-policy-private-samba.so
 lib/samba/private/libsamba-python-private-samba.so
 lib/samba/private/libsamba-security-private-samba.so
 lib/samba/private/libsamba-sockets-private-samba.so
 lib/samba/private/libsamba3-util-private-samba.so
 lib/samba/private/libsamdb-common-private-samba.so
+lib/samba/private/libsamdb-private-samba.so
 lib/samba/private/libscavenge-dns-records-private-samba.so
 lib/samba/private/libsecrets3-private-samba.so
 lib/samba/private/libserver-id-db-private-samba.so
@@ -925,9 +945,9 @@ lib/samba/private/libsys-rw-private-samb
 lib/samba/private/libtalloc-report-printf-private-samba.so
 lib/samba/private/libtalloc-report-private-samba.so
 lib/samba/private/libtdb-wrap-private-samba.so
+lib/samba/private/libtevent-util-private-samba.so
 lib/samba/private/libtime-basic-private-samba.so
 lib/samba/private/libtorture-private-samba.so
-lib/samba/private/libtrusts-util-private-samba.so
 lib/samba/private/libutil-reg-private-samba.so
 lib/samba/private/libutil-setid-private-samba.so
 lib/samba/private/libutil-tdb-private-samba.so
@@ -998,6 +1018,12 @@ libexec/samba/samba-dcerpcd
 ${PLIST.cups}libexec/samba/smbspool_krb5_wrapper
 man/man1/dbwrap_tool.1
 man/man1/gentest.1
+man/man1/ldbadd.1
+man/man1/ldbdel.1
+man/man1/ldbedit.1
+man/man1/ldbmodify.1
+man/man1/ldbrename.1
+man/man1/ldbsearch.1
 man/man1/locktest.1
 man/man1/log2pcap.1
 man/man1/masktest.1
@@ -1027,6 +1053,7 @@ man/man1/smbtree.1
 man/man1/testparm.1
 man/man1/wbinfo.1
 man/man1/wspsearch.1
+man/man3/ldb.3
 man/man5/lmhosts.5
 ${PLIST.pam}man/man5/pam_winbind.conf.5
 man/man5/smb.conf.5

Index: pkgsrc/net/samba4/buildlink3.mk
diff -u pkgsrc/net/samba4/buildlink3.mk:1.20 pkgsrc/net/samba4/buildlink3.mk:1.21
--- pkgsrc/net/samba4/buildlink3.mk:1.20        Thu May 16 06:15:24 2024
+++ pkgsrc/net/samba4/buildlink3.mk     Thu Oct 24 17:23:43 2024
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2024/05/16 06:15:24 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2024/10/24 17:23:43 adam Exp $
 
 BUILDLINK_TREE+=       samba
 
@@ -6,12 +6,12 @@ BUILDLINK_TREE+=      samba
 SAMBA_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.samba+=  samba>=4.9.4
-BUILDLINK_ABI_DEPENDS.samba+=  samba>=4.20.1nb1
+BUILDLINK_ABI_DEPENDS.samba+=  samba>=4.21.0
 BUILDLINK_PKGSRCDIR.samba?=    ../../net/samba4
 
 .include "../../archivers/libarchive/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
-.include "../../databases/ldb/buildlink3.mk"
+.include "../../databases/tdb/buildlink3.mk"
 .include "../../devel/cmocka/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"

Index: pkgsrc/net/samba4/distinfo
diff -u pkgsrc/net/samba4/distinfo:1.108 pkgsrc/net/samba4/distinfo:1.109
--- pkgsrc/net/samba4/distinfo:1.108    Sat Sep 21 09:16:21 2024
+++ pkgsrc/net/samba4/distinfo  Thu Oct 24 17:23:43 2024
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.108 2024/09/21 09:16:21 wiz Exp $
+$NetBSD: distinfo,v 1.109 2024/10/24 17:23:43 adam Exp $
 
-BLAKE2s (samba-4.20.5.tar.gz) = 82edce6198e7bca08c780fc038f07ac3779b2c23f5e71e97d1c1b874587054b1
-SHA512 (samba-4.20.5.tar.gz) = a666fc76dad2d9a68e802454555d2e93f7f71c2781ca5d11cf2fe8af046990b4be6677bbc754298613173849efb4387c16c2fd5557d65ba8b5a1ac02bd8c542a
-Size (samba-4.20.5.tar.gz) = 42503174 bytes
+BLAKE2s (samba-4.21.1.tar.gz) = a32aec50178ecc481ac128996dc1d311cba0ca785030dfd381f2548e2a412af7
+SHA512 (samba-4.21.1.tar.gz) = a3fb57d9dc72e7b924995cc59887535a75f4462d3afb68098321efeb15541e372071e3f8277006f9e792491e25a0f05127c2929fd2f22d9ee7dace3c13088cdb
+Size (samba-4.21.1.tar.gz) = 42635617 bytes
 SHA1 (patch-buildtools_wafsamba_samba__conftests.py) = d927db17124d2bb5b382885e70a41f84c3929926
 SHA1 (patch-buildtools_wafsamba_samba__install.py) = d801340617da325e3bb70a90350e45cc8e383c2d
 SHA1 (patch-buildtools_wafsamba_samba__pidl.py) = b9015694b80c0e6382d75c806fd6e0eb92e5f998
@@ -34,7 +34,7 @@ SHA1 (patch-source3_smbd_smb1__process.c
 SHA1 (patch-source3_utils_net__offlinejoin.c) = defb3ad930ba88ec040bda8899efd24e2a95f294
 SHA1 (patch-source4_auth_gensec_wscript__build) = 01f3cdf787833e05f2e0b49ff0af7c8bbad2c161
 SHA1 (patch-source4_dsdb_samdb_ldb__modules_wscript__build__server) = 47f55ec16b667a0a4d38de5ac89a117f2ac8f898
-SHA1 (patch-source4_scripting_wscript__build) = 816d44f48b6cbc6d999995e00eaea1d2dc477159
+SHA1 (patch-source4_scripting_wscript__build) = aac6894d49f5c17a28d26cb627be8cef1902bb1e
 SHA1 (patch-third__party_heimdal__build_roken.h) = 59d5523676fe8c0315e969247f26b4ea2f900402
 SHA1 (patch-third__party_heimdal_include_heim__threads.h) = 5ad13530cf9688e46f9ad487bb0fddab668c8276
 SHA1 (patch-third__party_heimdal_lib_hcrypto_evp.c) = 8e8e23198ef4afdc24a6930bd57aa5a898f1826f

Index: pkgsrc/net/samba4/options.mk
diff -u pkgsrc/net/samba4/options.mk:1.19 pkgsrc/net/samba4/options.mk:1.20
--- pkgsrc/net/samba4/options.mk:1.19   Sat Apr 29 08:01:06 2023
+++ pkgsrc/net/samba4/options.mk        Thu Oct 24 17:23:43 2024
@@ -1,8 +1,10 @@
-# $NetBSD: options.mk,v 1.19 2023/04/29 08:01:06 wiz Exp $
+# $NetBSD: options.mk,v 1.20 2024/10/24 17:23:43 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.samba4
-PKG_SUPPORTED_OPTIONS= ads avahi ldap pam winbind cups # cups option is broken for me.
-PKG_SUGGESTED_OPTIONS= avahi ldap pam winbind
+# As of 4.21.1, samba4 fails to build without "ads" and "ldap" options:
+# error: no member named 'ldap' in 'struct ads_struct'
+PKG_SUPPORTED_OPTIONS= avahi pam winbind cups # cups option is broken for me.
+PKG_SUGGESTED_OPTIONS= avahi pam winbind
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -11,9 +13,9 @@ SAMBA_ACL_OPSYS=      AIX Darwin FreeBSD HPUX
 PKG_SUPPORTED_OPTIONS+=        acl
 .endif
 
-.if !${MACHINE_PLATFORM:MDarwin-1[1-9].*}
-PKG_SUGGESTED_OPTIONS+=        ads
-.endif
+#.if !${MACHINE_PLATFORM:MDarwin-1[1-9].*}
+#PKG_SUGGESTED_OPTIONS+=       ads
+#.endif
 
 .if ${OPSYS} == "Linux"
 PKG_SUPPORTED_OPTIONS+=        snapper
@@ -36,13 +38,13 @@ CONFIGURE_ARGS+=    --without-acl-support
 ###
 ### Allow Samba to join as a member server of an Active Directory domain.
 ###
-.if !empty(PKG_OPTIONS:Mads)
-CONFIGURE_ARGS+=       --with-ads
+#.if !empty(PKG_OPTIONS:Mads)
+#CONFIGURE_ARGS+=      --with-ads
 PLIST.ads=             yes
-.else
-CONFIGURE_ARGS+=       --without-ads
-CONFIGURE_ARGS+=       --without-ad-dc
-.endif
+#.else
+#CONFIGURE_ARGS+=      --without-ads
+#CONFIGURE_ARGS+=      --without-ad-dc
+#.endif
 
 ###
 ### Native CUPS support for providing printing services.
@@ -60,13 +62,13 @@ CONFIGURE_ARGS+=    --disable-cups
 ### Support LDAP authentication and storage of Samba account information.
 ###
 # Active Directory requires ldap
-.if !empty(PKG_OPTIONS:Mldap) || !empty(PKG_OPTIONS:Mads)
-.  include "../../databases/openldap-client/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-ldap
+#.if !empty(PKG_OPTIONS:Mldap) || !empty(PKG_OPTIONS:Mads)
+.include "../../databases/openldap-client/buildlink3.mk"
+#CONFIGURE_ARGS+=      --with-ldap
 PLIST.ldap=            yes
-.else
-CONFIGURE_ARGS+=       --without-ldap
-.endif
+#.else
+#CONFIGURE_ARGS+=      --without-ldap
+#.endif
 
 ###
 ### Support PAM authentication and build smbpass and winbind PAM modules.

Index: pkgsrc/net/samba4/patches/patch-source4_scripting_wscript__build
diff -u pkgsrc/net/samba4/patches/patch-source4_scripting_wscript__build:1.1 pkgsrc/net/samba4/patches/patch-source4_scripting_wscript__build:1.2
--- pkgsrc/net/samba4/patches/patch-source4_scripting_wscript__build:1.1        Tue Oct 25 07:46:11 2022
+++ pkgsrc/net/samba4/patches/patch-source4_scripting_wscript__build    Thu Oct 24 17:23:43 2024
@@ -1,10 +1,10 @@
-$NetBSD: patch-source4_scripting_wscript__build,v 1.1 2022/10/25 07:46:11 wiz Exp $
+$NetBSD: patch-source4_scripting_wscript__build,v 1.2 2024/10/24 17:23:43 adam Exp $
 
 Avoid getting strange ending # character on interpreter 
 name like: 
 #!/usr/pkg/bin/python2.7#
 
---- source4/scripting/wscript_build.orig       2021-08-09 13:38:36.779384600 +0000
+--- source4/scripting/wscript_build.orig       2024-07-29 09:03:15.670633000 +0000
 +++ source4/scripting/wscript_build
 @@ -12,13 +12,13 @@ if not bld.env.disable_python:
  if sbin_files:
@@ -15,7 +15,7 @@ name like: 
      if 'XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']:
          bld.MANPAGES(man_files, True)
  
- if bld.CONFIG_SET('WITH_ADS'):
+ if bld.CONFIG_SET('HAVE_ADS'):
      bld.INSTALL_FILES('${BINDIR}',
                    'bin/samba-tool',
 -                  chmod=MODE_755, python_fixup=True, flat=True)

Prev by Date: CVS commit: pkgsrc/audio/cmus
Next by Date: CVS commit: pkgsrc/textproc/py-rapidfuzz
Previous by Thread: CVS commit: pkgsrc/audio/cmus
Next by Thread: CVS commit: pkgsrc/textproc/py-rapidfuzz
Indexes:

Home | Main Index | Thread Index | Old Index