Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 29 Sep 2023 16:20:50 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: b40c8cdf2f37 - main - archivers/py-borgbackup: Allow build with py-msgpack 1.0.6
Message-ID:  <202309291620.38TGKoT9066185@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=b40c8cdf2f37cda283f395467a153d530f3945cd

commit b40c8cdf2f37cda283f395467a153d530f3945cd
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2023-09-29 16:15:06 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2023-09-29 16:15:06 +0000

    archivers/py-borgbackup: Allow build with py-msgpack 1.0.6
    
    - Bump PORTREVISION for package change
    
    Reference:      https://github.com/borgbackup/borg/commit/95e75b90f1a092bad10e0b93ef065e78dfabb227
---
 archivers/py-borgbackup/Makefile            |  3 ++-
 archivers/py-borgbackup/files/patch-msgpack | 22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/archivers/py-borgbackup/Makefile b/archivers/py-borgbackup/Makefile
index 4397ad40191c..71361ae5baec 100644
--- a/archivers/py-borgbackup/Makefile
+++ b/archivers/py-borgbackup/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	borgbackup
 DISTVERSION=	1.2.6
+PORTREVISION=	1
 CATEGORIES=	archivers python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,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.5_99:devel/py-msgpack@${PY_FLAVOR}
+_BB_DEPENDS=	${PYTHON_PKGNAMEPREFIX}msgpack>=1.0.2<1.0.6_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..8aa640811d82
--- /dev/null
+++ b/archivers/py-borgbackup/files/patch-msgpack
@@ -0,0 +1,22 @@
+--- setup.py.orig	2023-08-31 21:08: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.5, !=1.0.1',
++    'msgpack >=0.5.6, <=1.0.6, !=1.0.1',
+     'packaging',
+ ]
+ 
+--- src/borg/helpers/msgpack.py.orig	2023-08-31 21:08:57 UTC
++++ src/borg/helpers/msgpack.py
+@@ -182,7 +182,7 @@ def is_slow_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, 5) and \
++    return (0, 5, 6) <= msgpack.version <= (1, 0, 6) 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?202309291620.38TGKoT9066185>