git: 1cc1228785ee - main - archivers/py-borgbackup: update to 1.2.4, unbreaking with msgpack 1.0.5

The branch main has been updated by mandree:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1cc1228785eef2fb840a399058d35e5af1e16395

commit 1cc1228785eef2fb840a399058d35e5af1e16395
Author:     Matthias Andree <mandree@FreeBSD.org>
AuthorDate: 2023-04-07 09:31:47 +0000
Commit:     Matthias Andree <mandree@FreeBSD.org>
CommitDate: 2023-04-07 09:38:11 +0000

    archivers/py-borgbackup: update to 1.2.4, unbreaking with msgpack 1.0.5
    
    Borgbackup pins the exact, full, patch-level based version range
    and the prior borgbackup 1.2.3 wanted to have at most msgpack 1.0.4.
    
    Update to 1.2.4 which allows msgpack 1.0.5, and pin the exact msgpack
    version in our depends to "fail early".
    
    And other changes including bug fixes:
    https://github.com/borgbackup/borg/blob/1.2.4/docs/changes.rst#version-124-2023-03-24
    
    based on a
    PR:             270665
    Submitted by:   otis@
    
    As in-depth soft robustness measure, add relevant warning comments to
    devel/py-msgpack/Makefile, and while there, clean up the python:3.6+
    to just a bare python because 3.6 and older are long gone from ports.
---
 archivers/py-borgbackup/Makefile | 7 ++++---
 archivers/py-borgbackup/distinfo | 6 +++---
 devel/py-msgpack/Makefile        | 6 ++++--
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/archivers/py-borgbackup/Makefile b/archivers/py-borgbackup/Makefile
index 33dbf91cb853..4d446466774a 100644
--- a/archivers/py-borgbackup/Makefile
+++ b/archivers/py-borgbackup/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	borgbackup
-DISTVERSION=	1.2.3
+DISTVERSION=	1.2.4
 CATEGORIES=	archivers python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,13 +12,13 @@ LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.7:devel/py-setuptools_scm@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}msgpack>=1.0:devel/py-msgpack@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}msgpack==1.0.5:devel/py-msgpack@${PY_FLAVOR}
+		# note that borgbackup pins the msgpack version range per patchlevel version!
 LIB_DEPENDS=	liblz4.so:archivers/liblz4 \
 		libzstd.so:archivers/zstd \
 		libxxhash.so:devel/xxhash
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}packaging>=19.0:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}msgpack>=1.0:devel/py-msgpack@${PY_FLAVOR}
-MAKE_ENV=	BORG_OPENSSL_PREFIX=${OPENSSLBASE}
 TEST_DEPENDS=	${RUN_DEPENDS} \
 		${PYTHON_PKGNAMEPREFIX}tox>3.2:devel/py-tox@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}virtualenv>=0:devel/py-virtualenv@${PY_FLAVOR} \
@@ -27,6 +27,7 @@ TEST_DEPENDS=	${RUN_DEPENDS} \
 		fakeroot:security/fakeroot
 USES=		pkgconfig python:3.8+ ssl
 USE_PYTHON=	autoplist distutils
+MAKE_ENV=	BORG_OPENSSL_PREFIX=${OPENSSLBASE}
 
 OPTIONS_DEFINE=		FUSE
 OPTIONS_DEFAULT=	FUSE
diff --git a/archivers/py-borgbackup/distinfo b/archivers/py-borgbackup/distinfo
index f0af9c2ea58e..8bf1665fd526 100644
--- a/archivers/py-borgbackup/distinfo
+++ b/archivers/py-borgbackup/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1673634167
-SHA256 (borgbackup-1.2.3.tar.gz) = e32418f8633c96fa9681352a56eb63b98e294203472c114a5242709d36966785
-SIZE (borgbackup-1.2.3.tar.gz) = 4044577
+TIMESTAMP = 1680857218
+SHA256 (borgbackup-1.2.4.tar.gz) = a4bd54e9469e81b7a30a6711423115abc818d9cd844ecb1ca0e6104bc5374da8
+SIZE (borgbackup-1.2.4.tar.gz) = 4056513
diff --git a/devel/py-msgpack/Makefile b/devel/py-msgpack/Makefile
index 01af18f003bd..2871c9284208 100644
--- a/devel/py-msgpack/Makefile
+++ b/devel/py-msgpack/Makefile
@@ -1,5 +1,7 @@
 PORTNAME=	msgpack
-PORTVERSION=	1.0.5
+PORTVERSION=	1.0.5 # WARNING: archivers/py-borgbackup pins the full version
+# so if upgrading msgpack, archivers/py-borgbackup will break. We need to
+# coordinate updates.
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +14,7 @@ WWW=		https://msgpack.org/ \
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		python:3.6+
+USES=		python
 USE_PYTHON=	autoplist concurrent cython distutils
 
 post-install: