diff --git a/config/rootfiles/packages/aarch64/samba b/config/rootfiles/packages/aarch64/samba
index 59c9a1b77..42269595a 100644
--- a/config/rootfiles/packages/aarch64/samba
+++ b/config/rootfiles/packages/aarch64/samba
@@ -518,6 +518,7 @@ usr/lib/python3.10/site-packages/samba/tests/blackbox/claims.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
@@ -1016,6 +1017,3 @@ var/lib/samba/private
 var/lib/samba/winbindd_privileged
 var/log/samba
 var/spool/samba
-srv/web/ipfire/cgi-bin/samba.cgi
-var/ipfire/menu.d/EX-samba.menu
-usr/local/bin/sambactrl
diff --git a/config/rootfiles/packages/x86_64/samba b/config/rootfiles/packages/x86_64/samba
index f511e0101..b8c517516 100644
--- a/config/rootfiles/packages/x86_64/samba
+++ b/config/rootfiles/packages/x86_64/samba
@@ -210,90 +210,90 @@ usr/lib/libwbclient.so.0.16
 #usr/lib/pkgconfig/netapi.pc
 #usr/lib/pkgconfig/samba-credentials.pc
 #usr/lib/pkgconfig/samba-hostconfig.pc
-#usr/lib/pkgconfig/samba-policy.cpython-310-xxxMACHINExxx-linux-gnu.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
 usr/lib/python3.10/site-packages/_tdb_text.py
-usr/lib/python3.10/site-packages/_tevent.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/ldb.cpython-310-xxxMACHINExxx-linux-gnu.so
+usr/lib/python3.10/site-packages/_tevent.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/ldb.cpython-310-x86_64-linux-gnu.so
 #usr/lib/python3.10/site-packages/samba
 usr/lib/python3.10/site-packages/samba/__init__.py
-usr/lib/python3.10/site-packages/samba/_glue.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/_ldb.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/auth.cpython-310-xxxMACHINExxx-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/_glue.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/_ldb.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/auth.cpython-310-x86_64-linux-gnu.so
 usr/lib/python3.10/site-packages/samba/auth_util.py
 usr/lib/python3.10/site-packages/samba/colour.py
 usr/lib/python3.10/site-packages/samba/common.py
-usr/lib/python3.10/site-packages/samba/compression.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/credentials.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/crypto.cpython-310-xxxMACHINExxx-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/compression.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/credentials.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/crypto.cpython-310-x86_64-linux-gnu.so
 usr/lib/python3.10/site-packages/samba/dbchecker.py
 #usr/lib/python3.10/site-packages/samba/dcerpc
 usr/lib/python3.10/site-packages/samba/dcerpc/__init__.py
-usr/lib/python3.10/site-packages/samba/dcerpc/atsvc.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/dcerpc/auth.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/dcerpc/base.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/dcerpc/claims.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/dcerpc/conditional_ace.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/dcerpc/dcerpc.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/dcerpc/dfs.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/dcerpc/dns.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/dcerpc/dnsp.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/dcerpc/dnsserver.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/dcerpc/drsblobs.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/dcerpc/drsuapi.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/dcerpc/echo.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/dcerpc/epmapper.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/dcerpc/gkdi.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/dcerpc/gmsa.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/dcerpc/idmap.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/dcerpc/initshutdown.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/dcerpc/irpc.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/dcerpc/krb5ccache.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/dcerpc/krb5pac.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/dcerpc/lsa.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/dcerpc/mdssvc.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/dcerpc/messaging.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/dcerpc/mgmt.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/dcerpc/misc.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/dcerpc/nbt.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/dcerpc/netlogon.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/dcerpc/ntlmssp.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/dcerpc/preg.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/dcerpc/samr.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/dcerpc/security.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/dcerpc/server_id.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/dcerpc/smb3posix.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/dcerpc/smbXsrv.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/dcerpc/smb_acl.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/dcerpc/spoolss.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/dcerpc/srvsvc.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/dcerpc/svcctl.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/dcerpc/unixinfo.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/dcerpc/winbind.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/dcerpc/windows_event_ids.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/dcerpc/winreg.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/dcerpc/winspool.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/dcerpc/witness.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/dcerpc/wkssvc.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/dcerpc/xattr.cpython-310-xxxMACHINExxx-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/dcerpc/atsvc.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/dcerpc/auth.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/dcerpc/base.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/dcerpc/claims.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/dcerpc/conditional_ace.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/dcerpc/dcerpc.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/dcerpc/dfs.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/dcerpc/dns.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/dcerpc/dnsp.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/dcerpc/dnsserver.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/dcerpc/drsblobs.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/dcerpc/drsuapi.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/dcerpc/echo.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/dcerpc/epmapper.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/dcerpc/gkdi.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/dcerpc/gmsa.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/dcerpc/idmap.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/dcerpc/initshutdown.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/dcerpc/irpc.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/dcerpc/krb5ccache.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/dcerpc/krb5pac.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/dcerpc/lsa.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/dcerpc/mdssvc.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/dcerpc/messaging.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/dcerpc/mgmt.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/dcerpc/misc.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/dcerpc/nbt.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/dcerpc/netlogon.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/dcerpc/ntlmssp.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/dcerpc/preg.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/dcerpc/samr.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/dcerpc/security.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/dcerpc/server_id.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/dcerpc/smb3posix.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/dcerpc/smbXsrv.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/dcerpc/smb_acl.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/dcerpc/spoolss.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/dcerpc/srvsvc.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/dcerpc/svcctl.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/dcerpc/unixinfo.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/dcerpc/winbind.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/dcerpc/windows_event_ids.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/dcerpc/winreg.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/dcerpc/winspool.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/dcerpc/witness.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/dcerpc/wkssvc.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/dcerpc/xattr.cpython-310-x86_64-linux-gnu.so
 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_update.py
 usr/lib/python3.10/site-packages/samba/drs_utils.py
