diff --git a/meta/recipes-devtools/rsync/files/0001-Add-missing-prototypes-to-function-declarations.patch b/meta/recipes-devtools/rsync/files/0001-Add-missing-prototypes-to-function-declarations.patch index e6d3578e85..1e43834aa6 100644 --- a/meta/recipes-devtools/rsync/files/0001-Add-missing-prototypes-to-function-declarations.patch +++ b/meta/recipes-devtools/rsync/files/0001-Add-missing-prototypes-to-function-declarations.patch @@ -1,4 +1,4 @@ -From 46cbe5b70b5cbf981cf693137ac081cacbbb2e2a Mon Sep 17 00:00:00 2001 +From ca0eb32797ac0ac05d176c88d40283936a7baa78 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 29 Aug 2022 19:53:28 -0700 Subject: [PATCH] Add missing prototypes to function declarations @@ -50,7 +50,7 @@ index 24de64f..a787488 100644 if (partial_string_buf) { if (partial_string_len) diff --git a/log.c b/log.c -index e4ba1cc..8482b71 100644 +index b948f16..afca81d 100644 --- a/log.c +++ b/log.c @@ -131,7 +131,7 @@ static void logit(int priority, const char *buf) @@ -63,11 +63,11 @@ index e4ba1cc..8482b71 100644 int options = LOG_PID; diff --git a/main.c b/main.c -index ccad28a..bbb09ba 100644 +index 78f0b83..7a3f80a 100644 --- a/main.c +++ b/main.c @@ -246,7 +246,7 @@ void read_del_stats(int f) - stats.deleted_files += stats.deleted_specials = read_varint(f); + stats.deleted_files += stats.deleted_specials = read_varint_bounded(f, 0, MAX_WIRE_DEL_STAT, "deleted_specials"); } -static void become_copy_as_user() diff --git a/meta/recipes-devtools/rsync/files/determism.patch b/meta/recipes-devtools/rsync/files/determism.patch index fd96b873c8..54f75049ab 100644 --- a/meta/recipes-devtools/rsync/files/determism.patch +++ b/meta/recipes-devtools/rsync/files/determism.patch @@ -1,4 +1,4 @@ -From b810d78a9327b5b313ebc0aa1a0b155de7c10afd Mon Sep 17 00:00:00 2001 +From 54072971b5319e85be4f5ff5a73ac262b73b9f41 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 21 Feb 2021 09:45:48 +0000 Subject: [PATCH] rsync: Fix a file sorting determinism issue @@ -25,7 +25,7 @@ https://github.com/WayneD/rsync/commit/d3085f7add38a5cf833a0b31cb0637ff46c80f8d 1 file changed, 5 insertions(+) diff --git a/Makefile.in b/Makefile.in -index 80e9d72..a7d313c 100644 +index 4f25841..00df9f1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -27,6 +27,11 @@ MKDIR_P=@MKDIR_P@ diff --git a/meta/recipes-devtools/rsync/files/makefile-no-rebuild.patch b/meta/recipes-devtools/rsync/files/makefile-no-rebuild.patch index fb195b1e68..b571d0c582 100644 --- a/meta/recipes-devtools/rsync/files/makefile-no-rebuild.patch +++ b/meta/recipes-devtools/rsync/files/makefile-no-rebuild.patch @@ -1,4 +1,4 @@ -From 0608f5ebb26e2e474867bec6c3d67dfd0a7663f0 Mon Sep 17 00:00:00 2001 +From 49f396f67b8c4cd5635b373acf347d22f1494561 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 12 Apr 2016 15:51:54 +0100 Subject: [PATCH] rsync: remove upstream's rebuild logic @@ -13,10 +13,10 @@ Signed-off-by: Ross Burton 1 file changed, 54 deletions(-) diff --git a/Makefile.in b/Makefile.in -index c2fe775..80e9d72 100644 +index 699d995..4f25841 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -185,60 +185,6 @@ conf: configure.sh config.h.in +@@ -193,60 +193,6 @@ conf: configure.sh config.h.in .PHONY: gen gen: conf proto.h man git-version.h diff --git a/meta/recipes-devtools/rsync/rsync_3.4.2.bb b/meta/recipes-devtools/rsync/rsync_3.4.3.bb similarity index 97% rename from meta/recipes-devtools/rsync/rsync_3.4.2.bb rename to meta/recipes-devtools/rsync/rsync_3.4.3.bb index 5fe1bc2c2b..43693859c0 100644 --- a/meta/recipes-devtools/rsync/rsync_3.4.2.bb +++ b/meta/recipes-devtools/rsync/rsync_3.4.3.bb @@ -16,7 +16,7 @@ SRC_URI = "https://download.samba.org/pub/${BPN}/src/${BP}.tar.gz \ file://determism.patch \ file://0001-Add-missing-prototypes-to-function-declarations.patch \ " -SRC_URI[sha256sum] = "ff10aa2c151cd4b2dbbe6135126dbc854046113d2dfb49572a348233267eb315" +SRC_URI[sha256sum] = "c72e63ca3021cbc80ba86ec30102773f4c5631fbc492b52e773b3958f82a53d3" # Out-of-tree builds don't install the documentation currently # https://github.com/RsyncProject/rsync/issues/846