diff --git a/config/rootfiles/packages/aarch64/samba b/config/rootfiles/packages/aarch64/samba
index 82ad93a90..cb7407504 100644
--- a/config/rootfiles/packages/aarch64/samba
+++ b/config/rootfiles/packages/aarch64/samba
@@ -57,8 +57,6 @@ usr/bin/wspsearch
 #usr/include/samba-4.0/core/ntstatus_gen.h
 #usr/include/samba-4.0/core/werror.h
 #usr/include/samba-4.0/core/werror_gen.h
-#usr/include/samba-4.0/credentials.h
-#usr/include/samba-4.0/dcerpc.h
 #usr/include/samba-4.0/dcesrv_core.h
 #usr/include/samba-4.0/domain_credentials.h
 #usr/include/samba-4.0/gen_ndr
@@ -80,7 +78,6 @@ usr/bin/wspsearch
 #usr/include/samba-4.0/gen_ndr/ndr_misc.h
 #usr/include/samba-4.0/gen_ndr/ndr_nbt.h
 #usr/include/samba-4.0/gen_ndr/ndr_samr.h
-#usr/include/samba-4.0/gen_ndr/ndr_samr_c.h
 #usr/include/samba-4.0/gen_ndr/ndr_svcctl.h
 #usr/include/samba-4.0/gen_ndr/ndr_svcctl_c.h
 #usr/include/samba-4.0/gen_ndr/netlogon.h
@@ -101,9 +98,7 @@ usr/bin/wspsearch
 #usr/include/samba-4.0/ndr/ndr_nbt.h
 #usr/include/samba-4.0/ndr/ndr_svcctl.h
 #usr/include/samba-4.0/netapi.h
-#usr/include/samba-4.0/param.h
 #usr/include/samba-4.0/passdb.h
-#usr/include/samba-4.0/policy.h
 #usr/include/samba-4.0/rpc_common.h
 #usr/include/samba-4.0/samba
 #usr/include/samba-4.0/samba/session.h
@@ -129,9 +124,6 @@ usr/bin/wspsearch
 #usr/include/samba-4.0/util/idtree_random.h
 #usr/include/samba-4.0/util/signal.h
 #usr/include/samba-4.0/util/substitute.h
-#usr/include/samba-4.0/util/tevent_ntstatus.h
-#usr/include/samba-4.0/util/tevent_unix.h
-#usr/include/samba-4.0/util/tevent_werror.h
 #usr/include/samba-4.0/util/tfork.h
 #usr/include/samba-4.0/util/time.h
 #usr/include/samba-4.0/util_ldb.h
@@ -139,15 +131,9 @@ usr/bin/wspsearch
 usr/lib/libdcerpc-binding.so
 usr/lib/libdcerpc-binding.so.0
 usr/lib/libdcerpc-binding.so.0.0.1
-usr/lib/libdcerpc-samr.so
-usr/lib/libdcerpc-samr.so.0
-usr/lib/libdcerpc-samr.so.0.0.1
 usr/lib/libdcerpc-server-core.so
 usr/lib/libdcerpc-server-core.so.0
 usr/lib/libdcerpc-server-core.so.0.0.1
-usr/lib/libdcerpc.so
-usr/lib/libdcerpc.so.0
-usr/lib/libdcerpc.so.0.0.1
 usr/lib/libndr-krb5pac.so
 usr/lib/libndr-krb5pac.so.0
 usr/lib/libndr-krb5pac.so.0.0.1
@@ -158,34 +144,22 @@ usr/lib/libndr-standard.so
 usr/lib/libndr-standard.so.0
 usr/lib/libndr-standard.so.0.0.1
 usr/lib/libndr.so
-usr/lib/libndr.so.4
-usr/lib/libndr.so.4.0.0
+usr/lib/libndr.so.5
+usr/lib/libndr.so.5.0.0
 usr/lib/libnetapi.so
 usr/lib/libnetapi.so.1
 usr/lib/libnetapi.so.1.0.0
 usr/lib/libnss_winbind.so.2
 usr/lib/libnss_wins.so.2
-usr/lib/libsamba-credentials.so
-usr/lib/libsamba-credentials.so.1
-usr/lib/libsamba-credentials.so.1.0.0
 usr/lib/libsamba-errors.so
 usr/lib/libsamba-errors.so.1
 usr/lib/libsamba-errors.so.1.0.0
-usr/lib/libsamba-hostconfig.so
-usr/lib/libsamba-hostconfig.so.0
-usr/lib/libsamba-hostconfig.so.0.0.1
 usr/lib/libsamba-passdb.so
 usr/lib/libsamba-passdb.so.0
-usr/lib/libsamba-passdb.so.0.28.0
-usr/lib/libsamba-policy.cpython-310-aarch64-linux-gnu.so
-usr/lib/libsamba-policy.cpython-310-aarch64-linux-gnu.so.0
-usr/lib/libsamba-policy.cpython-310-aarch64-linux-gnu.so.0.0.1
+usr/lib/libsamba-passdb.so.0.29.0
 usr/lib/libsamba-util.so
 usr/lib/libsamba-util.so.0
 usr/lib/libsamba-util.so.0.0.1
-usr/lib/libsamdb.so
-usr/lib/libsamdb.so.0
-usr/lib/libsamdb.so.0.0.1
 usr/lib/libsmbclient.so
 usr/lib/libsmbclient.so.0
 usr/lib/libsmbclient.so.0.8.0
@@ -195,24 +169,15 @@ usr/lib/libsmbconf.so.0.0.1
 usr/lib/libsmbldap.so
 usr/lib/libsmbldap.so.2
 usr/lib/libsmbldap.so.2.1.0
-usr/lib/libtevent-util.so
-usr/lib/libtevent-util.so.0
-usr/lib/libtevent-util.so.0.0.1
 usr/lib/libwbclient.so
 usr/lib/libwbclient.so.0
 usr/lib/libwbclient.so.0.16
-#usr/lib/pkgconfig/dcerpc.pc
-#usr/lib/pkgconfig/dcerpc_samr.pc
 #usr/lib/pkgconfig/ndr.pc
 #usr/lib/pkgconfig/ndr_krb5pac.pc
 #usr/lib/pkgconfig/ndr_nbt.pc
 #usr/lib/pkgconfig/ndr_standard.pc
 #usr/lib/pkgconfig/netapi.pc
-#usr/lib/pkgconfig/samba-credentials.pc
-#usr/lib/pkgconfig/samba-hostconfig.pc
-#usr/lib/pkgconfig/samba-policy.cpython-310-aarch64-linux-gnu.pc
 #usr/lib/pkgconfig/samba-util.pc
-#usr/lib/pkgconfig/samdb.pc
 #usr/lib/pkgconfig/smbclient.pc
 #usr/lib/pkgconfig/wbclient.pc
 usr/lib/python3.10/site-packages/_ldb_text.py
@@ -283,6 +248,31 @@ usr/lib/python3.10/site-packages/samba/dcerpc/xattr.cpython-310-aarch64-linux-gn
 usr/lib/python3.10/site-packages/samba/descriptor.py
 usr/lib/python3.10/site-packages/samba/dnsresolver.py
 usr/lib/python3.10/site-packages/samba/dnsserver.py
