samba4: downgrade to 4.13.9, as discussed on netbsd-users@

8 files changed, 104 insertions, 44 deletions

diff --git a/net/samba4/Makefile b/net/samba4/Makefile
index 382e95552ac..7576c54c452 100644
--- a/net/samba4/Makefile
+++ b/net/samba4/Makefile
@@ -1,7 +1,14 @@
-# $NetBSD: Makefile,v 1.126 2021/06/21 10:23:48 nia Exp $
-
-DISTNAME=	samba-4.14.5
-PKGREVISION=	1
+# $NetBSD: Makefile,v 1.127 2021/06/22 09:36:41 nia Exp $
+
+#
+# WARNING: DO NOT UPDATE WITHOUT RESOLVING THIS ISSUE:
+#
+# Samba 4.14 is incompatible with procfs in NetBSD 9.2 and other
+# BSDs!
+#
+# Please do not update without testing on NetBSD 9.2!
+#
+DISTNAME=	samba-4.13.9
 CATEGORIES=	net
 MASTER_SITES=	https://download.samba.org/pub/samba/stable/
 
diff --git a/net/samba4/PLIST b/net/samba4/PLIST
index f7616c08f9a..9ec0e1ed5e6 100644
--- a/net/samba4/PLIST
+++ b/net/samba4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.37 2021/05/30 20:02:31 thor Exp $
+@comment $NetBSD: PLIST,v 1.38 2021/06/22 09:36:41 nia Exp $
 bin/cifsdd
 bin/dbwrap_tool
 bin/dumpmscat
@@ -111,6 +111,7 @@ include/util/genrand.h
 include/util/idtree.h
 include/util/idtree_random.h
 include/util/signal.h
+include/util/string_wrappers.h
 include/util/substitute.h
 include/util/tevent_ntstatus.h
 include/util/tevent_unix.h
@@ -145,13 +146,13 @@ lib/libndr-standard.so.0
 lib/libndr-standard.so.0.0.1
 lib/libndr.so
 lib/libndr.so.1
-lib/libndr.so.1.0.1
+lib/libndr.so.1.0.0
 lib/libnetapi.so
 lib/libnetapi.so.0
 lib/libnss_winbind.so
 lib/libsamba-credentials.so
-lib/libsamba-credentials.so.1
-lib/libsamba-credentials.so.1.0.0
+lib/libsamba-credentials.so.0
+lib/libsamba-credentials.so.0.0.1
 lib/libsamba-errors.so
 lib/libsamba-errors.so.1
 lib/libsamba-hostconfig.so
@@ -171,12 +172,11 @@ lib/libsamdb.so.0
 lib/libsamdb.so.0.0.1
 lib/libsmbclient.so
 lib/libsmbclient.so.0
-lib/libsmbclient.so.0.7.0
+lib/libsmbclient.so.0.6.0
 lib/libsmbconf.so
 lib/libsmbconf.so.0
 ${PLIST.ldap}lib/libsmbldap.so
 ${PLIST.ldap}lib/libsmbldap.so.2
-lib/libsmbldap.so.2.1.0
 lib/libtevent-util.so
 lib/libtevent-util.so.0
 lib/libtevent-util.so.0.0.1
@@ -205,6 +205,7 @@ ${PYSITELIB}/samba/auth.so
 ${PYSITELIB}/samba/auth_util.py
 ${PYSITELIB}/samba/colour.py
 ${PYSITELIB}/samba/common.py
+${PYSITELIB}/samba/compat.py
 ${PYSITELIB}/samba/credentials.so
 ${PYSITELIB}/samba/crypto.so
 ${PYSITELIB}/samba/dbchecker.py
@@ -264,7 +265,6 @@ ${PYSITELIB}/samba/forest_update.py
 ${PYSITELIB}/samba/gensec.so
 ${PYSITELIB}/samba/getopt.py
 ${PYSITELIB}/samba/gp_ext_loader.py
-${PYSITELIB}/samba/gp_msgs_ext.py
 ${PYSITELIB}/samba/gp_parse/__init__.py
 ${PYSITELIB}/samba/gp_parse/gp_aas.py
 ${PYSITELIB}/samba/gp_parse/gp_csv.py
@@ -273,8 +273,6 @@ ${PYSITELIB}/samba/gp_parse/gp_ini.py
 ${PYSITELIB}/samba/gp_parse/gp_pol.py
 ${PYSITELIB}/samba/gp_scripts_ext.py
 ${PYSITELIB}/samba/gp_sec_ext.py
