From e5a3cc4bac3075169abe2844b8869f6a76d403c9 Mon Sep 17 00:00:00 2001
From: hgy59 <hpgy59@gmail.com>
Date: Thu, 14 Nov 2024 19:07:10 +0100
Subject: [PATCH] rdiff-backup: update and use alternate tmp dir (#4427)
 (#6049)

* rdiff-backup: update and use alternate tmp dir (#4427)
- update rdiff-backup to v2.2.6
- next publish will include ARMv5 archs again
- use alternate tmp dir to fix #4427
- update cross/librsync to v2.3.4

* add expandvars to crossenv

* python.mk: Allow ADDITIONAL_CROSSENV_WHEELS for extra crossenv dep

(cherry picked from commit 5c161823a97c64ec16fd64d6383afd5fa418cf9f)

* use ADDITIONAL_CROSSENV_WHEELS
- use solution of former #6040 to install expandvars into crossenv to build frozenlist
- revert install expandvars into crossenv in cross/python311/Makefile

* rdiff-backup: update requirements

* rdiff-backup: adjust requirements

- yarl >= 1.12.0 required for aiohttp==3.10.10

---------

Co-authored-by: Vincent Fortier <th0ma7@gmail.com>
---
 mk/spksrc.python.mk                           | 10 +++++
 spk/rdiff-backup/Makefile                     | 12 ++++--
 .../src/requirements-crossenv.txt             | 19 +++++----
 spk/rdiff-backup/src/requirements-pure.txt    | 39 +++++++++----------
 4 files changed, 47 insertions(+), 33 deletions(-)

diff --git a/mk/spksrc.python.mk b/mk/spksrc.python.mk
index 60101cf763c..07b98ef7dda 100644
--- a/mk/spksrc.python.mk
+++ b/mk/spksrc.python.mk
@@ -54,6 +54,9 @@ PYTHON_DEPENDS := $(foreach cross,$(foreach pkg_name,$(shell $(MAKE) dependency-
 
 # call-up pre-depend to prepare the shared python build environment
 PRE_DEPEND_TARGET = python_pre_depend
+ifneq ($(strip $(ADDITIONAL_CROSSENV_WHEELS)),)
+POST_DEPEND_TARGET = python_post_depend
+endif
 
 else
 ifneq ($(findstring $(ARCH),$(ARMv5_ARCHS) $(OLD_PPC_ARCHS)),$(ARCH))
@@ -86,3 +89,10 @@ python_pre_depend:
 	      rm -fr work-*/$${pkgname}* work-*/.$${pkgname}-* ; \
 	   fi ; \
 	done
+
+.PHONY: python_post_depend
+python_post_depend:
+	@$(MSG) "Install to crossenv: $(ADDITIONAL_CROSSENV_WHEELS)"
+	@. $(WORK_DIR)/crossenv/bin/activate ; \
+	$(RUN) build-pip --disable-pip-version-check install $(ADDITIONAL_CROSSENV_WHEELS) ; \
+	$(RUN) pip --disable-pip-version-check install $(ADDITIONAL_CROSSENV_WHEELS)
diff --git a/spk/rdiff-backup/Makefile b/spk/rdiff-backup/Makefile
index 9f548bc5a41..6e09b10c85d 100644
--- a/spk/rdiff-backup/Makefile
+++ b/spk/rdiff-backup/Makefile
@@ -1,6 +1,6 @@
 SPK_NAME = rdiff-backup
-SPK_VERS = 2.2.5
-SPK_REV = 5
+SPK_VERS = 2.2.6
+SPK_REV = 6
 SPK_ICON = src/rdiff-backup.png
 
 PYTHON_PACKAGE = python311
@@ -11,6 +11,9 @@ WHEELS = src/requirements-crossenv.txt src/requirements-pure.txt
 
 DEPENDS = cross/librsync cross/attr cross/acl
 
+# required to build frozenlist and yarl
+ADDITIONAL_CROSSENV_WHEELS = expandvars==0.12.0
+
 # [PyYAML]
 DEPENDS += cross/libyaml
 
@@ -18,13 +21,16 @@ MAINTAINER = SynoCommunity
 DESCRIPTION = Reverse differential backup tool, over a network or locally.
 STARTABLE = no
 DISPLAY_NAME = rdiff-backup
-CHANGELOG = "1. Update to v2.2.5.<br/>2. Migrate to Python 3.11."
+CHANGELOG = "1. Update to v2.2.6.<br/>2. Bring back support for ARMv5.<br/>3. Use alternate tmp dir."
 
 HOMEPAGE = https://rdiff-backup.net/
 LICENSE  = GPLv2
 
 SERVICE_SETUP = src/service-setup.sh
 
+# https://github.com/SynoCommunity/spksrc/issues/4427
+USE_ALTERNATE_TMPDIR = 1
+
 SPK_USR_LOCAL_LINKS = bin:env/bin/rdiff-backup bin:env/bin/rdiff-backup-statistics
 
 include ../../mk/spksrc.python.mk
diff --git a/spk/rdiff-backup/src/requirements-crossenv.txt b/spk/rdiff-backup/src/requirements-crossenv.txt
index 500becc7c95..d5939352a10 100644
--- a/spk/rdiff-backup/src/requirements-crossenv.txt
+++ b/spk/rdiff-backup/src/requirements-crossenv.txt
@@ -1,18 +1,17 @@
-rdiff-backup==2.2.5
+rdiff-backup==2.2.6
 
-aiohttp==3.8.5
-charset-normalizer==3.2.0
-coverage==7.2.7
-frozenlist==1.4.0
-multidict==6.0.4
+aiohttp==3.10.10
+charset-normalizer==3.4.0
+coverage==7.6.3
+frozenlist==1.5.0
+multidict==6.1.0
 pylibacl==0.7.0
 pyxattr==0.8.1
-yarl==1.9.2
+yarl==1.15.3
 
 # [psutil]
-# Last known version to build on armv5/ppc
-psutil==5.9.1
+psutil==5.9.8
 
 # [PyYAML]
 # Depends: libyaml
-PyYAML==6.0.1
+PyYAML==6.0.2
diff --git a/spk/rdiff-backup/src/requirements-pure.txt b/spk/rdiff-backup/src/requirements-pure.txt
index c9c50b4759c..651cc256f5d 100644
--- a/spk/rdiff-backup/src/requirements-pure.txt
+++ b/spk/rdiff-backup/src/requirements-pure.txt
@@ -1,40 +1,39 @@
-# Snapshot using python 3.11 on Jul 22nd 2023
+# Snapshot using python 3.11 on Nov 10th 2024
 #aiohttp                     ==> crossenv
 aiosignal==1.3.1
-async-timeout==4.0.2
-attrs==23.1.0
-cachetools==5.3.1
+async-timeout==5.0.1
+attrs==24.2.0
+cachetools==5.5.0
 #certifi                     ==> py311
-chardet==5.1.0
+chardet==5.2.0
 colorama==0.4.6
 #coverage                    ==> crossenv
 #distlib                     ==> py311
 #filelock                    ==> py311
-flake8==6.0.0
+flake8==7.1.1
 #frozenlist                  ==> crossenv
-idna==3.4
+idna==3.10
 mccabe==0.7.0
 #multidict                   ==> crossenv
-packaging==23.1
+packaging==24.2
 #platformdirs                ==> py311
-pluggy==1.2.0
+pluggy==1.5.0
 #psutil                      ==> crossenv
 py==1.11.0
-pycodestyle==2.10.0
-pyflakes==3.0.1
+pycodestyle==2.12.1
+pyflakes==3.2.0
 #pylibacl                    ==> crossenv
-pyparsing==3.1.0
-pyproject-api==1.5.3
+pyparsing==3.2.0
+pyproject_api==1.8.0
 #pyxattr                     ==> crossenv
 #PyYAML                      ==> crossenv
 #rdiff-backup                ==> crossenv
-requests==2.31.0
-rqdb==1.0.11
-setuptools-scm==7.1.0
+requests==2.32.3
+rqdb==1.6.1
 #six                         ==> py311
-tomli==2.0.1
-tox==4.6.4
-typing_extensions==4.7.1
-urllib3==2.0.4
+tomli==2.0.2
+tox==4.23.2
+typing_extensions==4.12.2
+urllib3==2.2.3
 #virtualenv                  ==> py311
 #yarl                        ==> crossenv