-usr/lib/python3.10/site-packages/samba/dsdb.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/dsdb_dns.cpython-310-xxxMACHINExxx-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/dsdb.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/dsdb_dns.cpython-310-x86_64-linux-gnu.so
 #usr/lib/python3.10/site-packages/samba/emulate
 usr/lib/python3.10/site-packages/samba/emulate/__init__.py
 usr/lib/python3.10/site-packages/samba/emulate/traffic.py
 usr/lib/python3.10/site-packages/samba/emulate/traffic_packets.py
 usr/lib/python3.10/site-packages/samba/forest_update.py
 usr/lib/python3.10/site-packages/samba/functional_level.py
-usr/lib/python3.10/site-packages/samba/gensec.cpython-310-xxxMACHINExxx-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/gensec.cpython-310-x86_64-linux-gnu.so
 usr/lib/python3.10/site-packages/samba/getopt.py
 usr/lib/python3.10/site-packages/samba/gkdi.py
 usr/lib/python3.10/site-packages/samba/gp
@@ -330,10 +330,10 @@ usr/lib/python3.10/site-packages/samba/gp_parse/gp_csv.py
 usr/lib/python3.10/site-packages/samba/gp_parse/gp_inf.py
 usr/lib/python3.10/site-packages/samba/gp_parse/gp_ini.py
 usr/lib/python3.10/site-packages/samba/gp_parse/gp_pol.py
-usr/lib/python3.10/site-packages/samba/gpo.cpython-310-xxxMACHINExxx-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/gpo.cpython-310-x86_64-linux-gnu.so
 usr/lib/python3.10/site-packages/samba/graph.py
 usr/lib/python3.10/site-packages/samba/hostconfig.py
-usr/lib/python3.10/site-packages/samba/hresult.cpython-310-xxxMACHINExxx-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/hresult.cpython-310-x86_64-linux-gnu.so
 usr/lib/python3.10/site-packages/samba/idmap.py
 usr/lib/python3.10/site-packages/samba/join.py
 #usr/lib/python3.10/site-packages/samba/kcc
@@ -345,15 +345,15 @@ 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/mdb_util.py
-usr/lib/python3.10/site-packages/samba/messaging.cpython-310-xxxMACHINExxx-linux-gnu.so
+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
 usr/lib/python3.10/site-packages/samba/ms_forest_updates_markdown.py
 usr/lib/python3.10/site-packages/samba/ms_schema.py
 usr/lib/python3.10/site-packages/samba/ms_schema_markdown.py
 usr/lib/python3.10/site-packages/samba/ndr.py
-usr/lib/python3.10/site-packages/samba/net.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/net_s3.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/netbios.cpython-310-xxxMACHINExxx-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/net.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/net_s3.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/netbios.cpython-310-x86_64-linux-gnu.so
 #usr/lib/python3.10/site-packages/samba/netcmd
 usr/lib/python3.10/site-packages/samba/netcmd/__init__.py
 usr/lib/python3.10/site-packages/samba/netcmd/common.py
@@ -459,11 +459,11 @@ usr/lib/python3.10/site-packages/samba/netcmd/validators.py
 usr/lib/python3.10/site-packages/samba/netcmd/visualize.py
 usr/lib/python3.10/site-packages/samba/nt_time.py
 usr/lib/python3.10/site-packages/samba/ntacls.py
-usr/lib/python3.10/site-packages/samba/ntstatus.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/param.cpython-310-xxxMACHINExxx-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/ntstatus.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/param.cpython-310-x86_64-linux-gnu.so
 usr/lib/python3.10/site-packages/samba/policies.py
-usr/lib/python3.10/site-packages/samba/policy.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/posix_eadb.cpython-310-xxxMACHINExxx-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/policy.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/posix_eadb.cpython-310-x86_64-linux-gnu.so
 #usr/lib/python3.10/site-packages/samba/provision
 usr/lib/python3.10/site-packages/samba/provision/__init__.py
 usr/lib/python3.10/site-packages/samba/provision/backend.py
