samba4: Various build fixes.

5 files changed, 83 insertions, 14 deletions

diff --git a/net/samba4/Makefile b/net/samba4/Makefile
index 8096406174d..50c43e85b96 100644
--- a/net/samba4/Makefile
+++ b/net/samba4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.148 2022/08/09 17:56:09 adam Exp $
+# $NetBSD: Makefile,v 1.149 2022/08/30 17:47:50 jperkin Exp $
 
 DISTNAME=	samba-4.16.4
 CATEGORIES=	net
@@ -100,18 +100,6 @@ CONFIGURE_ARGS+=	--jobs=1
 .endif
 CONFIGURE_ARGS+=	--without-gpgme
 
-# XXX: currenlty Samba requires embedded Heimdall
-#.include "../../mk/krb5.buildlink3.mk"
-#.if ${KRB5_TYPE} == "mit-krb5"
-#BUILDLINK_API_DEPENDS.mit-krb5+=	mit-krb5>=1.19.0
-#CONFIGURE_ARGS+=	--with-experimental-mit-ad-dc
-#CONFIGURE_ARGS+=	--with-system-mitkdc=${KRB5BASE}/sbin/krb5kdc
-#CONFIGURE_ARGS+=	--with-system-mitkrb5
-#.else
-# XXX: does not work with AD
-#CONFIGURE_ARGS+=	--with-system-heimdalkrb5
-#.endif
-
 # Depends on ncurses, explicitly disable for now.
 CONFIGURE_ARGS+=	--without-regedit
 
diff --git a/net/samba4/distinfo b/net/samba4/distinfo
index 5afa1bc3abe..1b425e23296 100644
--- a/net/samba4/distinfo
+++ b/net/samba4/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.80 2022/08/09 17:56:09 adam Exp $
+$NetBSD: distinfo,v 1.81 2022/08/30 17:47:50 jperkin Exp $
 
 BLAKE2s (samba-4.16.4.tar.gz) = a897a1150df7abf26af0c53923a9dc085d08eeaf2585dbbe0bc64e28ceb6d7ae
 SHA512 (samba-4.16.4.tar.gz) = 9754275ace30755b75f747e201f8ad4550a823c8606e550c0ce6b3ccbaf048dd895bf2c21127271298304be7f80de9b6451091c4949ebe267ee1cf3ab497cd85
@@ -32,10 +32,13 @@ SHA1 (patch-source3_modules_vfs__solarisacl.h) = 11f8664641a14fd83d78b1a7e10056a
 SHA1 (patch-source3_printing_samba-bgqd.c) = e9b83c35fbb24c702650d745b82fe6c9efbcdf76
 SHA1 (patch-source3_smbd_open.c) = 002f26f77dad54617bf9c0fe4fa12f093ef3b66c
 SHA1 (patch-source3_smbd_process.c) = 3a6f9682aca6473e364d0be0f601774df4fd1296
+SHA1 (patch-source3_smbd_quotas.c) = 7f959964fac3ee435c57a115c8f5b6407e57b777
 SHA1 (patch-source3_utils_net__offlinejoin.c) = 773a4686d5e2a7eaebf9430529708e8318d45c77
+SHA1 (patch-source4_auth_gensec_wscript__build) = 61400e5594600b38c831604aca4c11e7a5bfcb12
 SHA1 (patch-source4_dsdb_samdb_ldb__modules_wscript__build__server) = 47f55ec16b667a0a4d38de5ac89a117f2ac8f898
 SHA1 (patch-source4_scripting_wsript_build) = 816d44f48b6cbc6d999995e00eaea1d2dc477159
 SHA1 (patch-source4_utils_oLschema2ldif_wscript__build) = cbba15c2c0e1eee9d07424510a96b596f46992b4
 SHA1 (patch-third__party_heimdal__build_roken.h) = 59d5523676fe8c0315e969247f26b4ea2f900402
 SHA1 (patch-third__party_heimdal_include_heim__threads.h) = 5ad13530cf9688e46f9ad487bb0fddab668c8276
+SHA1 (patch-third__party_heimdal_lib_hcrypto_evp.c) = db1be175f7328d7aa9551ba2e641be15e348c84a
 SHA1 (patch-third__party_heimdal_lib_roken_getauxval.h) = 23c9cf574d9f042c9f6dd1b0377c91045e755b5b
