rdiff-backup: Bump to 2.2.0

packages/rdiff-backup/build.sh

@@ -2,10 +2,9 @@ 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_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=2.0.5
-TERMUX_PKG_REVISION=4
+TERMUX_PKG_VERSION=2.2.0
 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=2bb7837b4a9712b6efaebfa7da8ed6348ffcb02fcecff0e19d8fff732e933b87
+TERMUX_PKG_SHA256=951779e051f5f0a1da8c6608e4aa87e60649751c8f291e388f6292577eb1f494
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="librsync, python"
 TERMUX_PKG_BUILD_IN_SRC=true

packages/rdiff-backup/rdiff-backup-2.0.5-python-3.11.patch

@@ -1,45 +0,0 @@
-https://github.com/rdiff-backup/rdiff-backup/commit/066066b3957fd5a53ca21f0ced3ca0831bd3d4e6
-
-From 066066b3957fd5a53ca21f0ced3ca0831bd3d4e6 Mon Sep 17 00:00:00 2001
-From: Frank Crawford <frank@crawford.emu.id.au>
-Date: Sun, 2 Jan 2022 20:28:40 +1100
-Subject: [PATCH] Added patch for Python3.11 as per bpo-39573. (#655)
-
-DEV: Added patch for Python 3.11 as per bpo-39573 to replace Py_TYPE with Py_SET_TYPE, closes #633
----
- src/_librsyncmodule.c | 15 +++++++++++++--
- 1 file changed, 13 insertions(+), 2 deletions(-)
-
-diff --git a/src/_librsyncmodule.c b/src/_librsyncmodule.c
-index a46567fc4..158104d2e 100644
---- a/src/_librsyncmodule.c
-+++ b/src/_librsyncmodule.c
-@@ -25,6 +25,16 @@
- #include <librsync.h>
- #define RSM_JOB_BLOCKSIZE 65536
- 
-+/* ----------------------------------------------------------------------- *
-+ * Update for Python 3.11 - Contributed by Victor Stinner in bpo-39573.
-+ * Compatibility macro for older Python versions.
-+ * ----------------------------------------------------------------------- */
-+#if PY_VERSION_HEX < 0x030900A4 && !defined(Py_SET_TYPE)
-+static inline void _Py_SET_TYPE(PyObject *ob, PyTypeObject *type)
-+{ ob->ob_type = type; }
-+#define Py_SET_TYPE(ob, type) _Py_SET_TYPE((PyObject*)(ob), type)
-+#endif
-+
- static PyObject *librsyncError;
- 
- /* Sets python error string from result */
-@@ -540,8 +550,9 @@ PyMODINIT_FUNC PyInit__librsync(void)
- {
-   PyObject *m, *d;
- 
--  Py_TYPE(&_librsync_SigMakerType) = &PyType_Type;
--  Py_TYPE(&_librsync_DeltaMakerType) = &PyType_Type;
-+  /* Update for Python 3.11 - bpo-39573. */
-+  Py_SET_TYPE(&_librsync_SigMakerType, &PyType_Type);
-+  Py_SET_TYPE(&_librsync_DeltaMakerType, &PyType_Type);
-   static struct PyModuleDef librsync_def = {
-             PyModuleDef_HEAD_INIT, "_librsync", "RSync Lib", -1, _librsyncMethods, };
-   m = PyModule_Create(&librsync_def);