From bbae646f6b6d0c9a8c25c8c7546336890f6db59b Mon Sep 17 00:00:00 2001 From: Mateusz Piotrowski <0mp@FreeBSD.org> Date: Wed, 22 Oct 2025 16:20:07 +0200 Subject: net/samba422: Update to 4.22.3 Most of this patch is Andrej Ebert's work. I fixed some of the remaining issues and prepared it for landing in the ports tree under sponsorship from Klara, Inc. Changes in the port include: - There's an unconditional dependency on devel/icu now, since Samba pulls it in if it's in the build environment and complains afterwards if icu is bumped without a Samba rebuild. - Remove GSSAPI Builtin converters/p5-JSON build dependency, it's not needed since 4.20 as per upstream: https://www.samba.org/samba/history/samba-4.20.0.html - Change the LDAP_CONFIGURE option to --with-ldap/--without-ldap, the --with-openldap was patched in by the removed patch 0013. - Fix building with AD_DC disabled (by yasu@FreeBSD.org). The following paragraphs explain why certain files were added, modified, or deleted. 0013-Pass-additional-msg-parameter-to-CHECK_LIB-so-it-can.patch was removed. This patch did 3 things: - Introduce --with-openldap that we don't use anymore. - Increase verbosity of messages during buildtime, which we can drop. - Change the default of --with-libiconv, which we workaround now by passing ICONV_PREFIX explicitly. 0024-Cherry-pick-ZFS-provisioning-code-by-iXsystems-Inc.patch was split into: - patch-source3_smbd_pysmbd.c - patch-python_samba_join.py - patch-python_samba_provision_____init____.py 0027-Add-VFS-module-vfs_freebsd-that-implements-FreeBSD-s.patch was split into: - patch-source3_modules_vfs__freebsd.c - patch-docs-xml_manpages_vfs__freebsd.8.xml - patch-docs-xml_wscript__build - patch-source3_lib_sysacls.c - patch-source3_modules_wscript__build - patch-source3_param_loadparm.c 0028-Fix-rl_completion_func_t.patch was removed. Those changes seem to already be present in this release of Samba. 0099-s3-modules-zfsacl-fix-get-set-ACL-on-FreeBSD-13.patch was removed as it is no longer necessary thanks to patch-source3_modules_vfs__zfsacl.c. 0100-Fix-pathref-handling-for-FreeBSD-13plus_samba42x.patch was removed as it has been superseded by 0028-s3-lib-system-add-FreeBSD-proc_fd_pattern.patch. This change integrates the fdescfs patch from bug #284623, comment #20. 0102-FreeBSD-vfs_freebsd-fix-sys_proc_fd_path-args.patch was moved to patch-source3_modules_vfs__freebsd.c. patch-docs-xml_manpages_vfs__freebsd.8.xml contains parts of 0027-Add-VFS-module-vfs_freebsd-that-implements-FreeBSD-s.patch. patch-docs-xml_wscript__build contains parts of 0027-Add-VFS-module-vfs_freebsd-that-implements-FreeBSD-s.patch. patch-lib_ldb_wscript was removed as ldb is now bundled and private per default, as upstream recommends. Samba now conflicts with databases/ldb*. Subsequent commits to net/samba422 will make the bundled ldb public, so that other ports in the FreeBSD Ports Collection can satisfy their ldb dependency requirements with Samba 4.22. patch-lib_util_util_crypt_c was added to help Samba find the right headers. Obtained from: https://github.com/openbsd/ports/blob/master/net/samba/patches/patch-lib_util_util_crypt_c. patch-lib_util_wscript__build was removed as it no longer applied cleanly. patch-python_samba_join.py contains parts of 0024-Cherry-pick-ZFS-provisioning-code-by-iXsystems-Inc.patch. patch-python_samba_provision_____init____.py contains parts of 0024-Cherry-pick-ZFS-provisioning-code-by-iXsystems-Inc.patch. patch-python_samba_tdb__util.py was removed as those changes were upstreamed and are shipped in this version of Samba. Refer to https://bugzilla.samba.org/show_bug.cgi?id=15804 for more details. patch-source3_lib_sysacls.c contains parts of 0027-Add-VFS-module-vfs_freebsd-that-implements-FreeBSD-s.patch. patch-source3_modules_vfs__freebsd.c contains parts of 0027-Add-VFS-module-vfs_freebsd-that-implements-FreeBSD-s.patch and 0102-FreeBSD-vfs_freebsd-fix-sys_proc_fd_path-args.patch. patch-source3_modules_vfs__zfsacl.c was added. It is a patch by Peter Eriksson from https://bugzilla.samba.org/show_bug.cgi?id=15376. This change fixes setting ACLs from Windows for us, which was broken since Samba 4.19. patch-source3_modules_wscript__build contains parts of 0027-Add-VFS-module-vfs_freebsd-that-implements-FreeBSD-s.patch. patch-source3_param_loadparm.c contains parts of 0027-Add-VFS-module-vfs_freebsd-that-implements-FreeBSD-s.patch. patch-source3_smbd_pysmbd.c contains parts of 0024-Cherry-pick-ZFS-provisioning-code-by-iXsystems-Inc.patch. patch-source3_wscript__build was removed as it no longer applied cleanly. In future updates we should probably bring back 0024-Cherry-pick-ZFS-provisioning-code-by-iXsystems-Inc.patch and 0027-Add-VFS-module-vfs_freebsd-that-implements-FreeBSD-s.patch. Changes: https://wiki.samba.org/index.php/Samba_Features_added/changed#Samba_4.21 Changes: https://wiki.samba.org/index.php/Samba_Features_added/changed#Samba_4.22 PR: 284623, 287985 Reported by: Andrej Ebert Reviewed by: Michael Zoon Tested by: ghelmer@, kiwi@ Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D52168 Co-authored-by: Andrej Ebert Co-authored-by: Yasuhiro Kimura --- net/samba422/files/patch-docs-xml_wscript__build | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 net/samba422/files/patch-docs-xml_wscript__build (limited to 'net/samba422/files/patch-docs-xml_wscript__build') diff --git a/net/samba422/files/patch-docs-xml_wscript__build b/net/samba422/files/patch-docs-xml_wscript__build new file mode 100644 index 000000000000..cc8e028a823c --- /dev/null +++ b/net/samba422/files/patch-docs-xml_wscript__build @@ -0,0 +1,10 @@ +--- docs-xml/wscript_build.orig 2025-02-06 10:31:53 UTC ++++ docs-xml/wscript_build +@@ -88,6 +88,7 @@ vfs_module_manpages = ['vfs_acl_tdb', + 'vfs_extd_audit', + 'vfs_fake_perms', + 'vfs_fileid', ++ 'vfs_freebsd', + 'vfs_fruit', + 'vfs_full_audit', + 'vfs_glusterfs', -- cgit v1.2.3