git: e295ee325d65 - main - archivers/py-borgbackup: Allow build with py-msgpack 1.1.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 25 Sep 2024 04:27:58 UTC
The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=e295ee325d650f524bcdecdf5ed02f24fb149c58 commit e295ee325d650f524bcdecdf5ed02f24fb149c58 Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org> AuthorDate: 2024-09-25 04:17:27 +0000 Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> CommitDate: 2024-09-25 04:23:02 +0000 archivers/py-borgbackup: Allow build with py-msgpack 1.1.0 - Bump PORTREVISION for package change Reference: https://github.com/borgbackup/borg/commit/7511cb6c5e0448f0b5276f4281faa4c71c2f64ac --- archivers/py-borgbackup12/Makefile | 4 ++-- archivers/py-borgbackup12/files/patch-msgpack | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/archivers/py-borgbackup12/Makefile b/archivers/py-borgbackup12/Makefile index fd980609b8a9..d326256cf5d4 100644 --- a/archivers/py-borgbackup12/Makefile +++ b/archivers/py-borgbackup12/Makefile @@ -1,6 +1,6 @@ PORTNAME= borgbackup DISTVERSION= 1.2.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= archivers python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -14,7 +14,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE # note that borgbackup pins the msgpack version range per patchlevel version! -_BB_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack>=1.0.2<1.0.8_99:devel/py-msgpack@${PY_FLAVOR} +_BB_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack>=1.0.2<1.1.0_99:devel/py-msgpack@${PY_FLAVOR} BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=1.7:devel/py-setuptools-scm@${PY_FLAVOR} \ ${_BB_DEPENDS} LIB_DEPENDS= liblz4.so:archivers/liblz4 \ diff --git a/archivers/py-borgbackup12/files/patch-msgpack b/archivers/py-borgbackup12/files/patch-msgpack new file mode 100644 index 000000000000..bfa87a5cd7af --- /dev/null +++ b/archivers/py-borgbackup12/files/patch-msgpack @@ -0,0 +1,24 @@ +Obtained from: https://github.com/borgbackup/borg/commit/7511cb6c5e0448f0b5276f4281faa4c71c2f64ac + +--- setup.py.orig 2024-03-29 17:42:23 UTC ++++ setup.py +@@ -70,7 +70,7 @@ install_requires = [ + # Please note: + # using any other msgpack version is not supported by borg development and + # any feedback related to issues caused by this will be ignored. +- 'msgpack >=0.5.6, <=1.0.8, !=1.0.1', ++ 'msgpack >=0.5.6, <=1.1.0, !=1.0.1', + 'packaging', + ] + +--- src/borg/helpers/msgpack.py.orig 2024-03-29 17:42:23 UTC ++++ src/borg/helpers/msgpack.py +@@ -182,7 +182,7 @@ def is_supported_msgpack(): + def is_supported_msgpack(): + # DO NOT CHANGE OR REMOVE! See also requirements and comments in setup.py. + import msgpack +- return (0, 5, 6) <= msgpack.version <= (1, 0, 8) and \ ++ return (0, 5, 6) <= msgpack.version <= (1, 1, 0) and \ + msgpack.version not in [(1, 0, 1), ] # < add bad releases here to deny list + +