Date: Sat, 9 Mar 2024 14:18:52 GMT From: Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 70fc1370fd3c - main - archivers/py-borgbackup: Allow build with py-msgpack 1.0.8 Message-ID: <202403091418.429EIqir028541@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=70fc1370fd3c1ffe28800ad64819d3636141d93f commit 70fc1370fd3c1ffe28800ad64819d3636141d93f Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org> AuthorDate: 2024-03-09 13:57:18 +0000 Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> CommitDate: 2024-03-09 14:07:20 +0000 archivers/py-borgbackup: Allow build with py-msgpack 1.0.8 - Bump PORTREVISION for package change Reference: https://github.com/borgbackup/borg/commit/a507a2cb3b9fed025743e80971ce1615887a47e4 --- archivers/py-borgbackup/Makefile | 4 ++-- archivers/py-borgbackup/files/patch-msgpack | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/archivers/py-borgbackup/Makefile b/archivers/py-borgbackup/Makefile index 3cf44c50affc..0d8ecf652b30 100644 --- a/archivers/py-borgbackup/Makefile +++ b/archivers/py-borgbackup/Makefile @@ -1,6 +1,6 @@ PORTNAME= borgbackup DISTVERSION= 1.2.7 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= archivers python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -13,7 +13,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.7_99:devel/py-msgpack@${PY_FLAVOR} +_BB_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack>=1.0.2<1.0.8_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-borgbackup/files/patch-msgpack b/archivers/py-borgbackup/files/patch-msgpack new file mode 100644 index 000000000000..3400e95f671d --- /dev/null +++ b/archivers/py-borgbackup/files/patch-msgpack @@ -0,0 +1,24 @@ +Reference: https://github.com/borgbackup/borg/commit/a507a2cb3b9fed025743e80971ce1615887a47e4 + +--- setup.py.orig 2023-12-02 13:05:57 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.7, !=1.0.1', ++ 'msgpack >=0.5.6, <=1.0.8, !=1.0.1', + 'packaging', + ] + +--- src/borg/helpers/msgpack.py.orig 2023-12-02 13:05:57 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, 7) and \ ++ return (0, 5, 6) <= msgpack.version <= (1, 0, 8) and \ + msgpack.version not in [(1, 0, 1), ] # < add bad releases here to deny list + +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202403091418.429EIqir028541>