From 4cec53238dae070843b010902f35ceb125b003db Mon Sep 17 00:00:00 2001
From: heitbaum <rudi@heitbaum.com>
Date: Wed, 5 Jan 2022 06:28:19 +0000
Subject: [PATCH] rsync: update to 3.2.7

news:
- https://download.samba.org/pub/rsync/NEWS#3.2.4
- https://download.samba.org/ftp/rsync/NEWS#3.2.5
- https://download.samba.org/pub/rsync/NEWS#3.2.6
- https://download.samba.org/pub/rsync/NEWS#3.2.7
---
 packages/network/rsync/package.mk             | 31 ++++++---
 ...nd-glibc-s-lchmod-issue-a-better-way.patch | 65 -------------------
 2 files changed, 21 insertions(+), 75 deletions(-)
 delete mode 100644 packages/network/rsync/patches/0001-Work-around-glibc-s-lchmod-issue-a-better-way.patch

diff --git a/packages/network/rsync/package.mk b/packages/network/rsync/package.mk
index 0837052c33..293080fed4 100644
--- a/packages/network/rsync/package.mk
+++ b/packages/network/rsync/package.mk
@@ -2,35 +2,46 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="rsync"
-PKG_VERSION="3.2.3"
-PKG_SHA256="becc3c504ceea499f4167a260040ccf4d9f2ef9499ad5683c179a697146ce50e"
+PKG_VERSION="3.2.7"
+PKG_SHA256="4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb"
 PKG_LICENSE="GPLv3"
-PKG_SITE="http://www.samba.org/ftp/rsync/rsync.html"
+PKG_SITE="https://rsync.samba.org"
 PKG_URL="https://download.samba.org/pub/rsync/src/${PKG_NAME}-${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_HOST="autotools:host zlib:host zstd:host"
+PKG_DEPENDS_HOST="autotools:host zlib:host"
 PKG_DEPENDS_TARGET="toolchain zlib openssl"
 PKG_LONGDESC="A very fast method for bringing remote files into sync."
 PKG_BUILD_FLAGS="-sysroot"
 
-PKG_CONFIGURE_OPTS_HOST="--with-included-popt \
-                         --without-included-zlib \
+PKG_CONFIGURE_OPTS_HOST="--disable-md2man \
+                         --disable-ipv6 \
                          --disable-openssl \
+                         --disable-xxhash \
+                         --disable-zstd \
                          --disable-lz4 \
-                         --enable-zstd \
-                         --disable-xxhash"
+                         --disable-iconv \
+                         --with-included-popt \
+                         --without-included-zlib"
 
 PKG_CONFIGURE_OPTS_TARGET="--disable-acl-support \
-                           --disable-asm \
+                           --disable-md5-asm \
                            --enable-openssl \
                            --disable-lz4 \
                            --disable-md2man \
-                           --disable-simd \
+                           --disable-roll-simd \
                            --disable-xattr-support \
                            --disable-xxhash \
                            --disable-zstd \
                            --with-included-popt \
                            --without-included-zlib"
 
+pre_configure_host() {
+  HOST_CONFIGURE_OPTS=$(echo ${HOST_CONFIGURE_OPTS} | sed -e "s|--disable-static||" -e "s|--enable-shared||")
+}
+
+pre_configure_target() {
+  TARGET_CONFIGURE_OPTS=$(echo ${TARGET_CONFIGURE_OPTS} | sed -e "s|--disable-static||" -e "s|--enable-shared||")
+}
+
 pre_make_host() {
   # do not detect LE git version
   echo "#define RSYNC_GITVER \"${PKG_VERSION}\"" >git-version.h
diff --git a/packages/network/rsync/patches/0001-Work-around-glibc-s-lchmod-issue-a-better-way.patch b/packages/network/rsync/patches/0001-Work-around-glibc-s-lchmod-issue-a-better-way.patch
deleted file mode 100644
index 83a507cd62..0000000000
--- a/packages/network/rsync/patches/0001-Work-around-glibc-s-lchmod-issue-a-better-way.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 0b187830db0e88d7d5e21a2d2d6040d64fed34c3 Mon Sep 17 00:00:00 2001
-From: Wayne Davison <wayne@opencoder.net>
-Date: Fri, 30 Oct 2020 15:51:24 -0700
-Subject: [PATCH] Work around glibc's lchmod() issue a better way.
-
----
- syscall.c | 34 +++++++++++++++++++++-------------
- 1 file changed, 21 insertions(+), 13 deletions(-)
-
-diff --git a/syscall.c b/syscall.c
-index b9c3b4ef..11d10e4a 100644
---- a/syscall.c
-+++ b/syscall.c
-@@ -227,27 +227,35 @@ int do_open(const char *pathname, int flags, mode_t mode)
- #ifdef HAVE_CHMOD
- int do_chmod(const char *path, mode_t mode)
- {
-+	static int switch_step = 0;
- 	int code;
- 	if (dry_run) return 0;
- 	RETURN_ERROR_IF_RO_OR_LO;
-+	switch (switch_step) {
- #ifdef HAVE_LCHMOD
--	code = lchmod(path, mode & CHMOD_BITS);
--#else
--	if (S_ISLNK(mode)) {
-+#include "case_N.h"
-+		if ((code = lchmod(path, mode & CHMOD_BITS)) == 0 || errno != ENOTSUP)
-+			break;
-+		switch_step++;
-+#endif
-+
-+#include "case_N.h"
-+		if (S_ISLNK(mode)) {
- # if defined HAVE_SETATTRLIST
--		struct attrlist attrList;
--		uint32_t m = mode & CHMOD_BITS; /* manpage is wrong: not mode_t! */
-+			struct attrlist attrList;
-+			uint32_t m = mode & CHMOD_BITS; /* manpage is wrong: not mode_t! */
- 
--		memset(&attrList, 0, sizeof attrList);
--		attrList.bitmapcount = ATTR_BIT_MAP_COUNT;
--		attrList.commonattr = ATTR_CMN_ACCESSMASK;
--		code = setattrlist(path, &attrList, &m, sizeof m, FSOPT_NOFOLLOW);
-+			memset(&attrList, 0, sizeof attrList);
-+			attrList.bitmapcount = ATTR_BIT_MAP_COUNT;
-+			attrList.commonattr = ATTR_CMN_ACCESSMASK;
-+			code = setattrlist(path, &attrList, &m, sizeof m, FSOPT_NOFOLLOW);
- # else
--		code = 1;
-+			code = 1;
- # endif
--	} else
--		code = chmod(path, mode & CHMOD_BITS); /* DISCOURAGED FUNCTION */
--#endif /* !HAVE_LCHMOD */
-+		} else
-+			code = chmod(path, mode & CHMOD_BITS); /* DISCOURAGED FUNCTION */
-+		break;
-+	}
- 	if (code != 0 && (preserve_perms || preserve_executability))
- 		return code;
- 	return 0;
--- 
-2.33.0
-