From nobody Wed Sep 25 04:27:58 2024 X-Original-To: dev-commits-ports-all@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 4XD3cb6kXWz5WZZP; Wed, 25 Sep 2024 04:27:59 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XD3cb0cdFz4pKr; Wed, 25 Sep 2024 04:27:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727238479; 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=7i1mW6F5uj7zFZ0dQ+tvqL3EwZcwDnwJJ+hw55ATM9E=; b=BPgV4terN9GUUajTOLEGZSlIZObRpQ97FLNneSNlNxFYVrczeZ8dlhH4bG/LscXjsIoJIq z6DBTV/w8ZbZ3l2WYGJ+8lJ9Gs9wbRngiPcdiDsqixapJh/VM4QcV0YpYgMhLHrn+ZEuBD BG4BM/lNlzTDP2RkzX+e3DFw4xKbvXwONPa4ry8rPNZZFNrE9k24ysOMYwGDceHVQgAiOw i1ApkY6kISsxo/5yq0Dml/rFanjIJQZYvvU3KSzng8+Y26EhZm4L1U2f76Kc8Lh8bkhUGm UTDtGpQOLG/QAog845vFeqENVgE51brkbPqg/8opbyOmWO8wOvx7OifBw4ASGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727238479; a=rsa-sha256; cv=none; b=CHwYvJQcE1KrNCEIbBk94ErvZO5OyG6CnlxWIvttKmvruXDKeW8civwcKQ0FryeFR4eM9O vskisUIs3m95yV3zN9YqDLusX6lGRhgd67zPbpIZTqLDzuAdyQTIT2iQd70U/U2j97F5Bs GgzSGH/lIj2QvfrNldRDvDlgEWfdZBjWKE5ktrFlTHdf0ZHJ5mxViAjM73jIUoXsyTzfvY MULWlKMWBM+Rmu5IprVjxx12BN49IoXP1EOycwTYmjbrarfpJw/Oxj+7EuSoetUemTKKPQ fgf03Wwt8OT8c0a952v4IwWSxkIohVeaEAEWAA2PWTrrC+3n5iEAnNQ3/cHnow== 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=1727238479; 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=7i1mW6F5uj7zFZ0dQ+tvqL3EwZcwDnwJJ+hw55ATM9E=; b=Ykj4ga+/11tFDuCdyecTdbbJ6OwW+YEgtajoLhbeQTBe0kQHrmdq/vxcSLfRAMYBTDz4jT lzGAs1RQWLnHWEyTXM0fENv0jS0v8AdBqxW2oDCV5o/8p8W1w9auGKhLAn0mBj8GZ0qVYE eQgYBjqtgNaxCKElOvkZuOQbAqG8p/LkrW0hvwypm6RC5I2WcpMi51S+S9ozUcbVF+rSj6 tkEoDCE9l9ioAwxsSp5tsz09BSlO97M8Kk3CEVfcW1F7eTAOjEDtUpUbbFOE6qnKz3f0ty 9oxAkfxYZPEmNBIJplIu4xtXLkf4yZ7lVbMgJ+3oM1Zq4SZ0NqBwdP1xPDmH8g== 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 4XD3cb00Przy2v; Wed, 25 Sep 2024 04:27:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48P4RwYj039082; Wed, 25 Sep 2024 04:27:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48P4RwkK039079; Wed, 25 Sep 2024 04:27:58 GMT (envelope-from git) Date: Wed, 25 Sep 2024 04:27:58 GMT Message-Id: <202409250427.48P4RwkK039079@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: e295ee325d65 - main - archivers/py-borgbackup: Allow build with py-msgpack 1.1.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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: e295ee325d650f524bcdecdf5ed02f24fb149c58 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=e295ee325d650f524bcdecdf5ed02f24fb149c58 commit e295ee325d650f524bcdecdf5ed02f24fb149c58 Author: Po-Chuan Hsieh AuthorDate: 2024-09-25 04:17:27 +0000 Commit: Po-Chuan Hsieh CommitDate: 2024-09-25 04:23:02 +0000 archivers/py-borgbackup: Allow build with py-msgpack 1.1.0 - Bump PORTREVISION for package change Reference: https://github.com/borgbackup/borg/commit/7511cb6c5e0448f0b5276f4281faa4c71c2f64ac --- archivers/py-borgbackup12/Makefile | 4 ++-- archivers/py-borgbackup12/files/patch-msgpack | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/archivers/py-borgbackup12/Makefile b/archivers/py-borgbackup12/Makefile index fd980609b8a9..d326256cf5d4 100644 --- a/archivers/py-borgbackup12/Makefile +++ b/archivers/py-borgbackup12/Makefile @@ -1,6 +1,6 @@ PORTNAME= borgbackup DISTVERSION= 1.2.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= archivers python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -14,7 +14,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.8_99:devel/py-msgpack@${PY_FLAVOR} +_BB_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack>=1.0.2<1.1.0_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-borgbackup12/files/patch-msgpack b/archivers/py-borgbackup12/files/patch-msgpack new file mode 100644 index 000000000000..bfa87a5cd7af --- /dev/null +++ b/archivers/py-borgbackup12/files/patch-msgpack @@ -0,0 +1,24 @@ +Obtained from: https://github.com/borgbackup/borg/commit/7511cb6c5e0448f0b5276f4281faa4c71c2f64ac + +--- setup.py.orig 2024-03-29 17:42:23 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.8, !=1.0.1', ++ 'msgpack >=0.5.6, <=1.1.0, !=1.0.1', + 'packaging', + ] + +--- src/borg/helpers/msgpack.py.orig 2024-03-29 17:42:23 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, 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 + +