From ef5834618b0a5063f4d4920f3e69f0505ccc742b Mon Sep 17 00:00:00 2001 From: Alex Zhang Date: Sun, 11 Apr 2021 15:37:30 -0500 Subject: [PATCH] rsync: build with IPv6 support (#5826) --- packages/rsync/build.sh | 1 + packages/rsync/configure.ac.patch | 12 ++++++++++++ packages/rsync/configure.sh.patch | 12 ++++++++++++ 3 files changed, 25 insertions(+) create mode 100644 packages/rsync/configure.ac.patch create mode 100644 packages/rsync/configure.sh.patch diff --git a/packages/rsync/build.sh b/packages/rsync/build.sh index 88bdf92dc2..7fbd7c19bf 100644 --- a/packages/rsync/build.sh +++ b/packages/rsync/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Utility that provides fast incremental file transfer" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=3.2.3 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://rsync.samba.org/ftp/rsync/src/rsync-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=becc3c504ceea499f4167a260040ccf4d9f2ef9499ad5683c179a697146ce50e TERMUX_PKG_DEPENDS="libiconv, liblz4, libpopt, openssh | dropbear, openssl-tool, zlib, zstd" diff --git a/packages/rsync/configure.ac.patch b/packages/rsync/configure.ac.patch new file mode 100644 index 0000000000..da690fb0d1 --- /dev/null +++ b/packages/rsync/configure.ac.patch @@ -0,0 +1,12 @@ +diff -uNr rsync-3.1.3/configure.ac rsync-3.1.3.mod/configure.ac +--- rsync-3.1.3/configure.ac 2020-07-31 01:33:58.000000000 +0000 ++++ rsync-3.1.3.mod/configure.ac 2021-04-11 01:45:27.000000000 +0000 +@@ -380,7 +380,7 @@ + # http://www.v6.linux.or.jp/ + AC_EGREP_CPP(yes, [ + #include +-#if defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1 ++#if (defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) || defined(__ANDROID__) + yes + #endif], + [ipv6type=$i; diff --git a/packages/rsync/configure.sh.patch b/packages/rsync/configure.sh.patch new file mode 100644 index 0000000000..43436bddde --- /dev/null +++ b/packages/rsync/configure.sh.patch @@ -0,0 +1,12 @@ +diff -uNr rsync-3.1.3/configure.sh rsync-3.1.3.mod/configure.sh +--- rsync-3.1.3/configure.sh 2020-08-07 03:48:27.000000000 +0000 ++++ rsync-3.1.3.mod/configure.sh 2021-04-11 01:45:27.000000000 +0000 +@@ -5420,7 +5420,7 @@ + /* end confdefs.h. */ + + #include +-#if defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1 ++#if (defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) || defined(__ANDROID__) + yes + #endif + _ACEOF