CVS commit: [pkgsrc-2026Q2] pkgsrc/sysutils/py-borgbackup

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Tue Jul 21 18:35:29 UTC 2026

Modified Files:
        pkgsrc/sysutils/py-borgbackup [pkgsrc-2026Q2]: Makefile distinfo
Added Files:
        pkgsrc/sysutils/py-borgbackup/patches [pkgsrc-2026Q2]:
            patch-pyproject.toml patch-src_borg_helpers_msgpack.py

Log Message:
Pullup ticket #7189 - requested by he
sysutils/py-borgbackup: Build fix

Revisions pulled up:
- sysutils/py-borgbackup/Makefile                               1.64
- sysutils/py-borgbackup/distinfo                               1.43
- sysutils/py-borgbackup/patches/patch-pyproject.toml           1.3
- sysutils/py-borgbackup/patches/patch-src_borg_helpers_msgpack.py 1.7

---
   Module Name: pkgsrc
   Committed By:        he
   Date:                Tue Jul 21 14:10:28 UTC 2026

   Modified Files:
        pkgsrc/sysutils/py-borgbackup: Makefile distinfo
   Added Files:
        pkgsrc/sysutils/py-borgbackup/patches: patch-pyproject.toml
            patch-src_borg_helpers_msgpack.py

   Log Message:
   sysutils/py-borgbackup: make this accept a newer py-msgpack.

   This is in contravention to the upstream policy which insists that
   because the maintainers of py-msgpack in the distant past made a
   non-compatible change (apparently in a version before 0.5.6 of
   py-msgpack, many, many years ago), they now insist that you *cannot*
   use a newer version of py-msgpack than what the code insists on,
   ref.

      https://github.com/borgbackup/borg/issues/3753

   This collides (hard) with the pkgsrc default stance which is to
   "upgrade everything to the newest available version", and makes
   this package break each time a new version of py-msgpack is integrated
   in pkgsrc.

   For now just patch this to accept py-msgpack versions between
   0.5.6 and 1.2.1 and not just between 0.5.6 and 1.1.2.

   At least testing by doing a backup run makes that backup run
   complete successfully with py-mgspack 1.2.1 installed, instead
   of a sour error message that a non-supported version of msgpack
   is installed.

   This time I'll leave a comment over on the py-msgpack package,
   in an attempt at preventing this problem from once again creep
   into a pkgsrc maintenance branch.

   Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.62.2.1 pkgsrc/sysutils/py-borgbackup/Makefile
cvs rdiff -u -r1.42 -r1.42.2.1 pkgsrc/sysutils/py-borgbackup/distinfo
cvs rdiff -u -r0 -r1.3.2.2 \
    pkgsrc/sysutils/py-borgbackup/patches/patch-pyproject.toml
cvs rdiff -u -r0 -r1.7.2.2 \
    pkgsrc/sysutils/py-borgbackup/patches/patch-src_borg_helpers_msgpack.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/py-borgbackup/Makefile
diff -u pkgsrc/sysutils/py-borgbackup/Makefile:1.62 pkgsrc/sysutils/py-borgbackup/Makefile:1.62.2.1
--- pkgsrc/sysutils/py-borgbackup/Makefile:1.62 Mon Apr 20 18:26:59 2026
+++ pkgsrc/sysutils/py-borgbackup/Makefile      Tue Jul 21 18:35:28 2026
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.62 2026/04/20 18:26:59 adam Exp $
+# $NetBSD: Makefile,v 1.62.2.1 2026/07/21 18:35:28 maya Exp $
 
 DISTNAME=      borgbackup-1.4.4
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=   1
 CATEGORIES=    sysutils python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=b/borgbackup/}
 

Index: pkgsrc/sysutils/py-borgbackup/distinfo
diff -u pkgsrc/sysutils/py-borgbackup/distinfo:1.42 pkgsrc/sysutils/py-borgbackup/distinfo:1.42.2.1
--- pkgsrc/sysutils/py-borgbackup/distinfo:1.42 Mon Apr 20 18:26:59 2026
+++ pkgsrc/sysutils/py-borgbackup/distinfo      Tue Jul 21 18:35:28 2026
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.42 2026/04/20 18:26:59 adam Exp $
+$NetBSD: distinfo,v 1.42.2.1 2026/07/21 18:35:28 maya Exp $
 
 BLAKE2s (borgbackup-1.4.4.tar.gz) = f57ab5da7812cca3b34bcc41a38f05a4f62a979ea456326b75ea795c9e4e20b6
 SHA512 (borgbackup-1.4.4.tar.gz) = a43dbfaaeb46764975bc9765731090b50e514a5a31add9236af7de6e99e7c67ac4bcf6b9869d648f9ce11c7f7d52318369f4fb7951cc1ef947aee64ac222150a
 Size (borgbackup-1.4.4.tar.gz) = 3995698 bytes
+SHA1 (patch-pyproject.toml) = 23ac9381511da38faa224e05bf23e8997c9c4bb6
+SHA1 (patch-src_borg_helpers_msgpack.py) = 8b3c13ba68118b1d68d7c8a20cf1927699ec5fdf

Added files:

Index: pkgsrc/sysutils/py-borgbackup/patches/patch-pyproject.toml
diff -u /dev/null pkgsrc/sysutils/py-borgbackup/patches/patch-pyproject.toml:1.3.2.2
--- /dev/null   Tue Jul 21 18:35:29 2026
+++ pkgsrc/sysutils/py-borgbackup/patches/patch-pyproject.toml  Tue Jul 21 18:35:28 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-pyproject.toml,v 1.3.2.2 2026/07/21 18:35:28 maya Exp $
+
+Reinstate a patch to accept newer py-msgpack versions.
+
+--- pyproject.toml.orig        2026-07-21 13:28:54.888622385 +0000
++++ pyproject.toml
+@@ -35,7 +35,7 @@ dependencies = [
+     # 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 >=1.0.3, <=1.1.2",
++    "msgpack >=1.0.3, <=1.2.1",
+     "packaging",
+ ]
+ 

Index: pkgsrc/sysutils/py-borgbackup/patches/patch-src_borg_helpers_msgpack.py
diff -u /dev/null pkgsrc/sysutils/py-borgbackup/patches/patch-src_borg_helpers_msgpack.py:1.7.2.2
--- /dev/null   Tue Jul 21 18:35:29 2026
+++ pkgsrc/sysutils/py-borgbackup/patches/patch-src_borg_helpers_msgpack.py     Tue Jul 21 18:35:28 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_borg_helpers_msgpack.py,v 1.7.2.2 2026/07/21 18:35:28 maya Exp $
+
+Bump acceptance of py-msgpack versions.
+
+--- src/borg/helpers/msgpack.py.orig   2026-07-21 13:34:08.463330946 +0000
++++ src/borg/helpers/msgpack.py
+@@ -145,7 +145,7 @@ def is_supported_msgpack():
+     version_check = os.environ.get('BORG_MSGPACK_VERSION_CHECK', 'yes').strip().lower()
+ 
+     return version_check == 'no' or (
+-        (1, 0, 3) <= msgpack.version[:3] <= (1, 1, 2) and
++        (1, 0, 3) <= msgpack.version[:3] <= (1, 2, 1) and
+         msgpack.version not in []
+     )
+