Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 8498B84CE3 for ; Fri, 29 Sep 2023 08:10:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id pWjLz_sHZRhW for ; Fri, 29 Sep 2023 08:10:34 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id E813684C2C for ; Fri, 29 Sep 2023 08:10:33 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id DC165FBDB; Fri, 29 Sep 2023 08:10:33 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1695975033170270" MIME-Version: 1.0 Date: Fri, 29 Sep 2023 08:10:33 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/sysutils/py-borgbackup To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20230929081033.DC165FBDB@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1695975033170270 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Fri Sep 29 08:10:33 UTC 2023 Modified Files: pkgsrc/sysutils/py-borgbackup: Makefile distinfo Added Files: pkgsrc/sysutils/py-borgbackup/patches: patch-src_borg_helpers_msgpack.py Log Message: py-borgbackup: accept newer py-msgpack versions Bump PKGREVISION. To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 pkgsrc/sysutils/py-borgbackup/Makefile cvs rdiff -u -r1.32 -r1.33 pkgsrc/sysutils/py-borgbackup/distinfo cvs rdiff -u -r0 -r1.1 \ 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. --_----------=_1695975033170270 Content-Disposition: inline Content-Length: 2471 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/sysutils/py-borgbackup/Makefile diff -u pkgsrc/sysutils/py-borgbackup/Makefile:1.46 pkgsrc/sysutils/py-borgbackup/Makefile:1.47 --- pkgsrc/sysutils/py-borgbackup/Makefile:1.46 Wed Sep 6 07:21:21 2023 +++ pkgsrc/sysutils/py-borgbackup/Makefile Fri Sep 29 08:10:33 2023 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.46 2023/09/06 07:21:21 wiz Exp $ +# $NetBSD: Makefile,v 1.47 2023/09/29 08:10:33 wiz Exp $ DISTNAME= borgbackup-1.2.6 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.32 pkgsrc/sysutils/py-borgbackup/distinfo:1.33 --- pkgsrc/sysutils/py-borgbackup/distinfo:1.32 Wed Sep 6 07:21:21 2023 +++ pkgsrc/sysutils/py-borgbackup/distinfo Fri Sep 29 08:10:33 2023 @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.32 2023/09/06 07:21:21 wiz Exp $ +$NetBSD: distinfo,v 1.33 2023/09/29 08:10:33 wiz Exp $ BLAKE2s (borgbackup-1.2.6.tar.gz) = 544ba97f49a688f8a48d0a9ee0ad6b3130a67607e5c31b7351ef0b9e8c307c15 SHA512 (borgbackup-1.2.6.tar.gz) = 264bf023f4a53f79d8359e1ed0678c7572ad24776e0ddbc5d3446f548629ecea1e0798c33df4464573b1258f47220c86ca964673501dd9b3018484f1f86280f7 Size (borgbackup-1.2.6.tar.gz) = 4355451 bytes +SHA1 (patch-src_borg_helpers_msgpack.py) = 64723191c16805dbf27b0e0c20315ad93c00b06e Added files: 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.1 --- /dev/null Fri Sep 29 08:10:33 2023 +++ pkgsrc/sysutils/py-borgbackup/patches/patch-src_borg_helpers_msgpack.py Fri Sep 29 08:10:33 2023 @@ -0,0 +1,17 @@ +$NetBSD: patch-src_borg_helpers_msgpack.py,v 1.1 2023/09/29 08:10:33 wiz Exp $ + +Allow msgpack up to 1.0.7. +Loosely based on +https://github.com/borgbackup/borg/commit/cdcab4df6851b5d3da6ac5435bcaeb8aa1d632b5 + +--- src/borg/helpers/msgpack.py.orig 2023-08-31 21:08:57.000000000 +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, 5) and \ ++ return (0, 5, 6) <= msgpack.version <= (1, 0, 7) and \ + msgpack.version not in [(1, 0, 1), ] # < add bad releases here to deny list + + --_----------=_1695975033170270--