diff options
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/rsync/files/makefile-no-rebuild.patch | 14 | ||||
-rw-r--r-- | meta/recipes-devtools/rsync/rsync_3.2.2.bb (renamed from meta/recipes-devtools/rsync/rsync_3.2.1.bb) | 2 |
2 files changed, 10 insertions, 6 deletions
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 @@ | |||
1 | From 5ae38baadd40a996da3d19a147f37e7f1f3355bf Mon Sep 17 00:00:00 2001 | 1 | From 1f29584e57f5fda09970c66f3b94f4720e09c1bb Mon Sep 17 00:00:00 2001 |
2 | From: Ross Burton <ross.burton@intel.com> | 2 | From: Ross Burton <ross.burton@intel.com> |
3 | Date: Tue, 12 Apr 2016 15:51:54 +0100 | 3 | Date: Tue, 12 Apr 2016 15:51:54 +0100 |
4 | Subject: [PATCH] rsync: remove upstream's rebuild logic | 4 | Subject: [PATCH] rsync: remove upstream's rebuild logic |
@@ -10,14 +10,14 @@ Upstream-Status: Inappropriate | |||
10 | Signed-off-by: Ross Burton <ross.burton@intel.com> | 10 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
11 | 11 | ||
12 | --- | 12 | --- |
13 | Makefile.in | 50 -------------------------------------------------- | 13 | Makefile.in | 54 ----------------------------------------------------- |
14 | 1 file changed, 50 deletions(-) | 14 | 1 file changed, 54 deletions(-) |
15 | 15 | ||
16 | diff --git a/Makefile.in b/Makefile.in | 16 | diff --git a/Makefile.in b/Makefile.in |
17 | index 31ddc43..41c9a93 100644 | 17 | index 672fcc4..c12d8d4 100644 |
18 | --- a/Makefile.in | 18 | --- a/Makefile.in |
19 | +++ b/Makefile.in | 19 | +++ b/Makefile.in |
20 | @@ -167,56 +167,6 @@ gen: conf proto.h man | 20 | @@ -168,60 +168,6 @@ gen: conf proto.h man |
21 | gensend: gen | 21 | gensend: gen |
22 | rsync -aic $(GENFILES) $${SAMBA_HOST-samba.org}:/home/ftp/pub/rsync/generated-files/ | 22 | rsync -aic $(GENFILES) $${SAMBA_HOST-samba.org}:/home/ftp/pub/rsync/generated-files/ |
23 | 23 | ||
@@ -56,6 +56,10 @@ index 31ddc43..41c9a93 100644 | |||
56 | - ./config.status --recheck | 56 | - ./config.status --recheck |
57 | - ./config.status | 57 | - ./config.status |
58 | - | 58 | - |
59 | -.PHONY: restatus | ||
60 | -restatus: | ||
61 | - ./config.status | ||
62 | - | ||
59 | -Makefile: Makefile.in config.status configure.sh config.h.in | 63 | -Makefile: Makefile.in config.status configure.sh config.h.in |
60 | - @if test -f Makefile; then cp -p Makefile Makefile.old; else touch Makefile.old; fi | 64 | - @if test -f Makefile; then cp -p Makefile Makefile.old; else touch Makefile.old; fi |
61 | - @./config.status | 65 | - @./config.status |
diff --git a/meta/recipes-devtools/rsync/rsync_3.2.1.bb b/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 \ | |||
14 | file://makefile-no-rebuild.patch \ | 14 | file://makefile-no-rebuild.patch \ |
15 | " | 15 | " |
16 | 16 | ||
17 | SRC_URI[sha256sum] = "95f2dd62979b500a99b34c1a6453a0787ada0330e4bec7fcffad37b9062d58d3" | 17 | SRC_URI[sha256sum] = "644bd3841779507665211fd7db8359c8a10670c57e305b4aab61b4e40037afa8" |
18 | 18 | ||
19 | # -16548 required for v3.1.3pre1. Already in v3.1.3. | 19 | # -16548 required for v3.1.3pre1. Already in v3.1.3. |
20 | CVE_CHECK_WHITELIST += " CVE-2017-16548 " | 20 | CVE_CHECK_WHITELIST += " CVE-2017-16548 " |