CVS commit: pkgsrc/sysutils/py-borgbackup

["Havard Eidnes" <he%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   he
Date:           Mon Oct 28 09:59:34 UTC 2024

Modified Files:
        pkgsrc/sysutils/py-borgbackup: Makefile distinfo
Added Files:
        pkgsrc/sysutils/py-borgbackup/patches: patch-setup.py
            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.1.0 and not just between 0.5.6 and 1.0.8.

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


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 pkgsrc/sysutils/py-borgbackup/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/sysutils/py-borgbackup/distinfo
cvs rdiff -u -r0 -r1.6 pkgsrc/sysutils/py-borgbackup/patches/patch-setup.py
cvs rdiff -u -r0 -r1.3 \
    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.51 pkgsrc/sysutils/py-borgbackup/Makefile:1.52
--- pkgsrc/sysutils/py-borgbackup/Makefile:1.51 Mon Oct  7 20:42:01 2024
+++ pkgsrc/sysutils/py-borgbackup/Makefile      Mon Oct 28 09:59:34 2024
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.51 2024/10/07 20:42:01 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2024/10/28 09:59:34 he Exp $
 
 DISTNAME=      borgbackup-1.2.8
 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.35 pkgsrc/sysutils/py-borgbackup/distinfo:1.36
--- pkgsrc/sysutils/py-borgbackup/distinfo:1.35 Fri Apr 26 17:24:33 2024
+++ pkgsrc/sysutils/py-borgbackup/distinfo      Mon Oct 28 09:59:34 2024
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.35 2024/04/26 17:24:33 adam Exp $
+$NetBSD: distinfo,v 1.36 2024/10/28 09:59:34 he Exp $
 
 BLAKE2s (borgbackup-1.2.8.tar.gz) = 17d8cba6c30562be5618d580b79ee1ca5934b71e16aad0c83eb432c49d0c6e47
 SHA512 (borgbackup-1.2.8.tar.gz) = 9a62e5eec894ebffe928a08c9a0cceebde084f16524d363a3c3be01d908a7eceaea8fa11eac422acc0fdb2534d79d1ee5ec5d9167e1086f334af6a28887616d5
 Size (borgbackup-1.2.8.tar.gz) = 4369117 bytes
+SHA1 (patch-setup.py) = 33791606cfd6600d9969d530de73d724d0c44298
+SHA1 (patch-src_borg_helpers_msgpack.py) = 97960629190a2c3931ea9cd1a48e869425054802

Added files:

Index: pkgsrc/sysutils/py-borgbackup/patches/patch-setup.py
diff -u /dev/null pkgsrc/sysutils/py-borgbackup/patches/patch-setup.py:1.6
--- /dev/null   Mon Oct 28 09:59:34 2024
+++ pkgsrc/sysutils/py-borgbackup/patches/patch-setup.py        Mon Oct 28 09:59:34 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-setup.py,v 1.6 2024/10/28 09:59:34 he Exp $
+
+Allow a newer version of py-msgpack.
+
+--- setup.py.orig      2024-03-12 09:31:59.374517238 +0000
++++ 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.8, !=1.0.1',
++    'msgpack >=0.5.6, <=1.1.0, !=1.0.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.3
--- /dev/null   Mon Oct 28 09:59:34 2024
+++ pkgsrc/sysutils/py-borgbackup/patches/patch-src_borg_helpers_msgpack.py     Mon Oct 28 09:59:34 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_borg_helpers_msgpack.py,v 1.3 2024/10/28 09:59:34 he Exp $
+
+Permit newer versions of msgpack.
+
+--- src/borg/helpers/msgpack.py.orig   2024-03-12 09:32:37.673913724 +0000
++++ 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, 8) and \
++    return (0, 5, 6) <= msgpack.version <= (1, 1, 0) and \
+            msgpack.version not in [(1, 0, 1), ]  # < add bad releases here to deny list
+ 
+