@@ -471,25 +471,25 @@ usr/lib/python3.10/site-packages/samba/provision/common.py
 usr/lib/python3.10/site-packages/samba/provision/kerberos.py
 usr/lib/python3.10/site-packages/samba/provision/kerberos_implementation.py
 usr/lib/python3.10/site-packages/samba/provision/sambadns.py
-usr/lib/python3.10/site-packages/samba/registry.cpython-310-xxxMACHINExxx-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/registry.cpython-310-x86_64-linux-gnu.so
 usr/lib/python3.10/site-packages/samba/remove_dc.py
-usr/lib/python3.10/site-packages/samba/reparse_symlink.cpython-310-xxxMACHINExxx-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/reparse_symlink.cpython-310-x86_64-linux-gnu.so
 usr/lib/python3.10/site-packages/samba/safe_tarfile.py
 #usr/lib/python3.10/site-packages/samba/samba3
 usr/lib/python3.10/site-packages/samba/samba3/__init__.py
-usr/lib/python3.10/site-packages/samba/samba3/libsmb_samba_cwrapper.cpython-310-xxxMACHINExxx-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/samba3/libsmb_samba_cwrapper.cpython-310-x86_64-linux-gnu.so
 usr/lib/python3.10/site-packages/samba/samba3/libsmb_samba_internal.py
-usr/lib/python3.10/site-packages/samba/samba3/mdscli.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/samba3/param.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/samba3/passdb.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/samba3/smbconf.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/samba3/smbd.cpython-310-xxxMACHINExxx-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/samba3/mdscli.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/samba3/param.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/samba3/passdb.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/samba3/smbconf.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/samba3/smbd.cpython-310-x86_64-linux-gnu.so
 usr/lib/python3.10/site-packages/samba/samdb.py
 usr/lib/python3.10/site-packages/samba/schema.py
 usr/lib/python3.10/site-packages/samba/sd_utils.py
-usr/lib/python3.10/site-packages/samba/security.cpython-310-xxxMACHINExxx-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/security.cpython-310-x86_64-linux-gnu.so
 usr/lib/python3.10/site-packages/samba/sites.py
-usr/lib/python3.10/site-packages/samba/smbconf.cpython-310-xxxMACHINExxx-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/smbconf.cpython-310-x86_64-linux-gnu.so
 usr/lib/python3.10/site-packages/samba/subnets.py
 #usr/lib/python3.10/site-packages/samba/subunit
 usr/lib/python3.10/site-packages/samba/subunit/__init__.py
@@ -518,6 +518,7 @@ usr/lib/python3.10/site-packages/samba/tests/blackbox/claims.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
@@ -785,12 +786,12 @@ 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
-usr/lib/python3.10/site-packages/samba/werror.cpython-310-xxxMACHINExxx-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/werror.cpython-310-x86_64-linux-gnu.so
 usr/lib/python3.10/site-packages/samba/xattr.py
-usr/lib/python3.10/site-packages/samba/xattr_native.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/samba/xattr_tdb.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/talloc.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/tdb.cpython-310-xxxMACHINExxx-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/xattr_native.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/samba/xattr_tdb.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/talloc.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/tdb.cpython-310-x86_64-linux-gnu.so
 usr/lib/python3.10/site-packages/tevent.py
 #usr/lib/samba
 usr/lib/samba/idmap
@@ -1016,6 +1017,3 @@ var/lib/samba/private
 var/lib/samba/winbindd_privileged
 var/log/samba
 var/spool/samba
-srv/web/ipfire/cgi-bin/samba.cgi
-var/ipfire/menu.d/EX-samba.menu
-usr/local/bin/sambactrl
diff --git a/lfs/samba b/lfs/samba
index ec6ef832a..b21629bf9 100644
--- a/lfs/samba
+++ b/lfs/samba
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 4.20.1
+VER        = 4.20.2
 SUMMARY    = A SMB/CIFS File, Print, and Authentication Server
 
 THISAPP    = samba-$(VER)
@@ -33,7 +33,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = samba
-PAK_VER    = 101
+PAK_VER    = 102
 
 DEPS       = avahi cups perl-Parse-Yapp perl-JSON wsdd
 
@@ -47,7 +47,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 5516b3d74705ee829971119d9931ccd339aaa857647dc46e40fda96f65ec5ba695db107f91075a46e1a7135cfdcc0a56ee67aa3475649b314260be03e4e44657
+$(DL_FILE)_BLAKE2 = dffa86c8f3abca45e0b9dd29e723fbc13c0dac6c2b50d6240151ec0ae261fa5d9f43cc57403fa0b35624fd05f8cb50e2945d26b5f5205be48ccb60db0e64c1f7
 
 install : $(TARGET)
 