+#usr/lib/python3.10/site-packages/samba/domain
+usr/lib/python3.10/site-packages/samba/domain/__init__.py
+#usr/lib/python3.10/site-packages/samba/domain/models
+usr/lib/python3.10/site-packages/samba/domain/models/__init__.py
+usr/lib/python3.10/site-packages/samba/domain/models/auth_policy.py
+usr/lib/python3.10/site-packages/samba/domain/models/auth_silo.py
+usr/lib/python3.10/site-packages/samba/domain/models/claim_type.py
+usr/lib/python3.10/site-packages/samba/domain/models/computer.py
+usr/lib/python3.10/site-packages/samba/domain/models/constants.py
+usr/lib/python3.10/site-packages/samba/domain/models/container.py
+usr/lib/python3.10/site-packages/samba/domain/models/exceptions.py
+usr/lib/python3.10/site-packages/samba/domain/models/fields.py
+usr/lib/python3.10/site-packages/samba/domain/models/gmsa.py
+usr/lib/python3.10/site-packages/samba/domain/models/group.py
+usr/lib/python3.10/site-packages/samba/domain/models/model.py
+usr/lib/python3.10/site-packages/samba/domain/models/org.py
+usr/lib/python3.10/site-packages/samba/domain/models/person.py
+usr/lib/python3.10/site-packages/samba/domain/models/query.py
+usr/lib/python3.10/site-packages/samba/domain/models/registry.py
+usr/lib/python3.10/site-packages/samba/domain/models/schema.py
+usr/lib/python3.10/site-packages/samba/domain/models/site.py
+usr/lib/python3.10/site-packages/samba/domain/models/subnet.py
+usr/lib/python3.10/site-packages/samba/domain/models/types.py
+usr/lib/python3.10/site-packages/samba/domain/models/user.py
+usr/lib/python3.10/site-packages/samba/domain/models/value_type.py
 usr/lib/python3.10/site-packages/samba/domain_update.py
 usr/lib/python3.10/site-packages/samba/drs_utils.py
 usr/lib/python3.10/site-packages/samba/dsdb.cpython-310-aarch64-linux-gnu.so
@@ -344,6 +334,7 @@ usr/lib/python3.10/site-packages/samba/kcc/graph_utils.py
 usr/lib/python3.10/site-packages/samba/kcc/kcc_utils.py
 usr/lib/python3.10/site-packages/samba/kcc/ldif_import_export.py
 usr/lib/python3.10/site-packages/samba/logger.py
+usr/lib/python3.10/site-packages/samba/lsa_utils.py
 usr/lib/python3.10/site-packages/samba/mdb_util.py
 usr/lib/python3.10/site-packages/samba/messaging.cpython-310-aarch64-linux-gnu.so
 usr/lib/python3.10/site-packages/samba/ms_display_specifiers.py
@@ -366,9 +357,18 @@ usr/lib/python3.10/site-packages/samba/netcmd/domain
 usr/lib/python3.10/site-packages/samba/netcmd/domain/__init__.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/auth
 usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/__init__.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/policy.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/silo.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/silo_member.py
+#usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/policy
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/policy/__init__.py
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/policy/computer_allowed_to_authenticate_to.py
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/policy/policy.py
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/policy/service_allowed_to_authenticate_from.py
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/policy/service_allowed_to_authenticate_to.py
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/policy/user_allowed_to_authenticate_from.py
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/policy/user_allowed_to_authenticate_to.py
+#usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/silo
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/silo/__init__.py
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/silo/member.py
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/silo/silo.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/backup.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/claim
 usr/lib/python3.10/site-packages/samba/netcmd/domain/claim/__init__.py
@@ -381,24 +381,12 @@ usr/lib/python3.10/site-packages/samba/netcmd/domain/demote.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/functional_prep.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/info.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/join.py
+#usr/lib/python3.10/site-packages/samba/netcmd/domain/kds
+usr/lib/python3.10/site-packages/samba/netcmd/domain/kds/__init__.py
+usr/lib/python3.10/site-packages/samba/netcmd/domain/kds/root_key.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/keytab.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/leave.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/level.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/__init__.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/auth_policy.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/auth_silo.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/claim_type.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/exceptions.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/fields.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/group.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/model.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/query.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/schema.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/site.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/subnet.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/user.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/value_type.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/passwordsettings.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/provision.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/samba3upgrade.py
@@ -422,6 +410,10 @@ usr/lib/python3.10/site-packages/samba/netcmd/processes.py
 usr/lib/python3.10/site-packages/samba/netcmd/pso.py
 usr/lib/python3.10/site-packages/samba/netcmd/rodc.py
 usr/lib/python3.10/site-packages/samba/netcmd/schema.py
+#usr/lib/python3.10/site-packages/samba/netcmd/service_account
+usr/lib/python3.10/site-packages/samba/netcmd/service_account/__init__.py
+usr/lib/python3.10/site-packages/samba/netcmd/service_account/group_msa_membership.py
+usr/lib/python3.10/site-packages/samba/netcmd/service_account/service_account.py
 usr/lib/python3.10/site-packages/samba/netcmd/shell.py
 usr/lib/python3.10/site-packages/samba/netcmd/sites.py
 usr/lib/python3.10/site-packages/samba/netcmd/spn.py
@@ -513,10 +505,11 @@ usr/lib/python3.10/site-packages/samba/tdb_util.py
 #usr/lib/python3.10/site-packages/samba/tests/blackbox/__init__.py
 #usr/lib/python3.10/site-packages/samba/tests/blackbox/bug13653.py
 #usr/lib/python3.10/site-packages/samba/tests/blackbox/check_output.py
-usr/lib/python3.10/site-packages/samba/tests/blackbox/claims.py
+#usr/lib/python3.10/site-packages/samba/tests/blackbox/claims.py
 #usr/lib/python3.10/site-packages/samba/tests/blackbox/downgradedatabase.py
-usr/lib/python3.10/site-packages/samba/tests/blackbox/http_chunk.py
-usr/lib/python3.10/site-packages/samba/tests/blackbox/http_content.py
+#usr/lib/python3.10/site-packages/samba/tests/blackbox/gmsa.py
+#usr/lib/python3.10/site-packages/samba/tests/blackbox/http_chunk.py
+#usr/lib/python3.10/site-packages/samba/tests/blackbox/http_content.py
 #usr/lib/python3.10/site-packages/samba/tests/blackbox/mdsearch.py
 #usr/lib/python3.10/site-packages/samba/tests/blackbox/misc_dfs_widelink.py
 #usr/lib/python3.10/site-packages/samba/tests/blackbox/ndrdump.py
@@ -548,10 +541,10 @@ usr/lib/python3.10/site-packages/samba/tests/blackbox/http_content.py
 #usr/lib/python3.10/site-packages/samba/tests/dcerpc/array.py
 #usr/lib/python3.10/site-packages/samba/tests/dcerpc/bare.py
 #usr/lib/python3.10/site-packages/samba/tests/dcerpc/binding.py
-#usr/lib/python3.10/site-packages/samba/tests/dcerpc/createtrustrelax.py
 #usr/lib/python3.10/site-packages/samba/tests/dcerpc/dnsserver.py
 #usr/lib/python3.10/site-packages/samba/tests/dcerpc/integer.py
 #usr/lib/python3.10/site-packages/samba/tests/dcerpc/lsa.py
+#usr/lib/python3.10/site-packages/samba/tests/dcerpc/lsa_utils.py
 #usr/lib/python3.10/site-packages/samba/tests/dcerpc/mdssvc.py
 #usr/lib/python3.10/site-packages/samba/tests/dcerpc/misc.py
 #usr/lib/python3.10/site-packages/samba/tests/dcerpc/raw_protocol.py
@@ -583,6 +576,8 @@ usr/lib/python3.10/site-packages/samba/tests/blackbox/http_content.py
 #usr/lib/python3.10/site-packages/samba/tests/dsdb_api.py
 #usr/lib/python3.10/site-packages/samba/tests/dsdb_dns.py
 #usr/lib/python3.10/site-packages/samba/tests/dsdb_lock.py
+#usr/lib/python3.10/site-packages/samba/tests/dsdb_quiet_env_tests.py
+#usr/lib/python3.10/site-packages/samba/tests/dsdb_quiet_provision_tests.py
 #usr/lib/python3.10/site-packages/samba/tests/dsdb_schema_attributes.py
 #usr/lib/python3.10/site-packages/samba/tests/emulate
 #usr/lib/python3.10/site-packages/samba/tests/emulate/__init__.py
@@ -620,6 +615,7 @@ usr/lib/python3.10/site-packages/samba/tests/blackbox/http_content.py
 #usr/lib/python3.10/site-packages/samba/tests/krb5/etype_tests.py
 #usr/lib/python3.10/site-packages/samba/tests/krb5/fast_tests.py
 #usr/lib/python3.10/site-packages/samba/tests/krb5/gkdi_tests.py
+#usr/lib/python3.10/site-packages/samba/tests/krb5/gmsa_tests.py
 #usr/lib/python3.10/site-packages/samba/tests/krb5/group_tests.py
 #usr/lib/python3.10/site-packages/samba/tests/krb5/kcrypto.py
 #usr/lib/python3.10/site-packages/samba/tests/krb5/kdc_base_test.py
