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 1f1fc3f3b3..9f271fa6e2 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 56a785a7d964f797a786b2d5b75d9cee51b530b1 Mon Sep 17 00:00:00 2001 +From 5db6185e95929b7edc665b5f029ffd6a6f900eb3 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,10 +50,10 @@ index 7476f6a..b939a0c 100644 if (partial_string_buf) { if (partial_string_len) diff --git a/log.c b/log.c -index 889b57b..19e5e98 100644 +index bf30df9..7da831b 100644 --- a/log.c +++ b/log.c -@@ -140,7 +140,7 @@ static void logit(int priority, const char *buf) +@@ -147,7 +147,7 @@ static void logit(int priority, const char *buf) } } @@ -63,7 +63,7 @@ index 889b57b..19e5e98 100644 int options = LOG_PID; diff --git a/main.c b/main.c -index ed6e554..b5f9448 100644 +index 63c35a1..2d0c165 100644 --- a/main.c +++ b/main.c @@ -250,7 +250,7 @@ void read_del_stats(int f) diff --git a/meta/recipes-devtools/rsync/files/determism.patch b/meta/recipes-devtools/rsync/files/determism.patch index 890275f6d7..8883f9ffab 100644 --- a/meta/recipes-devtools/rsync/files/determism.patch +++ b/meta/recipes-devtools/rsync/files/determism.patch @@ -1,4 +1,4 @@ -From e784131e4ccbaf8ad7107d1f7a7f13da8c675827 Mon Sep 17 00:00:00 2001 +From 637d3e6dd6414c89b3a0e96eccbb8b37d179acec 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 de24949..bb9bb27 100644 +index 9de687e..44a8ee6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -28,6 +28,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 59255d15e7..4734f2c7c4 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 0e1f2aec0dbfc150013860b42b41645cebe236b7 Mon Sep 17 00:00:00 2001 +From 79b3194efff7e55ae9d0fadc40d45bec4bd37ea7 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 716171d..de24949 100644 +index 3a5d509..9de687e 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -267,60 +267,6 @@ conf: configure.sh config.h.in +@@ -306,60 +306,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.5.1.bb b/meta/recipes-devtools/rsync/rsync_3.5.2.bb similarity index 97% rename from meta/recipes-devtools/rsync/rsync_3.5.1.bb rename to meta/recipes-devtools/rsync/rsync_3.5.2.bb index 6b121ab1a8..299b444898 100644 --- a/meta/recipes-devtools/rsync/rsync_3.5.1.bb +++ b/meta/recipes-devtools/rsync/rsync_3.5.2.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] = "c55f9c9dc10fb8bec397b399a0fdded53cc9a2d8e30891bb0d63724d25c37bef" +SRC_URI[sha256sum] = "a10d591825251e070f74c98df3daad195def4ed81b4a2de16169026aea33f6c8" # Out-of-tree builds don't install the documentation currently # https://github.com/RsyncProject/rsync/issues/846