SLFO-pool/rsync
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync from SUSE:SLFO:Main rsync revision f8c2eaf399e44d41866f7d47bd1b522c

Browse Source
This commit is contained in:
Adrian Schröter 2025-02-07 18:42:11 +01:00
parent f6cf1e3b50
commit d198fdf67e
5 changed files with 76 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
rsync-gcc14.patch Normal file
View File

@ -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 <stdlib.h>
#include <sys/types.h>
#include <sys/socket.h>
-main()
+int main(void)
{
if (socket(AF_INET6, SOCK_STREAM, 0) < 0)
exit(1);

1
rsync-usr-etc.patch
View File

@ -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

18
rsync.changes
View File

@ -5,19 +5,19 @@ Thu Jan 23 10:55:40 UTC 2025 - Angel Yankov <angel.yankov@suse.com>
* Add rsync-protocol-version-32.patch
-------------------------------------------------------------------
Wed Jan 15 18:26:27 UTC 2025 - Angel Yankov <angel.yankov@suse.com>
Wed Jan 15 18:28:23 UTC 2025 - Angel Yankov <angel.yankov@suse.com>
- 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 <angel.yankov@suse.com>
Tue Jan 14 08:39:57 UTC 2025 - Angel Yankov <angel.yankov@suse.com>
- 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 <angel.yankov@suse.com>
Thu Jan 9 08:05:11 UTC 2025 - Angel Yankov <angel.yankov@suse.com>
- 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 <angel.yankov@suse.com>
* Added rsync-CVE-2024-12087_02.patch
* Added rsync-CVE-2024-12088.patch
-------------------------------------------------------------------
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>

29
rsync.spec
View File

@ -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

33
rsyncd-return-from-list-command-with-0.patch Normal file
View File

@ -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