@@ -716,6 +712,7 @@ usr/lib/python3.10/site-packages/samba/tests/blackbox/http_content.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/domain_auth_policy.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/domain_auth_silo.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/domain_claim.py
+#usr/lib/python3.10/site-packages/samba/tests/samba_tool/domain_kds_root_key.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/domain_models.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/drs_clone_dc_data_lmdb_size.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/dsacl.py
@@ -738,6 +735,7 @@ usr/lib/python3.10/site-packages/samba/tests/blackbox/http_content.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/provision_userPassword_crypt.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/rodc.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/schema.py
+#usr/lib/python3.10/site-packages/samba/tests/samba_tool/service_account.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/silo_base.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/sites.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/timecmd.py
@@ -782,7 +780,6 @@ usr/lib/python3.10/site-packages/samba/tests/blackbox/http_content.py
 #usr/lib/python3.10/site-packages/samba/tests/upgradeprovisionneeddc.py
 #usr/lib/python3.10/site-packages/samba/tests/usage.py
 #usr/lib/python3.10/site-packages/samba/tests/xattr.py
-usr/lib/python3.10/site-packages/samba/trust_utils.py
 usr/lib/python3.10/site-packages/samba/upgrade.py
 usr/lib/python3.10/site-packages/samba/upgradehelpers.py
 usr/lib/python3.10/site-packages/samba/uptodateness.py
@@ -808,6 +805,7 @@ usr/lib/samba/krb5/winbind_krb5_locator.so
 #usr/lib/samba/ldb
 usr/lib/samba/ldb/asq.so
 usr/lib/samba/ldb/ildap.so
+usr/lib/samba/ldb/ldap.so
 usr/lib/samba/ldb/ldb.so
 usr/lib/samba/ldb/ldbsamba_extensions.so
 usr/lib/samba/ldb/paged_searches.so
@@ -847,8 +845,10 @@ usr/lib/samba/libcom-err-private-samba.so
 usr/lib/samba/libcommon-auth-private-samba.so
 usr/lib/samba/libdbwrap-private-samba.so
 usr/lib/samba/libdcerpc-pkt-auth-private-samba.so
+usr/lib/samba/libdcerpc-private-samba.so
 usr/lib/samba/libdcerpc-samba-private-samba.so
 usr/lib/samba/libdcerpc-samba4-private-samba.so
+usr/lib/samba/libdcerpc-samr-private-samba.so
 usr/lib/samba/libdnsserver-common-private-samba.so
 usr/lib/samba/libdsdb-module-private-samba.so
 usr/lib/samba/libevents-private-samba.so
@@ -901,14 +901,19 @@ usr/lib/samba/libregistry-private-samba.so
 usr/lib/samba/libreplace-private-samba.so
 usr/lib/samba/libroken-private-samba.so
 usr/lib/samba/libsamba-cluster-support-private-samba.so
+usr/lib/samba/libsamba-credentials-private-samba.so
 usr/lib/samba/libsamba-debug-private-samba.so
+usr/lib/samba/libsamba-hostconfig-private-samba.so
 usr/lib/samba/libsamba-modules-private-samba.so
-usr/lib/samba/libsamba-net.cpython-310-aarch64-linux-gnu-private-samba.so
+usr/lib/samba/libsamba-net-join.cpython-310-aarch64-linux-gnu-private-samba.so
+usr/lib/samba/libsamba-net-private-samba.so
+usr/lib/samba/libsamba-policy-private-samba.so
 usr/lib/samba/libsamba-python.cpython-310-aarch64-linux-gnu-private-samba.so
 usr/lib/samba/libsamba-security-private-samba.so
 usr/lib/samba/libsamba-sockets-private-samba.so
 usr/lib/samba/libsamba3-util-private-samba.so
 usr/lib/samba/libsamdb-common-private-samba.so
+usr/lib/samba/libsamdb-private-samba.so
 usr/lib/samba/libsecrets3-private-samba.so
 usr/lib/samba/libserver-id-db-private-samba.so
 usr/lib/samba/libserver-role-private-samba.so
@@ -928,9 +933,9 @@ usr/lib/samba/libtalloc-report-private-samba.so
 usr/lib/samba/libtdb-private-samba.so
 usr/lib/samba/libtdb-wrap-private-samba.so
 usr/lib/samba/libtevent-private-samba.so
+usr/lib/samba/libtevent-util-private-samba.so
 usr/lib/samba/libtime-basic-private-samba.so
 usr/lib/samba/libtorture-private-samba.so
-usr/lib/samba/libtrusts-util-private-samba.so
 usr/lib/samba/libutil-reg-private-samba.so
 usr/lib/samba/libutil-setid-private-samba.so
 usr/lib/samba/libutil-tdb-private-samba.so
diff --git a/config/rootfiles/packages/riscv64/samba b/config/rootfiles/packages/riscv64/samba
index 93e39e0e7..b530ea2b2 100644
--- a/config/rootfiles/packages/riscv64/samba
+++ b/config/rootfiles/packages/riscv64/samba
@@ -57,8 +57,6 @@ usr/bin/wspsearch
 #usr/include/samba-4.0/core/ntstatus_gen.h
 #usr/include/samba-4.0/core/werror.h
 #usr/include/samba-4.0/core/werror_gen.h
-#usr/include/samba-4.0/credentials.h
-#usr/include/samba-4.0/dcerpc.h
 #usr/include/samba-4.0/dcesrv_core.h
 #usr/include/samba-4.0/domain_credentials.h
 #usr/include/samba-4.0/gen_ndr
@@ -80,7 +78,6 @@ usr/bin/wspsearch
 #usr/include/samba-4.0/gen_ndr/ndr_misc.h
 #usr/include/samba-4.0/gen_ndr/ndr_nbt.h
 #usr/include/samba-4.0/gen_ndr/ndr_samr.h
-#usr/include/samba-4.0/gen_ndr/ndr_samr_c.h
 #usr/include/samba-4.0/gen_ndr/ndr_svcctl.h
 #usr/include/samba-4.0/gen_ndr/ndr_svcctl_c.h
 #usr/include/samba-4.0/gen_ndr/netlogon.h
@@ -101,9 +98,7 @@ usr/bin/wspsearch
 #usr/include/samba-4.0/ndr/ndr_nbt.h
 #usr/include/samba-4.0/ndr/ndr_svcctl.h
 #usr/include/samba-4.0/netapi.h
-#usr/include/samba-4.0/param.h
 #usr/include/samba-4.0/passdb.h
-#usr/include/samba-4.0/policy.h
 #usr/include/samba-4.0/rpc_common.h
 #usr/include/samba-4.0/samba
 #usr/include/samba-4.0/samba/session.h
@@ -129,9 +124,6 @@ usr/bin/wspsearch
 #usr/include/samba-4.0/util/idtree_random.h
 #usr/include/samba-4.0/util/signal.h
 #usr/include/samba-4.0/util/substitute.h
-#usr/include/samba-4.0/util/tevent_ntstatus.h
-#usr/include/samba-4.0/util/tevent_unix.h
-#usr/include/samba-4.0/util/tevent_werror.h
 #usr/include/samba-4.0/util/tfork.h
 #usr/include/samba-4.0/util/time.h
 #usr/include/samba-4.0/util_ldb.h
@@ -139,15 +131,9 @@ usr/bin/wspsearch
 usr/lib/libdcerpc-binding.so
 usr/lib/libdcerpc-binding.so.0
 usr/lib/libdcerpc-binding.so.0.0.1
-usr/lib/libdcerpc-samr.so
-usr/lib/libdcerpc-samr.so.0
-usr/lib/libdcerpc-samr.so.0.0.1
 usr/lib/libdcerpc-server-core.so
 usr/lib/libdcerpc-server-core.so.0
 usr/lib/libdcerpc-server-core.so.0.0.1
-usr/lib/libdcerpc.so
-usr/lib/libdcerpc.so.0
-usr/lib/libdcerpc.so.0.0.1
 usr/lib/libndr-krb5pac.so
 usr/lib/libndr-krb5pac.so.0
 usr/lib/libndr-krb5pac.so.0.0.1
