Accepting request 1202965 from network

OBS-URL: https://build.opensuse.org/request/show/1202965
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rsync?expand=0&rev=91

rsync-usr-etc.patch

@@ -1,4 +1,3 @@
-Nur in a: .cirrus.yml.
 diff -ur a/clientserver.c b/clientserver.c
 --- a/clientserver.c	2023-11-28 17:12:41.643268046 +0100
 +++ b/clientserver.c	2023-11-28 17:25:30.476279700 +0100

rsync.changes

@@ -3,6 +3,11 @@ Fri Sep  6 12:23:31 UTC 2024 - Marcus Meissner <meissner@suse.com>
 
 - rsync-gcc14.patch: fixed the ipv6 configure check (bsc#1230156)
 
+-------------------------------------------------------------------
+Thu Sep  5 23:44:21 UTC 2024 - Georg Pfuetzenreuter <mail+rpm@georg-pfuetzenreuter.net>
+
+- Add rsyncd-return-from-list-command-with-0.patch to not treat #list as failure
+
 -------------------------------------------------------------------
 Mon Aug 26 09:41:28 UTC 2024 - Thorsten Kukuk <kukuk@suse.com>
 

rsync.spec

@@ -58,6 +58,8 @@ Patch0:         rsync-no-libattr.patch
 Patch1:         rsync-gcc14.patch
 Patch2:         rsync-usr-etc.patch
 Patch3:         rsync-run-dir.patch
+# https://github.com/RsyncProject/rsync/pull/639
+Patch5:         rsyncd-return-from-list-command-with-0.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  c++_compiler

rsyncd-return-from-list-command-with-0.patch

@@ -0,0 +1,33 @@
+From bfb95e4a60c27ec0f9bb4668cc6163f5cfb3e635 Mon Sep 17 00:00:00 2001
+From: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
+Date: Fri, 6 Sep 2024 01:39:32 +0200
+Subject: [PATCH] Return from #list command with 0
+
+The "#list" command should not be treated as a failure when it is
+both a legitimate request by the client, and correctly answered by the
+server. It is commonly used for assessing whether a rsync endpoint is
+healthy, having it return with a non-zero exit code causes misleading
+error reports, and, in case of socket activation, failed service
+instances on the server.
+
+Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
+---
+ clientserver.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/clientserver.c b/clientserver.c
+index 7c897abc..c507ea91 100644
+--- a/clientserver.c
++++ b/clientserver.c
+@@ -1371,7 +1371,7 @@ int start_daemon(int f_in, int f_out)
+ 		rprintf(FLOG, "module-list request from %s (%s)\n",
+ 			host, addr);
+ 		send_listing(f_out);
+-		return -1;
++		return 0;
+ 	}
+ 
+ 	if (*line == '#') {
+-- 
+2.46.0
+