From 6c186f4dfbeea09c23b2b31314b851870aca92e3 Mon Sep 17 00:00:00 2001 From: Tony Fernandez Date: Mon, 4 Nov 2024 12:14:15 -0500 Subject: [PATCH 1/4] Upgraded Borgmatic to version 1.9.0 --- spk/borgbackup/Makefile | 2 +- spk/borgbackup/src/requirements-pure.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spk/borgbackup/Makefile b/spk/borgbackup/Makefile index a0c94257fcb..5e3595aeacd 100644 --- a/spk/borgbackup/Makefile +++ b/spk/borgbackup/Makefile @@ -30,7 +30,7 @@ DESCRIPTION = Deduplicating backup program with compression and authenticated en DISPLAY_NAME = Borg STARTABLE = no -CHANGELOG = "1. Update borg to v1.2.6.
2. Update borgmatic to v1.8.2.
3. Update emborg to v1.37.
4. Migrate to python 3.11." +CHANGELOG = "1. Update borgmatic to v1.9.0.
" HOMEPAGE = https://borgbackup.readthedocs.io LICENSE = 3-Clause BSD diff --git a/spk/borgbackup/src/requirements-pure.txt b/spk/borgbackup/src/requirements-pure.txt index 58d5b712799..86d7e1a9fa4 100644 --- a/spk/borgbackup/src/requirements-pure.txt +++ b/spk/borgbackup/src/requirements-pure.txt @@ -5,7 +5,7 @@ appdirs==1.4.4 arrow==1.2.3 attrs==23.1.0 #borgbackup ==> crossenv -borgmatic==1.8.2 +borgmatic==1.9.0 #certifi ==> python311:pure #charset-normalizer ==> crossenv colorama==0.4.6 From 60ca71feb22f7320b15570d63a8e3305d7a79393 Mon Sep 17 00:00:00 2001 From: hgy59 Date: Tue, 5 Nov 2024 00:46:30 +0100 Subject: [PATCH 2/4] borgbackup: update borgbackup and emborg - update borgbackup from v1.2.6 to v1.4.0 - update emborg from v1.37 to v1.40 - add cross/xxhash - update python modules --- spk/borgbackup/Makefile | 8 +++-- spk/borgbackup/src/requirements-crossenv.txt | 10 +++---- spk/borgbackup/src/requirements-pure.txt | 31 ++++++++++---------- 3 files changed, 26 insertions(+), 23 deletions(-) diff --git a/spk/borgbackup/Makefile b/spk/borgbackup/Makefile index 5e3595aeacd..abb141cd236 100644 --- a/spk/borgbackup/Makefile +++ b/spk/borgbackup/Makefile @@ -1,13 +1,13 @@ SPK_NAME = borgbackup -SPK_VERS = 1.2.6 -SPK_REV = 14 +SPK_VERS = 1.4.0 +SPK_REV = 15 SPK_ICON = src/borgbackup.png PYTHON_PACKAGE = python311 SPK_DEPENDS = "python311>=3.11.5-8" UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS) -DEPENDS = cross/attr cross/acl cross/openssl3 cross/lz4 cross/zstd cross/libb2 cross/fuse +DEPENDS = cross/attr cross/acl cross/openssl3 cross/lz4 cross/zstd cross/libb2 cross/fuse cross/xxhash # Requirements file generation # - first create borgbackup wheel defined in src/requirements-crossenv.txt @@ -45,6 +45,8 @@ ENV += BORG_OPENSSL_PREFIX="$(OPENSSL_STAGING_PREFIX)" ENV += BORG_LIBLZ4_PREFIX="$(STAGING_INSTALL_PREFIX)" ENV += BORG_LIBZSTD_PREFIX="$(STAGING_INSTALL_PREFIX)" ENV += BORG_LIBB2_PREFIX="$(STAGING_INSTALL_PREFIX)" +ENV += BORG_LIBXXHASH_PREFIX="$(STAGING_INSTALL_PREFIX)" +ENV += BORG_LIBACL_PREFIX="$(STAGING_INSTALL_PREFIX)" include ../../mk/spksrc.common.mk diff --git a/spk/borgbackup/src/requirements-crossenv.txt b/spk/borgbackup/src/requirements-crossenv.txt index 9e62c72f2cf..f33fc116a9d 100644 --- a/spk/borgbackup/src/requirements-crossenv.txt +++ b/spk/borgbackup/src/requirements-crossenv.txt @@ -1,12 +1,12 @@ # requirements that need crossenv to build wheel for -borgbackup==1.2.6 +borgbackup==1.4.0 -charset-normalizer==3.2.0 +charset-normalizer==3.4.0 llfuse==1.5.0 -msgpack==1.0.5 # used compiled verrsion for performance +msgpack==1.1.0 # used compiled verrsion for performance pyrsistent==0.19.3 -ruamel.yaml.clib==0.2.7 +ruamel.yaml.clib==0.2.12 # [rpds-py] # Require environment variables @@ -14,4 +14,4 @@ ruamel.yaml.clib==0.2.7 # PYO3_CROSS_INCLUDE_DIR=$(STAGING_INSTALL_PREFIX)/include/ # Requires path to maturin from crossenv # ENV += PATH=$(WORK_DIR)/crossenv/build/bin:$(PATH) -rpds-py==0.10.2 +rpds-py==0.20.1 diff --git a/spk/borgbackup/src/requirements-pure.txt b/spk/borgbackup/src/requirements-pure.txt index 86d7e1a9fa4..2a79058698f 100644 --- a/spk/borgbackup/src/requirements-pure.txt +++ b/spk/borgbackup/src/requirements-pure.txt @@ -2,8 +2,8 @@ # to be managed as pure-python appdirs==1.4.4 -arrow==1.2.3 -attrs==23.1.0 +arrow==1.3.0 +attrs==24.2.0 #borgbackup ==> crossenv borgmatic==1.9.0 #certifi ==> python311:pure @@ -11,26 +11,27 @@ borgmatic==1.9.0 colorama==0.4.6 #distlib ==> python311:pure docopt==0.6.2 -emborg==1.37 +emborg==1.40 #filelock ==> python311:pure -idna==3.4 -inform==1.28 -jsonschema==4.19.0 -jsonschema-specifications==2023.7.1 +idna==3.10 +inform==1.31 +jsonschema==4.23.0 +jsonschema-specifications==2024.10.1 #llfuse ==> crossenv #msgpack ==> crossenv -nestedtext==3.6 -packaging==23.1 +nestedtext==3.7 +packaging==24.1 #platformdirs ==> python311:pure pyparsing==3.1.1 #pyrsistent ==> crossenv -python-dateutil==2.8.2 -quantiphy==2.19 -referencing==0.30.2 -requests==2.31.0 +python-dateutil==2.9.0.post0 +quantiphy==2.20 +referencing==0.35.1 +requests==2.32.3 #rpds-py ==> crossenv -ruamel.yaml==0.17.32 +ruamel.yaml==0.18.6 #ruamel.yaml.clib ==> crossenv #six ==> python311:pure -urllib3==2.0.4 +types_python_dateutil==2.9.0.20241003 +urllib3==2.2.3 #virtualenv ==> python311:pure From 3f5e4ada24a35a8b6d05c1e3386e9b628d83b6ff Mon Sep 17 00:00:00 2001 From: hgy59 Date: Tue, 5 Nov 2024 22:26:25 +0100 Subject: [PATCH 3/4] update changelog --- spk/borgbackup/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spk/borgbackup/Makefile b/spk/borgbackup/Makefile index abb141cd236..9b4562077b0 100644 --- a/spk/borgbackup/Makefile +++ b/spk/borgbackup/Makefile @@ -30,7 +30,7 @@ DESCRIPTION = Deduplicating backup program with compression and authenticated en DISPLAY_NAME = Borg STARTABLE = no -CHANGELOG = "1. Update borgmatic to v1.9.0.
" +CHANGELOG = "1. Update borgmatic to v1.9.0.
2. Update borg to v1.4.0.
3. Update emborg to v1.40." HOMEPAGE = https://borgbackup.readthedocs.io LICENSE = 3-Clause BSD From e3ff1ba649e6723e870ecc4d6de07686b2686dfa Mon Sep 17 00:00:00 2001 From: hgy59 Date: Thu, 7 Nov 2024 07:01:09 +0100 Subject: [PATCH 4/4] update changelog --- spk/borgbackup/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spk/borgbackup/Makefile b/spk/borgbackup/Makefile index 9b4562077b0..e88ba378885 100644 --- a/spk/borgbackup/Makefile +++ b/spk/borgbackup/Makefile @@ -30,7 +30,7 @@ DESCRIPTION = Deduplicating backup program with compression and authenticated en DISPLAY_NAME = Borg STARTABLE = no -CHANGELOG = "1. Update borgmatic to v1.9.0.
2. Update borg to v1.4.0.
3. Update emborg to v1.40." +CHANGELOG = "1. Update borgmatic to v1.9.0.
2. Update borg to v1.4.0.
3. Update emborg to v1.40.
4. Add ARMv5 again." HOMEPAGE = https://borgbackup.readthedocs.io LICENSE = 3-Clause BSD