@@ -158,34 +144,22 @@ usr/lib/libndr-standard.so
 usr/lib/libndr-standard.so.0
 usr/lib/libndr-standard.so.0.0.1
 usr/lib/libndr.so
-usr/lib/libndr.so.4
-usr/lib/libndr.so.4.0.0
+usr/lib/libndr.so.5
+usr/lib/libndr.so.5.0.0
 usr/lib/libnetapi.so
 usr/lib/libnetapi.so.1
 usr/lib/libnetapi.so.1.0.0
 usr/lib/libnss_winbind.so.2
 usr/lib/libnss_wins.so.2
-usr/lib/libsamba-credentials.so
-usr/lib/libsamba-credentials.so.1
-usr/lib/libsamba-credentials.so.1.0.0
 usr/lib/libsamba-errors.so
 usr/lib/libsamba-errors.so.1
 usr/lib/libsamba-errors.so.1.0.0
-usr/lib/libsamba-hostconfig.so
-usr/lib/libsamba-hostconfig.so.0
-usr/lib/libsamba-hostconfig.so.0.0.1
 usr/lib/libsamba-passdb.so
 usr/lib/libsamba-passdb.so.0
-usr/lib/libsamba-passdb.so.0.28.0
-usr/lib/libsamba-policy.cpython-310-riscv64-linux-gnu.so
-usr/lib/libsamba-policy.cpython-310-riscv64-linux-gnu.so.0
-usr/lib/libsamba-policy.cpython-310-riscv64-linux-gnu.so.0.0.1
+usr/lib/libsamba-passdb.so.0.29.0
 usr/lib/libsamba-util.so
 usr/lib/libsamba-util.so.0
 usr/lib/libsamba-util.so.0.0.1
-usr/lib/libsamdb.so
-usr/lib/libsamdb.so.0
-usr/lib/libsamdb.so.0.0.1
 usr/lib/libsmbclient.so
 usr/lib/libsmbclient.so.0
 usr/lib/libsmbclient.so.0.8.0
@@ -195,24 +169,15 @@ usr/lib/libsmbconf.so.0.0.1
 usr/lib/libsmbldap.so
 usr/lib/libsmbldap.so.2
 usr/lib/libsmbldap.so.2.1.0
-usr/lib/libtevent-util.so
-usr/lib/libtevent-util.so.0
-usr/lib/libtevent-util.so.0.0.1
 usr/lib/libwbclient.so
 usr/lib/libwbclient.so.0
 usr/lib/libwbclient.so.0.16
-#usr/lib/pkgconfig/dcerpc.pc
-#usr/lib/pkgconfig/dcerpc_samr.pc
 #usr/lib/pkgconfig/ndr.pc
 #usr/lib/pkgconfig/ndr_krb5pac.pc
 #usr/lib/pkgconfig/ndr_nbt.pc
 #usr/lib/pkgconfig/ndr_standard.pc
 #usr/lib/pkgconfig/netapi.pc
-#usr/lib/pkgconfig/samba-credentials.pc
-#usr/lib/pkgconfig/samba-hostconfig.pc
-#usr/lib/pkgconfig/samba-policy.cpython-310-riscv64-linux-gnu.pc
 #usr/lib/pkgconfig/samba-util.pc
-#usr/lib/pkgconfig/samdb.pc
 #usr/lib/pkgconfig/smbclient.pc
 #usr/lib/pkgconfig/wbclient.pc
 usr/lib/python3.10/site-packages/_ldb_text.py
@@ -283,6 +248,31 @@ usr/lib/python3.10/site-packages/samba/dcerpc/xattr.cpython-310-riscv64-linux-gn
 usr/lib/python3.10/site-packages/samba/descriptor.py
 usr/lib/python3.10/site-packages/samba/dnsresolver.py
 usr/lib/python3.10/site-packages/samba/dnsserver.py
+#usr/lib/python3.10/site-packages/samba/domain
+usr/lib/python3.10/site-packages/samba/domain/__init__.py
+#usr/lib/python3.10/site-packages/samba/domain/models
+usr/lib/python3.10/site-packages/samba/domain/models/__init__.py
+usr/lib/python3.10/site-packages/samba/domain/models/auth_policy.py
+usr/lib/python3.10/site-packages/samba/domain/models/auth_silo.py
+usr/lib/python3.10/site-packages/samba/domain/models/claim_type.py
+usr/lib/python3.10/site-packages/samba/domain/models/computer.py
+usr/lib/python3.10/site-packages/samba/domain/models/constants.py
+usr/lib/python3.10/site-packages/samba/domain/models/container.py
+usr/lib/python3.10/site-packages/samba/domain/models/exceptions.py
+usr/lib/python3.10/site-packages/samba/domain/models/fields.py
+usr/lib/python3.10/site-packages/samba/domain/models/gmsa.py
+usr/lib/python3.10/site-packages/samba/domain/models/group.py
+usr/lib/python3.10/site-packages/samba/domain/models/model.py
+usr/lib/python3.10/site-packages/samba/domain/models/org.py
+usr/lib/python3.10/site-packages/samba/domain/models/person.py
+usr/lib/python3.10/site-packages/samba/domain/models/query.py
+usr/lib/python3.10/site-packages/samba/domain/models/registry.py
+usr/lib/python3.10/site-packages/samba/domain/models/schema.py
+usr/lib/python3.10/site-packages/samba/domain/models/site.py
+usr/lib/python3.10/site-packages/samba/domain/models/subnet.py
+usr/lib/python3.10/site-packages/samba/domain/models/types.py
+usr/lib/python3.10/site-packages/samba/domain/models/user.py
+usr/lib/python3.10/site-packages/samba/domain/models/value_type.py
 usr/lib/python3.10/site-packages/samba/domain_update.py
 usr/lib/python3.10/site-packages/samba/drs_utils.py
 usr/lib/python3.10/site-packages/samba/dsdb.cpython-310-riscv64-linux-gnu.so
@@ -344,6 +334,7 @@ usr/lib/python3.10/site-packages/samba/kcc/graph_utils.py
 usr/lib/python3.10/site-packages/samba/kcc/kcc_utils.py
 usr/lib/python3.10/site-packages/samba/kcc/ldif_import_export.py
 usr/lib/python3.10/site-packages/samba/logger.py
+usr/lib/python3.10/site-packages/samba/lsa_utils.py
 usr/lib/python3.10/site-packages/samba/mdb_util.py
 usr/lib/python3.10/site-packages/samba/messaging.cpython-310-riscv64-linux-gnu.so
 usr/lib/python3.10/site-packages/samba/ms_display_specifiers.py
@@ -366,9 +357,18 @@ usr/lib/python3.10/site-packages/samba/netcmd/dns.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/__init__.py
 #usr/lib/python3.10/site-packages/samba/netcmd/domain/auth
 usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/__init__.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/policy.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/silo.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/silo_member.py
+#usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/policy
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/policy/__init__.py
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/policy/computer_allowed_to_authenticate_to.py
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/policy/policy.py
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/policy/service_allowed_to_authenticate_from.py
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/policy/service_allowed_to_authenticate_to.py
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/policy/user_allowed_to_authenticate_from.py
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/policy/user_allowed_to_authenticate_to.py
+#usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/silo
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/silo/__init__.py
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/silo/member.py
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/silo/silo.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/backup.py
 #usr/lib/python3.10/site-packages/samba/netcmd/domain/claim
 usr/lib/python3.10/site-packages/samba/netcmd/domain/claim/__init__.py
