diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-05-05 07:05:38 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-05-05 21:17:38 +0100 |
commit | 2a39819c3943a0a31b7ab1559f938d7a161795d4 (patch) | |
tree | dc5dae81481f1faf41aa388dd24c80259313ecbc /meta/recipes-devtools/rsync/files | |
parent | 1d9533d4e7c9f6cc39439a09e89e5f8a9a43e028 (diff) | |
download | poky-2a39819c3943a0a31b7ab1559f938d7a161795d4.tar.gz |
rsync: update 3.2.3 -> 3.2.4
Drop configure options that have been removed upstream.
License-Update: formatting
(From OE-Core rev: bc9bf4c2ea4230391fc3ee2f55d1f73e1dd39edf)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rsync/files')
-rw-r--r-- | meta/recipes-devtools/rsync/files/0001-rsync-ssl-Verify-the-hostname-in-the-certificate-whe.patch | 31 | ||||
-rw-r--r-- | meta/recipes-devtools/rsync/files/makefile-no-rebuild.patch | 12 |
2 files changed, 6 insertions, 37 deletions
diff --git a/meta/recipes-devtools/rsync/files/0001-rsync-ssl-Verify-the-hostname-in-the-certificate-whe.patch b/meta/recipes-devtools/rsync/files/0001-rsync-ssl-Verify-the-hostname-in-the-certificate-whe.patch deleted file mode 100644 index 2d51ddf965..0000000000 --- a/meta/recipes-devtools/rsync/files/0001-rsync-ssl-Verify-the-hostname-in-the-certificate-whe.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | From fbe85634d88e82fbb439ae2a5d1aca8b8c309bea Mon Sep 17 00:00:00 2001 | ||
2 | From: Matt McCutchen <matt@mattmccutchen.net> | ||
3 | Date: Wed, 26 Aug 2020 12:16:08 -0400 | ||
4 | Subject: [PATCH] rsync-ssl: Verify the hostname in the certificate when using | ||
5 | openssl. | ||
6 | |||
7 | CVE: CVE-2020-14387 | ||
8 | |||
9 | Upstream-Status: Backport [https://git.samba.org/?p=rsync.git;a=commit;h=c3f7414] | ||
10 | |||
11 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
12 | --- | ||
13 | rsync-ssl | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/rsync-ssl b/rsync-ssl | ||
17 | index 8101975..46701af 100755 | ||
18 | --- a/rsync-ssl | ||
19 | +++ b/rsync-ssl | ||
20 | @@ -129,7 +129,7 @@ function rsync_ssl_helper { | ||
21 | fi | ||
22 | |||
23 | if [[ $RSYNC_SSL_TYPE == openssl ]]; then | ||
24 | - exec $RSYNC_SSL_OPENSSL s_client $caopt $certopt -quiet -verify_quiet -servername $hostname -connect $hostname:$port | ||
25 | + exec $RSYNC_SSL_OPENSSL s_client $caopt $certopt -quiet -verify_quiet -servername $hostname -verify_hostname $hostname -connect $hostname:$port | ||
26 | elif [[ $RSYNC_SSL_TYPE == gnutls ]]; then | ||
27 | exec $RSYNC_SSL_GNUTLS --logfile=/dev/null $gnutls_cert_opt $gnutls_opts $hostname:$port | ||
28 | else | ||
29 | -- | ||
30 | 2.17.1 | ||
31 | |||
diff --git a/meta/recipes-devtools/rsync/files/makefile-no-rebuild.patch b/meta/recipes-devtools/rsync/files/makefile-no-rebuild.patch index 4ba7665280..92ed1f4419 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 1f29584e57f5fda09970c66f3b94f4720e09c1bb Mon Sep 17 00:00:00 2001 | 1 | From 81700d1a0e51391028c761cc8ef1cd660084d114 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 |
@@ -14,12 +14,12 @@ Signed-off-by: Ross Burton <ross.burton@intel.com> | |||
14 | 1 file changed, 54 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 672fcc4..c12d8d4 100644 | 17 | index 3cde955..d963a70 100644 |
18 | --- a/Makefile.in | 18 | --- a/Makefile.in |
19 | +++ b/Makefile.in | 19 | +++ b/Makefile.in |
20 | @@ -168,60 +168,6 @@ gen: conf proto.h man | 20 | @@ -190,60 +190,6 @@ gensend: gen |
21 | gensend: gen | 21 | fi |
22 | rsync -aic $(GENFILES) $${SAMBA_HOST-samba.org}:/home/ftp/pub/rsync/generated-files/ | 22 | rsync -aic $(GENFILES) git-version.h $${SAMBA_HOST-samba.org}:/home/ftp/pub/rsync/generated-files/ || true |
23 | 23 | ||
24 | -aclocal.m4: $(srcdir)/m4/*.m4 | 24 | -aclocal.m4: $(srcdir)/m4/*.m4 |
25 | - aclocal -I $(srcdir)/m4 | 25 | - aclocal -I $(srcdir)/m4 |
@@ -41,7 +41,7 @@ index 672fcc4..c12d8d4 100644 | |||
41 | - else \ | 41 | - else \ |
42 | - echo "config.h.in has CHANGED."; \ | 42 | - echo "config.h.in has CHANGED."; \ |
43 | - fi | 43 | - fi |
44 | - @if test -f configure.sh.old -o -f config.h.in.old; then \ | 44 | - @if test -f configure.sh.old || test -f config.h.in.old; then \ |
45 | - if test "$(MAKECMDGOALS)" = reconfigure; then \ | 45 | - if test "$(MAKECMDGOALS)" = reconfigure; then \ |
46 | - echo 'Continuing with "make reconfigure".'; \ | 46 | - echo 'Continuing with "make reconfigure".'; \ |
47 | - else \ | 47 | - else \ |