Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe *rsync* to *3.3.0* has Succeeded.
Next steps:
- apply the patch: git am 0001-rsync-upgrade-3.2.7-3.3.0.patch
- check the changes to upstream patches and summarize them in the commit
message,
- compile an image that contains the package
- perform some basic sanity tests
- amend the patch and sign it off: git commit -s --reset-author --amend
- send it to the appropriate mailing list
Alternatively, if you believe the recipe should not be upgraded at this time,
you can fill RECIPE_NO_UPDATE_REASON in respective recipe file so that
automatic upgrades would no longer be attempted.
Please review the attached files for further information and build/update
failures.
Any problem please file a bug at
https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler
Regards,
The Upgrade Helper
-- >8 --
>From d9543ac063b30b01fbf8d0d2c5ad858ba4c82782 Mon Sep 17 00:00:00 2001
From: Upgrade Helper <a...@yoctoproject.org>
Date: Mon, 15 Apr 2024 20:33:18 +0000
Subject: [PATCH] rsync: upgrade 3.2.7 -> 3.3.0
---
...-prototypes-to-function-declarations.patch | 13 ++++++------
.../rsync/files/determism.patch | 20 +++++++++++++------
.../rsync/files/makefile-no-rebuild.patch | 7 +++----
.../rsync/{rsync_3.2.7.bb => rsync_3.3.0.bb} | 2 +-
4 files changed, 24 insertions(+), 18 deletions(-)
rename meta/recipes-devtools/rsync/{rsync_3.2.7.bb => rsync_3.3.0.bb} (96%)
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 8895adad74..aec186e8c8 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 651425fced0691d9063fe417388ba6ca1c38c40b Mon Sep 17 00:00:00 2001
+From fb2e454f79a5641494243ba1a41ea79baff376d9 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.k...@gmail.com>
Date: Mon, 29 Aug 2022 19:53:28 -0700
Subject: [PATCH] Add missing prototypes to function declarations
@@ -15,7 +15,6 @@ Fixes errors like
Upstream-Status: Submitted
[https://lists.samba.org/archive/rsync/2022-August/032858.html]
Signed-off-by: Khem Raj <raj.k...@gmail.com>
-
---
checksum.c | 2 +-
exclude.c | 2 +-
@@ -30,10 +29,10 @@ Signed-off-by: Khem Raj <raj.k...@gmail.com>
10 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/checksum.c b/checksum.c
-index 60de365..67a9e16 100644
+index cb21882..736818b 100644
--- a/checksum.c
+++ b/checksum.c
-@@ -778,7 +778,7 @@ static void verify_digest(struct name_num_item *nni, BOOL
check_auth_list)
+@@ -779,7 +779,7 @@ static void verify_digest(struct name_num_item *nni, BOOL
check_auth_list)
}
#endif
@@ -43,7 +42,7 @@ index 60de365..67a9e16 100644
#if defined SUPPORT_XXH3 || defined USE_OPENSSL
struct name_num_item *nni;
diff --git a/exclude.c b/exclude.c
-index ffe55b1..a85ea76 100644
+index 87edbcf..ae0de2f 100644
--- a/exclude.c
+++ b/exclude.c
@@ -363,7 +363,7 @@ void implied_include_partial_string(const char *s_start,
const char *s_end)
@@ -96,10 +95,10 @@ index e4ba1cc..8482b71 100644
int options = LOG_PID;
diff --git a/main.c b/main.c
-index d2a7b9b..c50af45 100644
+index 0c60b86..4bc664a 100644
--- a/main.c
+++ b/main.c
-@@ -244,7 +244,7 @@ void read_del_stats(int f)
+@@ -246,7 +246,7 @@ void read_del_stats(int f)
stats.deleted_files += stats.deleted_specials = read_varint(f);
}
diff --git a/meta/recipes-devtools/rsync/files/determism.patch
b/meta/recipes-devtools/rsync/files/determism.patch
index e3494fdded..eba1f67db6 100644
--- a/meta/recipes-devtools/rsync/files/determism.patch
+++ b/meta/recipes-devtools/rsync/files/determism.patch
@@ -1,7 +1,12 @@
+From f717a9c4d957d6400f33bfdebcf2b08bb98ce4b3 Mon Sep 17 00:00:00 2001
+From: Richard Purdie <richard.pur...@linuxfoundation.org>
+Date: Sun, 21 Feb 2021 09:45:48 +0000
+Subject: [PATCH] rsync: Fix a file sorting determinism issue
+
The Makefile calls awk on a "*.c" glob. The results of this glob are sorted
but the order depends on the locale settings, particularly whether
"util.c" and "util2.c" sort before or after each other. In en_US.UTF-8
-they sort one way, in C, they sort the other. The sorting order changes
+they sort one way, in C, they sort the other. The sorting order changes
the output binaries. The behaviour also changes dependning on whether
SHELL (/bin/sh) is dash or bash.
@@ -15,12 +20,15 @@ Upstream-Status: Backport [ish, see below]
After discussion upstream renamed util.c to util1.c which avoids the problem
in a different way. This patch can be dropped when we upgrade to include:
https://github.com/WayneD/rsync/commit/d3085f7add38a5cf833a0b31cb0637ff46c80f8d
+---
+ Makefile.in | 5 +++++
+ 1 file changed, 5 insertions(+)
-Index: rsync-3.2.3/Makefile.in
-===================================================================
---- rsync-3.2.3.orig/Makefile.in
-+++ rsync-3.2.3/Makefile.in
-@@ -26,6 +26,11 @@ MKDIR_P=@MKDIR_P@
+diff --git a/Makefile.in b/Makefile.in
+index a084935..1c93824 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -27,6 +27,11 @@ MKDIR_P=@MKDIR_P@
VPATH=$(srcdir)
SHELL=/bin/sh
diff --git a/meta/recipes-devtools/rsync/files/makefile-no-rebuild.patch
b/meta/recipes-devtools/rsync/files/makefile-no-rebuild.patch
index 92ed1f4419..df74e5b326 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 81700d1a0e51391028c761cc8ef1cd660084d114 Mon Sep 17 00:00:00 2001
+From 3e214c731612c13b36545f301945d4ac16e9368a Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.bur...@intel.com>
Date: Tue, 12 Apr 2016 15:51:54 +0100
Subject: [PATCH] rsync: remove upstream's rebuild logic
@@ -8,16 +8,15 @@ generally overcomplicated, and we ensure that autoreconf is
invoked if required.
Upstream-Status: Inappropriate
Signed-off-by: Ross Burton <ross.bur...@intel.com>
-
---
Makefile.in | 54 -----------------------------------------------------
1 file changed, 54 deletions(-)
diff --git a/Makefile.in b/Makefile.in
-index 3cde955..d963a70 100644
+index a1253e5..a084935 100644
--- a/Makefile.in
+++ b/Makefile.in
-@@ -190,60 +190,6 @@ gensend: gen
+@@ -192,60 +192,6 @@ gensend: gen
fi
rsync -aic $(GENFILES) git-version.h
$${SAMBA_HOST-samba.org}:/home/ftp/pub/rsync/generated-files/ || true
diff --git a/meta/recipes-devtools/rsync/rsync_3.2.7.bb
b/meta/recipes-devtools/rsync/rsync_3.3.0.bb
similarity index 96%
rename from meta/recipes-devtools/rsync/rsync_3.2.7.bb
rename to meta/recipes-devtools/rsync/rsync_3.3.0.bb
index 130581a785..b42026331d 100644
--- a/meta/recipes-devtools/rsync/rsync_3.2.7.bb
+++ b/meta/recipes-devtools/rsync/rsync_3.3.0.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] =
"4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb"
+SRC_URI[sha256sum] =
"7399e9a6708c32d678a72a63219e96f23be0be2336e50fd1348498d07041df90"
inherit autotools-brokensep
--
2.42.0
0001-rsync-upgrade-3.2.7-3.3.0.patch
Description: Binary data
packages/core2-64-poky-linux/rsync: PKGV changed from 3.2.7 [default] to 3.3.0 [default] packages/core2-64-poky-linux/rsync: PV changed from "3.2.7" to "3.3.0" packages/core2-64-poky-linux/rsync: SRC_URI changed from "https://download.samba.org/pub/rsync/src/rsync-3.2.7.tar.gz file://rsyncd.conf file://makefile-no-rebuild.patch file://determism.patch file://0001-Add-missing-prototypes-to-function-declarations.patch" to "https://download.samba.org/pub/rsync/src/rsync-3.3.0.tar.gz file://rsyncd.conf file://makefile-no-rebuild.patch file://determism.patch file://0001-Add-missing-prototypes-to-function-declarations.patch" packages/core2-64-poky-linux/rsync/rsync-dbg: PKGV changed from 3.2.7 [default] to 3.3.0 [default] packages/core2-64-poky-linux/rsync/rsync-dbg: PV changed from "3.2.7" to "3.3.0" packages/core2-64-poky-linux/rsync/rsync-dbg: PKGSIZE changed from 1465704 to 1467048 (+0%) packages/core2-64-poky-linux/rsync/rsync-dev: PKGV changed from 3.2.7 [default] to 3.3.0 [default] packages/core2-64-poky-linux/rsync/rsync-dev: PV changed from "3.2.7" to "3.3.0" packages/core2-64-poky-linux/rsync/rsync-doc: PKGV changed from 3.2.7 [default] to 3.3.0 [default] packages/core2-64-poky-linux/rsync/rsync-doc: PV changed from "3.2.7" to "3.3.0" packages/core2-64-poky-linux/rsync/rsync-doc: PKGSIZE changed from 298026 to 298518 (+0%) packages/core2-64-poky-linux/rsync/rsync-locale: PKGV changed from 3.2.7 [default] to 3.3.0 [default] packages/core2-64-poky-linux/rsync/rsync-locale: PV changed from "3.2.7" to "3.3.0" packages/core2-64-poky-linux/rsync/rsync-src: PKGV changed from 3.2.7 [default] to 3.3.0 [default] packages/core2-64-poky-linux/rsync/rsync-src: PV changed from "3.2.7" to "3.3.0" packages/core2-64-poky-linux/rsync/rsync-src: PKGSIZE changed from 1640513 to 1641890 (+0%) packages/core2-64-poky-linux/rsync/rsync-staticdev: PKGV changed from 3.2.7 [default] to 3.3.0 [default] packages/core2-64-poky-linux/rsync/rsync-staticdev: PV changed from "3.2.7" to "3.3.0" packages/core2-64-poky-linux/rsync/rsync: PKGV changed from 3.2.7 [default] to 3.3.0 [default] packages/core2-64-poky-linux/rsync/rsync: PV changed from "3.2.7" to "3.3.0"
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#198313): https://lists.openembedded.org/g/openembedded-core/message/198313 Mute This Topic: https://lists.openembedded.org/mt/105552107/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
