git: 787eb66ae149 - main - archivers/py-borgbackup: Allow build with py-msgpack 1.1.1

From: Po-Chuan Hsieh <sunpoet_at_FreeBSD.org>
Date: Thu, 26 Jun 2025 11:34:20 UTC
The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=787eb66ae149d38d12c5cf2794c5d7f9f455590e

commit 787eb66ae149d38d12c5cf2794c5d7f9f455590e
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2025-06-26 10:04:08 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2025-06-26 11:30:16 +0000

    archivers/py-borgbackup: Allow build with py-msgpack 1.1.1
    
    - Bump PORTREVISION for package change
    
    Obtained from:  https://github.com/borgbackup/borg/commit/56ddc010cbeba09b49969cf08f079ad69dd45dc2
---
 archivers/py-borgbackup12/Makefile            | 4 ++--
 archivers/py-borgbackup12/files/patch-msgpack | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/archivers/py-borgbackup12/Makefile b/archivers/py-borgbackup12/Makefile
index 1496dcd1c6af..c4aeb6525678 100644
--- a/archivers/py-borgbackup12/Makefile
+++ b/archivers/py-borgbackup12/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	borgbackup
 DISTVERSION=	1.2.8
-PORTREVISION=	3
+PORTREVISION=	4
 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.1.1:devel/py-msgpack@${PY_FLAVOR}
+_BB_DEPENDS=	${PYTHON_PKGNAMEPREFIX}msgpack>=1.0.2<1.1.1_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
index bfa87a5cd7af..e70a3ecac75d 100644
--- a/archivers/py-borgbackup12/files/patch-msgpack
+++ b/archivers/py-borgbackup12/files/patch-msgpack
@@ -1,4 +1,5 @@
 Obtained from:	https://github.com/borgbackup/borg/commit/7511cb6c5e0448f0b5276f4281faa4c71c2f64ac
+		https://github.com/borgbackup/borg/commit/56ddc010cbeba09b49969cf08f079ad69dd45dc2
 
 --- setup.py.orig	2024-03-29 17:42:23 UTC
 +++ setup.py
@@ -7,7 +8,7 @@ Obtained from:	https://github.com/borgbackup/borg/commit/7511cb6c5e0448f0b5276f4
      # 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',
++    'msgpack >=0.5.6, <=1.1.1, !=1.0.1',
      'packaging',
  ]
  
@@ -18,7 +19,7 @@ Obtained from:	https://github.com/borgbackup/borg/commit/7511cb6c5e0448f0b5276f4
      # 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 \
++    return (0, 5, 6) <= msgpack.version <= (1, 1, 1) and \
             msgpack.version not in [(1, 0, 1), ]  # < add bad releases here to deny list