@@ -381,24 +381,12 @@ usr/lib/python3.10/site-packages/samba/netcmd/domain/demote.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/functional_prep.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/info.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/join.py
+#usr/lib/python3.10/site-packages/samba/netcmd/domain/kds
+usr/lib/python3.10/site-packages/samba/netcmd/domain/kds/__init__.py
+usr/lib/python3.10/site-packages/samba/netcmd/domain/kds/root_key.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/keytab.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/leave.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/level.py
-#usr/lib/python3.10/site-packages/samba/netcmd/domain/models
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/__init__.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/auth_policy.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/auth_silo.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/claim_type.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/exceptions.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/fields.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/group.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/model.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/query.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/schema.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/site.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/subnet.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/user.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/value_type.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/passwordsettings.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/provision.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/samba3upgrade.py
@@ -422,6 +410,10 @@ usr/lib/python3.10/site-packages/samba/netcmd/processes.py
 usr/lib/python3.10/site-packages/samba/netcmd/pso.py
 usr/lib/python3.10/site-packages/samba/netcmd/rodc.py
 usr/lib/python3.10/site-packages/samba/netcmd/schema.py
+#usr/lib/python3.10/site-packages/samba/netcmd/service_account
+usr/lib/python3.10/site-packages/samba/netcmd/service_account/__init__.py
+usr/lib/python3.10/site-packages/samba/netcmd/service_account/group_msa_membership.py
+usr/lib/python3.10/site-packages/samba/netcmd/service_account/service_account.py
 usr/lib/python3.10/site-packages/samba/netcmd/shell.py
 usr/lib/python3.10/site-packages/samba/netcmd/sites.py
 usr/lib/python3.10/site-packages/samba/netcmd/spn.py
@@ -515,6 +507,7 @@ usr/lib/python3.10/site-packages/samba/tdb_util.py
 #usr/lib/python3.10/site-packages/samba/tests/blackbox/check_output.py
 #usr/lib/python3.10/site-packages/samba/tests/blackbox/claims.py
 #usr/lib/python3.10/site-packages/samba/tests/blackbox/downgradedatabase.py
+#usr/lib/python3.10/site-packages/samba/tests/blackbox/gmsa.py
 #usr/lib/python3.10/site-packages/samba/tests/blackbox/http_chunk.py
 #usr/lib/python3.10/site-packages/samba/tests/blackbox/http_content.py
 #usr/lib/python3.10/site-packages/samba/tests/blackbox/mdsearch.py
@@ -548,10 +541,10 @@ usr/lib/python3.10/site-packages/samba/tdb_util.py
 #usr/lib/python3.10/site-packages/samba/tests/dcerpc/array.py
 #usr/lib/python3.10/site-packages/samba/tests/dcerpc/bare.py
 #usr/lib/python3.10/site-packages/samba/tests/dcerpc/binding.py
-#usr/lib/python3.10/site-packages/samba/tests/dcerpc/createtrustrelax.py
 #usr/lib/python3.10/site-packages/samba/tests/dcerpc/dnsserver.py
 #usr/lib/python3.10/site-packages/samba/tests/dcerpc/integer.py
 #usr/lib/python3.10/site-packages/samba/tests/dcerpc/lsa.py
+#usr/lib/python3.10/site-packages/samba/tests/dcerpc/lsa_utils.py
 #usr/lib/python3.10/site-packages/samba/tests/dcerpc/mdssvc.py
 #usr/lib/python3.10/site-packages/samba/tests/dcerpc/misc.py
 #usr/lib/python3.10/site-packages/samba/tests/dcerpc/raw_protocol.py
@@ -583,6 +576,8 @@ usr/lib/python3.10/site-packages/samba/tdb_util.py
 #usr/lib/python3.10/site-packages/samba/tests/dsdb_api.py
 #usr/lib/python3.10/site-packages/samba/tests/dsdb_dns.py
 #usr/lib/python3.10/site-packages/samba/tests/dsdb_lock.py
+#usr/lib/python3.10/site-packages/samba/tests/dsdb_quiet_env_tests.py
+#usr/lib/python3.10/site-packages/samba/tests/dsdb_quiet_provision_tests.py
 #usr/lib/python3.10/site-packages/samba/tests/dsdb_schema_attributes.py
 #usr/lib/python3.10/site-packages/samba/tests/emulate
 #usr/lib/python3.10/site-packages/samba/tests/emulate/__init__.py
@@ -620,6 +615,7 @@ usr/lib/python3.10/site-packages/samba/tdb_util.py
 #usr/lib/python3.10/site-packages/samba/tests/krb5/etype_tests.py
 #usr/lib/python3.10/site-packages/samba/tests/krb5/fast_tests.py
 #usr/lib/python3.10/site-packages/samba/tests/krb5/gkdi_tests.py
+#usr/lib/python3.10/site-packages/samba/tests/krb5/gmsa_tests.py
 #usr/lib/python3.10/site-packages/samba/tests/krb5/group_tests.py
 #usr/lib/python3.10/site-packages/samba/tests/krb5/kcrypto.py
 #usr/lib/python3.10/site-packages/samba/tests/krb5/kdc_base_test.py
@@ -716,6 +712,7 @@ usr/lib/python3.10/site-packages/samba/tdb_util.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/domain_auth_policy.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/domain_auth_silo.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/domain_claim.py
+#usr/lib/python3.10/site-packages/samba/tests/samba_tool/domain_kds_root_key.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/domain_models.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/drs_clone_dc_data_lmdb_size.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/dsacl.py
@@ -738,6 +735,7 @@ usr/lib/python3.10/site-packages/samba/tdb_util.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/provision_userPassword_crypt.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/rodc.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/schema.py
+#usr/lib/python3.10/site-packages/samba/tests/samba_tool/service_account.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/silo_base.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/sites.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/timecmd.py
@@ -782,7 +780,6 @@ usr/lib/python3.10/site-packages/samba/tdb_util.py
 #usr/lib/python3.10/site-packages/samba/tests/upgradeprovisionneeddc.py
 #usr/lib/python3.10/site-packages/samba/tests/usage.py
 #usr/lib/python3.10/site-packages/samba/tests/xattr.py
-#usr/lib/python3.10/site-packages/samba/trust_utils.py
 usr/lib/python3.10/site-packages/samba/upgrade.py
 usr/lib/python3.10/site-packages/samba/upgradehelpers.py
 usr/lib/python3.10/site-packages/samba/uptodateness.py
@@ -808,6 +805,7 @@ usr/lib/samba/krb5/winbind_krb5_locator.so
 #usr/lib/samba/ldb
 usr/lib/samba/ldb/asq.so
 usr/lib/samba/ldb/ildap.so
+usr/lib/samba/ldb/ldap.so
 usr/lib/samba/ldb/ldb.so
 usr/lib/samba/ldb/ldbsamba_extensions.so
 usr/lib/samba/ldb/paged_searches.so
@@ -847,8 +845,10 @@ usr/lib/samba/libcom-err-private-samba.so
 usr/lib/samba/libcommon-auth-private-samba.so
 usr/lib/samba/libdbwrap-private-samba.so
 usr/lib/samba/libdcerpc-pkt-auth-private-samba.so
+usr/lib/samba/libdcerpc-private-samba.so
 usr/lib/samba/libdcerpc-samba-private-samba.so
 usr/lib/samba/libdcerpc-samba4-private-samba.so
+usr/lib/samba/libdcerpc-samr-private-samba.so
 usr/lib/samba/libdnsserver-common-private-samba.so
 usr/lib/samba/libdsdb-module-private-samba.so
 usr/lib/samba/libevents-private-samba.so
@@ -901,14 +901,19 @@ usr/lib/samba/libregistry-private-samba.so
 usr/lib/samba/libreplace-private-samba.so
 usr/lib/samba/libroken-private-samba.so
 usr/lib/samba/libsamba-cluster-support-private-samba.so
+usr/lib/samba/libsamba-credentials-private-samba.so
 usr/lib/samba/libsamba-debug-private-samba.so
+usr/lib/samba/libsamba-hostconfig-private-samba.so
 usr/lib/samba/libsamba-modules-private-samba.so
-usr/lib/samba/libsamba-net.cpython-310-riscv64-linux-gnu-private-samba.so
+usr/lib/samba/libsamba-net-join.cpython-310-riscv64-linux-gnu-private-samba.so
+usr/lib/samba/libsamba-net-private-samba.so
+usr/lib/samba/libsamba-policy-private-samba.so
 usr/lib/samba/libsamba-python.cpython-310-riscv64-linux-gnu-private-samba.so
 usr/lib/samba/libsamba-security-private-samba.so
 usr/lib/samba/libsamba-sockets-private-samba.so
 usr/lib/samba/libsamba3-util-private-samba.so
 usr/lib/samba/libsamdb-common-private-samba.so
