From 1dcb54f139091ebfe169e1478cde930123e6b989 Mon Sep 17 00:00:00 2001 From: hgy59 Date: Fri, 29 Mar 2024 11:30:16 +0100 Subject: [PATCH 1/6] 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 --- cross/librsync/Makefile | 4 +-- cross/librsync/PLIST | 2 +- cross/librsync/digests | 6 ++-- spk/rdiff-backup/Makefile | 9 +++-- .../src/requirements-crossenv.txt | 14 ++++---- spk/rdiff-backup/src/requirements-pure.txt | 35 +++++++++---------- 6 files changed, 36 insertions(+), 34 deletions(-) diff --git a/cross/librsync/Makefile b/cross/librsync/Makefile index 9a036dff212..f934517b30e 100644 --- a/cross/librsync/Makefile +++ b/cross/librsync/Makefile @@ -1,8 +1,8 @@ PKG_NAME = librsync -PKG_VERS = 2.3.2 +PKG_VERS = 2.3.4 PKG_EXT = tar.gz PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT) -PKG_DIST_SITE = https://github.com/librsync/$(PKG_NAME)/archive +PKG_DIST_SITE = https://github.com/librsync/librsync/archive PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIR = $(PKG_NAME)-$(PKG_VERS) diff --git a/cross/librsync/PLIST b/cross/librsync/PLIST index 39feafbc484..3c8a95070d9 100644 --- a/cross/librsync/PLIST +++ b/cross/librsync/PLIST @@ -1,4 +1,4 @@ bin:bin/rdiff lnk:lib/librsync.so lnk:lib/librsync.so.2 -lib:lib/librsync.so.2.3.2 +lib:lib/librsync.so.2.3.4 diff --git a/cross/librsync/digests b/cross/librsync/digests index 6a0afeb0f3f..0d2792c345c 100644 --- a/cross/librsync/digests +++ b/cross/librsync/digests @@ -1,3 +1,3 @@ -librsync-2.3.2.tar.gz SHA1 02d513f7781e172cddf79a984f50284327b3ff4a -librsync-2.3.2.tar.gz SHA256 ef8ce23df38d5076d25510baa2cabedffbe0af460d887d86c2413a1c2b0c676f -librsync-2.3.2.tar.gz MD5 74ba5b50de5ba3d595828e9109fa5fce +librsync-2.3.4.tar.gz SHA1 d116958ee9cdfab5a6129e0b2e707e271b20550c +librsync-2.3.4.tar.gz SHA256 a0dedf9fff66d8e29e7c25d23c1f42beda2089fb4eac1b36e6acd8a29edfbd1f +librsync-2.3.4.tar.gz MD5 71d227be94f6fbfc7b6d0fce3ce81861 diff --git a/spk/rdiff-backup/Makefile b/spk/rdiff-backup/Makefile index 9f548bc5a41..b21b2d30af8 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 @@ -18,13 +18,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.
2. Migrate to Python 3.11." +CHANGELOG = "1. Update to v2.2.6.
2. Bring back support for ARMv5.
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..63b9011aeb1 100644 --- a/spk/rdiff-backup/src/requirements-crossenv.txt +++ b/spk/rdiff-backup/src/requirements-crossenv.txt @@ -1,13 +1,13 @@ -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.9.3 +charset-normalizer==3.3.2 +coverage==7.4.4 +frozenlist==1.4.1 +multidict==6.0.5 pylibacl==0.7.0 pyxattr==0.8.1 -yarl==1.9.2 +yarl==1.9.4 # [psutil] # Last known version to build on armv5/ppc diff --git a/spk/rdiff-backup/src/requirements-pure.txt b/spk/rdiff-backup/src/requirements-pure.txt index c9c50b4759c..90c15ae9dc9 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 Mar 29th 2024 #aiohttp ==> crossenv aiosignal==1.3.1 -async-timeout==4.0.2 -attrs==23.1.0 -cachetools==5.3.1 +async-timeout==4.0.3 +attrs==23.2.0 +cachetools==5.3.3 #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.0.0 #frozenlist ==> crossenv -idna==3.4 +idna==3.6 mccabe==0.7.0 #multidict ==> crossenv -packaging==23.1 +packaging==24.0 #platformdirs ==> py311 -pluggy==1.2.0 +pluggy==1.4.0 #psutil ==> crossenv py==1.11.0 -pycodestyle==2.10.0 -pyflakes==3.0.1 +pycodestyle==2.11.1 +pyflakes==3.2.0 #pylibacl ==> crossenv -pyparsing==3.1.0 -pyproject-api==1.5.3 +pyparsing==3.1.2 +pyproject-api==1.6.1 #pyxattr ==> crossenv #PyYAML ==> crossenv #rdiff-backup ==> crossenv requests==2.31.0 -rqdb==1.0.11 -setuptools-scm==7.1.0 +rqdb==1.6.0 #six ==> py311 tomli==2.0.1 -tox==4.6.4 -typing_extensions==4.7.1 -urllib3==2.0.4 +tox==4.14.2 +typing_extensions==4.10.0 +urllib3==2.2.1 #virtualenv ==> py311 #yarl ==> crossenv From 99b63151e4362e3027f10a2e7f75733bc00c83ef Mon Sep 17 00:00:00 2001 From: hgy59 Date: Fri, 29 Mar 2024 11:39:38 +0100 Subject: [PATCH 2/6] add expandvars to crossenv --- cross/python311/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/cross/python311/Makefile b/cross/python311/Makefile index 98e04488b9e..a0cd43524a9 100644 --- a/cross/python311/Makefile +++ b/cross/python311/Makefile @@ -149,6 +149,7 @@ CROSSENV_WHEELS += poetry==1.6.1 CROSSENV_WHEELS += scikit-build==0.17.6 CROSSENV_WHEELS += setuptools-rust==1.7.0 CROSSENV_WHEELS += setuptools-scm==7.1.0 +CROSSENV_WHEELS += expandvars==0.12.0 # For future use when building numpy >= 1.26 #CROSSENV_WHEELS += meson-python==0.13.2 #CROSSENV_WHEELS += scikit-build-core==0.5.0 From d4886462fba2d8be4f3388df4e79ef7ed187d7a7 Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Wed, 20 Mar 2024 23:40:51 +0000 Subject: [PATCH 3/6] python.mk: Allow ADDITIONAL_CROSSENV_WHEELS for extra crossenv dep (cherry picked from commit 5c161823a97c64ec16fd64d6383afd5fa418cf9f) --- mk/spksrc.python.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/mk/spksrc.python.mk b/mk/spksrc.python.mk index 60101cf763c..8428e9b5266 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,9 @@ python_pre_depend: rm -fr work-*/$${pkgname}* work-*/.$${pkgname}-* ; \ fi ; \ done + +.PHONY: python_post_depend +python_post_depend: + @. $(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) From 7f50d563f49d264c7eff391cb2af2bcf86b7c743 Mon Sep 17 00:00:00 2001 From: hgy59 Date: Sun, 10 Nov 2024 16:12:55 +0100 Subject: [PATCH 4/6] 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 --- cross/python311/Makefile | 1 - mk/spksrc.python.mk | 1 + spk/rdiff-backup/Makefile | 3 +++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/cross/python311/Makefile b/cross/python311/Makefile index 757c9f3443b..540bae4a5b2 100644 --- a/cross/python311/Makefile +++ b/cross/python311/Makefile @@ -150,7 +150,6 @@ CROSSENV_WHEELS += poetry==1.8.3 CROSSENV_WHEELS += scikit-build==0.18.1 CROSSENV_WHEELS += setuptools-rust==1.10.2 CROSSENV_WHEELS += setuptools-scm==8.1.0 -CROSSENV_WHEELS += expandvars==0.12.0 # For future use when building numpy >= 1.26 #CROSSENV_WHEELS += meson-python==1.5.2 #CROSSENV_WHEELS += scikit-build-core==0.10.7 diff --git a/mk/spksrc.python.mk b/mk/spksrc.python.mk index 8428e9b5266..07b98ef7dda 100644 --- a/mk/spksrc.python.mk +++ b/mk/spksrc.python.mk @@ -92,6 +92,7 @@ python_pre_depend: .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 b21b2d30af8..ce45c161a32 100644 --- a/spk/rdiff-backup/Makefile +++ b/spk/rdiff-backup/Makefile @@ -11,6 +11,9 @@ WHEELS = src/requirements-crossenv.txt src/requirements-pure.txt DEPENDS = cross/librsync cross/attr cross/acl +# required to build frozenlist +ADDITIONAL_CROSSENV_WHEELS = expandvars==0.12.0 + # [PyYAML] DEPENDS += cross/libyaml From 424d01c4ed9e2cf75ecbbd23ab8c06738cf8d721 Mon Sep 17 00:00:00 2001 From: hgy59 Date: Sun, 10 Nov 2024 18:15:23 +0100 Subject: [PATCH 5/6] rdiff-backup: update requirements --- spk/rdiff-backup/Makefile | 2 +- .../src/requirements-crossenv.txt | 17 +++++----- spk/rdiff-backup/src/requirements-pure.txt | 34 +++++++++---------- 3 files changed, 26 insertions(+), 27 deletions(-) diff --git a/spk/rdiff-backup/Makefile b/spk/rdiff-backup/Makefile index ce45c161a32..6e09b10c85d 100644 --- a/spk/rdiff-backup/Makefile +++ b/spk/rdiff-backup/Makefile @@ -11,7 +11,7 @@ WHEELS = src/requirements-crossenv.txt src/requirements-pure.txt DEPENDS = cross/librsync cross/attr cross/acl -# required to build frozenlist +# required to build frozenlist and yarl ADDITIONAL_CROSSENV_WHEELS = expandvars==0.12.0 # [PyYAML] diff --git a/spk/rdiff-backup/src/requirements-crossenv.txt b/spk/rdiff-backup/src/requirements-crossenv.txt index 63b9011aeb1..cc76279a48d 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.6 -aiohttp==3.9.3 -charset-normalizer==3.3.2 -coverage==7.4.4 -frozenlist==1.4.1 -multidict==6.0.5 +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.4 +yarl==1.9.10 # [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 90c15ae9dc9..651cc256f5d 100644 --- a/spk/rdiff-backup/src/requirements-pure.txt +++ b/spk/rdiff-backup/src/requirements-pure.txt @@ -1,39 +1,39 @@ -# Snapshot using python 3.11 on Mar 29th 2024 +# Snapshot using python 3.11 on Nov 10th 2024 #aiohttp ==> crossenv aiosignal==1.3.1 -async-timeout==4.0.3 -attrs==23.2.0 -cachetools==5.3.3 +async-timeout==5.0.1 +attrs==24.2.0 +cachetools==5.5.0 #certifi ==> py311 chardet==5.2.0 colorama==0.4.6 #coverage ==> crossenv #distlib ==> py311 #filelock ==> py311 -flake8==7.0.0 +flake8==7.1.1 #frozenlist ==> crossenv -idna==3.6 +idna==3.10 mccabe==0.7.0 #multidict ==> crossenv -packaging==24.0 +packaging==24.2 #platformdirs ==> py311 -pluggy==1.4.0 +pluggy==1.5.0 #psutil ==> crossenv py==1.11.0 -pycodestyle==2.11.1 +pycodestyle==2.12.1 pyflakes==3.2.0 #pylibacl ==> crossenv -pyparsing==3.1.2 -pyproject-api==1.6.1 +pyparsing==3.2.0 +pyproject_api==1.8.0 #pyxattr ==> crossenv #PyYAML ==> crossenv #rdiff-backup ==> crossenv -requests==2.31.0 -rqdb==1.6.0 +requests==2.32.3 +rqdb==1.6.1 #six ==> py311 -tomli==2.0.1 -tox==4.14.2 -typing_extensions==4.10.0 -urllib3==2.2.1 +tomli==2.0.2 +tox==4.23.2 +typing_extensions==4.12.2 +urllib3==2.2.3 #virtualenv ==> py311 #yarl ==> crossenv From 7c91fdd04525c84b7056da89c1d9b2f2050388b0 Mon Sep 17 00:00:00 2001 From: hgy59 Date: Mon, 11 Nov 2024 23:58:32 +0100 Subject: [PATCH 6/6] rdiff-backup: adjust requirements - yarl >= 1.12.0 required for aiohttp==3.10.10 --- spk/rdiff-backup/src/requirements-crossenv.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spk/rdiff-backup/src/requirements-crossenv.txt b/spk/rdiff-backup/src/requirements-crossenv.txt index cc76279a48d..d5939352a10 100644 --- a/spk/rdiff-backup/src/requirements-crossenv.txt +++ b/spk/rdiff-backup/src/requirements-crossenv.txt @@ -7,7 +7,7 @@ frozenlist==1.5.0 multidict==6.1.0 pylibacl==0.7.0 pyxattr==0.8.1 -yarl==1.9.10 +yarl==1.15.3 # [psutil] psutil==5.9.8