From 7dfda6a8c2b351d34ad838eddf67ce4f39e7855c Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Sun, 14 Aug 2022 21:57:54 +0000
Subject: [PATCH 1/2] rsync: update to 3.2.5

news:
- https://rsync.samba.org/ftp/rsync/NEWS#3.2.5
---
 packages/network/rsync/package.mk                   |  4 ++--
 .../patches/rsync-0001-don-t-set-RSYNC-GITVER.patch | 11 +++++++++++
 .../rsync/patches/rsync-schar-fix-3.2.4.patch       | 13 -------------
 3 files changed, 13 insertions(+), 15 deletions(-)
 create mode 100644 packages/network/rsync/patches/rsync-0001-don-t-set-RSYNC-GITVER.patch
 delete mode 100644 packages/network/rsync/patches/rsync-schar-fix-3.2.4.patch

diff --git a/packages/network/rsync/package.mk b/packages/network/rsync/package.mk
index c8e42afc2c..5b97030124 100644
--- a/packages/network/rsync/package.mk
+++ b/packages/network/rsync/package.mk
@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="rsync"
-PKG_VERSION="3.2.4"
-PKG_SHA256="6f761838d08052b0b6579cf7f6737d93e47f01f4da04c5d24d3447b7f2a5fad1"
+PKG_VERSION="3.2.5"
+PKG_SHA256="2ac4d21635cdf791867bc377c35ca6dda7f50d919a58be45057fd51600c69aba"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://rsync.samba.org"
 PKG_URL="https://download.samba.org/pub/rsync/src/${PKG_NAME}-${PKG_VERSION}.tar.gz"
diff --git a/packages/network/rsync/patches/rsync-0001-don-t-set-RSYNC-GITVER.patch b/packages/network/rsync/patches/rsync-0001-don-t-set-RSYNC-GITVER.patch
new file mode 100644
index 0000000000..ecb7f4791b
--- /dev/null
+++ b/packages/network/rsync/patches/rsync-0001-don-t-set-RSYNC-GITVER.patch
@@ -0,0 +1,11 @@
+--- a/mkgitver	2021-10-01 21:17:53.000000000 +0000
++++ b/mkgitver	2022-08-15 02:11:06.553999692 +0000
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ 
+ srcdir=`dirname $0`
+-gitver=`git describe --abbrev=8 2>/dev/null`
++gitver=""
+ 
+ if [ ! -f git-version.h ]; then
+     touch git-version.h
diff --git a/packages/network/rsync/patches/rsync-schar-fix-3.2.4.patch b/packages/network/rsync/patches/rsync-schar-fix-3.2.4.patch
deleted file mode 100644
index 08dd9c78dd..0000000000
--- a/packages/network/rsync/patches/rsync-schar-fix-3.2.4.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 24e383a9..5a53d339 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1117,7 +1117,7 @@ else
- fi
- 
- AC_CACHE_CHECK([for unsigned char],rsync_cv_SIGNED_CHAR_OK,[
--AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[signed char *s = ""]])],[rsync_cv_SIGNED_CHAR_OK=yes],[rsync_cv_SIGNED_CHAR_OK=no])])
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[signed char *s = (signed char *)""]])],[rsync_cv_SIGNED_CHAR_OK=yes],[rsync_cv_SIGNED_CHAR_OK=no])])
- if test x"$rsync_cv_SIGNED_CHAR_OK" = x"yes"; then
-     AC_DEFINE(SIGNED_CHAR_OK, 1, [Define to 1 if "signed char" is a valid type])
- fi

From 49807a5a221257b864a5184447fcf1eddfe06b32 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Mon, 15 Aug 2022 01:16:44 +0000
Subject: [PATCH 2/2] network-tools: rsync update and update addon to (116)

---
 packages/addons/tools/network-tools/changelog.txt | 3 +++
 packages/addons/tools/network-tools/package.mk    | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/addons/tools/network-tools/changelog.txt b/packages/addons/tools/network-tools/changelog.txt
index 7bcc9a87dd..9b57bc7879 100644
--- a/packages/addons/tools/network-tools/changelog.txt
+++ b/packages/addons/tools/network-tools/changelog.txt
@@ -1,3 +1,6 @@
+116
+- rsync: update to 3.2.5
+
 115
 - irssi: update to 1.4.2 and meson build
 - ngrep: update to using pcre2
diff --git a/packages/addons/tools/network-tools/package.mk b/packages/addons/tools/network-tools/package.mk
index 9729aa8fc8..16e1a50e99 100644
--- a/packages/addons/tools/network-tools/package.mk
+++ b/packages/addons/tools/network-tools/package.mk
@@ -3,7 +3,7 @@
 
 PKG_NAME="network-tools"
 PKG_VERSION="1.0"
-PKG_REV="115"
+PKG_REV="116"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://libreelec.tv"