From 2cf32c444ed3ac5f125708c175bbf608bea64156 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Tue, 25 Feb 2020 13:54:12 +0100
Subject: [PATCH] rdiff-backup: Update from 1.3.3 to 1.9.1b0

---
 packages/rdiff-backup/build.sh                | 16 +++++++++------
 .../rdiff-backup-1.2.8-librsync-1.0.0.patch   | 20 -------------------
 2 files changed, 10 insertions(+), 26 deletions(-)
 delete mode 100644 packages/rdiff-backup/rdiff-backup-1.2.8-librsync-1.0.0.patch

diff --git a/packages/rdiff-backup/build.sh b/packages/rdiff-backup/build.sh
index 8b481e686..db4adcb7b 100644
--- a/packages/rdiff-backup/build.sh
+++ b/packages/rdiff-backup/build.sh
@@ -1,14 +1,18 @@
-TERMUX_PKG_HOMEPAGE=http://www.nongnu.org/rdiff-backup/
+TERMUX_PKG_HOMEPAGE=https://rdiff-backup.net
 TERMUX_PKG_DESCRIPTION="A utility for local/remote mirroring and incremental backups"
 TERMUX_PKG_LICENSE="GPL-2.0"
-TERMUX_PKG_VERSION=1.3.3
-TERMUX_PKG_SRCURL=https://savannah.nongnu.org/download/rdiff-backup/rdiff-backup-$TERMUX_PKG_VERSION.tar.gz
-TERMUX_PKG_SHA256=ee030ce638df0eb1047cf72578e0de15d9a3ee9ab24da2dc0023e2978be30c06
-TERMUX_PKG_DEPENDS="librsync, python2"
+TERMUX_PKG_VERSION=1.9.1~b0
+TERMUX_PKG_SRCURL=https://github.com/rdiff-backup/rdiff-backup/releases/download/v${TERMUX_PKG_VERSION/\~/}/rdiff-backup-${TERMUX_PKG_VERSION/\~/}.tar.gz
+TERMUX_PKG_SHA256=c6a7335841d958ad7cda0bd640cef63a6c25fd3821b7a38af2a642557e18ad9b
+TERMUX_PKG_DEPENDS="librsync, python"
 TERMUX_PKG_BUILD_IN_SRC=true
 
+termux_step_make() {
+	continue
+}
+
 termux_step_make_install() {
-	local _PYTHON_VERSION=2.7
+	local _PYTHON_VERSION=3.8
 	export PYTHONPATH=$TERMUX_PREFIX/lib/python${_PYTHON_VERSION}/site-packages
 	export CPPFLAGS+=" -I${TERMUX_PREFIX}/include/python${_PYTHON_VERSION}"
 	export LDFLAGS+=" -lpython${_PYTHON_VERSION}"
diff --git a/packages/rdiff-backup/rdiff-backup-1.2.8-librsync-1.0.0.patch b/packages/rdiff-backup/rdiff-backup-1.2.8-librsync-1.0.0.patch
deleted file mode 100644
index ce23c8a81..000000000
--- a/packages/rdiff-backup/rdiff-backup-1.2.8-librsync-1.0.0.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Patch by Roman Tereshonkov and Kari Hautio for rdiff-backup <= 1.2.8 to avoid a build failure with
-librsync >= 1.0.0 (which is a security bugfix release). The discussion and solution finding can be
-found at https://bugs.launchpad.net/duplicity/+bug/1416344 (for duplicity).
-
---- rdiff-backup-1.2.8/_librsyncmodule.c			2009-03-16 15:36:21.000000000 +0100
-+++ rdiff-backup-1.2.8/_librsyncmodule.c.librsync-1.0.0		2015-03-02 00:54:24.000000000 +0100
-@@ -59,8 +59,13 @@
-   if (sm == NULL) return NULL;
-   sm->x_attr = NULL;
- 
-+#ifdef RS_DEFAULT_STRONG_LEN
-   sm->sig_job = rs_sig_begin((size_t)blocklen,
- 							 (size_t)RS_DEFAULT_STRONG_LEN);
-+#else
-+  sm->sig_job = rs_sig_begin((size_t)blocklen,
-+							 (size_t)8, RS_MD4_SIG_MAGIC);
-+#endif
-   return (PyObject*)sm;
- }
-