diff --git a/net/samba4/patches/patch-source3_smbd_quotas.c b/net/samba4/patches/patch-source3_smbd_quotas.c
new file mode 100644
index 00000000000..c0aec842311
--- /dev/null
+++ b/net/samba4/patches/patch-source3_smbd_quotas.c
@@ -0,0 +1,48 @@
+$NetBSD: patch-source3_smbd_quotas.c,v 1.1 2022/08/30 17:47:50 jperkin Exp $
+
+Disable NFS quota support, bundled gssapi headers conflict with system.
+
+--- source3/smbd/quotas.c.orig	2022-01-24 10:26:59.245308200 +0000
++++ source3/smbd/quotas.c
+@@ -54,6 +54,7 @@
+  Alan Romeril <a.romeril@ic.ac.uk> July 2K.
+ ****************************************************************************/
+ 
++#if 0
+ #include <rpc/rpc.h>
+ #include <rpc/types.h>
+ #include <rpcsvc/rquota.h>
+@@ -210,6 +211,7 @@ static bool nfs_quotas(char *nfspath, ui
+ 	DEBUG(10,("nfs_quotas: End of nfs_quotas\n" ));
+ 	return ret;
+ }
++#endif
+ 
+ /****************************************************************************
+ try to get the disk space from disk quotas (SunOS & Solaris2 version)
+@@ -252,7 +254,9 @@ bool disk_quotas(connection_struct *conn
+ 		/* quotas are only on vxfs, UFS or NFS */
+ 		if ((sbuf.st_ex_dev == devno) && (
+ 			strcmp( mnt.mnt_fstype, MNTTYPE_UFS ) == 0 ||
++#if 0
+ 			strcmp( mnt.mnt_fstype, "nfs" ) == 0    ||
++#endif
+ 			strcmp( mnt.mnt_fstype, "vxfs" ) == 0 )) {
+ 				found = true;
+ 				name = talloc_asprintf(talloc_tos(),
+@@ -272,6 +276,7 @@ bool disk_quotas(connection_struct *conn
+ 	}
+ 	become_root();
+ 
++#if 0
+ 	if (strcmp(mnt.mnt_fstype, "nfs") == 0) {
+ 		bool retval;
+ 		DEBUG(5,("disk_quotas: looking for mountpath (NFS) \"%s\"\n",
+@@ -281,6 +286,7 @@ bool disk_quotas(connection_struct *conn
+ 		unbecome_root();
+ 		return retval;
+ 	}
++#endif
+ 
+ 	DEBUG(5,("disk_quotas: looking for quotas file \"%s\"\n", name));
+ 	if((file=open(name, O_RDONLY,0))<0) {
diff --git a/net/samba4/patches/patch-source4_auth_gensec_wscript__build b/net/samba4/patches/patch-source4_auth_gensec_wscript__build
new file mode 100644
index 00000000000..6b6736ea0aa
--- /dev/null
+++ b/net/samba4/patches/patch-source4_auth_gensec_wscript__build
@@ -0,0 +1,15 @@
+$NetBSD: patch-source4_auth_gensec_wscript__build,v 1.1 2022/08/30 17:47:50 jperkin Exp $
+
+Do not mark gensec_krb5 as internal, kdc.so ends up linked against it and fails
+shlibs check as gensec_module_krb5.so has not been installed.
+
+--- source4/auth/gensec/wscript_build.orig	2022-07-27 07:18:22.200870300 +0000
++++ source4/auth/gensec/wscript_build
+@@ -14,7 +14,6 @@ bld.SAMBA_MODULE('gensec_krb5',
+ 	subsystem='gensec',
+ 	init_function='gensec_krb5_init',
+ 	deps='samba-credentials authkrb5 com_err',
+-	internal_module=False,
+         enabled=bld.AD_DC_BUILD_IS_ENABLED()
+ 	)
+ 
diff --git a/net/samba4/patches/patch-third__party_heimdal_lib_hcrypto_evp.c b/net/samba4/patches/patch-third__party_heimdal_lib_hcrypto_evp.c
new file mode 100644
index 00000000000..7bb4764f0ed
--- /dev/null
+++ b/net/samba4/patches/patch-third__party_heimdal_lib_hcrypto_evp.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-third__party_heimdal_lib_hcrypto_evp.c,v 1.1 2022/08/30 17:47:50 jperkin Exp $
+
+Disable pkcs11_hcrypto, only available on Oracle Solaris 11.x
+
+--- third_party/heimdal/lib/hcrypto/evp.c.orig	2022-03-08 14:53:05.754089600 +0000
++++ third_party/heimdal/lib/hcrypto/evp.c
+@@ -55,8 +55,6 @@
+ #ifndef HCRYPTO_DEF_PROVIDER
+ # ifdef __APPLE__
+ #  define HCRYPTO_DEF_PROVIDER cc
+-# elif __sun
+-#  define HCRYPTO_DEF_PROVIDER pkcs11_hcrypto
+ # elif HAVE_HCRYPTO_W_OPENSSL
+ #  define HCRYPTO_DEF_PROVIDER ossl
+ # else