+usr/lib/samba/libsamdb-private-samba.so
 usr/lib/samba/libsecrets3-private-samba.so
 usr/lib/samba/libserver-id-db-private-samba.so
 usr/lib/samba/libserver-role-private-samba.so
@@ -928,9 +933,9 @@ usr/lib/samba/libtalloc-report-private-samba.so
 usr/lib/samba/libtdb-private-samba.so
 usr/lib/samba/libtdb-wrap-private-samba.so
 usr/lib/samba/libtevent-private-samba.so
+usr/lib/samba/libtevent-util-private-samba.so
 usr/lib/samba/libtime-basic-private-samba.so
 usr/lib/samba/libtorture-private-samba.so
-usr/lib/samba/libtrusts-util-private-samba.so
 usr/lib/samba/libutil-reg-private-samba.so
 usr/lib/samba/libutil-setid-private-samba.so
 usr/lib/samba/libutil-tdb-private-samba.so
@@ -1019,4 +1024,4 @@ var/log/samba
 var/spool/samba
 srv/web/ipfire/cgi-bin/samba.cgi
 var/ipfire/menu.d/EX-samba.menu
-usr/local/bin/sambactrl
+usr/local/bin/sambactrl
\ No newline at end of file
diff --git a/config/rootfiles/packages/x86_64/samba b/config/rootfiles/packages/x86_64/samba
index 92862313d..e720457a3 100644
--- a/config/rootfiles/packages/x86_64/samba
+++ b/config/rootfiles/packages/x86_64/samba
@@ -57,8 +57,6 @@ usr/bin/wspsearch
 #usr/include/samba-4.0/core/ntstatus_gen.h
 #usr/include/samba-4.0/core/werror.h
 #usr/include/samba-4.0/core/werror_gen.h
-#usr/include/samba-4.0/credentials.h
-#usr/include/samba-4.0/dcerpc.h
 #usr/include/samba-4.0/dcesrv_core.h
 #usr/include/samba-4.0/domain_credentials.h
 #usr/include/samba-4.0/gen_ndr
@@ -80,7 +78,6 @@ usr/bin/wspsearch
 #usr/include/samba-4.0/gen_ndr/ndr_misc.h
 #usr/include/samba-4.0/gen_ndr/ndr_nbt.h
 #usr/include/samba-4.0/gen_ndr/ndr_samr.h
-#usr/include/samba-4.0/gen_ndr/ndr_samr_c.h
 #usr/include/samba-4.0/gen_ndr/ndr_svcctl.h
 #usr/include/samba-4.0/gen_ndr/ndr_svcctl_c.h
 #usr/include/samba-4.0/gen_ndr/netlogon.h
@@ -101,9 +98,7 @@ usr/bin/wspsearch
 #usr/include/samba-4.0/ndr/ndr_nbt.h
 #usr/include/samba-4.0/ndr/ndr_svcctl.h
 #usr/include/samba-4.0/netapi.h
-#usr/include/samba-4.0/param.h
 #usr/include/samba-4.0/passdb.h
-#usr/include/samba-4.0/policy.h
 #usr/include/samba-4.0/rpc_common.h
 #usr/include/samba-4.0/samba
 #usr/include/samba-4.0/samba/session.h
@@ -129,9 +124,6 @@ usr/bin/wspsearch
 #usr/include/samba-4.0/util/idtree_random.h
 #usr/include/samba-4.0/util/signal.h
 #usr/include/samba-4.0/util/substitute.h
-#usr/include/samba-4.0/util/tevent_ntstatus.h
-#usr/include/samba-4.0/util/tevent_unix.h
-#usr/include/samba-4.0/util/tevent_werror.h
 #usr/include/samba-4.0/util/tfork.h
 #usr/include/samba-4.0/util/time.h
 #usr/include/samba-4.0/util_ldb.h
@@ -139,15 +131,9 @@ usr/bin/wspsearch
 usr/lib/libdcerpc-binding.so
 usr/lib/libdcerpc-binding.so.0
 usr/lib/libdcerpc-binding.so.0.0.1
-usr/lib/libdcerpc-samr.so
-usr/lib/libdcerpc-samr.so.0
-usr/lib/libdcerpc-samr.so.0.0.1
 usr/lib/libdcerpc-server-core.so
 usr/lib/libdcerpc-server-core.so.0
 usr/lib/libdcerpc-server-core.so.0.0.1
-usr/lib/libdcerpc.so
-usr/lib/libdcerpc.so.0
-usr/lib/libdcerpc.so.0.0.1
 usr/lib/libndr-krb5pac.so
 usr/lib/libndr-krb5pac.so.0
 usr/lib/libndr-krb5pac.so.0.0.1
@@ -158,34 +144,22 @@ usr/lib/libndr-standard.so
 usr/lib/libndr-standard.so.0
 usr/lib/libndr-standard.so.0.0.1
 usr/lib/libndr.so
-usr/lib/libndr.so.4
-usr/lib/libndr.so.4.0.0
+usr/lib/libndr.so.5
+usr/lib/libndr.so.5.0.0
 usr/lib/libnetapi.so
 usr/lib/libnetapi.so.1
 usr/lib/libnetapi.so.1.0.0
 usr/lib/libnss_winbind.so.2
 usr/lib/libnss_wins.so.2
-usr/lib/libsamba-credentials.so
-usr/lib/libsamba-credentials.so.1
-usr/lib/libsamba-credentials.so.1.0.0
 usr/lib/libsamba-errors.so
 usr/lib/libsamba-errors.so.1
 usr/lib/libsamba-errors.so.1.0.0
-usr/lib/libsamba-hostconfig.so
-usr/lib/libsamba-hostconfig.so.0
-usr/lib/libsamba-hostconfig.so.0.0.1
 usr/lib/libsamba-passdb.so
 usr/lib/libsamba-passdb.so.0
-usr/lib/libsamba-passdb.so.0.28.0
-usr/lib/libsamba-policy.cpython-310-x86-64-linux-gnu.so
-usr/lib/libsamba-policy.cpython-310-x86-64-linux-gnu.so.0
-usr/lib/libsamba-policy.cpython-310-x86-64-linux-gnu.so.0.0.1
+usr/lib/libsamba-passdb.so.0.29.0
 usr/lib/libsamba-util.so
 usr/lib/libsamba-util.so.0
 usr/lib/libsamba-util.so.0.0.1
-usr/lib/libsamdb.so
-usr/lib/libsamdb.so.0
-usr/lib/libsamdb.so.0.0.1
 usr/lib/libsmbclient.so
 usr/lib/libsmbclient.so.0
 usr/lib/libsmbclient.so.0.8.0
@@ -195,24 +169,15 @@ usr/lib/libsmbconf.so.0.0.1
 usr/lib/libsmbldap.so
 usr/lib/libsmbldap.so.2
 usr/lib/libsmbldap.so.2.1.0
-usr/lib/libtevent-util.so
-usr/lib/libtevent-util.so.0
-usr/lib/libtevent-util.so.0.0.1
 usr/lib/libwbclient.so
 usr/lib/libwbclient.so.0
 usr/lib/libwbclient.so.0.16
-#usr/lib/pkgconfig/dcerpc.pc
-#usr/lib/pkgconfig/dcerpc_samr.pc
 #usr/lib/pkgconfig/ndr.pc
 #usr/lib/pkgconfig/ndr_krb5pac.pc
 #usr/lib/pkgconfig/ndr_nbt.pc
 #usr/lib/pkgconfig/ndr_standard.pc
 #usr/lib/pkgconfig/netapi.pc
-#usr/lib/pkgconfig/samba-credentials.pc
-#usr/lib/pkgconfig/samba-hostconfig.pc
-#usr/lib/pkgconfig/samba-policy.cpython-310-x86_64-linux-gnu.pc
 #usr/lib/pkgconfig/samba-util.pc
-#usr/lib/pkgconfig/samdb.pc
 #usr/lib/pkgconfig/smbclient.pc
 #usr/lib/pkgconfig/wbclient.pc
 usr/lib/python3.10/site-packages/_ldb_text.py
