From nobody Fri Apr 7 09:39:20 2023 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 4PtCxh56Wrz44Q3P; Fri, 7 Apr 2023 09:39:20 +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 4PtCxh4GmYz3kk3; Fri, 7 Apr 2023 09:39:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680860360; 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=ZE9Bs2zwrZ/a/0Ez5u86WyjDKKywKb6lquaUqGrghzU=; b=OwSZLRJ0XkHCXIAp5soy1M9pSTcjNGropQuknR7BMkug71HpHcuSazGEtxwBfFnSQIDRl/ W6t6ptYPIgGFCIaKaCrDhNMZzAYPiR6iHdX8JODo1xLE2lB5aMIov0qETQGPWRU3bGFJYi +wpIL3FoK+jmBOw30eKeObvONiknjNXI1z3gojdDLbVT2ky/9PqHRbEBq2sLGFKNwytMLH UbCwnvi0QUcB9GGi2MqdgU9x19F9c2lCOdh1CDXFBabqUkTrWJRl3ZHbl9PjVxt1HbovUS IdPfyl1zjS+20IopAAx0X8lRUkO4GYK5fzyHHEAZt4qbFvu5AEa4MnipBOXlzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680860360; 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=ZE9Bs2zwrZ/a/0Ez5u86WyjDKKywKb6lquaUqGrghzU=; b=xnEOLRG71QRLWXgHAuXGtO+qSZKVOrpJfEHZ+mzaDdAEPfMQR2/t9Z+1arZbdurNYPNFus 0Bp8OPx3rfiUrBTk+ah5V/cIrc17yu+JoY9qiugpodi7rq1esAC8BtaqrDxpc360JLxEZl pBKi/plrfY7xcKY8zJTTbZwFL7RzjSqoxfcpjPvgNnm/2TDZe87l8yV1pqiUANPm3qHDFt tUV7RCQAkkovsM0tXeHJ83jpr+07KR0zEwEhbL5hEw2C2BUAUcjOYMXa8d344GLDITC8oa jreryg2RRzxRpTnP5AZWnywmXcC0wyoPEThuYeIIDV/RQDidcnCCHfE13KpPBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680860360; a=rsa-sha256; cv=none; b=ks4CTBru/FxUKUm48g+4V0L9ELiUxMbYTXiT2xoexD1PHyRGqBsVln+kPfPM9Kf8yzgi39 6nAB6jDx0+u6EK1vpSfsFz3XLIrLqVNKmIsjvDCGIXe7rRRmVRdBL65Mczr+TddG/n00ch fSGz2eMVndo6Cid4FD3Chj+YDzkjJfJUVOdxhk8Az2Wi/17JFaGFjo6es1Cif20Yi7qUMq c/B7f2sikpaU3ACz2BpkVjsITUSluwfMa/XNajV1uu2aPBZmSTZWIEm9+9bR4J7b2F5XJO g1/fRbhzolTh5Jd53aOCb8gQbCEjZEPSX9SD/YJm5iOHEhN9QYsaCV6rXeh6Bw== 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 4PtCxh3KjXzgYt; Fri, 7 Apr 2023 09:39:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3379dKG9036429; Fri, 7 Apr 2023 09:39:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3379dKBt036428; Fri, 7 Apr 2023 09:39:20 GMT (envelope-from git) Date: Fri, 7 Apr 2023 09:39:20 GMT Message-Id: <202304070939.3379dKBt036428@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Andree Subject: git: 1cc1228785ee - main - archivers/py-borgbackup: update to 1.2.4, unbreaking with msgpack 1.0.5 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: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1cc1228785eef2fb840a399058d35e5af1e16395 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=1cc1228785eef2fb840a399058d35e5af1e16395 commit 1cc1228785eef2fb840a399058d35e5af1e16395 Author: Matthias Andree AuthorDate: 2023-04-07 09:31:47 +0000 Commit: Matthias Andree CommitDate: 2023-04-07 09:38:11 +0000 archivers/py-borgbackup: update to 1.2.4, unbreaking with msgpack 1.0.5 Borgbackup pins the exact, full, patch-level based version range and the prior borgbackup 1.2.3 wanted to have at most msgpack 1.0.4. Update to 1.2.4 which allows msgpack 1.0.5, and pin the exact msgpack version in our depends to "fail early". And other changes including bug fixes: https://github.com/borgbackup/borg/blob/1.2.4/docs/changes.rst#version-124-2023-03-24 based on a PR: 270665 Submitted by: otis@ As in-depth soft robustness measure, add relevant warning comments to devel/py-msgpack/Makefile, and while there, clean up the python:3.6+ to just a bare python because 3.6 and older are long gone from ports. --- archivers/py-borgbackup/Makefile | 7 ++++--- archivers/py-borgbackup/distinfo | 6 +++--- devel/py-msgpack/Makefile | 6 ++++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/archivers/py-borgbackup/Makefile b/archivers/py-borgbackup/Makefile index 33dbf91cb853..4d446466774a 100644 --- a/archivers/py-borgbackup/Makefile +++ b/archivers/py-borgbackup/Makefile @@ -1,5 +1,5 @@ PORTNAME= borgbackup -DISTVERSION= 1.2.3 +DISTVERSION= 1.2.4 CATEGORIES= archivers python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,13 +12,13 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.7:devel/py-setuptools_scm@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}msgpack>=1.0:devel/py-msgpack@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}msgpack==1.0.5:devel/py-msgpack@${PY_FLAVOR} + # note that borgbackup pins the msgpack version range per patchlevel version! LIB_DEPENDS= liblz4.so:archivers/liblz4 \ libzstd.so:archivers/zstd \ libxxhash.so:devel/xxhash RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}packaging>=19.0:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}msgpack>=1.0:devel/py-msgpack@${PY_FLAVOR} -MAKE_ENV= BORG_OPENSSL_PREFIX=${OPENSSLBASE} TEST_DEPENDS= ${RUN_DEPENDS} \ ${PYTHON_PKGNAMEPREFIX}tox>3.2:devel/py-tox@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}virtualenv>=0:devel/py-virtualenv@${PY_FLAVOR} \ @@ -27,6 +27,7 @@ TEST_DEPENDS= ${RUN_DEPENDS} \ fakeroot:security/fakeroot USES= pkgconfig python:3.8+ ssl USE_PYTHON= autoplist distutils +MAKE_ENV= BORG_OPENSSL_PREFIX=${OPENSSLBASE} OPTIONS_DEFINE= FUSE OPTIONS_DEFAULT= FUSE diff --git a/archivers/py-borgbackup/distinfo b/archivers/py-borgbackup/distinfo index f0af9c2ea58e..8bf1665fd526 100644 --- a/archivers/py-borgbackup/distinfo +++ b/archivers/py-borgbackup/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1673634167 -SHA256 (borgbackup-1.2.3.tar.gz) = e32418f8633c96fa9681352a56eb63b98e294203472c114a5242709d36966785 -SIZE (borgbackup-1.2.3.tar.gz) = 4044577 +TIMESTAMP = 1680857218 +SHA256 (borgbackup-1.2.4.tar.gz) = a4bd54e9469e81b7a30a6711423115abc818d9cd844ecb1ca0e6104bc5374da8 +SIZE (borgbackup-1.2.4.tar.gz) = 4056513 diff --git a/devel/py-msgpack/Makefile b/devel/py-msgpack/Makefile index 01af18f003bd..2871c9284208 100644 --- a/devel/py-msgpack/Makefile +++ b/devel/py-msgpack/Makefile @@ -1,5 +1,7 @@ PORTNAME= msgpack -PORTVERSION= 1.0.5 +PORTVERSION= 1.0.5 # WARNING: archivers/py-borgbackup pins the full version +# so if upgrading msgpack, archivers/py-borgbackup will break. We need to +# coordinate updates. CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,7 +14,7 @@ WWW= https://msgpack.org/ \ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/COPYING -USES= python:3.6+ +USES= python USE_PYTHON= autoplist concurrent cython distutils post-install: