.gitignore

@@ -1,2 +1,2 @@
-SOURCES/samba-4.19.4.tar.xz
+SOURCES/samba-4.20.2.tar.xz
 SOURCES/samba-pubkey_AA99442FB680B620.gpg

.samba.metadata

@@ -1,2 +1,2 @@
-6a164128df94dd89e785ca9f42d7be5714f16bed SOURCES/samba-4.19.4.tar.xz
+607bea15c2306b165610ebe3f617f1b29ef7f133 SOURCES/samba-4.20.2.tar.xz
 971f563c447eda8d144d6c9e743cd0f0488c0d9e SOURCES/samba-pubkey_AA99442FB680B620.gpg

SOURCES/redhat-4.20.2.patch

@@ -0,0 +1,102 @@
+From dddbbec2cb10b05a6ec3b4f1fcc877d60a44080a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Pavel=20Filipensk=C3=BD?= <pfilipensky@samba.org>
+Date: Thu, 4 Jul 2024 11:08:03 +0200
+Subject: [PATCH 1/2] .gitlab-ci-main.yml: Add safe.directory '*'
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is to fix the error when pushing to personal gitlab repo:
+
+2024-07-04 08:16:05,460 Running: 'git clone --recursive --shared /builds/pfilipen/samba /builds/samba-testbase/master' in '/builds/pfilipen/samba'
+Cloning into '/builds/samba-testbase/master'...
+fatal: detected dubious ownership in repository at '/builds/pfilipen/samba/.git'
+To add an exception for this directory, call:
+	git config --global --add safe.directory /builds/pfilipen/samba/.git
+fatal: Could not read from remote repository.
+
+Instead of adding more and more explicit repositories
+we should just allow any, we're in an isolated environment...
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=15660
+
+Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>
+Signed-off-by: Pavel Filipenský <pfilipensky@samba.org>
+Signed-off-by: Stefan Metzmacher <metze@samba.org>
+Reviewed-by: Andreas Schneider <asn@samba.org>
+
+Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
+Autobuild-Date(master): Wed Jul 10 10:35:00 UTC 2024 on atb-devel-224
+
+(cherry picked from commit 3a21b7d9a4e7e9814d0be8c0ebf72b9821a5dc36)
+---
+ .gitlab-ci-main.yml | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
+index face2103327..08865ca2c42 100644
+--- a/.gitlab-ci-main.yml
++++ b/.gitlab-ci-main.yml
+@@ -146,8 +146,7 @@ include:
+     - ccache -z -M 500M
+     - ccache -s
+       # We are already running .gitlab-ci directives from this repo, remove additional checks that break our CI
+-    - git config --global --add safe.directory `pwd`
+-    - git config --global --add safe.directory /builds/samba-team/devel/samba/.git
++    - git config --global --add safe.directory '*'
+   after_script:
+     - mount
+     - df -h
+-- 
+2.45.2
+
+
+From 1c69964d34d2cf66532b23ffde76a839a65b0db2 Mon Sep 17 00:00:00 2001
+From: Andreas Schneider <asn@samba.org>
+Date: Fri, 12 Jul 2024 14:18:26 +0200
+Subject: [PATCH 2/2] s3:printing: Allow to run samba-bgqd as a standalone
+ systemd service
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=15683
+
+Signed-off-by: Andreas Schneider <asn@samba.org>
+Reviewed-by: Alexander Bokovoy <ab@samba.org>
+(cherry picked from commit 0a532378322661b23b3393eb2ebde29402a16e62)
+
+Autobuild-User(v4-20-test): Jule Anger <janger@samba.org>
+Autobuild-Date(v4-20-test): Tue Jul 23 08:56:24 UTC 2024 on atb-devel-224
+
+(cherry picked from commit 4cf9af9186d7829f11bd07c7d6e526a51dcf0d61)
+---
+ source3/printing/samba-bgqd.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/source3/printing/samba-bgqd.c b/source3/printing/samba-bgqd.c
+index 59ed0cc40db..9560fcf9e35 100644
+--- a/source3/printing/samba-bgqd.c
++++ b/source3/printing/samba-bgqd.c
+@@ -253,7 +253,9 @@ int main(int argc, const char *argv[])
+ 	log_stdout = (debug_get_log_type() == DEBUG_STDOUT);
+ 
+ 	/* main process will notify systemd */
+-	daemon_sd_notifications(false);
++	if (ready_signal_fd != -1 || watch_fd != -1) {
++		daemon_sd_notifications(false);
++	}
+ 
+ 	if (!cmdline_daemon_cfg->fork) {
+ 		daemon_status(progname, "Starting process ... ");
+@@ -325,6 +327,10 @@ int main(int argc, const char *argv[])
+ 		goto done;
+ 	}
+ 
++	if (!cmdline_daemon_cfg->fork) {
++		daemon_ready(progname);
++	}
++
+ 	if (ready_signal_fd != -1) {
+ 		pid_t pid = getpid();
+ 		ssize_t written;
+-- 
+2.45.2
+

SOURCES/samba-4.19.4.tar.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEgfXigyvSVFoYl7cTqplEL7aAtiAFAmWcCFAACgkQqplEL7aA
-tiDKSBAAuWA9jT6xCfFACIlme7DbEoUm/Bsbf+GM2Somd3pgajekiNxo7CsW9Xub
-Vmpj0Q5OKiri81XTqA8LlqMCBliqfw/rnP48kCH0YqXzjqD6aYuwmk0Q4G3wWBTJ
-2ZT/wOpbM3YooFfE9Iffz6uNgAiQ/8kpBt2m6Zzfy8n1ThfztyGAGaSmrUWxgUlq
-XjRjtgTw4isZBm+RzCFSGuPxvWvxRlfD5JCe2gc221rI3kbaQE2GSxdZ6D0635Ln
-iy64SLIAKkQCrrFFckudSCCLKgLNdIClEwzamhhCbmCxnWMDufzN+BQZhq3axQ+x
-svPfZqltVSQztr4nPGvKdebtVLL2Zyf/LtXWQP/s66quHlHFoEAC7MuD6tEMQVar
-JQUCN51Gs0Yk12iReQFm6/Uo35aPAlai1e2uOkNzS5FnagRObYt6FYeQripks4I8
-ZW5VvF4cE0zqdjrlG+Ttqmpbj7i6AUJj9wSbrEOFDUhTL+QPPOfJ05yr1BHmS6nJ
-vuuUs+ei/DnYEFS91P81h5NuOdpRHIBTG6LUOLz5KOoNdIgvzjD/Ugyscj4AFTBo
-+NTG9nNr6gkLV/6dxDRR2/sbU6P+FZBL+JVUoDR7XQ7oHG7sFV+/8Dtu8RivEw++
-1sNGqxvGkwu7JunMkJO5YZRwXi81v3nmHkWKgb0+52iYXgmdesY=
-=kOPP
------END PGP SIGNATURE-----

SOURCES/samba-4.20.2.tar.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEgfXigyvSVFoYl7cTqplEL7aAtiAFAmZy684ACgkQqplEL7aA
+tiDXDw/+KleJ11LLq5ZlXMlj11niRCETErY8cuoZ9VX04lfRwRBnplpKKLSQuFit
+5HeY5ED65DhbpGzPfLPx7xOw4wyFc/bXhHPTgF3Ybj8TKkEcaMmkpD3V8FPa4NAt
+vNZ3alLQLP//kgRXnqeV9pfa4slx17G6WeBLbpd8b4SbgPMgokJt7hL3nWfBrFE9
+p6B+TKZcwfoCn9ufz1UxMpBFtpSK0yF0S7CQcdv3JrBNIYhULuXbnAnLCHcH1RqW
+xreoxZPnMx+SrYb0iHyKbkMsDujCqBKm9CyS13Yt9DjI49lv0pBwQFnaqtR4Xm/D
+BU2XIWLLInUecxtUOBtsa046h55fLQPgkb+WYob++iA9r91y4JAZIiAxdVrNLsxR
+BiFUxkL7EPtyptT84xNjpQ3CTZuw8tlHu/sJ1/XHRUFMtRGjiMqJp7ULsVQDfwET
+7T+HHrVHNstddb9A6WfM8qSItoMfGUlYyzTQ2d3OmrbGRnB0qf+zg9DI+vXv5Itx
+M23we8ljSadCnc/kqz3Z6gefI538WWDnbXIljRqDxuzwaSXhMd4heG+xIAAO0Of5
+ziyCVQ/n8gnyXQmC82Xlebc3mYki8UoyYWdbVNJZAOEo/LuBql1OkjOhkhMcBDmr
+qvD6f+0+MA4nydmVhI/q/pmo7nAUD3SAxmRKrVTwjpjcAnZ4IGw=
+=CGiK
+-----END PGP SIGNATURE-----

SOURCES/smb.conf.vendor

@@ -18,9 +18,6 @@
 	load printers = yes
 	cups options = raw
 
-	# Install samba-usershares package for support
-	include = /etc/samba/usershares.conf
-
 [homes]
 	comment = Home Directories
 	valid users = %S, %D%w%S