Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 7E18684EE1 for ; Mon, 18 Dec 2023 09:28:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id iaVk6fkeW6Ev for ; Mon, 18 Dec 2023 09:28:39 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 37DDE84DA9 for ; Mon, 18 Dec 2023 09:28:39 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 2B87AFA42; Mon, 18 Dec 2023 09:28:39 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1702891719114250" MIME-Version: 1.0 Date: Mon, 18 Dec 2023 09:28:39 +0000 From: =?UTF-8?B?RnLDqWTDqXJpYyBGYXViZXJ0ZWF1?= Subject: CVS commit: pkgsrc/sysutils/duplicity To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: triaxx@netbsd.org X-Mailer: log_accum Message-Id: <20231218092839.2B87AFA42@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1702891719114250 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: triaxx Date: Mon Dec 18 09:28:39 UTC 2023 Modified Files: pkgsrc/sysutils/duplicity: Makefile PLIST distinfo pkgsrc/sysutils/duplicity/patches: patch-duplicity_gpginterface.py Log Message: duplicity: Update to 2.1.4 pkgsrc changes: --------------- * Update HOMEPAGE. * Add dependencies for some backends. * Fix SUBST messages. upstream changes: ----------------- * Lot of changes: http://duplicity.us/stable/CHANGELOG.html To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.61 pkgsrc/sysutils/duplicity/Makefile cvs rdiff -u -r1.18 -r1.19 pkgsrc/sysutils/duplicity/PLIST cvs rdiff -u -r1.30 -r1.31 pkgsrc/sysutils/duplicity/distinfo cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/sysutils/duplicity/patches/patch-duplicity_gpginterface.py Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1702891719114250 Content-Disposition: inline Content-Length: 12634 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/sysutils/duplicity/Makefile diff -u pkgsrc/sysutils/duplicity/Makefile:1.60 pkgsrc/sysutils/duplicity/Makefile:1.61 --- pkgsrc/sysutils/duplicity/Makefile:1.60 Tue Nov 7 22:38:04 2023 +++ pkgsrc/sysutils/duplicity/Makefile Mon Dec 18 09:28:38 2023 @@ -1,18 +1,18 @@ -# $NetBSD: Makefile,v 1.60 2023/11/07 22:38:04 wiz Exp $ +# $NetBSD: Makefile,v 1.61 2023/12/18 09:28:38 triaxx Exp $ -DISTNAME= duplicity-0.8.20 -PKGREVISION= 4 +DISTNAME= duplicity-2.1.4 CATEGORIES= sysutils net python MASTER_SITES= ${MASTER_SITE_PYPI:=d/duplicity/} MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= https://www.nongnu.org/duplicity/ +HOMEPAGE= https://duplicity.us/ COMMENT= Remote encrypting incremental backup utility LICENSE= gnu-gpl-v2 USE_PKGLOCALEDIR= yes -TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm +TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools>=44.1.1:../../devel/py-setuptools +TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=5.0.2:../../devel/py-setuptools_scm DEPENDS+= ${PYPKGPREFIX}-fasteners-[0-9]*:../../devel/py-fasteners DEPENDS+= ${PYPKGPREFIX}-future-[0-9]*:../../devel/py-future @@ -20,11 +20,18 @@ GPGPATH= ${PREFIX}/bin/gpg2 DEPENDS+= gnupg2-[0-9]*:../../security/gnupg2 DEPENDS+= lftp-[0-9]*:../../net/lftp DEPENDS+= ${PYPKGPREFIX}-boto3-[0-9]*:../../net/py-boto3 +DEPENDS+= ${PYPKGPREFIX}-botocore-[0-9]*:../../net/py-botocore DEPENDS+= ${PYPKGPREFIX}-dropbox-[0-9]*:../../net/py-dropbox +DEPENDS+= ${PYPKGPREFIX}-fasteners-[0-9]*:../../devel/py-fasteners +DEPENDS+= ${PYPKGPREFIX}-google-api-python-client-[0-9]*:../../www/py-google-api-python-client +DEPENDS+= ${PYPKGPREFIX}-google-auth-oauthlib-[0-9]*:../../security/py-google-auth-oauthlib +DEPENDS+= ${PYPKGPREFIX}-httplib2-[0-9]*:../../www/py-httplib2 +DEPENDS+= ${PYPKGPREFIX}-lxml-[0-9]*:../../textproc/py-lxml DEPENDS+= ${PYPKGPREFIX}-paramiko-[0-9]*:../../security/py-paramiko +DEPENDS+= ${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests DEPENDS+= ${PYPKGPREFIX}-requests-oauthlib-[0-9]*:../../security/py-requests-oauthlib DEPENDS+= ${PYPKGPREFIX}-swiftclient-[0-9]*:../../www/py-swiftclient -TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock +TEST_DEPENDS+= ${PYPKGPREFIX}-mock>=3.0.5:../../devel/py-mock TEST_DEPENDS+= ${PYPKGPREFIX}-pexpect-[0-9]*:../../devel/py-pexpect TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test TEST_DEPENDS+= ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner @@ -38,13 +45,14 @@ USE_PKG_RESOURCES= yes SUBST_CLASSES+= fix-paths SUBST_STAGE.fix-paths= pre-configure -SUBST_MESSAGE.fix-paths= fixing hard coded dirs +SUBST_MESSAGE.fix-paths= Fixing hard coded directories SUBST_FILES.fix-paths= setup.py SUBST_SED.fix-paths= -e 's,share/man/man1,${PKGMANDIR}/man1,' SUBST_SED.fix-paths+= -e 's,share/locale,${PKGLOCALEDIR}/locale,' SUBST_CLASSES+= gpgpath SUBST_STAGE.gpgpath= pre-configure +SUBST_MESSAGE.gpgpath= Fixing path of GnuPG SUBST_FILES.gpgpath= duplicity/gpginterface.py SUBST_VARS.gpgpath= GPGPATH Index: pkgsrc/sysutils/duplicity/PLIST diff -u pkgsrc/sysutils/duplicity/PLIST:1.18 pkgsrc/sysutils/duplicity/PLIST:1.19 --- pkgsrc/sysutils/duplicity/PLIST:1.18 Fri Apr 30 07:03:28 2021 +++ pkgsrc/sysutils/duplicity/PLIST Mon Dec 18 09:28:38 2023 @@ -1,6 +1,5 @@ -@comment $NetBSD: PLIST,v 1.18 2021/04/30 07:03:28 adam Exp $ +@comment $NetBSD: PLIST,v 1.19 2023/12/18 09:28:38 triaxx Exp $ bin/duplicity -bin/rdiffdir ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt @@ -11,6 +10,9 @@ ${PYSITELIB}/duplicity/__init__.pyc ${PYSITELIB}/duplicity/__init__.pyo ${PYSITELIB}/duplicity/_librsync.so ${PYSITELIB}/duplicity/_librsyncmodule.c +${PYSITELIB}/duplicity/argparse311.py +${PYSITELIB}/duplicity/argparse311.pyc +${PYSITELIB}/duplicity/argparse311.pyo ${PYSITELIB}/duplicity/asyncscheduler.py ${PYSITELIB}/duplicity/asyncscheduler.pyc ${PYSITELIB}/duplicity/asyncscheduler.pyo @@ -21,12 +23,6 @@ ${PYSITELIB}/duplicity/backends/README ${PYSITELIB}/duplicity/backends/__init__.py ${PYSITELIB}/duplicity/backends/__init__.pyc ${PYSITELIB}/duplicity/backends/__init__.pyo -${PYSITELIB}/duplicity/backends/_boto_multi.py -${PYSITELIB}/duplicity/backends/_boto_multi.pyc -${PYSITELIB}/duplicity/backends/_boto_multi.pyo -${PYSITELIB}/duplicity/backends/_boto_single.py -${PYSITELIB}/duplicity/backends/_boto_single.pyc -${PYSITELIB}/duplicity/backends/_boto_single.pyo ${PYSITELIB}/duplicity/backends/_cf_cloudfiles.py ${PYSITELIB}/duplicity/backends/_cf_cloudfiles.pyc ${PYSITELIB}/duplicity/backends/_cf_cloudfiles.pyo @@ -126,9 +122,9 @@ ${PYSITELIB}/duplicity/backends/rsyncbac ${PYSITELIB}/duplicity/backends/s3_boto3_backend.py ${PYSITELIB}/duplicity/backends/s3_boto3_backend.pyc ${PYSITELIB}/duplicity/backends/s3_boto3_backend.pyo -${PYSITELIB}/duplicity/backends/s3_boto_backend.py -${PYSITELIB}/duplicity/backends/s3_boto_backend.pyc -${PYSITELIB}/duplicity/backends/s3_boto_backend.pyo +${PYSITELIB}/duplicity/backends/slatebackend.py +${PYSITELIB}/duplicity/backends/slatebackend.pyc +${PYSITELIB}/duplicity/backends/slatebackend.pyo ${PYSITELIB}/duplicity/backends/ssh_paramiko_backend.py ${PYSITELIB}/duplicity/backends/ssh_paramiko_backend.pyc ${PYSITELIB}/duplicity/backends/ssh_paramiko_backend.pyo @@ -147,12 +143,21 @@ ${PYSITELIB}/duplicity/backends/tahoebac ${PYSITELIB}/duplicity/backends/webdavbackend.py ${PYSITELIB}/duplicity/backends/webdavbackend.pyc ${PYSITELIB}/duplicity/backends/webdavbackend.pyo +${PYSITELIB}/duplicity/backends/xorrisobackend.py +${PYSITELIB}/duplicity/backends/xorrisobackend.pyc +${PYSITELIB}/duplicity/backends/xorrisobackend.pyo ${PYSITELIB}/duplicity/cached_ops.py ${PYSITELIB}/duplicity/cached_ops.pyc ${PYSITELIB}/duplicity/cached_ops.pyo -${PYSITELIB}/duplicity/commandline.py -${PYSITELIB}/duplicity/commandline.pyc -${PYSITELIB}/duplicity/commandline.pyo +${PYSITELIB}/duplicity/cli_data.py +${PYSITELIB}/duplicity/cli_data.pyc +${PYSITELIB}/duplicity/cli_data.pyo +${PYSITELIB}/duplicity/cli_main.py +${PYSITELIB}/duplicity/cli_main.pyc +${PYSITELIB}/duplicity/cli_main.pyo +${PYSITELIB}/duplicity/cli_util.py +${PYSITELIB}/duplicity/cli_util.pyc +${PYSITELIB}/duplicity/cli_util.pyo ${PYSITELIB}/duplicity/config.py ${PYSITELIB}/duplicity/config.pyc ${PYSITELIB}/duplicity/config.pyo @@ -232,49 +237,56 @@ ${PYSITELIB}/duplicity/util.py ${PYSITELIB}/duplicity/util.pyc ${PYSITELIB}/duplicity/util.pyo man/man1/duplicity.1 -man/man1/rdiffdir.1 -share/doc/${PKGNAME}/AUTHORS share/doc/${PKGNAME}/CHANGELOG.md +share/doc/${PKGNAME}/CONTRIBUTING.md share/doc/${PKGNAME}/COPYING share/doc/${PKGNAME}/README-LOG.md share/doc/${PKGNAME}/README-REPO.md share/doc/${PKGNAME}/README-TESTING.md share/doc/${PKGNAME}/README.md -share/locale/bg/LC_MESSAGES/duplicity.mo -share/locale/bs/LC_MESSAGES/duplicity.mo -share/locale/ca/LC_MESSAGES/duplicity.mo -share/locale/ca@valencia/LC_MESSAGES/duplicity.mo -share/locale/cs/LC_MESSAGES/duplicity.mo -share/locale/de/LC_MESSAGES/duplicity.mo -share/locale/el/LC_MESSAGES/duplicity.mo +share/locale/af_ZA/LC_MESSAGES/duplicity.mo +share/locale/ar_SA/LC_MESSAGES/duplicity.mo +share/locale/ca_ES/LC_MESSAGES/duplicity.mo +share/locale/cs_CZ/LC_MESSAGES/duplicity.mo +share/locale/da_DK/LC_MESSAGES/duplicity.mo +share/locale/de_AT/LC_MESSAGES/duplicity.mo +share/locale/de_DE/LC_MESSAGES/duplicity.mo +share/locale/el_GR/LC_MESSAGES/duplicity.mo share/locale/en_AU/LC_MESSAGES/duplicity.mo share/locale/en_GB/LC_MESSAGES/duplicity.mo -share/locale/eo/LC_MESSAGES/duplicity.mo -share/locale/es/LC_MESSAGES/duplicity.mo -share/locale/fi/LC_MESSAGES/duplicity.mo -share/locale/fr/LC_MESSAGES/duplicity.mo -share/locale/gl/LC_MESSAGES/duplicity.mo -share/locale/he/LC_MESSAGES/duplicity.mo -share/locale/hu/LC_MESSAGES/duplicity.mo -share/locale/id/LC_MESSAGES/duplicity.mo -share/locale/io/LC_MESSAGES/duplicity.mo -share/locale/it/LC_MESSAGES/duplicity.mo -share/locale/ja/LC_MESSAGES/duplicity.mo -share/locale/km/LC_MESSAGES/duplicity.mo -share/locale/ms/LC_MESSAGES/duplicity.mo -share/locale/nb/LC_MESSAGES/duplicity.mo -share/locale/nl/LC_MESSAGES/duplicity.mo -share/locale/oc/LC_MESSAGES/duplicity.mo -share/locale/pl/LC_MESSAGES/duplicity.mo -share/locale/pt/LC_MESSAGES/duplicity.mo +share/locale/en_PR/LC_MESSAGES/duplicity.mo +share/locale/en_US/LC_MESSAGES/duplicity.mo +share/locale/es_EM/LC_MESSAGES/duplicity.mo +share/locale/es_ES/LC_MESSAGES/duplicity.mo +share/locale/es_MX/LC_MESSAGES/duplicity.mo +share/locale/es_PR/LC_MESSAGES/duplicity.mo +share/locale/es_US/LC_MESSAGES/duplicity.mo +share/locale/fi_FI/LC_MESSAGES/duplicity.mo +share/locale/fr_FR/LC_MESSAGES/duplicity.mo +share/locale/he_IL/LC_MESSAGES/duplicity.mo +share/locale/hu_HU/LC_MESSAGES/duplicity.mo +share/locale/it_IT/LC_MESSAGES/duplicity.mo +share/locale/ja_JP/LC_MESSAGES/duplicity.mo +share/locale/ko_KR/LC_MESSAGES/duplicity.mo +share/locale/nl_BE/LC_MESSAGES/duplicity.mo +share/locale/nl_NL/LC_MESSAGES/duplicity.mo +share/locale/nl_SR/LC_MESSAGES/duplicity.mo +share/locale/no_NO/LC_MESSAGES/duplicity.mo +share/locale/pl_PL/LC_MESSAGES/duplicity.mo share/locale/pt_BR/LC_MESSAGES/duplicity.mo -share/locale/ru/LC_MESSAGES/duplicity.mo -share/locale/sl/LC_MESSAGES/duplicity.mo -share/locale/sq/LC_MESSAGES/duplicity.mo -share/locale/sr/LC_MESSAGES/duplicity.mo -share/locale/sv/LC_MESSAGES/duplicity.mo -share/locale/tr/LC_MESSAGES/duplicity.mo -share/locale/ug/LC_MESSAGES/duplicity.mo -share/locale/uk/LC_MESSAGES/duplicity.mo +share/locale/pt_PT/LC_MESSAGES/duplicity.mo +share/locale/ro_RO/LC_MESSAGES/duplicity.mo +share/locale/ru_BY/LC_MESSAGES/duplicity.mo +share/locale/ru_MD/LC_MESSAGES/duplicity.mo +share/locale/ru_RU/LC_MESSAGES/duplicity.mo +share/locale/ru_UA/LC_MESSAGES/duplicity.mo +share/locale/sr_SP/LC_MESSAGES/duplicity.mo +share/locale/sv_SE/LC_MESSAGES/duplicity.mo +share/locale/tr_TR/LC_MESSAGES/duplicity.mo +share/locale/uk_UA/LC_MESSAGES/duplicity.mo +share/locale/vi_VN/LC_MESSAGES/duplicity.mo share/locale/zh_CN/LC_MESSAGES/duplicity.mo +share/locale/zh_HK/LC_MESSAGES/duplicity.mo +share/locale/zh_MO/LC_MESSAGES/duplicity.mo +share/locale/zh_SG/LC_MESSAGES/duplicity.mo share/locale/zh_TW/LC_MESSAGES/duplicity.mo Index: pkgsrc/sysutils/duplicity/distinfo diff -u pkgsrc/sysutils/duplicity/distinfo:1.30 pkgsrc/sysutils/duplicity/distinfo:1.31 --- pkgsrc/sysutils/duplicity/distinfo:1.30 Tue Oct 26 11:19:32 2021 +++ pkgsrc/sysutils/duplicity/distinfo Mon Dec 18 09:28:38 2023 @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.30 2021/10/26 11:19:32 nia Exp $ +$NetBSD: distinfo,v 1.31 2023/12/18 09:28:38 triaxx Exp $ -BLAKE2s (duplicity-0.8.20.tar.gz) = 562e966f61a4b4dafadf92c797e36c28f19fa04ea2dc73a4ac9dcca8658f347b -SHA512 (duplicity-0.8.20.tar.gz) = 4feaaa02bbf52caff7e56784cd5a8c8d325c803299c642a1928052f2a4330eedd156897df3c9f550cba650bc572220f0127cac3ee390aad9656e1e1d85b4b59d -Size (duplicity-0.8.20.tar.gz) = 1364900 bytes -SHA1 (patch-duplicity_gpginterface.py) = 3d765f1666f44bbf8cb535cba37b76f914ffdd93 +BLAKE2s (duplicity-2.1.4.tar.gz) = 616be498842857eff4114cbac5f8cb3552c5a0737daa598fbdb7439ab1d65212 +SHA512 (duplicity-2.1.4.tar.gz) = 91804c6f4dc13d700cbe4747317f9611f530996de8a22a0907d714fb6f8a7fadc3371c270a2257c24324c0233bb4501a4b7d33aea7631862568c8530f7173ef1 +Size (duplicity-2.1.4.tar.gz) = 1556341 bytes +SHA1 (patch-duplicity_gpginterface.py) = 2fdf1cec8d069380be4802dd14ed7baaeb0c5929 Index: pkgsrc/sysutils/duplicity/patches/patch-duplicity_gpginterface.py diff -u pkgsrc/sysutils/duplicity/patches/patch-duplicity_gpginterface.py:1.1 pkgsrc/sysutils/duplicity/patches/patch-duplicity_gpginterface.py:1.2 --- pkgsrc/sysutils/duplicity/patches/patch-duplicity_gpginterface.py:1.1 Thu Feb 11 10:40:35 2021 +++ pkgsrc/sysutils/duplicity/patches/patch-duplicity_gpginterface.py Mon Dec 18 09:28:38 2023 @@ -1,15 +1,15 @@ -$NetBSD: patch-duplicity_gpginterface.py,v 1.1 2021/02/11 10:40:35 adam Exp $ +$NetBSD: patch-duplicity_gpginterface.py,v 1.2 2023/12/18 09:28:38 triaxx Exp $ Provide path to gpg. ---- duplicity/gpginterface.py.orig 2020-11-18 20:05:43.000000000 +0000 +--- duplicity/gpginterface.py.orig 2023-10-10 16:25:32.000000000 +0000 +++ duplicity/gpginterface.py -@@ -286,7 +286,7 @@ class GnuPG(object): +@@ -282,7 +282,7 @@ class GnuPG(object): """ def __init__(self): -- self.call = u'gpg' -+ self.call = u'@GPGPATH@' +- self.call = "gpg" ++ self.call = "@GPGPATH@" self.passphrase = None self.options = Options() --_----------=_1702891719114250--