@@ -283,6 +248,31 @@ usr/lib/python3.10/site-packages/samba/dcerpc/xattr.cpython-310-x86_64-linux-gnu
 usr/lib/python3.10/site-packages/samba/descriptor.py
 usr/lib/python3.10/site-packages/samba/dnsresolver.py
 usr/lib/python3.10/site-packages/samba/dnsserver.py
+#usr/lib/python3.10/site-packages/samba/domain
+usr/lib/python3.10/site-packages/samba/domain/__init__.py
+#usr/lib/python3.10/site-packages/samba/domain/models
+usr/lib/python3.10/site-packages/samba/domain/models/__init__.py
+usr/lib/python3.10/site-packages/samba/domain/models/auth_policy.py
+usr/lib/python3.10/site-packages/samba/domain/models/auth_silo.py
+usr/lib/python3.10/site-packages/samba/domain/models/claim_type.py
+usr/lib/python3.10/site-packages/samba/domain/models/computer.py
+usr/lib/python3.10/site-packages/samba/domain/models/constants.py
+usr/lib/python3.10/site-packages/samba/domain/models/container.py
+usr/lib/python3.10/site-packages/samba/domain/models/exceptions.py
+usr/lib/python3.10/site-packages/samba/domain/models/fields.py
+usr/lib/python3.10/site-packages/samba/domain/models/gmsa.py
+usr/lib/python3.10/site-packages/samba/domain/models/group.py
+usr/lib/python3.10/site-packages/samba/domain/models/model.py
+usr/lib/python3.10/site-packages/samba/domain/models/org.py
+usr/lib/python3.10/site-packages/samba/domain/models/person.py
+usr/lib/python3.10/site-packages/samba/domain/models/query.py
+usr/lib/python3.10/site-packages/samba/domain/models/registry.py
+usr/lib/python3.10/site-packages/samba/domain/models/schema.py
+usr/lib/python3.10/site-packages/samba/domain/models/site.py
+usr/lib/python3.10/site-packages/samba/domain/models/subnet.py
+usr/lib/python3.10/site-packages/samba/domain/models/types.py
+usr/lib/python3.10/site-packages/samba/domain/models/user.py
+usr/lib/python3.10/site-packages/samba/domain/models/value_type.py
 usr/lib/python3.10/site-packages/samba/domain_update.py
 usr/lib/python3.10/site-packages/samba/drs_utils.py
 usr/lib/python3.10/site-packages/samba/dsdb.cpython-310-x86_64-linux-gnu.so
@@ -344,6 +334,7 @@ usr/lib/python3.10/site-packages/samba/kcc/graph_utils.py
 usr/lib/python3.10/site-packages/samba/kcc/kcc_utils.py
 usr/lib/python3.10/site-packages/samba/kcc/ldif_import_export.py
 usr/lib/python3.10/site-packages/samba/logger.py
+usr/lib/python3.10/site-packages/samba/lsa_utils.py
 usr/lib/python3.10/site-packages/samba/mdb_util.py
 usr/lib/python3.10/site-packages/samba/messaging.cpython-310-x86_64-linux-gnu.so
 usr/lib/python3.10/site-packages/samba/ms_display_specifiers.py
@@ -366,9 +357,18 @@ usr/lib/python3.10/site-packages/samba/netcmd/domain
 usr/lib/python3.10/site-packages/samba/netcmd/domain/__init__.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/auth
 usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/__init__.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/policy.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/silo.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/silo_member.py
+#usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/policy
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/policy/__init__.py
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/policy/computer_allowed_to_authenticate_to.py
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/policy/policy.py
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/policy/service_allowed_to_authenticate_from.py
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/policy/service_allowed_to_authenticate_to.py
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/policy/user_allowed_to_authenticate_from.py
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/policy/user_allowed_to_authenticate_to.py
+#usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/silo
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/silo/__init__.py
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/silo/member.py
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/silo/silo.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/backup.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/claim
 usr/lib/python3.10/site-packages/samba/netcmd/domain/claim/__init__.py
@@ -381,24 +381,12 @@ usr/lib/python3.10/site-packages/samba/netcmd/domain/demote.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/functional_prep.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/info.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/join.py
+#usr/lib/python3.10/site-packages/samba/netcmd/domain/kds
+usr/lib/python3.10/site-packages/samba/netcmd/domain/kds/__init__.py
+usr/lib/python3.10/site-packages/samba/netcmd/domain/kds/root_key.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/keytab.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/leave.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/level.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/__init__.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/auth_policy.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/auth_silo.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/claim_type.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/exceptions.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/fields.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/group.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/model.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/query.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/schema.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/site.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/subnet.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/user.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/value_type.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/passwordsettings.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/provision.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/samba3upgrade.py
@@ -422,6 +410,10 @@ usr/lib/python3.10/site-packages/samba/netcmd/processes.py
 usr/lib/python3.10/site-packages/samba/netcmd/pso.py
 usr/lib/python3.10/site-packages/samba/netcmd/rodc.py
 usr/lib/python3.10/site-packages/samba/netcmd/schema.py
+#usr/lib/python3.10/site-packages/samba/netcmd/service_account
+usr/lib/python3.10/site-packages/samba/netcmd/service_account/__init__.py
+usr/lib/python3.10/site-packages/samba/netcmd/service_account/group_msa_membership.py
+usr/lib/python3.10/site-packages/samba/netcmd/service_account/service_account.py
 usr/lib/python3.10/site-packages/samba/netcmd/shell.py
 usr/lib/python3.10/site-packages/samba/netcmd/sites.py
 usr/lib/python3.10/site-packages/samba/netcmd/spn.py
@@ -513,16 +505,17 @@ usr/lib/python3.10/site-packages/samba/tdb_util.py
 #usr/lib/python3.10/site-packages/samba/tests/blackbox/__init__.py
 #usr/lib/python3.10/site-packages/samba/tests/blackbox/bug13653.py
 #usr/lib/python3.10/site-packages/samba/tests/blackbox/check_output.py
-usr/lib/python3.10/site-packages/samba/tests/blackbox/claims.py
+#usr/lib/python3.10/site-packages/samba/tests/blackbox/claims.py
 #usr/lib/python3.10/site-packages/samba/tests/blackbox/downgradedatabase.py
-usr/lib/python3.10/site-packages/samba/tests/blackbox/http_chunk.py
-usr/lib/python3.10/site-packages/samba/tests/blackbox/http_content.py
+#usr/lib/python3.10/site-packages/samba/tests/blackbox/gmsa.py
+#usr/lib/python3.10/site-packages/samba/tests/blackbox/http_chunk.py
+#usr/lib/python3.10/site-packages/samba/tests/blackbox/http_content.py
 #usr/lib/python3.10/site-packages/samba/tests/blackbox/mdsearch.py
 #usr/lib/python3.10/site-packages/samba/tests/blackbox/misc_dfs_widelink.py
 #usr/lib/python3.10/site-packages/samba/tests/blackbox/ndrdump.py
 #usr/lib/python3.10/site-packages/samba/tests/blackbox/netads_dns.py
 #usr/lib/python3.10/site-packages/samba/tests/blackbox/netads_json.py
-usr/lib/python3.10/site-packages/samba/tests/blackbox/rpcd_witness_samba_only.py
+#usr/lib/python3.10/site-packages/samba/tests/blackbox/rpcd_witness_samba_only.py
 #usr/lib/python3.10/site-packages/samba/tests/blackbox/samba_dnsupdate.py
 #usr/lib/python3.10/site-packages/samba/tests/blackbox/smbcacls.py
 #usr/lib/python3.10/site-packages/samba/tests/blackbox/smbcacls_basic.py
@@ -548,10 +541,10 @@ usr/lib/python3.10/site-packages/samba/tests/blackbox/rpcd_witness_samba_only.py
 #usr/lib/python3.10/site-packages/samba/tests/dcerpc/array.py
 #usr/lib/python3.10/site-packages/samba/tests/dcerpc/bare.py
 #usr/lib/python3.10/site-packages/samba/tests/dcerpc/binding.py
