From nobody Sat Mar 9 14:18:52 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TsQBj3WBKz5DJ21; Sat, 9 Mar 2024 14:18:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TsQBj20w0z48tP; Sat, 9 Mar 2024 14:18:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709993933; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q8rUwk/igqtzR7Ua83wjNCxa0mALvEnMJ9JpxBwt07k=; b=fnB7tHgAcU7zBlECgeuKyRIqdTGovSR5Xz1+SmTza269T5HY1kGNn7GqUC4s23NDmlNr/I w6NqP94MQiPKYiCd2+VhijEBb7hTkdVJACxdARpu2BR8xjdZ62FXf4Fq47LKjuM4JywFxL C5ZmftMSJzSe5G9dgdwnHXvAU4oYQmQ3YHe9UUcEG/kiuAmn/8+Pd8EmcfRt84Ou+uawok bW32JqjKlik1RXuryLPNRJwxWTWVI23IiaIU5j2WyXWg8fqZxipMCXHg5ucpzPMOUOyEeA InozjLZ7aIMnOxlOUdBM477hcpK6qvml/ZE//ENDIEBmJ84UwC/yQ/kb6rtuYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709993933; a=rsa-sha256; cv=none; b=KKh4lDbSCuIV9rs2MuohUFV9rDJ/tuoVGOsb4KmwCI+lVrW5hQUw0uQHuPuXuVHVGC6MZM K7fWRoN92EpV2r7zDzfkWRG0hk05i7MRWK/i/Ss46XCsob4XzubsC8tYmT0XfDWs9oX7ie WuIf5KHz5y2FuPoZrgD5TGAXXxEAbvXDJe5ydtIZyidzMDrVPo+Hz4OdHiKmMw6fP+yXcv 3IohIcwEGtuWzTvskla60AyBQ5q4Ee313sS37WYakhQC3WZHCU4QZUaJ4SV+ytXaF4AQRB Q7a3dPpI/Go9NgVnj0iWNtPbAcX/ic7llxFy/LTZvH+Z8aRKsEQPxtsm9tJsgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709993933; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q8rUwk/igqtzR7Ua83wjNCxa0mALvEnMJ9JpxBwt07k=; b=jP8PTDFWtPXI8HDvVEtPvv5n2wYEPw/O+WxG1HS25eN8c39kTflP1DSwIfqup5r+PjeHlq qxmdw5k055Q+Z5Qx0695nG9aUCxoMRsGNB/XU9NqBXqtjAQlZm5hW6SI2bv0JTiI2Ki8hJ gNV7rtrBk7LSg1VvZl7BpWMMP/zYuEmLu2Nj2XC4TnTudh+i85EDgHbfdW5itIcxd/HEN2 Pc2AFmscY6nXp7t5cZzfBVEzXASuEXWlwn4XsEAoybijTMTOK/MEU25kC8WyYewokaUwGW /aYj9TBKYuCg4mknl1LJbrhgJp/jyMKDVqJ8DGGYy+NVghz0WEGA69FyNZ+fKw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TsQBh6pRsz15TG; Sat, 9 Mar 2024 14:18:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 429EIqoP028544; Sat, 9 Mar 2024 14:18:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 429EIqir028541; Sat, 9 Mar 2024 14:18:52 GMT (envelope-from git) Date: Sat, 9 Mar 2024 14:18:52 GMT Message-Id: <202403091418.429EIqir028541@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 70fc1370fd3c - main - archivers/py-borgbackup: Allow build with py-msgpack 1.0.8 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 70fc1370fd3c1ffe28800ad64819d3636141d93f Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=70fc1370fd3c1ffe28800ad64819d3636141d93f commit 70fc1370fd3c1ffe28800ad64819d3636141d93f Author: Po-Chuan Hsieh AuthorDate: 2024-03-09 13:57:18 +0000 Commit: Po-Chuan Hsieh CommitDate: 2024-03-09 14:07:20 +0000 archivers/py-borgbackup: Allow build with py-msgpack 1.0.8 - Bump PORTREVISION for package change Reference: https://github.com/borgbackup/borg/commit/a507a2cb3b9fed025743e80971ce1615887a47e4 --- archivers/py-borgbackup/Makefile | 4 ++-- archivers/py-borgbackup/files/patch-msgpack | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/archivers/py-borgbackup/Makefile b/archivers/py-borgbackup/Makefile index 3cf44c50affc..0d8ecf652b30 100644 --- a/archivers/py-borgbackup/Makefile +++ b/archivers/py-borgbackup/Makefile @@ -1,6 +1,6 @@ PORTNAME= borgbackup DISTVERSION= 1.2.7 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= archivers python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE # note that borgbackup pins the msgpack version range per patchlevel version! -_BB_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack>=1.0.2<1.0.7_99:devel/py-msgpack@${PY_FLAVOR} +_BB_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack>=1.0.2<1.0.8_99:devel/py-msgpack@${PY_FLAVOR} BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=1.7:devel/py-setuptools-scm@${PY_FLAVOR} \ ${_BB_DEPENDS} LIB_DEPENDS= liblz4.so:archivers/liblz4 \ diff --git a/archivers/py-borgbackup/files/patch-msgpack b/archivers/py-borgbackup/files/patch-msgpack new file mode 100644 index 000000000000..3400e95f671d --- /dev/null +++ b/archivers/py-borgbackup/files/patch-msgpack @@ -0,0 +1,24 @@ +Reference: https://github.com/borgbackup/borg/commit/a507a2cb3b9fed025743e80971ce1615887a47e4 + +--- setup.py.orig 2023-12-02 13:05:57 UTC ++++ 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.7, !=1.0.1', ++ 'msgpack >=0.5.6, <=1.0.8, !=1.0.1', + 'packaging', + ] + +--- src/borg/helpers/msgpack.py.orig 2023-12-02 13:05:57 UTC ++++ src/borg/helpers/msgpack.py +@@ -182,7 +182,7 @@ def is_supported_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, 7) and \ ++ return (0, 5, 6) <= msgpack.version <= (1, 0, 8) and \ + msgpack.version not in [(1, 0, 1), ] # < add bad releases here to deny list + +