-${PYSITELIB}/samba/gp_smb_conf_ext.py
-${PYSITELIB}/samba/gp_sudoers_ext.py
 ${PYSITELIB}/samba/gpclass.py
 ${PYSITELIB}/samba/gpo.so
 ${PYSITELIB}/samba/graph.py
@@ -340,8 +338,7 @@ ${PYSITELIB}/samba/provision/sambadns.py
 ${PYSITELIB}/samba/registry.so
 ${PYSITELIB}/samba/remove_dc.py
 ${PYSITELIB}/samba/samba3/__init__.py
-${PYSITELIB}/samba/samba3/libsmb_samba_cwrapper.so
-${PYSITELIB}/samba/samba3/libsmb_samba_internal.py
+${PYSITELIB}/samba/samba3/libsmb_samba_internal.so
 ${PYSITELIB}/samba/samba3/mdscli.so
 ${PYSITELIB}/samba/samba3/param.so
 ${PYSITELIB}/samba/samba3/passdb.so
@@ -378,8 +375,6 @@ ${PYSITELIB}/samba/tests/blackbox/netads_json.py
 ${PYSITELIB}/samba/tests/blackbox/samba_dnsupdate.py
 ${PYSITELIB}/samba/tests/blackbox/smbcacls.py
 ${PYSITELIB}/samba/tests/blackbox/smbcacls_basic.py
-${PYSITELIB}/samba/tests/blackbox/smbcacls_dfs_propagate_inherit.py
-${PYSITELIB}/samba/tests/blackbox/smbcacls_propagate_inhertance.py
 ${PYSITELIB}/samba/tests/blackbox/smbcontrol.py
 ${PYSITELIB}/samba/tests/blackbox/smbcontrol_process.py
 ${PYSITELIB}/samba/tests/blackbox/traffic_learner.py
@@ -388,13 +383,10 @@ ${PYSITELIB}/samba/tests/blackbox/traffic_summary.py
 ${PYSITELIB}/samba/tests/common.py
 ${PYSITELIB}/samba/tests/complex_expressions.py
 ${PYSITELIB}/samba/tests/core.py
