CVS commit: [pkgsrc-2025Q3] pkgsrc/sysutils/py-borgbackup

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

Module Name:    pkgsrc
Committed By:   maya
Date:           Tue Oct 21 01:43:30 UTC 2025

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

Log Message:
Pullup ticket #7013 - requested by bsiegert
sysutils/py-borgbackup: Functionality fix

Revisions pulled up:
- sysutils/py-borgbackup/Makefile                               1.59
- sysutils/py-borgbackup/distinfo                               1.39
- sysutils/py-borgbackup/patches/patch-pyproject.toml           1.1
- sysutils/py-borgbackup/patches/patch-src_borg_helpers_msgpack.py 1.5

---
   Module Name:    pkgsrc
   Committed By:   he
   Date:           Thu Oct 16 21:30:21 UTC 2025

   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: add patches to accept py-msgpack up to 1.1.2.

   This evidently got lost in the previous update...
   This replicates what upstream has already done in 1.4.2rc*.


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.57.2.1 pkgsrc/sysutils/py-borgbackup/Makefile
cvs rdiff -u -r1.38 -r1.38.4.1 pkgsrc/sysutils/py-borgbackup/distinfo
cvs rdiff -u -r0 -r1.1.2.2 \
    pkgsrc/sysutils/py-borgbackup/patches/patch-pyproject.toml
cvs rdiff -u -r0 -r1.5.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.57 pkgsrc/sysutils/py-borgbackup/Makefile:1.57.2.1
--- pkgsrc/sysutils/py-borgbackup/Makefile:1.57 Fri Jul  4 09:08:38 2025
+++ pkgsrc/sysutils/py-borgbackup/Makefile      Tue Oct 21 01:43:30 2025
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.57 2025/07/04 09:08:38 wiz Exp $
+# $NetBSD: Makefile,v 1.57.2.1 2025/10/21 01:43:30 maya Exp $
 
 DISTNAME=      borgbackup-1.4.1
 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.38 pkgsrc/sysutils/py-borgbackup/distinfo:1.38.4.1
--- pkgsrc/sysutils/py-borgbackup/distinfo:1.38 Mon Apr 28 19:34:53 2025
+++ pkgsrc/sysutils/py-borgbackup/distinfo      Tue Oct 21 01:43:30 2025
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.38 2025/04/28 19:34:53 adam Exp $
+$NetBSD: distinfo,v 1.38.4.1 2025/10/21 01:43:30 maya Exp $
 
 BLAKE2s (borgbackup-1.4.1.tar.gz) = 83b9dc79715247e3547b6f654b647aeab01da4d8f4ba6dd888584c1c215eefad
 SHA512 (borgbackup-1.4.1.tar.gz) = 83ce8fcefa4e4099922e1f3894aba41d8d83ccff3e554b4b5ee0f0b9b8b18b18bcbf7f566e36aea4214e0d9d427cb66d63d2e1933b773e3338fd5814fd80e3a4
 Size (borgbackup-1.4.1.tar.gz) = 3817197 bytes
+SHA1 (patch-pyproject.toml) = d8f7336b8cce3b31fd26e69bb9972032df7e27da
+SHA1 (patch-src_borg_helpers_msgpack.py) = fdb65b06c37a5ccfa59de12173814b4fe4bd45ea

Added files:

Index: pkgsrc/sysutils/py-borgbackup/patches/patch-pyproject.toml
diff -u /dev/null pkgsrc/sysutils/py-borgbackup/patches/patch-pyproject.toml:1.1.2.2
--- /dev/null   Tue Oct 21 01:43:30 2025
+++ pkgsrc/sysutils/py-borgbackup/patches/patch-pyproject.toml  Tue Oct 21 01:43:30 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-pyproject.toml,v 1.1.2.2 2025/10/21 01:43:30 maya Exp $
+
+Bump allowable msgpack version.
+
+--- pyproject.toml.orig        2025-10-13 08:29:03.525998785 +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.0",
++    "msgpack >=1.0.3, <=1.1.2",
+     "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.5.2.2
--- /dev/null   Tue Oct 21 01:43:30 2025
+++ pkgsrc/sysutils/py-borgbackup/patches/patch-src_borg_helpers_msgpack.py     Tue Oct 21 01:43:30 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_borg_helpers_msgpack.py,v 1.5.2.2 2025/10/21 01:43:30 maya Exp $
+
+Permit newer versions of msgpack than what's originally
+declared by upstream.
+
+--- src/borg/helpers/msgpack.py.orig   2024-03-12 09:32:37.673913724 +0000
++++ src/borg/helpers/msgpack.py
+@@ -137,7 +137,7 @@ def is_slow_msgpack():
+ def is_supported_msgpack():
+     # 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, 2) and \
+            msgpack.version not in []  # < add bad releases here to deny list
+ 
+