Merge ~mitchdz/ubuntu/+source/samba:mitch/spotlight_fix into ubuntu/+source/samba:ubuntu/jammy-devel

[Mitchell Dzurick]

PPA - https://launchpad.net/~mitchdz/+archive/ubuntu/samba-spotlight-fix-lp2046994

[Dan Bungert (dbungert)]

Thanks, uploading.

diff --git a/debian/changelog b/debian/changelog
index c40db34..df9d3d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+samba (2:4.15.13+dfsg-0ubuntu1.6) jammy; urgency=medium
+
+  * d/p/lp2046994-spotlight-doesnt-work-with-latest-macos-ventura.patch: fix
+    spotlight search function on macos ventura (LP: #2046994).
+
+ -- Mitchell Dzurick <[e-mail]>  Fri, 05 Jan 2024 14:23:01 -0700
+
 samba (2:4.15.13+dfsg-0ubuntu1.5) jammy-security; urgency=medium
 
   * SECURITY UPDATE: SMB clients can truncate files with read-only
diff --git a/debian/patches/lp2046994-spotlight-doesnt-work-with-latest-macos-ventura.patch b/debian/patches/lp2046994-spotlight-doesnt-work-with-latest-macos-ventura.patch
new file mode 100644
index 0000000..0c3cfde
--- /dev/null
+++ b/debian/patches/lp2046994-spotlight-doesnt-work-with-latest-macos-ventura.patch
@@ -0,0 +1,40 @@
+Description: Spotlight search function broken with macOS Ventura and later client Edit
+In macOS Ventura marshalling of kMDScopeArray in the "openQueryWithParams"
+request has changed from
+
+  string: kMDScopeArray
+  sl_array_t(#1): {
+    string: /foo/bar
+  }
+
+
+to:
+
+  string: kMDScopeArray
+  sl_array_t(#1): {
+    sl_array_t(#1): {
+      string: /foo/bar
+    }
+  }
+Author: Ralph Boehme <[e-mail]>
+Origin: upstream, https://gitlab.com/samba-team/samba/-/merge_requests/2915
+Bug: https://bugzilla.samba.org/show_bug.cgi?id=15299
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/samba/+bug/2046994
+Last-Update: 2024-01-05
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/source3/rpc_server/mdssvc/mdssvc.c
++++ b/source3/rpc_server/mdssvc/mdssvc.c
+@@ -996,6 +996,12 @@
+ 
+ 	scope = dalloc_get(path_scope, "char *", 0);
+ 	if (scope == NULL) {
++		scope = dalloc_get(path_scope,
++				   "DALLOC_CTX", 0,
++				   "char *", 0);
++	}
++	if (scope == NULL) {
++		DBG_ERR("Failed to parse kMDScopeArray\n");
+ 		goto error;
+ 	}
+ 
diff --git a/debian/patches/series b/debian/patches/series
index e4f16bf..f05bf50 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -90,3 +90,4 @@ CVE-2023-4154-19.patch
 CVE-2023-4154-20.patch
 CVE-2023-4154-21.patch
 CVE-2023-42669.patch
+lp2046994-spotlight-doesnt-work-with-latest-macos-ventura.patch