-${PYSITELIB}/samba/tests/cred_opt.py
 ${PYSITELIB}/samba/tests/credentials.py
 ${PYSITELIB}/samba/tests/dcerpc/__init__.py
 ${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/mdssvc.py
@@ -405,7 +397,6 @@ ${PYSITELIB}/samba/tests/dcerpc/registry.py
 ${PYSITELIB}/samba/tests/dcerpc/rpc_talloc.py
 ${PYSITELIB}/samba/tests/dcerpc/rpcecho.py
 ${PYSITELIB}/samba/tests/dcerpc/sam.py
-${PYSITELIB}/samba/tests/dcerpc/samr_change_password.py
 ${PYSITELIB}/samba/tests/dcerpc/srvsvc.py
 ${PYSITELIB}/samba/tests/dcerpc/string_tests.py
 ${PYSITELIB}/samba/tests/dcerpc/testrpc.py
@@ -443,14 +434,8 @@ ${PYSITELIB}/samba/tests/kcc/graph.py
 ${PYSITELIB}/samba/tests/kcc/graph_utils.py
 ${PYSITELIB}/samba/tests/kcc/kcc_utils.py
 ${PYSITELIB}/samba/tests/kcc/ldif_import_export.py
-${PYSITELIB}/samba/tests/krb5/as_canonicalization_tests.py
-${PYSITELIB}/samba/tests/krb5/compatability_tests.py
 ${PYSITELIB}/samba/tests/krb5/kcrypto.py
-${PYSITELIB}/samba/tests/krb5/kdc_base_test.py
-${PYSITELIB}/samba/tests/krb5/kdc_tests.py
-${PYSITELIB}/samba/tests/krb5/kdc_tgs_tests.py
 ${PYSITELIB}/samba/tests/krb5/raw_testcase.py
-${PYSITELIB}/samba/tests/krb5/rfc4120_constants.py
 ${PYSITELIB}/samba/tests/krb5/rfc4120_pyasn1.py
 ${PYSITELIB}/samba/tests/krb5/s4u_tests.py
 ${PYSITELIB}/samba/tests/krb5/simple_tests.py
@@ -538,7 +523,6 @@ ${PYSITELIB}/samba/tests/samdb.py
 ${PYSITELIB}/samba/tests/samdb_api.py
 ${PYSITELIB}/samba/tests/security.py
 ${PYSITELIB}/samba/tests/segfault.py
-${PYSITELIB}/samba/tests/smb-notify.py
 ${PYSITELIB}/samba/tests/smb.py
 ${PYSITELIB}/samba/tests/smbd_base.py
 ${PYSITELIB}/samba/tests/smbd_fuzztest.py
@@ -551,11 +535,10 @@ ${PYSITELIB}/samba/tests/upgradeprovision.py
 ${PYSITELIB}/samba/tests/upgradeprovisionneeddc.py
 ${PYSITELIB}/samba/tests/usage.py
 ${PYSITELIB}/samba/tests/xattr.py
-${PYSITELIB}/samba/trust_utils.py
+${PYSITELIB}/samba/third_party/__init__.py
 ${PYSITELIB}/samba/upgrade.py
 ${PYSITELIB}/samba/upgradehelpers.py
 ${PYSITELIB}/samba/uptodateness.py
-${PYSITELIB}/samba/vgp_sudoers_ext.py
 ${PYSITELIB}/samba/werror.so
 ${PYSITELIB}/samba/xattr.py
 ${PYSITELIB}/samba/xattr_native.so
@@ -575,7 +558,6 @@ ${PLIST.ads}lib/samba/idmap/rfc2307.${SOEXT}
 lib/samba/idmap/rid.${SOEXT}
 lib/samba/idmap/script.${SOEXT}
 lib/samba/idmap/tdb2.${SOEXT}
-lib/samba/krb5/async_dns_krb5_locator.${SOEXT}
 lib/samba/krb5/winbind_krb5_locator.${SOEXT}
 lib/samba/ldb/acl.${SOEXT}
 lib/samba/ldb/aclread.${SOEXT}
diff --git a/net/samba4/buildlink3.mk b/net/samba4/buildlink3.mk
index 6d00273d220..2b736f55f61 100644
--- a/net/samba4/buildlink3.mk
+++ b/net/samba4/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2021/04/21 13:24:14 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2021/06/22 09:36:41 nia Exp $
 
 BUILDLINK_TREE+=	samba
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	samba
 SAMBA_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.samba+=	samba>=4.9.4
-BUILDLINK_ABI_DEPENDS.samba?=	samba>=4.14.2nb1
+BUILDLINK_ABI_DEPENDS.samba?=	samba>=4.13.9
 BUILDLINK_PKGSRCDIR.samba?=	../../net/samba4
 
 .include "../../archivers/libarchive/buildlink3.mk"
diff --git a/net/samba4/distinfo b/net/samba4/distinfo
index ddadc17385e..bf6c1a5e490 100644
--- a/net/samba4/distinfo
+++ b/net/samba4/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.62 2021/06/01 08:30:17 adam Exp $
+$NetBSD: distinfo,v 1.63 2021/06/22 09:36:41 nia Exp $
 
-SHA1 (samba-4.14.5.tar.gz) = 498f9aec010962b790b363adf2fe1fcd68e44db6
-RMD160 (samba-4.14.5.tar.gz) = 9e7997033b458967fb63be9809ba2df1e2d3e025
-SHA512 (samba-4.14.5.tar.gz) = ef50aae93141a41034a10eb0b1a135d4b8b28c63663b930d24d6199d9ffd1fd139b6443d1859df19d3299b507a4a1c2810de057e2affd4e8b8cfc7175fdd7b39
-Size (samba-4.14.5.tar.gz) = 18653694 bytes
+SHA1 (samba-4.13.9.tar.gz) = 53e167dc014b77b4314943f177a1e9ff77daf320
+RMD160 (samba-4.13.9.tar.gz) = 97fa709930487bdd08d0da5bce18d7dc05e17d9f
+SHA512 (samba-4.13.9.tar.gz) = 35c98979c1141fe4bd700e3c8f2439ec08876697faeaced6668ea6a9fea1d8303ca34e82123499aa4a41054b9ed6e1260ae779ea8d59978ba6de6b5861f21948
+Size (samba-4.13.9.tar.gz) = 18443813 bytes
 SHA1 (patch-buildtools_wafsamba_samba__conftests.py) = d927db17124d2bb5b382885e70a41f84c3929926
 SHA1 (patch-buildtools_wafsamba_samba__install.py) = d801340617da325e3bb70a90350e45cc8e383c2d
 SHA1 (patch-buildtools_wafsamba_samba__pidl.py) = e4c0ed3dacfcf5613a5b397b3c6cf88509497da7
@@ -15,20 +15,22 @@ SHA1 (patch-lib_pthreadpool_pthreadpool.c) = 4b0c3d49d578b5ab12f5bad1ebeb50efb43
 SHA1 (patch-lib_replace_system_passwd.h) = 652be067b2560310ce3a4bbf37c24cb2fa8eb82d
 SHA1 (patch-lib_replace_wscript) = 2a754e7310850b376d5881b82a8467041284fce9
 SHA1 (patch-lib_tdb_common_mutex.c) = 74162bf9dfd440fc0b9782982e83776c9671a983
-SHA1 (patch-lib_tevent_tevent.c) = c5100a1ab65ab5a645901e9a9fb021a6f38cc2c5
+SHA1 (patch-lib_tevent_tevent.c) = dc782c5b7214abf52a4c8c242018b1989bca08e3
 SHA1 (patch-lib_tevent_tevent__threads.c) = e5e82db82cff4d550451cd9290b3a351b25d4de4
 SHA1 (patch-lib_tevent_wscript) = fbbe2024096b57d651d90064f53489a974db9d7a
 SHA1 (patch-lib_util_charset_charset__macosxfs.c) = 9772fc52fff48aec2a7e279223f73bb791217c26
-SHA1 (patch-lib_util_smb__threads.h) = ee8366e4d68d1c8965e9d86bdade965822133ca6
+SHA1 (patch-lib_util_smb__threads.h) = 817591a2b69f31ac29497a2006fe21f0b4b0aaea
 SHA1 (patch-lib_util_tfork.c) = a9acb5561c5bba76450c48904a22019c8b14cbec
 SHA1 (patch-libcli_dns_wscript__build) = 4103a144aa1bb4662fd7a62270941f1a3d01fe89
 SHA1 (patch-nsswitch_stress-nss-libwbclient.c) = c546f00184b0d22b6c150e210962cdfc6fc12df2
 SHA1 (patch-nsswitch_winbind__nss__netbsd.c) = 2773ec9269d1fe0d7ce7ed220f6a7122d187fabe
 SHA1 (patch-nsswitch_wscript__build) = e8a6251e031ffa13d6347fade8891f7afd65d3eb
+SHA1 (patch-source3_libsmb_libsmb__stat.c) = 1f88759babfd64b525df8087ea143c7bc3171549
 SHA1 (patch-source3_libsmb_pylibsmb.c) = 962bb35b140ec11c0035ffa7fb83c9143fa5615f
 SHA1 (patch-source3_smbd_process.c) = 3a6f9682aca6473e364d0be0f601774df4fd1296
 SHA1 (patch-source4_dsdb_samdb_ldb__modules_wscript__build__server) = 47f55ec16b667a0a4d38de5ac89a117f2ac8f898
 SHA1 (patch-source4_heimdal__build_roken.h) = f467a541fa09e2aa483d10ed9d49df9167a3443a
 SHA1 (patch-source4_heimdal_include_heim__threads.h) = 1108fe804f235c72a93bcda0ec14454828ed030f
 SHA1 (patch-source4_scripting_wsript_build) = bd4feddcaadf1c3d2d25eb7914e7b5843e4e9511
+SHA1 (patch-source4_torture_libsmbclient_libsmbclient.c) = 38bb8b53581d5f0b5b0e9f0fce58f51148e91c20
 SHA1 (patch-source4_utils_oLschema2ldif_wscript__build) = b0cbbcd4ebedd443dc9f9a59d1dad2e039bb9663
diff --git a/net/samba4/patches/patch-lib_tevent_tevent.c b/net/samba4/patches/patch-lib_tevent_tevent.c
index f23048c817f..923a2e7698b 100644
--- a/net/samba4/patches/patch-lib_tevent_tevent.c
+++ b/net/samba4/patches/patch-lib_tevent_tevent.c
@@ -1,9 +1,9 @@
-$NetBSD: patch-lib_tevent_tevent.c,v 1.2 2021/04/29 15:21:16 taca Exp $
+$NetBSD: patch-lib_tevent_tevent.c,v 1.3 2021/06/22 09:36:41 nia Exp $
 
 On SunOS (OpenSolaris), pthread_mutex_init() expects a zeroed-out
 mutex data structure
 
---- lib/tevent/tevent.c.orig	2019-01-15 10:07:00.000000000 +0000
+--- lib/tevent/tevent.c.orig	2020-07-09 09:33:56.000000000 +0000
 +++ lib/tevent/tevent.c
 @@ -423,6 +423,7 @@ static int tevent_common_context_constru
  		return ret;
diff --git a/net/samba4/patches/patch-lib_util_smb__threads.h b/net/samba4/patches/patch-lib_util_smb__threads.h
index b3dfe194a82..36f6af68985 100644
--- a/net/samba4/patches/patch-lib_util_smb__threads.h
+++ b/net/samba4/patches/patch-lib_util_smb__threads.h
@@ -1,9 +1,9 @@
-$NetBSD: patch-lib_util_smb__threads.h,v 1.2 2021/04/29 15:21:16 taca Exp $
+$NetBSD: patch-lib_util_smb__threads.h,v 1.3 2021/06/22 09:36:41 nia Exp $
 
 On SunOS (OpenSolaris), pthread_mutex_init() expects a zeroed-out
 mutex data structure
 
---- lib/util/smb_threads.h.orig	2019-01-15 10:07:00.000000000 +0000
+--- lib/util/smb_threads.h.orig	2020-07-09 09:33:56.000000000 +0000
 +++ lib/util/smb_threads.h
 @@ -66,6 +66,7 @@ static int smb_create_mutex_pthread(cons
  	if (!pmut) { \
diff --git a/net/samba4/patches/patch-source3_libsmb_libsmb__stat.c b/net/samba4/patches/patch-source3_libsmb_libsmb__stat.c
new file mode 100644
index 00000000000..22e8729a9d7
--- /dev/null
+++ b/net/samba4/patches/patch-source3_libsmb_libsmb__stat.c
@@ -0,0 +1,37 @@
+$NetBSD: patch-source3_libsmb_libsmb__stat.c,v 1.3 2021/06/22 09:36:41 nia Exp $
+
+Compatibility fix.
+
+--- source3/libsmb/libsmb_stat.c.orig	2020-11-11 15:02:40.000000000 +0000
++++ source3/libsmb/libsmb_stat.c
+@@ -102,18 +102,30 @@ void setup_stat(struct stat *st,
+ 	}
+ 
+ 	st->st_dev = dev;
++#if defined(__APPLE__) || defined(__NetBSD__)
++	st->st_atimespec = access_time_ts;
++	st->st_ctimespec = change_time_ts;
++	st->st_mtimespec = write_time_ts;
++#else
+ 	st->st_atim = access_time_ts;
+ 	st->st_ctim = change_time_ts;
+ 	st->st_mtim = write_time_ts;
++#endif
+ }
+ 
+ void setup_stat_from_stat_ex(const struct stat_ex *stex,
+ 			     const char *fname,
+ 			     struct stat *st)
+ {
++#if defined(__APPLE__) || defined(__NetBSD__)
++	st->st_atimespec = stex->st_ex_atime;
++	st->st_ctimespec = stex->st_ex_ctime;
++	st->st_mtimespec = stex->st_ex_mtime;
++#else
+ 	st->st_atim = stex->st_ex_atime;
+ 	st->st_ctim = stex->st_ex_ctime;
+ 	st->st_mtim = stex->st_ex_mtime;
++#endif
+ 
+ 	st->st_mode = stex->st_ex_mode;
+ 	st->st_size = stex->st_ex_size;
diff --git a/net/samba4/patches/patch-source4_torture_libsmbclient_libsmbclient.c b/net/samba4/patches/patch-source4_torture_libsmbclient_libsmbclient.c
new file mode 100644
index 00000000000..e1872481383
--- /dev/null
+++ b/net/samba4/patches/patch-source4_torture_libsmbclient_libsmbclient.c
@@ -0,0 +1,32 @@
+$NetBSD: patch-source4_torture_libsmbclient_libsmbclient.c,v 1.3 2021/06/22 09:36:41 nia Exp $
+
+Compatibility fix.
+
+--- source4/torture/libsmbclient/libsmbclient.c.orig	2020-11-11 15:11:03.000000000 +0000
++++ source4/torture/libsmbclient/libsmbclient.c
+@@ -1231,8 +1231,13 @@ static bool torture_libsmbclient_utimes(
+ 	ret = smbc_fstat(fhandle, &st);
+ 	torture_assert_int_not_equal(tctx, ret, -1, "smbc_fstat failed");
+ 
++#if defined(__APPLE__) || defined(__NetBSD__)
++	tbuf[0] = convert_timespec_to_timeval(st.st_atimespec);
++	tbuf[1] = convert_timespec_to_timeval(st.st_mtimespec);
++#else
+ 	tbuf[0] = convert_timespec_to_timeval(st.st_atim);
+ 	tbuf[1] = convert_timespec_to_timeval(st.st_mtim);
++#endif
+ 
+ 	tbuf[1] = timeval_add(&tbuf[1], 0, 100000); /* 100 msec */
+ 
+@@ -1244,7 +1249,11 @@ static bool torture_libsmbclient_utimes(
+ 
+ 	torture_assert_int_equal(
+ 		tctx,
++#if defined(__APPLE__) || defined(__NetBSD__)
++		st.st_mtimespec.tv_nsec / 1000,
++#else
+ 		st.st_mtim.tv_nsec / 1000,
++#endif
+ 		tbuf[1].tv_usec,
+ 		"smbc_utimes did not update msec");
+