From 50cd11d4efc577ac68b554ea8c1e4a4882c80ea4 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 4 May 2024 10:52:14 +0200 Subject: [PATCH] package/rsync: bump to version 3.3.0 Drop first patch (already in version) https://github.com/RsyncProject/rsync/blob/v3.3.0/NEWS.md Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit a8be7900a363ab21d8a1234d410cbc1ccee1edfd) Signed-off-by: Peter Korsgaard --- ...py-in-crypto-lib-instead-of-MD5_Init.patch | 28 ------------------- ...pkg-config-to-retrieve-openssl-depe.patch} | 0 package/rsync/rsync.hash | 4 +-- package/rsync/rsync.mk | 2 +- 4 files changed, 3 insertions(+), 31 deletions(-) delete mode 100644 package/rsync/0001-Check-for-EVP_MD_CTX_copy-in-crypto-lib-instead-of-MD5_Init.patch rename package/rsync/{0002-configure.ac-use-pkg-config-to-retrieve-openssl-depe.patch => 0001-configure.ac-use-pkg-config-to-retrieve-openssl-depe.patch} (100%) diff --git a/package/rsync/0001-Check-for-EVP_MD_CTX_copy-in-crypto-lib-instead-of-MD5_Init.patch b/package/rsync/0001-Check-for-EVP_MD_CTX_copy-in-crypto-lib-instead-of-MD5_Init.patch deleted file mode 100644 index 5381159968..0000000000 --- a/package/rsync/0001-Check-for-EVP_MD_CTX_copy-in-crypto-lib-instead-of-MD5_Init.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 556a2c5bc2f6244f140a96302d4df92cfc25af8b Mon Sep 17 00:00:00 2001 -From: Wayne Davison -Date: Tue, 25 Oct 2022 21:55:53 -0700 -Subject: [PATCH] Check for EVP_MD_CTX_copy in crypto lib instead of MD5_Init. - -Upstream: https://github.com/WayneD/rsync/commit/556a2c5bc2f6244f140a96302d4df92cfc25af8b -Signed-off-by: Fabrice Fontaine ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index a2c99558..ccad7f13 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -432,10 +432,10 @@ AH_TEMPLATE([USE_OPENSSL], - if test x"$enable_openssl" != x"no"; then - if test x"$ac_cv_header_openssl_md4_h" = x"yes" && test x"$ac_cv_header_openssl_md5_h" = x"yes"; then - AC_MSG_RESULT(yes) -- AC_SEARCH_LIBS(MD5_Init, crypto, -+ AC_SEARCH_LIBS(EVP_MD_CTX_copy, crypto, - [AC_DEFINE(USE_OPENSSL) - enable_openssl=yes], -- [err_msg="$err_msg$nl- Failed to find MD5_Init function in openssl crypto lib."; -+ [err_msg="$err_msg$nl- Failed to find EVP_MD_CTX_copy function in openssl crypto lib."; - no_lib="$no_lib openssl"]) - else - AC_MSG_RESULT(no) diff --git a/package/rsync/0002-configure.ac-use-pkg-config-to-retrieve-openssl-depe.patch b/package/rsync/0001-configure.ac-use-pkg-config-to-retrieve-openssl-depe.patch similarity index 100% rename from package/rsync/0002-configure.ac-use-pkg-config-to-retrieve-openssl-depe.patch rename to package/rsync/0001-configure.ac-use-pkg-config-to-retrieve-openssl-depe.patch diff --git a/package/rsync/rsync.hash b/package/rsync/rsync.hash index 842b5c099f..edeca9c4df 100644 --- a/package/rsync/rsync.hash +++ b/package/rsync/rsync.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://rsync.samba.org/ftp/rsync/src/rsync-3.2.7.tar.gz.asc -sha256 4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb rsync-3.2.7.tar.gz +# https://rsync.samba.org/ftp/rsync/src/rsync-3.3.0.tar.gz.asc +sha256 7399e9a6708c32d678a72a63219e96f23be0be2336e50fd1348498d07041df90 rsync-3.3.0.tar.gz # Locally calculated sha256 85c19ea50a224c2d0067a69c083584e5717b40b76610ec1218f91385775067dd COPYING diff --git a/package/rsync/rsync.mk b/package/rsync/rsync.mk index b9d392c8cb..188c87e1d4 100644 --- a/package/rsync/rsync.mk +++ b/package/rsync/rsync.mk @@ -4,7 +4,7 @@ # ################################################################################ -RSYNC_VERSION = 3.2.7 +RSYNC_VERSION = 3.3.0 RSYNC_SITE = https://rsync.samba.org/ftp/rsync/src RSYNC_LICENSE = GPL-3.0+ with exceptions RSYNC_LICENSE_FILES = COPYING