From patchwork Tue Apr 16 06:13:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: auh@yoctoproject.org X-Patchwork-Id: 42381 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 142F2C25B79 for ; Tue, 16 Apr 2024 06:14:09 +0000 (UTC) Received: from a27-33.smtp-out.us-west-2.amazonses.com (a27-33.smtp-out.us-west-2.amazonses.com [54.240.27.33]) by mx.groups.io with SMTP id smtpd.web11.13431.1713248038653455780 for ; Mon, 15 Apr 2024 23:14:00 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@yoctoproject.org header.s=lvjh2tk576v2ro5mi6k4dt3mc6wpqbky header.b=SjwFKy49; dkim=pass header.i=@amazonses.com header.s=7v7vs6w47njt4pimodk5mmttbegzsi6n header.b=4jb4o2mS; spf=pass (domain: us-west-2.amazonses.com, ip: 54.240.27.33, mailfrom: 0101018ee58a7380-4e391d08-da26-473b-90f3-5ddb63537871-000000@us-west-2.amazonses.com) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=lvjh2tk576v2ro5mi6k4dt3mc6wpqbky; d=yoctoproject.org; t=1713248039; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date; bh=mavfdMbjS/08qqg4IeRxutciUo/569yEc2xOtcVNu3g=; b=SjwFKy49X2fc57yciAfUa+2qHoJS506yTOtLJxAPb/oQx1ovs0isAE70rGoLSQs3 Zhtx1cvUlAghyUayhVezQkq66mKmgofH6dNtAMZPPhCl/i4BLVuHzUWhqFnuxZAwrkJ 1RECEgc4Ard5lckUgq7zrXjZnjx+MJV9PK6RN/ow= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=7v7vs6w47njt4pimodk5mmttbegzsi6n; d=amazonses.com; t=1713248039; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date:Feedback-ID; bh=mavfdMbjS/08qqg4IeRxutciUo/569yEc2xOtcVNu3g=; b=4jb4o2mSzbN/obS+R/UPagOiE3J4hIEGUAA/DMtQjFcOiZKwPxfhKW1fVT2sdYem i/eBdYIq1dCT7VN0wJfY0PdSPsgXkfAGEyScPjwxaeYhdwZWH2+8IkDqX79dnU5QqPd BByeutS8vanTaaah8dGuBrnF6LIzNKA2b520yRzE= MIME-Version: 1.0 From: auh@yoctoproject.org To: Yi Zhao Cc: openembedded-core@lists.openembedded.org Subject: [AUH] rsync: upgrading to 3.3.0 SUCCEEDED Message-ID: <0101018ee58a7380-4e391d08-da26-473b-90f3-5ddb63537871-000000@us-west-2.amazonses.com> Date: Tue, 16 Apr 2024 06:13:59 +0000 Feedback-ID: 1.us-west-2.9np3MYPs3fEaOBysGKSlUD4KtcmPijcmS9Az2Hwf7iQ=:AmazonSES X-SES-Outgoing: 2024.04.16-54.240.27.33 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 16 Apr 2024 06:14:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/198313 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 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 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 - --- checksum.c | 2 +- exclude.c | 2 +- @@ -30,10 +29,10 @@ Signed-off-by: Khem Raj 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 +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 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 - --- 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