Date: Mon, 10 Nov 2025 22:32:49 GMT From: Matthias Andree <mandree@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 4e552d07da1d - main - archivers/py-borgbackup: update to 1.4.2 Message-ID: <202511102232.5AAMWnLb009259@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=4e552d07da1d85921687c556a39450b1811f9e38 commit 4e552d07da1d85921687c556a39450b1811f9e38 Author: Matthias Andree <mandree@FreeBSD.org> AuthorDate: 2025-11-10 22:29:01 +0000 Commit: Matthias Andree <mandree@FreeBSD.org> CommitDate: 2025-11-10 22:32:46 +0000 archivers/py-borgbackup: update to 1.4.2 Changelog: https://borgbackup.readthedocs.io/en/1.4.2/changes.html#version-1-4-2-2025-10-31 This reverts the setuptools update for the SPDX license documentation, which would break with our ancient setuptools. (Note that https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=270358 and https://reviews.freebsd.org/D46236 have not made progress in over one and a half years, so... we need to work around that.) --- archivers/py-borgbackup/Makefile | 16 ++++++----- archivers/py-borgbackup/distinfo | 6 ++--- archivers/py-borgbackup/files/patch-msgpack | 25 ----------------- archivers/py-borgbackup/files/patch-pyproject.toml | 31 ++++++++++++++++++++++ .../files/patch-requirements.d_development.txt | 10 +++++++ 5 files changed, 53 insertions(+), 35 deletions(-) diff --git a/archivers/py-borgbackup/Makefile b/archivers/py-borgbackup/Makefile index 701d312b6ce6..2f35b72ee38f 100644 --- a/archivers/py-borgbackup/Makefile +++ b/archivers/py-borgbackup/Makefile @@ -1,6 +1,5 @@ PORTNAME= borgbackup -DISTVERSION= 1.4.1 -PORTREVISION= 2 +DISTVERSION= 1.4.2 CATEGORIES= archivers python MASTER_SITES= https://github.com/borgbackup/borg/releases/download/${DISTVERSION}/ \ PYPI @@ -14,9 +13,9 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE # note that borgbackup pins the msgpack version range per patchlevel version! -_BB_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack>=1.0.3<1.1.2_99:devel/py-msgpack@${PY_FLAVOR} +_BB_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack>=1.0.3<1.1.3:devel/py-msgpack@${PY_FLAVOR} BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pkgconfig>=0:devel/py-pkgconfig@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=1.7:devel/py-setuptools-scm@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=8:devel/py-setuptools-scm@${PY_FLAVOR} \ ${_BB_DEPENDS} LIB_DEPENDS= liblz4.so:archivers/liblz4 \ libzstd.so:archivers/zstd \ @@ -24,13 +23,13 @@ LIB_DEPENDS= liblz4.so:archivers/liblz4 \ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}packaging>=19.0:devel/py-packaging@${PY_FLAVOR} \ ${_BB_DEPENDS} TEST_DEPENDS= ${RUN_DEPENDS} \ - ${PYTHON_PKGNAMEPREFIX}tox>3.2:devel/py-tox@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tox>=4.19:devel/py-tox@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}virtualenv>=0:devel/py-virtualenv@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} \ fakeroot:security/fakeroot USES= pkgconfig python ssl -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist cython3 distutils MAKE_ENV= BORG_OPENSSL_PREFIX=${OPENSSLBASE} OPTIONS_DEFINE= FUSE @@ -83,6 +82,9 @@ post-install: ${SETENV} ${_BORGENV} ${STAGEDIR}${PREFIX}/bin/borg info ${WRKDIR}/borgrepo do-test: - cd ${WRKSRC} && ${SETENV} ${_BORGENV} ${TEST_ENV} tox-${PYTHON_VER} -e ${PY_FLAVOR} -vv +# work around https://github.com/tox-dev/tox/issues/3602 + ${RM} ${WRKSRC}/setup.cfg +# the PATH dance works around a strange "pkg-config" file not found error. + cd ${WRKSRC} && ${SETENV} ${_BORGENV} PATH=${PATH}:${LOCALBASE}/bin tox-${PYTHON_VER} -e ${PY_FLAVOR} -vv .include <bsd.port.post.mk> diff --git a/archivers/py-borgbackup/distinfo b/archivers/py-borgbackup/distinfo index e51614a71566..a8096cff4dcb 100644 --- a/archivers/py-borgbackup/distinfo +++ b/archivers/py-borgbackup/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1745270367 -SHA256 (borgbackup-1.4.1.tar.gz) = b8fbf8f1c19d900b6b32a5a1dc131c5d8665a7c7eea409e9095209100b903839 -SIZE (borgbackup-1.4.1.tar.gz) = 3817197 +TIMESTAMP = 1762805872 +SHA256 (borgbackup-1.4.2.tar.gz) = 8923f5e953205d81138d1d7276c8a1c864215e230994d620c397635568ed376f +SIZE (borgbackup-1.4.2.tar.gz) = 3932875 diff --git a/archivers/py-borgbackup/files/patch-msgpack b/archivers/py-borgbackup/files/patch-msgpack deleted file mode 100644 index 509fce82fdb8..000000000000 --- a/archivers/py-borgbackup/files/patch-msgpack +++ /dev/null @@ -1,25 +0,0 @@ -Obtained from: https://github.com/borgbackup/borg/commit/862f19aab9780b91424bb7f9319d915751d0024f - https://github.com/borgbackup/borg/commit/e7d8fba1df8409f5aa71faa16f97935aea802171 - ---- pyproject.toml.orig 2025-04-18 19:16:24 UTC -+++ pyproject.toml -@@ -35,7 +35,7 @@ dependencies = [ - # 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 >=1.0.3, <=1.1.0", -+ "msgpack >=1.0.3, <=1.1.2", - "packaging", - ] - ---- src/borg/helpers/msgpack.py.orig 2025-04-18 19:16:24 UTC -+++ src/borg/helpers/msgpack.py -@@ -137,7 +137,7 @@ def is_supported_msgpack(): - def is_supported_msgpack(): - # DO NOT CHANGE OR REMOVE! See also requirements and comments in pyproject.toml. - import msgpack -- return (1, 0, 3) <= msgpack.version <= (1, 1, 0) and \ -+ return (1, 0, 3) <= msgpack.version <= (1, 1, 2) and \ - msgpack.version not in [] # < add bad releases here to deny list - - diff --git a/archivers/py-borgbackup/files/patch-pyproject.toml b/archivers/py-borgbackup/files/patch-pyproject.toml new file mode 100644 index 000000000000..4fa47884b424 --- /dev/null +++ b/archivers/py-borgbackup/files/patch-pyproject.toml @@ -0,0 +1,31 @@ +This file shall be removed once we install a new enough setuptools as our default version. + +--- pyproject.toml.orig 2025-10-31 18:16:12 UTC ++++ pyproject.toml +@@ -12,6 +12,7 @@ classifiers = [ + "Development Status :: 4 - Beta", + "Environment :: Console", + "Intended Audience :: System Administrators", ++ "License :: OSI Approved :: BSD License", + "Operating System :: POSIX :: BSD :: FreeBSD", + "Operating System :: POSIX :: BSD :: OpenBSD", + "Operating System :: POSIX :: BSD :: NetBSD", +@@ -28,8 +29,7 @@ classifiers = [ + "Topic :: Security :: Cryptography", + "Topic :: System :: Archiving :: Backup", + ] +-license = "BSD-3-Clause" +-license-files = ["LICENSE", "AUTHORS"] ++license = {text="BSD"} + dependencies = [ + # We are rather picky about msgpack versions, because a good working msgpack is + # very important for Borg, see: https://github.com/borgbackup/borg/issues/3753 +@@ -73,7 +73,7 @@ where = ["src"] + "*" = ["*.c", "*.h", "*.pyx"] + + [build-system] +-requires = ["setuptools>=78.1.1", "setuptools_scm>=8", "wheel", "pkgconfig", "Cython>=3.0.3"] ++requires = ["setuptools>=64", "setuptools_scm>=8", "wheel", "pkgconfig", "Cython>=3.0.3"] + build-backend = "setuptools.build_meta" + + [tool.setuptools_scm] diff --git a/archivers/py-borgbackup/files/patch-requirements.d_development.txt b/archivers/py-borgbackup/files/patch-requirements.d_development.txt new file mode 100644 index 000000000000..c348f6c9e86c --- /dev/null +++ b/archivers/py-borgbackup/files/patch-requirements.d_development.txt @@ -0,0 +1,10 @@ +This file shall be removed once we install a new enough setuptools as our default version. + +--- requirements.d/development.txt.orig 2025-10-31 18:16:12 UTC ++++ requirements.d/development.txt +@@ -1,4 +1,4 @@ +-setuptools>=78.1.1 ++setuptools>=64 + setuptools_scm>=8 + pip + virtualenvhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202511102232.5AAMWnLb009259>