From nobody Fri Sep 29 16:20:50 2023
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 4RxwZB5Fr2z4v6hx;
Fri, 29 Sep 2023 16:20:50 +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 4RxwZB4J4Qz4T68;
Fri, 29 Sep 2023 16:20:50 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1696004450;
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=rhoGR39OOYjMBFJSpwHwpNL9kTdsb6DozcyY8bcui+s=;
b=X8Av5VAq/pn+TJ3rC9XkVtEt3ZwPUw8FxCnW0GAmLbW7sGCS0i4zOFYxb+293cW/6GWsJ2
wg3QnDHrCWBa2xkr6JNJGMNnvadPsG92Cmatt54DtYLts7oKVHIbXvidCbSNWkYRHGxTgU
OeEA/eSwbdCHLJ36yFiruUIUOTe63zouAEwXcQH0oOFW27PHyUljrzNn7k4Z/8qfEmK5FO
joYuB0nIbEl2vuB/o/Ni+e8AG/MdZEtzBRnUplme0xaAwWT2p+f8H4huE2hTdZTY3mOmt7
vaH4kmA82/hDHCeIZRmSl/i0dcKRbTWSBgxBjRwnk4UJ4gm+e2fcEQnyK+52Yg==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696004450; a=rsa-sha256; cv=none;
b=wgxrqDAaX5zmfGrtLOu/5uakAecmpBkeWcmH9y8NYN+hSAr1q/cGP3j5tPJfwXQBwLb1+w
6oP0HBkgI9fqOCv4A9GvSPETLbbMaxM/YTsyEIq7Hj09rYMgBQNG1CRpPBv/+DmYgOrULe
UNXSNkUa6NUrgRBotb5AVUvltgnMSmFFTwrvpXkbjz33o5G7aY83JINaxHR/IqUKn8OAhJ
7cnZJrt7P2Ol/z7Hcd15yC7sgJ/Gu0FKFEQuvXlpg7v+mdTdF6gETNcJpNTnvMk7z6JyY7
3lyvH5bQcv+LibAp5fbQjoy2I3+U9LppU0Aeat+lFCGtQX0WaqjmJ87OSI82RA==
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=1696004450;
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=rhoGR39OOYjMBFJSpwHwpNL9kTdsb6DozcyY8bcui+s=;
b=K0MSfrNj51koHuUKbq6yJ2Ro46a1Rvv0+8TA1Iw4usI0E0vY5RV6eWN3hHvpHNHfc1MNMm
f5+VkId3A3+s57Kx9JxVVUfs29/bFMILoTeUJ3T7XVdTwMQ50yG9AuCissNsWtkMqGhFm+
ZYOWQL2gE2T1mHvg5TCZZZWcnuvS2h09KIp7nQ48SqR890wijuZxArKvELc7n/WWEXrFXc
OEl1zwdrFLrzzvdpxJtaJERpmk5lUbtrr4ught6zyj9j0PR8PNw9ZapMf6tXjGyK41fh7b
JKc/XucRcMbp7vKwN1r0SSqyEzxoHFBgvdu0YrsyOPat2LUzT6mU/kYQOsM32Q==
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 4RxwZB3LqJz1B1Z;
Fri, 29 Sep 2023 16:20:50 +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 38TGKodI066197;
Fri, 29 Sep 2023 16:20:50 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38TGKoT9066185;
Fri, 29 Sep 2023 16:20:50 GMT
(envelope-from git)
Date: Fri, 29 Sep 2023 16:20:50 GMT
Message-Id: <202309291620.38TGKoT9066185@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
dev-commits-ports-main@FreeBSD.org
From: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
Subject: git: b40c8cdf2f37 - main - archivers/py-borgbackup: Allow
build with py-msgpack 1.0.6
List-Id: Commit messages for all branches of the ports repository <dev-commits-ports-all.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all
List-Help: <mailto:dev-commits-ports-all+help@freebsd.org>
List-Post: <mailto:dev-commits-ports-all@freebsd.org>
List-Subscribe: <mailto:dev-commits-ports-all+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-ports-all+unsubscribe@freebsd.org>
Sender: owner-dev-commits-ports-all@freebsd.org
X-BeenThere: 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: b40c8cdf2f37cda283f395467a153d530f3945cd
Auto-Submitted: auto-generated
The branch main has been updated by sunpoet:
URL: https://cgit.FreeBSD.org/ports/commit/?id=b40c8cdf2f37cda283f395467a153d530f3945cd
commit b40c8cdf2f37cda283f395467a153d530f3945cd
Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2023-09-29 16:15:06 +0000
Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2023-09-29 16:15:06 +0000
archivers/py-borgbackup: Allow build with py-msgpack 1.0.6
- Bump PORTREVISION for package change
Reference: https://github.com/borgbackup/borg/commit/95e75b90f1a092bad10e0b93ef065e78dfabb227
---
archivers/py-borgbackup/Makefile | 3 ++-
archivers/py-borgbackup/files/patch-msgpack | 22 ++++++++++++++++++++++
2 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/archivers/py-borgbackup/Makefile b/archivers/py-borgbackup/Makefile
index 4397ad40191c..71361ae5baec 100644
--- a/archivers/py-borgbackup/Makefile
+++ b/archivers/py-borgbackup/Makefile
@@ -1,5 +1,6 @@
PORTNAME= borgbackup
DISTVERSION= 1.2.6
+PORTREVISION= 1
CATEGORIES= archivers python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -12,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.5_99:devel/py-msgpack@${PY_FLAVOR}
+_BB_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack>=1.0.2<1.0.6_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..8aa640811d82
--- /dev/null
+++ b/archivers/py-borgbackup/files/patch-msgpack
@@ -0,0 +1,22 @@
+--- setup.py.orig 2023-08-31 21:08: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.5, !=1.0.1',
++ 'msgpack >=0.5.6, <=1.0.6, !=1.0.1',
+ 'packaging',
+ ]
+
+--- src/borg/helpers/msgpack.py.orig 2023-08-31 21:08:57 UTC
++++ 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, 6) and \
+ msgpack.version not in [(1, 0, 1), ] # < add bad releases here to deny list
+
+