[08/13] rsync: update 3.2.1 -> 3.2.2

Submitted by Alexander Kanavin on Aug. 1, 2020, 9:23 p.m. | Patch ID: 174986

Details

Message ID 20200801212335.14922-8-alex.kanavin@gmail.com
State Accepted
Commit a1b6e078e12fb3cd5057076d6ecd60152fd35074
Headers show

Commit Message

Alexander Kanavin Aug. 1, 2020, 9:23 p.m.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 .../rsync/files/makefile-no-rebuild.patch          | 14 +++++++++-----
 .../rsync/{rsync_3.2.1.bb => rsync_3.2.2.bb}       |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)
 rename meta/recipes-devtools/rsync/{rsync_3.2.1.bb => rsync_3.2.2.bb} (95%)

Patch hide | download patch | download mbox

diff --git a/meta/recipes-devtools/rsync/files/makefile-no-rebuild.patch b/meta/recipes-devtools/rsync/files/makefile-no-rebuild.patch
index 038a672095..4ba7665280 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 5ae38baadd40a996da3d19a147f37e7f1f3355bf Mon Sep 17 00:00:00 2001
+From 1f29584e57f5fda09970c66f3b94f4720e09c1bb Mon Sep 17 00:00:00 2001
 From: Ross Burton <ross.burton@intel.com>
 Date: Tue, 12 Apr 2016 15:51:54 +0100
 Subject: [PATCH] rsync: remove upstream's rebuild logic
@@ -10,14 +10,14 @@  Upstream-Status: Inappropriate
 Signed-off-by: Ross Burton <ross.burton@intel.com>
 
 ---
- Makefile.in | 50 --------------------------------------------------
- 1 file changed, 50 deletions(-)
+ Makefile.in | 54 -----------------------------------------------------
+ 1 file changed, 54 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index 31ddc43..41c9a93 100644
+index 672fcc4..c12d8d4 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -167,56 +167,6 @@ gen: conf proto.h man
+@@ -168,60 +168,6 @@ gen: conf proto.h man
  gensend: gen
  	rsync -aic $(GENFILES) $${SAMBA_HOST-samba.org}:/home/ftp/pub/rsync/generated-files/
  
@@ -56,6 +56,10 @@  index 31ddc43..41c9a93 100644
 -	./config.status --recheck
 -	./config.status
 -
+-.PHONY: restatus
+-restatus:
+-	./config.status
+-
 -Makefile: Makefile.in config.status configure.sh config.h.in
 -	@if test -f Makefile; then cp -p Makefile Makefile.old; else touch Makefile.old; fi
 -	@./config.status
diff --git a/meta/recipes-devtools/rsync/rsync_3.2.1.bb b/meta/recipes-devtools/rsync/rsync_3.2.2.bb
similarity index 95%
rename from meta/recipes-devtools/rsync/rsync_3.2.1.bb
rename to meta/recipes-devtools/rsync/rsync_3.2.2.bb
index ea6b1ce38f..182628f4b4 100644
--- a/meta/recipes-devtools/rsync/rsync_3.2.1.bb
+++ b/meta/recipes-devtools/rsync/rsync_3.2.2.bb
@@ -14,7 +14,7 @@  SRC_URI = "https://download.samba.org/pub/${BPN}/src/${BP}.tar.gz \
            file://makefile-no-rebuild.patch \
            "
 
-SRC_URI[sha256sum] = "95f2dd62979b500a99b34c1a6453a0787ada0330e4bec7fcffad37b9062d58d3"
+SRC_URI[sha256sum] = "644bd3841779507665211fd7db8359c8a10670c57e305b4aab61b4e40037afa8"
 
 # -16548 required for v3.1.3pre1. Already in v3.1.3.
 CVE_CHECK_WHITELIST += " CVE-2017-16548 "