-#usr/lib/python3.10/site-packages/samba/tests/dcerpc/createtrustrelax.py
 #usr/lib/python3.10/site-packages/samba/tests/dcerpc/dnsserver.py
 #usr/lib/python3.10/site-packages/samba/tests/dcerpc/integer.py
 #usr/lib/python3.10/site-packages/samba/tests/dcerpc/lsa.py
+#usr/lib/python3.10/site-packages/samba/tests/dcerpc/lsa_utils.py
 #usr/lib/python3.10/site-packages/samba/tests/dcerpc/mdssvc.py
 #usr/lib/python3.10/site-packages/samba/tests/dcerpc/misc.py
 #usr/lib/python3.10/site-packages/samba/tests/dcerpc/raw_protocol.py
@@ -583,6 +576,8 @@ usr/lib/python3.10/site-packages/samba/tests/blackbox/rpcd_witness_samba_only.py
 #usr/lib/python3.10/site-packages/samba/tests/dsdb_api.py
 #usr/lib/python3.10/site-packages/samba/tests/dsdb_dns.py
 #usr/lib/python3.10/site-packages/samba/tests/dsdb_lock.py
+#usr/lib/python3.10/site-packages/samba/tests/dsdb_quiet_env_tests.py
+#usr/lib/python3.10/site-packages/samba/tests/dsdb_quiet_provision_tests.py
 #usr/lib/python3.10/site-packages/samba/tests/dsdb_schema_attributes.py
 #usr/lib/python3.10/site-packages/samba/tests/emulate
 #usr/lib/python3.10/site-packages/samba/tests/emulate/__init__.py
@@ -620,6 +615,7 @@ usr/lib/python3.10/site-packages/samba/tests/blackbox/rpcd_witness_samba_only.py
 #usr/lib/python3.10/site-packages/samba/tests/krb5/etype_tests.py
 #usr/lib/python3.10/site-packages/samba/tests/krb5/fast_tests.py
 #usr/lib/python3.10/site-packages/samba/tests/krb5/gkdi_tests.py
+#usr/lib/python3.10/site-packages/samba/tests/krb5/gmsa_tests.py
 #usr/lib/python3.10/site-packages/samba/tests/krb5/group_tests.py
 #usr/lib/python3.10/site-packages/samba/tests/krb5/kcrypto.py
 #usr/lib/python3.10/site-packages/samba/tests/krb5/kdc_base_test.py
@@ -716,6 +712,7 @@ usr/lib/python3.10/site-packages/samba/tests/blackbox/rpcd_witness_samba_only.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/domain_auth_policy.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/domain_auth_silo.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/domain_claim.py
+#usr/lib/python3.10/site-packages/samba/tests/samba_tool/domain_kds_root_key.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/domain_models.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/drs_clone_dc_data_lmdb_size.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/dsacl.py
@@ -738,6 +735,7 @@ usr/lib/python3.10/site-packages/samba/tests/blackbox/rpcd_witness_samba_only.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/provision_userPassword_crypt.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/rodc.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/schema.py
+#usr/lib/python3.10/site-packages/samba/tests/samba_tool/service_account.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/silo_base.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/sites.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/timecmd.py
@@ -782,7 +780,6 @@ usr/lib/python3.10/site-packages/samba/tests/blackbox/rpcd_witness_samba_only.py
 #usr/lib/python3.10/site-packages/samba/tests/upgradeprovisionneeddc.py
 #usr/lib/python3.10/site-packages/samba/tests/usage.py
 #usr/lib/python3.10/site-packages/samba/tests/xattr.py
-usr/lib/python3.10/site-packages/samba/trust_utils.py
 usr/lib/python3.10/site-packages/samba/upgrade.py
 usr/lib/python3.10/site-packages/samba/upgradehelpers.py
 usr/lib/python3.10/site-packages/samba/uptodateness.py
@@ -808,6 +805,7 @@ usr/lib/samba/krb5/winbind_krb5_locator.so
 #usr/lib/samba/ldb
 usr/lib/samba/ldb/asq.so
 usr/lib/samba/ldb/ildap.so
+usr/lib/samba/ldb/ldap.so
 usr/lib/samba/ldb/ldb.so
 usr/lib/samba/ldb/ldbsamba_extensions.so
 usr/lib/samba/ldb/paged_searches.so
@@ -847,8 +845,10 @@ usr/lib/samba/libcom-err-private-samba.so
 usr/lib/samba/libcommon-auth-private-samba.so
 usr/lib/samba/libdbwrap-private-samba.so
 usr/lib/samba/libdcerpc-pkt-auth-private-samba.so
+usr/lib/samba/libdcerpc-private-samba.so
 usr/lib/samba/libdcerpc-samba-private-samba.so
 usr/lib/samba/libdcerpc-samba4-private-samba.so
+usr/lib/samba/libdcerpc-samr-private-samba.so
 usr/lib/samba/libdnsserver-common-private-samba.so
 usr/lib/samba/libdsdb-module-private-samba.so
 usr/lib/samba/libevents-private-samba.so
@@ -901,14 +901,19 @@ usr/lib/samba/libregistry-private-samba.so
 usr/lib/samba/libreplace-private-samba.so
 usr/lib/samba/libroken-private-samba.so
 usr/lib/samba/libsamba-cluster-support-private-samba.so
+usr/lib/samba/libsamba-credentials-private-samba.so
 usr/lib/samba/libsamba-debug-private-samba.so
+usr/lib/samba/libsamba-hostconfig-private-samba.so
 usr/lib/samba/libsamba-modules-private-samba.so
-usr/lib/samba/libsamba-net.cpython-310-x86-64-linux-gnu-private-samba.so
+usr/lib/samba/libsamba-net-join.cpython-310-x86-64-linux-gnu-private-samba.so
+usr/lib/samba/libsamba-net-private-samba.so
+usr/lib/samba/libsamba-policy-private-samba.so
 usr/lib/samba/libsamba-python.cpython-310-x86-64-linux-gnu-private-samba.so
 usr/lib/samba/libsamba-security-private-samba.so
 usr/lib/samba/libsamba-sockets-private-samba.so
 usr/lib/samba/libsamba3-util-private-samba.so
 usr/lib/samba/libsamdb-common-private-samba.so
+usr/lib/samba/libsamdb-private-samba.so
 usr/lib/samba/libsecrets3-private-samba.so
 usr/lib/samba/libserver-id-db-private-samba.so
 usr/lib/samba/libserver-role-private-samba.so
@@ -928,9 +933,9 @@ usr/lib/samba/libtalloc-report-private-samba.so
 usr/lib/samba/libtdb-private-samba.so
 usr/lib/samba/libtdb-wrap-private-samba.so
 usr/lib/samba/libtevent-private-samba.so
+usr/lib/samba/libtevent-util-private-samba.so
 usr/lib/samba/libtime-basic-private-samba.so
 usr/lib/samba/libtorture-private-samba.so
-usr/lib/samba/libtrusts-util-private-samba.so
 usr/lib/samba/libutil-reg-private-samba.so
 usr/lib/samba/libutil-setid-private-samba.so
 usr/lib/samba/libutil-tdb-private-samba.so
diff --git a/lfs/samba b/lfs/samba
index 8d2c6a3a3..8358264a3 100644
--- a/lfs/samba
+++ b/lfs/samba
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 4.20.4
+VER        = 4.21.0
 SUMMARY    = A SMB/CIFS File, Print, and Authentication Server
 
 THISAPP    = samba-$(VER)
@@ -35,7 +35,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = samba
 PAK_VER    = 105
 
-DEPS       = avahi cups perl-Parse-Yapp wsdd
+DEPS       = avahi cups perl-Parse-Yapp perl-JSON wsdd
 
 SERVICES   = samba
 
@@ -47,7 +47,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 1e5d99ed249f7a2bc21d0efec1d795262c556276984d48a774aef133bc1a9e182b7f20ce85aef2fc2b7d7e0b8b3a4edf1a6a855f679ed4d2408bd69b059463ee
+$(DL_FILE)_BLAKE2 = 0889f2be3b78affee88250114397de87a77da77d9674815ec5605780a6bb3e2e28dbbae53b66695196408f4aef550acce793e6397045fbea4bb236fdd095ce1a
 
 install : $(TARGET)
 
