package/rsync: bump version to 3.2.5

Fix https://nvd.nist.gov/vuln/detail/CVE-2022-29154

Remove 0001-rsync-ssl-Verify-the-hostname-in-the-certificate-when-using-openssl.patch, applied to master:
c3f7414c45

remove 0002-Handle-linking-with-a-zlib-with-external-read_buf.patch b/package/rsync/0002-Handle-linking-with-a-zlib-with-external-read_buf.patch, applied to naster:
60dd42be60

Signed-off-by: Yair Ben-Avraham <yairba@protonmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Yair Ben-Avraham 2022-08-15 04:06:02 +00:00 committed by Thomas Petazzoni
parent 3ae900bcf9
commit 4990cf7a59
4 changed files with 4 additions and 60 deletions

View File

@ -1,29 +0,0 @@
From c3f7414c450faaf6a8281cc4a4403529aeb7d859 Mon Sep 17 00:00:00 2001
From: Matt McCutchen <matt@mattmccutchen.net>
Date: Wed, 26 Aug 2020 12:16:08 -0400
Subject: [PATCH] rsync-ssl: Verify the hostname in the certificate when using
openssl.
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Retrieved from:
https://git.samba.org/?p=rsync.git;a=commitdiff;h=c3f7414c450faaf6a8281cc4a4403529aeb7d859]
---
rsync-ssl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rsync-ssl b/rsync-ssl
index 8101975a..46701af1 100755
--- a/rsync-ssl
+++ b/rsync-ssl
@@ -129,7 +129,7 @@ function rsync_ssl_helper {
fi
if [[ $RSYNC_SSL_TYPE == openssl ]]; then
- exec $RSYNC_SSL_OPENSSL s_client $caopt $certopt -quiet -verify_quiet -servername $hostname -connect $hostname:$port
+ exec $RSYNC_SSL_OPENSSL s_client $caopt $certopt -quiet -verify_quiet -servername $hostname -verify_hostname $hostname -connect $hostname:$port
elif [[ $RSYNC_SSL_TYPE == gnutls ]]; then
exec $RSYNC_SSL_GNUTLS --logfile=/dev/null $gnutls_cert_opt $gnutls_opts $hostname:$port
else
--
2.25.1

View File

@ -1,27 +0,0 @@
From 60dd42be603a79cd57cec076fe1680e9037be774 Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayne@opencoder.net>
Date: Mon, 11 Apr 2022 08:29:54 -0700
Subject: [PATCH] Handle linking with a zlib with external read_buf.
[Retrieved from:
https://github.com/WayneD/rsync/commit/60dd42be603a79cd57cec076fe1680e9037be774]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
rsync.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/rsync.h b/rsync.h
index 4b30570b..e5aacd25 100644
--- a/rsync.h
+++ b/rsync.h
@@ -1172,6 +1172,10 @@ struct name_num_obj {
struct name_num_item list[10]; /* we'll get a compile error/warning if this is ever too small */
};
+#ifdef EXTERNAL_ZLIB
+#define read_buf read_buf_
+#endif
+
#ifndef __cplusplus
#include "proto.h"
#endif

View File

@ -1,5 +1,5 @@
# Locally calculated after checking pgp signature
# https://download.samba.org/pub/rsync/src/rsync-3.2.3.tar.gz.asc
sha256 becc3c504ceea499f4167a260040ccf4d9f2ef9499ad5683c179a697146ce50e rsync-3.2.3.tar.gz
# https://download.samba.org/pub/rsync/src/rsync-3.2.5.tar.gz.asc
sha256 2ac4d21635cdf791867bc377c35ca6dda7f50d919a58be45057fd51600c69aba rsync-3.2.5.tar.gz
# Locally calculated
sha256 0d33aa97d302cb9df27f99dfa28d58001c2479a02317956f1a7a890f3937a976 COPYING
sha256 85c19ea50a224c2d0067a69c083584e5717b40b76610ec1218f91385775067dd COPYING

View File

@ -4,7 +4,7 @@
#
################################################################################
RSYNC_VERSION = 3.2.3
RSYNC_VERSION = 3.2.5
RSYNC_SITE = http://rsync.samba.org/ftp/rsync/src
RSYNC_LICENSE = GPL-3.0+ with exceptions
RSYNC_LICENSE_FILES = COPYING