From nobody Sun Jul 21 16:02:39 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 4WRp8b4wBTz5Rklg; Sun, 21 Jul 2024 16:02:39 +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 4WRp8b438cz4mt0; Sun, 21 Jul 2024 16:02:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721577759; 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=BgfTTmSezVTWZZde0WmZBqQH1zPe8M2/jy3C38XO1CU=; b=sOFma93mQQi8dL0W8unI4jfGqJ7E2mVRWIn+bzDU3WL7rV6AEHax18lQGX3WJNaxUqpBO2 UpFbYMqDitXqGZa5oLX5ZH6KVQA7rXKzIPFWJ29UzFhaVjGS467y0mRRKbJSFccR+ly7cJ o4Me5xGyNIIkl+ZzjhN+ltnuLHxT6qmOPNzvJojf3cpOnczyAaRNl9Jh+LK4u6PbqdpUTD 7P3LmrmY0tT4FSW1UOYGI58KFx+6f7/Vk/U2BLJ7uBUJ8BXVdVbvUIfh2H8VCxOZzQCZ5J zfvJLt/xuUeZ8vJzYwYz4OofpgxKdiAUQ0NVms/y1lgrhS7grcFxPmTWqQ2KTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721577759; a=rsa-sha256; cv=none; b=Lax9ZoOyOiFAh5niiGfvx0uCXkl8pjTZlAzuU0cnin4DU6j28ySsrug24omeXZaikKT2La UWdiHZJ87OuaQQDOif5Pc/rLLyD2f/VkTqfqwB5z91TVcJ+Jvc5SIi6/wvCO8vZUSvPZVY 8YKB54syKjh4027+CRFy4uInLMoiQ/5b4A8H4j6D4Tsgzc07tWR61SJg9RFA+1brUvBHWc sAoslocSQuoCy/GvYl0xho+IlPx2orqta49CUK8xf/odl5bb5QtbD9cvfB5TkRIYv0c0L/ Zjn26uKsX4kWBAFIqD2c2hk5CsQQvGP0fnOgu2gijkWGAJQLLHDsDR7+syj/lA== 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=1721577759; 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=BgfTTmSezVTWZZde0WmZBqQH1zPe8M2/jy3C38XO1CU=; b=RF9fMCncTLQ0ozKCc0euylN3VSvAQWbP+JdgayF8uDZ2xLEtqS9Jtz7IZH5+3HAaBq9Y3T ie5b1mLXyFdUpwUth85UcfXiXUBpKfNR02AOzjsoJ9yiiAy6z81H0/gykW1njiEbyreXyO G1qzwfVzTEVkpOqeK+WbfRHZReVOJtlcWB6EUCbmhs/vXqsOBu1Rp5hsfKPRgw2kfCmIzV bp73cmH5cJiqLe8jpaNcTmXZgkq5iJTCas2MtTvQ/U0khy6Yzgc/looMLaIrXndXGtLKiW JvOzQa3g+7oUCaS6+8ZyHhhn5nVA/9gLPTP/Xzf1UEjbb5HwSSu1mJGUYlXo8A== 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 4WRp8b3fPyz160t; Sun, 21 Jul 2024 16:02:39 +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 46LG2dtx011530; Sun, 21 Jul 2024 16:02:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46LG2d4J011527; Sun, 21 Jul 2024 16:02:39 GMT (envelope-from git) Date: Sun, 21 Jul 2024 16:02:39 GMT Message-Id: <202407211602.46LG2d4J011527@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: 3b5b6c2798e3 - main - py-borgbackup: Upgrade to 1.4.0, preserving 1.2.8 as py-borgbackup12 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-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: 3b5b6c2798e3e59ae96a23b0ae16df519efa076f Auto-Submitted: auto-generated The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=3b5b6c2798e3e59ae96a23b0ae16df519efa076f commit 3b5b6c2798e3e59ae96a23b0ae16df519efa076f Author: Matthias Andree AuthorDate: 2024-07-21 15:29:03 +0000 Commit: Matthias Andree CommitDate: 2024-07-21 16:02:27 +0000 py-borgbackup: Upgrade to 1.4.0, preserving 1.2.8 as py-borgbackup12 ...and mentioning it in MOVED so that the upgrade path is clear. ChangeLog: https://www.borgbackup.org/releases/borg-1.4.html --- MOVED | 1 + archivers/Makefile | 1 + archivers/py-borgbackup/Makefile | 8 ++-- archivers/py-borgbackup/distinfo | 6 +-- archivers/py-borgbackup/pkg-plist | 1 + archivers/py-borgbackup11/Makefile | 3 ++ archivers/py-borgbackup12/Makefile | 73 +++++++++++++++++++++++++++++++++++ archivers/py-borgbackup12/distinfo | 3 ++ archivers/py-borgbackup12/pkg-descr | 9 +++++ archivers/py-borgbackup12/pkg-message | 32 +++++++++++++++ archivers/py-borgbackup12/pkg-plist | 35 +++++++++++++++++ 11 files changed, 165 insertions(+), 7 deletions(-) diff --git a/MOVED b/MOVED index f7564a104fd2..09d0a998d0bb 100644 --- a/MOVED +++ b/MOVED @@ -3401,3 +3401,4 @@ textproc/rubygem-nokogiri111|textproc/rubygem-nokogiri|2024-07-17|Obsolete, use devel/rubygem-google-gax||2024-07-21|Remove obsoleted port. This gem is officially end-of-life audio/strawberry@qt5|audio/strawberry|2024-07-21|Unflavor. Qt5 is obsolete audio/strawberry@qt6|audio/strawberry|2024-07-21|Unflavor. Qt5 is obsolete +archivers/py-borgbackup|archivers/py-borgbackup12|2024-07-21|Borgbackup released a new stable version 1.4.0 diff --git a/archivers/Makefile b/archivers/Makefile index 54ccaf3f66b3..46d216a9e410 100644 --- a/archivers/Makefile +++ b/archivers/Makefile @@ -183,6 +183,7 @@ SUBDIR += py-blosc2 SUBDIR += py-borgbackup SUBDIR += py-borgbackup11 + SUBDIR += py-borgbackup12 SUBDIR += py-brotli SUBDIR += py-brotlicffi SUBDIR += py-brotlipy diff --git a/archivers/py-borgbackup/Makefile b/archivers/py-borgbackup/Makefile index 0da3be670eb8..34be7f812f9a 100644 --- a/archivers/py-borgbackup/Makefile +++ b/archivers/py-borgbackup/Makefile @@ -1,6 +1,6 @@ PORTNAME= borgbackup -DISTVERSION= 1.2.8 -PORTREVISION= 1 +DISTVERSION= 1.4.0 +PORTREVISION= 0 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.8_99:devel/py-msgpack@${PY_FLAVOR} +_BB_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack>=1.0.2<1.1.0: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 \ @@ -27,7 +27,7 @@ TEST_DEPENDS= ${RUN_DEPENDS} \ ${PYTHON_PKGNAMEPREFIX}pkgconfig>=0:devel/py-pkgconfig@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} \ fakeroot:security/fakeroot -USES= pkgconfig python ssl +USES= pkgconfig python:3.9+ ssl USE_PYTHON= autoplist distutils MAKE_ENV= BORG_OPENSSL_PREFIX=${OPENSSLBASE} diff --git a/archivers/py-borgbackup/distinfo b/archivers/py-borgbackup/distinfo index 050f395e4118..2c8ffe4a7bca 100644 --- a/archivers/py-borgbackup/distinfo +++ b/archivers/py-borgbackup/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1711803798 -SHA256 (borgbackup-1.2.8.tar.gz) = d39d22b0d2cb745584d68608a179b6c75f7b40e496e96feb789e41d34991f4aa -SIZE (borgbackup-1.2.8.tar.gz) = 4369117 +TIMESTAMP = 1721573353 +SHA256 (borgbackup-1.4.0.tar.gz) = c54c45155643fa66fed7f9ff2d134ea0a58d0ac197c18781ddc2fb236bf6ed29 +SIZE (borgbackup-1.4.0.tar.gz) = 3798511 diff --git a/archivers/py-borgbackup/pkg-plist b/archivers/py-borgbackup/pkg-plist index 8582338afb36..be93d9bf9606 100644 --- a/archivers/py-borgbackup/pkg-plist +++ b/archivers/py-borgbackup/pkg-plist @@ -30,6 +30,7 @@ share/man/man1/borg-rename.1.gz share/man/man1/borg-serve.1.gz share/man/man1/borg-umount.1.gz share/man/man1/borg-upgrade.1.gz +share/man/man1/borg-version.1.gz share/man/man1/borg-with-lock.1.gz share/man/man1/borg.1.gz share/man/man1/borgfs.1.gz diff --git a/archivers/py-borgbackup11/Makefile b/archivers/py-borgbackup11/Makefile index ba593f705f1f..b3d3d026354d 100644 --- a/archivers/py-borgbackup11/Makefile +++ b/archivers/py-borgbackup11/Makefile @@ -13,6 +13,9 @@ WWW= https://pypi.org/project/borgbackup/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE +DEPRECATED= No longer supported upstream, use borgbackup 1.2 (oldstable) or 1.4 (stable) instead. +EXPIRATION_DATE=2024-09-30 + BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=1.7:devel/py-setuptools-scm@${PY_FLAVOR} LIB_DEPENDS= liblz4.so:archivers/liblz4 \ libzstd.so:archivers/zstd \ diff --git a/archivers/py-borgbackup12/Makefile b/archivers/py-borgbackup12/Makefile new file mode 100644 index 000000000000..fd980609b8a9 --- /dev/null +++ b/archivers/py-borgbackup12/Makefile @@ -0,0 +1,73 @@ +PORTNAME= borgbackup +DISTVERSION= 1.2.8 +PORTREVISION= 1 +CATEGORIES= archivers python +MASTER_SITES= PYPI +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMESUFFIX= 12 + +MAINTAINER= mandree@FreeBSD.org +COMMENT= Deduplicating backup program +WWW= https://pypi.org/project/borgbackup/ + +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} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=1.7:devel/py-setuptools-scm@${PY_FLAVOR} \ + ${_BB_DEPENDS} +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} \ + ${_BB_DEPENDS} +TEST_DEPENDS= ${RUN_DEPENDS} \ + ${PYTHON_PKGNAMEPREFIX}tox>3.2:devel/py-tox@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}virtualenv>=0:devel/py-virtualenv@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pkgconfig>=0:devel/py-pkgconfig@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} \ + fakeroot:security/fakeroot +USES= pkgconfig python ssl +USE_PYTHON= autoplist distutils +MAKE_ENV= BORG_OPENSSL_PREFIX=${OPENSSLBASE} + +OPTIONS_DEFINE= FUSE +OPTIONS_DEFAULT= FUSE + +FUSE_DESC= Support to mount locally borg backup files +FUSE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}llfuse>0:devel/py-llfuse@${PY_FLAVOR} + +_BORGHOME=${WRKDIR}/testhome +_BORGENV=-i BORG_PASSPHRASE=secret123 PYTHONPATH=${STAGEDIR}${PYTHON_SITELIBDIR} HOME=${_BORGHOME} +post-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/share/man/man1/ + ${INSTALL_MAN} ${WRKSRC}/docs/man/* ${STAGEDIR}${PREFIX}/share/man/man1/ + ${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/borg/ -name "*.so" \ + -exec ${STRIP_CMD} {} \; + @${ECHO_MSG} "----> running borg smoke tests" + ${MKDIR} ${_BORGHOME} + ${SETENV} PYTHONPATH=${STAGEDIR}${PYTHON_SITELIBDIR} ${STAGEDIR}${PREFIX}/bin/borg -V + ${RM} -r ${WRKDIR}/borgrepo + ${SETENV} ${_BORGENV} ${STAGEDIR}${PREFIX}/bin/borg init --encryption=repokey ${WRKDIR}/borgrepo + ${SETENV} ${_BORGENV} ${STAGEDIR}${PREFIX}/bin/borg key export ${WRKDIR}/borgrepo + ${SETENV} ${_BORGENV} ${STAGEDIR}${PREFIX}/bin/borg create ${WRKDIR}/borgrepo::test1 ${WRKSRC} + ${SETENV} ${_BORGENV} ${STAGEDIR}${PREFIX}/bin/borg create ${WRKDIR}/borgrepo::test2 ${WRKSRC} ${STAGEDIR} + ${SETENV} ${_BORGENV} ${STAGEDIR}${PREFIX}/bin/borg check --verify-data ${WRKDIR}/borgrepo + ${SETENV} ${_BORGENV} ${STAGEDIR}${PREFIX}/bin/borg info ${WRKDIR}/borgrepo + ${SETENV} ${_BORGENV} ${STAGEDIR}${PREFIX}/bin/borg prune --keep-last 1 ${WRKDIR}/borgrepo + ${SETENV} ${_BORGENV} ${STAGEDIR}${PREFIX}/bin/borg check --verify-data ${WRKDIR}/borgrepo + ${ECHO_CMD} YES \ + | ${SETENV} ${_BORGENV} ${STAGEDIR}${PREFIX}/bin/borg check --repair ${WRKDIR}/borgrepo + ${SETENV} ${_BORGENV} ${STAGEDIR}${PREFIX}/bin/borg compact --progress ${WRKDIR}/borgrepo + ${SETENV} ${_BORGENV} ${STAGEDIR}${PREFIX}/bin/borg check --verify-data ${WRKDIR}/borgrepo + ${SETENV} ${_BORGENV} ${STAGEDIR}${PREFIX}/bin/borg extract --dry-run --progress ${WRKDIR}/borgrepo::test2 + ${SETENV} ${_BORGENV} ${STAGEDIR}${PREFIX}/bin/borg export-tar ${WRKDIR}/borgrepo::test2 - >/dev/null + ${SETENV} ${_BORGENV} ${STAGEDIR}${PREFIX}/bin/borg list ${WRKDIR}/borgrepo + # long output - ${SETENV} ${_BORGENV} ${STAGEDIR}${PREFIX}/bin/borg list ${WRKDIR}/borgrepo::test2 | ${GREP} -v ^d + ${SETENV} ${_BORGENV} ${STAGEDIR}${PREFIX}/bin/borg info ${WRKDIR}/borgrepo + +do-test: + cd ${WRKSRC} && ${SETENV} ${_BORGENV} ${TEST_ENV} tox-${PYTHON_VER} -e ${PY_FLAVOR} -vv + +.include diff --git a/archivers/py-borgbackup12/distinfo b/archivers/py-borgbackup12/distinfo new file mode 100644 index 000000000000..050f395e4118 --- /dev/null +++ b/archivers/py-borgbackup12/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1711803798 +SHA256 (borgbackup-1.2.8.tar.gz) = d39d22b0d2cb745584d68608a179b6c75f7b40e496e96feb789e41d34991f4aa +SIZE (borgbackup-1.2.8.tar.gz) = 4369117 diff --git a/archivers/py-borgbackup12/pkg-descr b/archivers/py-borgbackup12/pkg-descr new file mode 100644 index 000000000000..f2e09ee51b29 --- /dev/null +++ b/archivers/py-borgbackup12/pkg-descr @@ -0,0 +1,9 @@ +[excerpt from borgbackup web site] + +BorgBackup (short: Borg) is a deduplicating backup program. Optionally, it +supports compression and authenticated encryption. + +The main goal of Borg is to provide an efficient and secure way to backup data. +The data deduplication technique used makes Borg suitable for daily backups +since only changes are stored. The authenticated encryption technique makes it +suitable for backups to not fully trusted targets. diff --git a/archivers/py-borgbackup12/pkg-message b/archivers/py-borgbackup12/pkg-message new file mode 100644 index 000000000000..52b4e6aa0e07 --- /dev/null +++ b/archivers/py-borgbackup12/pkg-message @@ -0,0 +1,32 @@ +[ +{ type: install + message: <