From d198fdf67e2d6698f6e05654fe45295391d3f3e66ea72b951524c604bc0ed35c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 7 Feb 2025 18:42:11 +0100 Subject: [PATCH] Sync from SUSE:SLFO:Main rsync revision f8c2eaf399e44d41866f7d47bd1b522c --- rsync-gcc14.patch | 13 ++++++++ rsync-usr-etc.patch | 1 - rsync.changes | 18 ++++++++--- rsync.spec | 29 +++++++++-------- rsyncd-return-from-list-command-with-0.patch | 33 ++++++++++++++++++++ 5 files changed, 76 insertions(+), 18 deletions(-) create mode 100644 rsync-gcc14.patch create mode 100644 rsyncd-return-from-list-command-with-0.patch diff --git a/rsync-gcc14.patch b/rsync-gcc14.patch new file mode 100644 index 0000000..375ac51 --- /dev/null +++ b/rsync-gcc14.patch @@ -0,0 +1,13 @@ +Index: rsync-3.3.0/configure.ac +=================================================================== +--- rsync-3.3.0.orig/configure.ac ++++ rsync-3.3.0/configure.ac +@@ -412,7 +412,7 @@ AS_HELP_STRING([--disable-ipv6],[disable + #include + #include + #include +-main() ++int main(void) + { + if (socket(AF_INET6, SOCK_STREAM, 0) < 0) + exit(1); diff --git a/rsync-usr-etc.patch b/rsync-usr-etc.patch index a99cee2..8d4f59e 100644 --- a/rsync-usr-etc.patch +++ b/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 diff --git a/rsync.changes b/rsync.changes index 93dad8c..819ccba 100644 --- a/rsync.changes +++ b/rsync.changes @@ -5,19 +5,19 @@ Thu Jan 23 10:55:40 UTC 2025 - Angel Yankov * Add rsync-protocol-version-32.patch ------------------------------------------------------------------- -Wed Jan 15 18:26:27 UTC 2025 - Angel Yankov +Wed Jan 15 18:28:23 UTC 2025 - Angel Yankov - Fix FLAG_GOT_DIR_FLIST collission with FLAG_HLINKED * Added rsync-fix-FLAG_GOT_DIR_FLIST.patch ------------------------------------------------------------------- -Tue Jan 14 08:48:01 UTC 2025 - Angel Yankov +Tue Jan 14 08:39:57 UTC 2025 - Angel Yankov - Security update,CVE-2024-12747, bsc#1235475 race condition in handling symbolic links * Added rsync-CVE-2024-12747.patch - + ------------------------------------------------------------------- -Thu Jan 9 08:06:18 UTC 2025 - Angel Yankov +Thu Jan 9 08:05:11 UTC 2025 - Angel Yankov - Security update, fix multiple vulnerabilities: * CVE-2024-12084, bsc#1234100 - Heap Buffer Overflow in Checksum Parsing @@ -36,6 +36,16 @@ Thu Jan 9 08:06:18 UTC 2025 - Angel Yankov * Added rsync-CVE-2024-12087_02.patch * Added rsync-CVE-2024-12088.patch +------------------------------------------------------------------- +Fri Sep 6 12:23:31 UTC 2024 - Marcus Meissner + +- rsync-gcc14.patch: fixed the ipv6 configure check (bsc#1230156) + +------------------------------------------------------------------- +Thu Sep 5 23:44:21 UTC 2024 - Georg Pfuetzenreuter + +- 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 diff --git a/rsync.spec b/rsync.spec index 34cd598..5acf855 100644 --- a/rsync.spec +++ b/rsync.spec @@ -55,28 +55,31 @@ Source11: https://rsync.samba.org/ftp/rsync/src/rsync-patches-%{version}.t Source12: %{name}.keyring Source13: rsyncd 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 # PATCH-FIX-UPSTREAM: rsync CVE-2024-12084 bsc#1234100 -Patch4: rsync-CVE-2024-12084-overflow-01.patch -Patch5: rsync-CVE-2024-12084-overflow-02.patch +Patch6: rsync-CVE-2024-12084-overflow-01.patch +Patch7: rsync-CVE-2024-12084-overflow-02.patch # PATCH-FIX-UPSTREAM: rsync CVE-2024-12085 bsc#1234101 -Patch6: rsync-CVE-2024-12085.patch +Patch8: rsync-CVE-2024-12085.patch # PATCH-FIX-UPSTREAM: rsync CVE-2024-12086 bsc#1234102 -Patch7: rsync-CVE-2024-12086_01.patch -Patch8: rsync-CVE-2024-12086_02.patch -Patch9: rsync-CVE-2024-12086_03.patch -Patch10: rsync-CVE-2024-12086_04.patch +Patch9: rsync-CVE-2024-12086_01.patch +Patch10: rsync-CVE-2024-12086_02.patch +Patch11: rsync-CVE-2024-12086_03.patch +Patch12: rsync-CVE-2024-12086_04.patch # PATCH-FIX-UPSTREAM: rsync CVE-2024-12087 bsc#1234103 -Patch11: rsync-CVE-2024-12087_01.patch -Patch12: rsync-CVE-2024-12087_02.patch +Patch13: rsync-CVE-2024-12087_01.patch +Patch14: rsync-CVE-2024-12087_02.patch # PATCH-FIX-UPSTREAM: rsync CVE-2024-12088 bsc#1234104 -Patch13: rsync-CVE-2024-12088.patch +Patch15: rsync-CVE-2024-12088.patch # PATCH-FIX-UPSTREAM: rsync CVE-2024-12747 bsc#1235475 -Patch14: rsync-CVE-2024-12747.patch +Patch16: rsync-CVE-2024-12747.patch # PATCH-FIX-UPSTREAM: bsc#1235895 -Patch15: rsync-fix-FLAG_GOT_DIR_FLIST.patch -Patch16: rsync-protocol-version-32.patch +Patch17: rsync-fix-FLAG_GOT_DIR_FLIST.patch +Patch18: rsync-protocol-version-32.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: c++_compiler diff --git a/rsyncd-return-from-list-command-with-0.patch b/rsyncd-return-from-list-command-with-0.patch new file mode 100644 index 0000000..3ab511a --- /dev/null +++ b/rsyncd-return-from-list-command-with-0.patch @@ -0,0 +1,33 @@ +From bfb95e4a60c27ec0f9bb4668cc6163f5cfb3e635 Mon Sep 17 00:00:00 2001 +From: Georg Pfuetzenreuter +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 +--- + 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 +