From fea7db1283a2cc00ebca9c494e7fb66ceff1cb91 Mon Sep 17 00:00:00 2001 From: Po-Chuan Hsieh Date: Sun, 19 Oct 2025 08:00:39 +0800 Subject: [PATCH] archivers/py-borgbackup: Allow build with py-msgpack 1.1.2 - Bump PORTREVISION for package change Obtained from: https://github.com/borgbackup/borg/commit/e7d8fba1df8409f5aa71faa16f97935aea802171 --- archivers/py-borgbackup/Makefile | 4 ++-- archivers/py-borgbackup/files/patch-msgpack | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/archivers/py-borgbackup/Makefile b/archivers/py-borgbackup/Makefile index 69c105b03851..701d312b6ce6 100644 --- a/archivers/py-borgbackup/Makefile +++ b/archivers/py-borgbackup/Makefile @@ -1,6 +1,6 @@ PORTNAME= borgbackup DISTVERSION= 1.4.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= archivers python MASTER_SITES= https://github.com/borgbackup/borg/releases/download/${DISTVERSION}/ \ PYPI @@ -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.3<1.1.1_99:devel/py-msgpack@${PY_FLAVOR} +_BB_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack>=1.0.3<1.1.2_99:devel/py-msgpack@${PY_FLAVOR} BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pkgconfig>=0:devel/py-pkgconfig@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=1.7:devel/py-setuptools-scm@${PY_FLAVOR} \ ${_BB_DEPENDS} diff --git a/archivers/py-borgbackup/files/patch-msgpack b/archivers/py-borgbackup/files/patch-msgpack index 10ba34e36b2e..509fce82fdb8 100644 --- a/archivers/py-borgbackup/files/patch-msgpack +++ b/archivers/py-borgbackup/files/patch-msgpack @@ -1,4 +1,5 @@ Obtained from: https://github.com/borgbackup/borg/commit/862f19aab9780b91424bb7f9319d915751d0024f + https://github.com/borgbackup/borg/commit/e7d8fba1df8409f5aa71faa16f97935aea802171 --- pyproject.toml.orig 2025-04-18 19:16:24 UTC +++ pyproject.toml @@ -7,7 +8,7 @@ Obtained from: https://github.com/borgbackup/borg/commit/862f19aab9780b91424bb7f # using any other msgpack version is not supported by borg development and # any feedback related to issues caused by this will be ignored. - "msgpack >=1.0.3, <=1.1.0", -+ "msgpack >=1.0.3, <=1.1.1", ++ "msgpack >=1.0.3, <=1.1.2", "packaging", ] @@ -18,7 +19,7 @@ Obtained from: https://github.com/borgbackup/borg/commit/862f19aab9780b91424bb7f # DO NOT CHANGE OR REMOVE! See also requirements and comments in pyproject.toml. import msgpack - return (1, 0, 3) <= msgpack.version <= (1, 1, 0) and \ -+ return (1, 0, 3) <= msgpack.version <= (1, 1, 1) and \ ++ return (1, 0, 3) <= msgpack.version <= (1, 1, 2) and \ msgpack.version not in [] # < add bad releases here to deny list