pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/sysutils/duplicity



Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Feb 11 10:40:35 UTC 2021

Modified Files:
        pkgsrc/sysutils/duplicity: Makefile PLIST distinfo options.mk
Added Files:
        pkgsrc/sysutils/duplicity/patches: patch-duplicity_gpginterface.py
Removed Files:
        pkgsrc/sysutils/duplicity/patches: patch-aa

Log Message:
duplicity: updated to 0.8.18

rel.0.8.18 (2021-01-09)

Other
* Merge branch 'onedrive-token' into 'master' [Kenneth Loafman]
* Onedrive: Support using an external client id / refresh token. [Michael Terry]
* Update .gitlab-ci.yml to need code test to pass. [Kenneth Loafman]
* Merge branch 'master' of git%gitlab.com@localhost:duplicity/duplicity.git. [Kenneth Loafman]
* Fix issue 26 Backend b2 backblaze fails with nameprefix restrictions. [Kenneth Loafman]
* Fix issue 29 Backend b2 backblaze fails with nameprefix restrictions. [Kenneth Loafman]
* Fix unadorned strings. [Kenneth Loafman]
* Merge branch 'Rufflewind-master-patch-11811' into 'master' [Kenneth Loafman]
* Report errors if B2 backend does exist but otherwise fails to import. [Phil Ruffwind]
* Add report.xml. [Kenneth Loafman]
* Remove basepython in code and coverage tests. [Kenneth Loafman]
* Fix pep8 warning. [Kenneth Loafman]
* Added option --log-timestamp to prepend timestamp to log entry. [Kenneth Loafman]
* Merge branch 'master' of gitlab.com:duplicity/duplicity. [Kenneth Loafman]
* Merge branch 'master' into 'master' [Kenneth Loafman]
* Improve. [Gwyn Ciesla]
* Change version for LP. [Kenneth Loafman]
* Change version for LP. [Kenneth Loafman]
* Improve patch for Python 3.10. [Gwyn Ciesla]
* Conditionalize for Python version. [Gwyn Ciesla]
* Patch for Python 3.10. [Gwyn Ciesla]

rel.0.8.17 (2020-11-11)

Other
* Fixup ignore\_regexps for optional text. [Kenneth Loafman]
* Fix issue 26 (again) - duplicity does not clean up par2 files. [Kenneth Loafman]
* Fix issue 26 - duplicity does not clean up par2 files. [Kenneth Loafman]
* Fix issue 25 - Multibackend not deleting files. [Kenneth Loafman]
* Adjust setup.py for changelog changes. [Kenneth Loafman]
* Delete previous manual changelogs. [Kenneth Loafman]
* Tools to make a CHANGELOG.md from git commits. [Kenneth Loafman]
* Merge branch 'exc-if-present-robust' into 'master' [Kenneth Loafman]
* Make exclude-if-present more robust. [Michael Terry]
* Merge branch 'no-umask' into 'master' [Kenneth Loafman]
* Drop default umask of 0077. [Michael Terry]
* Comment out RsyncBackendTest, again. [Kenneth Loafman]
* Fix some unadorned strings. [Kenneth Loafman]
* Fixed RsyncBackendTeest with proper URL. [Kenneth Loafman]
* Merge branch 'Yump-issue-23' into 'master' [Kenneth Loafman]
* Fix issue 23. [Yump]
* Rclonebackend now logs at the same logging level as duplicity. [Kenneth Loafman]
* Allow sign-build to fail on walk away.  Need passwordless option. [Kenneth Loafman]
* Merge branch 'fix-rename' into 'master' [Kenneth Loafman]
* Fix --rename typo. [Michael Terry]
* Move back to VM build, not remote.  Too many issues with remote. [Kenneth Loafman]
* Merge branch 'escape-quote' into 'master' [Kenneth Loafman]
* Escape single quotes in machine-readable log messages. [Michael Terry]
* Uncomment review-tools for snap. [Kenneth Loafman]
* Whoops, missing wildcard '*'. [Kenneth Loafman]
* Changes to allow remote build of snap on LP. [Kenneth Loafman]
* Changes to allow remote build of snap on LP. [Kenneth Loafman]
* Add a pylint disable-import-error flag. [Kenneth Loafman]
* Change urllib2 to urllib.request in parse\_digest\_challenge(). [Kenneth Loafman]
* Fix Python 3.9 test in .gitlab-ci.yaml. [Kenneth Loafman]
* Fix Python 3.9 test in .gitlab-ci.yaml. [Kenneth Loafman]
* Add Python 3.9 to .gitlab-ci.yaml. [Kenneth Loafman]
* Add Python 3.9 to the test suite.  It tests sucessfuly. [Kenneth Loafman]
* Fix bug 1893481 again for Python2.  Missed include. [Kenneth Loafman]
* Fix bug 1893481 Error when logging improperly encoded filenames. [Kenneth Loafman]
* Change version for LP. [Kenneth Loafman]

rel.0.8.16 (2020-09-29)

Other
* Merged in s3-unfreeze-all. [Kenneth Loafman]
* Merge branch 's3-unfreeze-all' into 'master' [Kenneth Loafman]
* Wait for Glacier batch unfreeze to finish. [Marco Herrn]
* Adorn string as unicode. [Marco Herrn]
* Utilize ThreadPoolExecutor for S3 glacier unfreeze. [Marco Herrn]
* Refine codestyle according to PEP-8. [Marco Herrn]
* Adorn strings as unicode. [Marco Herrn]
* S3 unfreeze all files at once. [Marco Herrn]
* Add boto3 to list of requirements. [Kenneth Loafman]
* Remove ancient CVS Id macro. [Kenneth Loafman]
* Merged in OutlawPlz:paramiko-progress. [Kenneth Loafman]
* Merge branch 'paramiko-progress' into 'master' [Kenneth Loafman]
* Fixes paramiko backend progress bar. [Matteo Palazzo]
* Merged in lazy init for Boto3 network connections. [Kenneth Loafman]
* Merge branch 'feature/lazy\_init\_boto3' into 'master' [Kenneth Loafman]
* Initial crack at lazy init for Boto3. [Carl Alexander Adams]
* Merge branch 'hostname' into 'master' [Kenneth Loafman]
* Record the hostname, not the fqdn, in manifest files. [Michael Terry]
* Merge branch 'listdir-contains' into 'master' [Kenneth Loafman]
* Avoid calling stat when checking for exclude-if-present files. [Michael Terry]
* Fix build control files after markdown conversion. [Kenneth Loafman]
* Recover some changes lost after using web-ide. [Kenneth Loafman]
* Paperwork. [Kenneth Loafman]
* Merge branch 's3-boto3-region-and-endpoint' into 'master' [Kenneth Loafman]
* Set default values for s3\_region\_name and s3\_endpoint\_url. [Marco Herrn]
* Allow setting s3 region and endpoint. [Marco Herrn]
* Update README-REPO.md. [Kenneth Loafman]
* Make code view consistent. [Kenneth Loafman]
* Update setup.py. [Kenneth Loafman]
* Update README.md. [Kenneth Loafman]
* Paperwork. [Kenneth Loafman]
* Revert "Merge branch 's3-boto3-region-and-endpoint' into 'master'" [Kenneth Loafman]
* Bump version for LP dev build. [Kenneth Loafman]

rel.0.8.15 (2020-07-27)

Other
* Always paperwork. [Kenneth Loafman]
* Merge branch 's3-boto3-region-and-endpoint' into 'master' [Kenneth Loafman]
* Allow setting s3 region and endpoint. [Marco Herrn]
* Merge branch 'pydrive-notfound' into 'master' [Kenneth Loafman]
* Fix missing FileNotUploadedError in pydrive backend. [Martin Sucha]
* Merge branch 'pydriveshared' into 'master' [Kenneth Loafman]
* Fixed indentation. [Joshua Chan]
* Added shared drive support to existing `pydrive` backend instead of a new backend. [Joshua Chan]
* PydriveShared backend is identical to Pydrive backend, except that it works on shared drives rather than personal drives. [Joshua Chan]
* Include the query when parsing the backend URL string, so users can use it to pass supplementary info to the backend. [Joshua Chan]
* Fix caps on X-Python-Version. [Kenneth Loafman]
* Fix issue 10 - ppa:duplicity-*-git fails to install on Focal Fossa. [Kenneth Loafman]
* Merge branch 'patch-2' into 'master' [Kenneth Loafman]
* Remove python-cloudfiles from suggestions. [Jairo Llopis]
* Merge branch 'patch-1' into 'master' [Kenneth Loafman]
* Update azure requirement. [Jairo Llopis]
* Fix bug 1211481 with merge from Raffaele Di Campli. [Kenneth Loafman]
* Merge branch 'master' into 'master' [Kenneth Loafman]
* Added `--do-not-restore-ownership` option. [Jacotsu]
* Fix bug 1887689 with patch from Matthew Barry. [Kenneth Loafman]
* Bump version for LP build. [Kenneth Loafman]
* Merge branch 'fix-glacier-check' into 'master' [Kenneth Loafman]
* Fix check for s3 glacier/deep. [Michael Terry]
* Change from push to upload. [Kenneth Loafman]
* Add specific version for six. [Kenneth Loafman]

rel.0.8.14 (2020-07-04)

Other
* Set deprecation version to 0.9.0 for short filenames. [Kenneth Loafman]
* Fixes for issue 7, par2backend produces badly encoded filenames. [Kenneth Loafman]
* Added a couple of fsdecode calls for issue 7. [Kenneth Loafman]
* Generalize exception for failed get\_version() on LaunchPad. [Kenneth Loafman]
* Ignore *.so files. [Kenneth Loafman]
* Update docs. [Kenneth Loafman]
* Catch up on paperwork. [Kenneth Loafman]
* Merge branch 'mikix/rename-fix' into 'master' [Kenneth Loafman]
* Fix --rename encoding. [Michael Terry]
* Merge remote-tracking branch 'team/fix-py27-testing' [Kenneth Loafman]
* Skip tests failing on py27 under 18.04 (timing error). [Kenneth Loafman]
* Fix code style issue. [Kenneth Loafman]
* Add PATHS\_FROM\_ECLIPSE\_TO\_PYTHON to environ whan starting pydevd. [Kenneth Loafman]
* Add *.pyc to .gitignore. [Kenneth Loafman]
* Replace compilec.py with 'setup.py build\_ext', del compilec.py. [Kenneth Loafman]
* Fix unadorned string. [Kenneth Loafman]
* Fix usage of TOXPYTHON and overrides/bin shebangs. [Kenneth Loafman]
* Use default 'before\_script' for py27. [Kenneth Loafman]
* Don't collect coverage unless needed. [Kenneth Loafman]
* Merge branch 'master' into 'master' [Kenneth Loafman]
* Support PyDrive2 library in the pydrive backend. [Jindrich Makovicka]
* Merge branch 'Tidy\_up\_gitlab\_CI\_doc' into 'master' [Kenneth Loafman]
* Tidy .gitlab-ci.yml, fix py3.5 test, add py2.7 test (allowed to fail) [Aaron Whitehouse]
* Merge branch 'fix-py27-CI' [Kenneth Loafman]
* Test code instead of py27 since py27 is tested elsewhere. [Kenneth Loafman]
* Fix RdiffdirTest to use TOXPYTHON as well. [Kenneth Loafman]
* Set TOXPYTHON before tests. [Kenneth Loafman]
* Put TOXPYTHON in passed environment. [Kenneth Loafman]
* More fixes for bug 1877885 - Catch quota overflow on Mega upload. [Kenneth Loafman]
* More fixes for bug 1877885 - Catch quota overflow on Mega upload. [Kenneth Loafman]
* Undo: Try forcing python version to match tox testing version. [Kenneth Loafman]
* Always upgrade pip. [Kenneth Loafman]
* Try forcing python version to match tox testing version. [Kenneth Loafman]
* Uncomment all tests. [Kenneth Loafman]
* Test just py27 for now. [Kenneth Loafman]
* Replace bzr with git. [Kenneth Loafman]
* Don't load repo version of future, let pip do it. [Kenneth Loafman]
* Hmmm, Gitlab yaml does not like continuation lines.  Fix it. [Kenneth Loafman]
* Fix typo. [Kenneth Loafman]
* Update to use pip as module and add py35 test. [Kenneth Loafman]
* Add py35 to CI tests. [Kenneth Loafman]
* More changes to support Xenial. [Kenneth Loafman]
* Fix typo. [Kenneth Loafman]
* Fix duplicity to run under Python 3.5. [Kenneth Loafman]
* Fix duplicity to run under Python 3.5. [Kenneth Loafman]
* Merge branch 'add\_gitlab\_testing' into 'master' [Kenneth Loafman]
* Update .gitlab-ci.yml to update pip before installing other pip packages (to try to fix more-itertools issue: https://github.com/pytest-dev/pytest/issues/4770 ) [Aaron Whitehouse]
* Don't include .git dir when building docker images. [Kenneth Loafman]
* Merge branch 'update\_pip\_before\_install' into 'master' [Kenneth Loafman]
* Upgrade pip before installing requirements with it. Fixes more-itertools error as newer versions of pip identify that the latest more-itertools are incompatible with python 2. [Aaron Whitehouse]
* Patched in a megav2backend.py to update to MEGAcmd tools. [Kenneth Loafman]
* Change log.Warning to log.Warn.  Whoops! [Kenneth Loafman]
* Fixed bug 1875937 - validate\_encryption\_settings() fails w/S3 glacier. [Kenneth Loafman]
* Restore commented our backend requirements. [Kenneth Loafman]
* Fixes for rclonebackend from Francesco Magno (original author) [Kenneth Loafman]
* Version man pages during setup.py install. [Kenneth Loafman]
* More fixes for Launchpad build limitations. [Kenneth Loafman]
* More fixes for Launchpad build limitations. [Kenneth Loafman]
* Move setuptools\_scm to setup\_requires. [Kenneth Loafman]
* Back off requirements for fallback\_version in setup.py. [Kenneth Loafman]
* Add some requirements for LP build. [Kenneth Loafman]
* Make sure we get six from pip to support dropbox. [Kenneth Loafman]
* Provide fallback\_version for Launchpad builder. [Kenneth Loafman]
* Remove python3-setuptools-scm from setup.py. [Kenneth Loafman]
* Add python3-setuptools-scm to debian/control. [Kenneth Loafman]
* Try variation with hyphen seperator. [Kenneth Loafman]
* Try python3\_setuptools\_scm (apt repo name).  Probably too old. [Kenneth Loafman]
* Add setuptools\_scm to install\_requires. [Kenneth Loafman]

rel.0.8.13 (2020-05-05)

Other
* Fixed release date. [Kenneth Loafman]
* Fixed bug 1876446 - WebDAV backend creates only tiny or 0 Byte files. [Kenneth Loafman]
* Fix to run with --dist-dir command. [Kenneth Loafman]
* Fixed bug 1876778 - byte/str issues in megabackend.py. [Kenneth Loafman]
* Fix to use 'setup.py develop' instead of sdist. [Kenneth Loafman]
* Fix to run with --dist-dir command. [Kenneth Loafman]
* Fixed bug 1875529 - Support hiding instead of deletin on B2. [Kenneth Loafman]
* Uncomment upload and sign. [Kenneth Loafman]
* Reworked versioning to be git tag based. [Kenneth Loafman]
* Migrate bzr to git. [Kenneth Loafman]
* Fixed bug 1872332 - NameError in ssh\_paramiko\_backend.py. [ken]
* Fix spelling error. [ken]
* Fixed bug 1869921 - B2 backup resume fails for TypeError. [ken]
* Merged in lp:\~kenneth-loafman/duplicity/duplicity-pylint   - Enable additional pylint warnings. Make 1st pass at correction.       unused-argument,       unused-wildcard-import,       
redefined-builtin,       bad-indentation,       mixed-indentation,      unreachable   - Renamed globals to config to fix conflict with \_\_builtin\_\_.glogals()   - Resolved conflict between 
duplicity.config and testing.manual.config   - Normalized emacs mode line to have encoding:utf8 on all *.py files. [ken]
* More changes for pylint. * Resolved conflict between duplicity.config and testing.manual.config * Normalized emacs mode line to have encoding:utf8 on all *.py files. [Kenneth Loafman]
* More changes for pylint. * Remove copy.com refs. [Kenneth Loafman]
* More changes for pylint. [Kenneth Loafman]
* More changes for pylint. [Kenneth Loafman]
* Enable additional pylint warnings.  Make 1st pass at correction.   - unused-argument,     unused-wildcard-import,     redefined-builtin,     bad-indentation,     mixed-indentation. [Kenneth Loafman]
* Fixed bug 1868414 - timeout parameter not passed to   BlobService for Azure backend. [Kenneth Loafman]

rel.0.8.12 (2020-03-19)

Other
* Merged in translation updates * Prep for 0.8.12. [Kenneth Loafman]
* Fixed bug 1867742 - TypeError: fsdecode()   takes 1 positional argument but 2 were given   with PCA backend. [Kenneth Loafman]
* Fixed bug 1867529 - UnicodeDecodeError: 'ascii'   codec can't decode byte 0x85 in position 0:   ordinal not in range(128) with PCA. [Kenneth Loafman]
* Fixed bug 1867468 - UnboundLocalError (local   variable 'ch\_err' referenced before assignment)   in ssh\_paramiko\_backend.py. [Kenneth Loafman]
* Fixed bug 1867444 - UnicodeDecodeError: 'ascii'   codec can't decode byte 0x85 in position 0:   ordinal not in range(128) using PCA backend. [Kenneth Loafman]
* Fixed bug 1867435 - TypeError: must be str,   not bytes using PCA backend. [Kenneth Loafman]
* Move pylint config from test\_code to pylintrc. [Kenneth Loafman]
* Cleaned up some setup issues where the man pages   and snapcraft.yaml were not getting versioned. [Kenneth Loafman]
* Fixed bug 1769267 - [enhancement] please consider   using rclone as backend. [Kenneth Loafman]
* Fixed bug 1755955 - best order is unclear,   of exclude-if-present and exclude-device-files   - Removed warning and will now allow these two to     be in any order.  If encountered outside of the   
  first two slots, duplicity will silently move     them to be in the first two slots.  Within those     two slots the order does not matter. [ken]
* Fixed a couple of file history bugs:   - 1044715 Provide a file history feature     + removed neutering done between series   - 1526557 --file-changed does not work     + fixed str/bytes issue 
finding filename. [ken]
* Fixed bug 1865648 - module 'multiprocessing.dummy' has   no attribute 'cpu\_count'.   - replaced with module psutil for cpu\_count() only   - appears Arch Linux does not support multiprocessing. 
[ken]
* Mod to get focal build on LP working. [ken]
* Mod to get focal build on LP working. [ken]
* Mod to get focal build on LP working. [ken]

rel.0.8.11 (2020-02-24)

Other
* Merged in translation updates. [ken]
* Fixed to work around par2 0.8.1 core dump on short name   - https://github.com/Parchive/par2cmdline/issues/145. [ken]
* Fixed bug 1857818 - startswith first arg must be bytes   - use util.fsdecode on filename. [ken]
* Fixed bug 1863018 - mediafire backend fails on py3   - Fixed handling of bytes filename in url. [ken]
* Add rclone requirement to snapcraft.yaml. [ken]
* Fixed bug 1236248 - --extra-clean clobbers old backups   - Removed --extra-clean, code, and docs. [ken]
* Fixed bug 1862672 - test\_log does not respect TMPDIR   - Patch supplied by Jan Tojnar. [ken]
* Fixed bug 1860405 - Auth mechanism not supported   - Added python3-boto3 requirement to snapcraft.yaml. [ken]
* More readthedocs munges. [ken]
* Don't format the po files for readthedocs. [ken]
* Add readthedocs.yaml config file, try 3. [ken]
* Add readthedocs.yaml config file, try 2. [ken]
* Add readthedocs.yaml config file. [ken]
* Remove intltool for readthedocs builder. [ken]
* Add python-gettext for readthedocs builder. [ken]
* Add gettext/intltool for readthedocs builder. [ken]
* Add gettext for readthedocs builder. [ken]
* Add intltool for readthedocs builder. [ken]
* Add intltools for readthedocs builder. [ken]
* Add intltools for readthedocs builder. [ken]
* Point readthedocs.io to this repo. [ken]
* Renamed botobackend.py to s3\_boto\_backend.py. [ken]
* Renamed botobackend.py to s3\_boto\_backend.py. [ken]
* Merged from parent to bring in changes. [Byron Hammond]
* Renamed MulitGzipFile to GzipFile to avoid future problems with upstream author of mgzip fixing the Mulit -> Multi typo. [Byron Hammond]
* Adding missed mgzip import and adjusting untouched unit tests. [Byron Hammond]
* Adding multi-core support by using mgzip instead of gzip. [Byron Hammond]
* Missing comma. [ken]
* Some code cleanup and play with docs. [ken]
* Uncomment snapcraft sign-build.  Seems it's fixed now. [ken]
* Fix argument order on review-tools. [ken]
* Reworked setup.py to build a pip-compatible   distribution tarball of duplicity. * Added dist/makepip for convenience. [ken]
* Adjust Dockerfiles to new requirements. [ken]
* Fix - Removing old backup chains   fails using pexpect+sftp. [ken]
* Adjust Dockerfiles to new requirements. [ken]
* Enhance setup.py/cfg to allow install by pip. [ken]
* Enhance setup.py/cfg to allow install by pip. [ken]
* Enhance setup.py/cfg to allow install by pip. [ken]
* Bump version. [Kenneth Loafman]
* Gave up fighting the fascist version control   munging on snapcraft.io.  Duplicity now has the   form 0.8.10.1558, where the last number is the   bzr revno.  Can't do something nice like having   a 
dev/fin indicator like 0.8.10dev1558 for dev   versions and a fin for release or final. [Kenneth Loafman]


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 pkgsrc/sysutils/duplicity/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/sysutils/duplicity/PLIST
cvs rdiff -u -r1.25 -r1.26 pkgsrc/sysutils/duplicity/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/sysutils/duplicity/options.mk
cvs rdiff -u -r1.4 -r0 pkgsrc/sysutils/duplicity/patches/patch-aa
cvs rdiff -u -r0 -r1.1 \
    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.

Modified files:

Index: pkgsrc/sysutils/duplicity/Makefile
diff -u pkgsrc/sysutils/duplicity/Makefile:1.51 pkgsrc/sysutils/duplicity/Makefile:1.52
--- pkgsrc/sysutils/duplicity/Makefile:1.51     Fri Dec  4 20:45:41 2020
+++ pkgsrc/sysutils/duplicity/Makefile  Thu Feb 11 10:40:35 2021
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.51 2020/12/04 20:45:41 nia Exp $
+# $NetBSD: Makefile,v 1.52 2021/02/11 10:40:35 adam Exp $
 
-DISTNAME=      duplicity-0.7.17
-PKGREVISION=   2
-CATEGORIES=    sysutils net
-MASTER_SITES=  http://code.launchpad.net/duplicity/0.7-series/${PKGVERSION_NOREV}/+download/
+DISTNAME=      duplicity-0.8.18
+CATEGORIES=    sysutils net python
+MASTER_SITES=  ${MASTER_SITE_PYPI:=d/duplicity/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://www.nongnu.org/duplicity/
@@ -12,26 +11,27 @@ LICENSE=    gnu-gpl-v2
 
 USE_PKGLOCALEDIR=      yes
 
-.include "options.mk"
+BUILD_DEPENDS+=        ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm
+DEPENDS+=      ${PYPKGPREFIX}-fasteners-[0-9]*:../../devel/py-fasteners
+DEPENDS+=      ${PYPKGPREFIX}-future-[0-9]*:../../devel/py-future
 
+GPGPATH=       ${PREFIX}/bin/gpg2
+DEPENDS+=      gnupg2-[0-9]*:../../security/gnupg2
 DEPENDS+=      lftp-[0-9]*:../../net/lftp
-DEPENDS+=      ncftp3-[0-9]*:../../net/ncftp3
-DEPENDS+=      rsync-[0-9]*:../../net/rsync
-DEPENDS+=      ${PYPKGPREFIX}-boto-[0-9]*:../../net/py-boto
+DEPENDS+=      ${PYPKGPREFIX}-boto3-[0-9]*:../../net/py-boto3
 DEPENDS+=      ${PYPKGPREFIX}-dropbox-[0-9]*:../../net/py-dropbox
 DEPENDS+=      ${PYPKGPREFIX}-paramiko-[0-9]*:../../security/py-paramiko
-DEPENDS+=      ${PYPKGPREFIX}-pexpect-[0-9]*:../../devel/py-pexpect
 DEPENDS+=      ${PYPKGPREFIX}-requests-oauthlib-[0-9]*:../../security/py-requests-oauthlib
-DEPENDS+=      ${PYPKGPREFIX}-fasteners-[0-9]*:../../devel/py-fasteners
-DEPENDS+=      ${PYPKGPREFIX}-cloudfiles-[0-9]*:../../www/py-cloudfiles
 DEPENDS+=      ${PYPKGPREFIX}-swiftclient-[0-9]*:../../www/py-swiftclient
-DEPENDS+=      ${PYPKGPREFIX}-gdata-[0-9]*:../../www/py-gdata
-.include "../../net/librsync/buildlink3.mk"
+TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../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
 
-REPLACE_PYTHON+=               bin/duplicity \
-                               bin/rdiffdir
-PYTHON_VERSIONS_ACCEPTED=      27 # not yet ported as of 0.6.22
-EGG_NAME=                      ${DISTNAME:S/09/9/}
+REPLACE_PYTHON+=       bin/duplicity
+REPLACE_PYTHON+=       bin/rdiffdir
+
+PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 SUBST_CLASSES+=                        fix-paths
 SUBST_STAGE.fix-paths=         pre-configure
@@ -47,4 +47,5 @@ SUBST_VARS.gpgpath=           GPGPATH
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
+.include "../../net/librsync/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/sysutils/duplicity/PLIST
diff -u pkgsrc/sysutils/duplicity/PLIST:1.16 pkgsrc/sysutils/duplicity/PLIST:1.17
--- pkgsrc/sysutils/duplicity/PLIST:1.16        Fri Jan 26 14:53:05 2018
+++ pkgsrc/sysutils/duplicity/PLIST     Thu Feb 11 10:40:35 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2018/01/26 14:53:05 triaxx Exp $
+@comment $NetBSD: PLIST,v 1.17 2021/02/11 10:40:35 adam Exp $
 bin/duplicity
 bin/rdiffdir
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
@@ -10,12 +10,14 @@ ${PYSITELIB}/duplicity/__init__.py
 ${PYSITELIB}/duplicity/__init__.pyc
 ${PYSITELIB}/duplicity/__init__.pyo
 ${PYSITELIB}/duplicity/_librsync.so
+${PYSITELIB}/duplicity/_librsyncmodule.c
 ${PYSITELIB}/duplicity/asyncscheduler.py
 ${PYSITELIB}/duplicity/asyncscheduler.pyc
 ${PYSITELIB}/duplicity/asyncscheduler.pyo
 ${PYSITELIB}/duplicity/backend.py
 ${PYSITELIB}/duplicity/backend.pyc
 ${PYSITELIB}/duplicity/backend.pyo
+${PYSITELIB}/duplicity/backends/README
 ${PYSITELIB}/duplicity/backends/__init__.py
 ${PYSITELIB}/duplicity/backends/__init__.pyc
 ${PYSITELIB}/duplicity/backends/__init__.pyo
@@ -31,18 +33,15 @@ ${PYSITELIB}/duplicity/backends/_cf_clou
 ${PYSITELIB}/duplicity/backends/_cf_pyrax.py
 ${PYSITELIB}/duplicity/backends/_cf_pyrax.pyc
 ${PYSITELIB}/duplicity/backends/_cf_pyrax.pyo
-${PYSITELIB}/duplicity/backends/acdclibackend.py
-${PYSITELIB}/duplicity/backends/acdclibackend.pyc
-${PYSITELIB}/duplicity/backends/acdclibackend.pyo
+${PYSITELIB}/duplicity/backends/adbackend.py
+${PYSITELIB}/duplicity/backends/adbackend.pyc
+${PYSITELIB}/duplicity/backends/adbackend.pyo
 ${PYSITELIB}/duplicity/backends/azurebackend.py
 ${PYSITELIB}/duplicity/backends/azurebackend.pyc
 ${PYSITELIB}/duplicity/backends/azurebackend.pyo
 ${PYSITELIB}/duplicity/backends/b2backend.py
 ${PYSITELIB}/duplicity/backends/b2backend.pyc
 ${PYSITELIB}/duplicity/backends/b2backend.pyo
-${PYSITELIB}/duplicity/backends/botobackend.py
-${PYSITELIB}/duplicity/backends/botobackend.pyc
-${PYSITELIB}/duplicity/backends/botobackend.pyo
 ${PYSITELIB}/duplicity/backends/cfbackend.py
 ${PYSITELIB}/duplicity/backends/cfbackend.pyc
 ${PYSITELIB}/duplicity/backends/cfbackend.pyo
@@ -64,6 +63,9 @@ ${PYSITELIB}/duplicity/backends/hubicbac
 ${PYSITELIB}/duplicity/backends/imapbackend.py
 ${PYSITELIB}/duplicity/backends/imapbackend.pyc
 ${PYSITELIB}/duplicity/backends/imapbackend.pyo
+${PYSITELIB}/duplicity/backends/jottacloudbackend.py
+${PYSITELIB}/duplicity/backends/jottacloudbackend.pyc
+${PYSITELIB}/duplicity/backends/jottacloudbackend.pyo
 ${PYSITELIB}/duplicity/backends/lftpbackend.py
 ${PYSITELIB}/duplicity/backends/lftpbackend.pyc
 ${PYSITELIB}/duplicity/backends/lftpbackend.pyo
@@ -76,6 +78,9 @@ ${PYSITELIB}/duplicity/backends/mediafir
 ${PYSITELIB}/duplicity/backends/megabackend.py
 ${PYSITELIB}/duplicity/backends/megabackend.pyc
 ${PYSITELIB}/duplicity/backends/megabackend.pyo
+${PYSITELIB}/duplicity/backends/megav2backend.py
+${PYSITELIB}/duplicity/backends/megav2backend.pyc
+${PYSITELIB}/duplicity/backends/megav2backend.pyo
 ${PYSITELIB}/duplicity/backends/multibackend.py
 ${PYSITELIB}/duplicity/backends/multibackend.pyc
 ${PYSITELIB}/duplicity/backends/multibackend.pyo
@@ -88,6 +93,9 @@ ${PYSITELIB}/duplicity/backends/onedrive
 ${PYSITELIB}/duplicity/backends/par2backend.py
 ${PYSITELIB}/duplicity/backends/par2backend.pyc
 ${PYSITELIB}/duplicity/backends/par2backend.pyo
+${PYSITELIB}/duplicity/backends/pcabackend.py
+${PYSITELIB}/duplicity/backends/pcabackend.pyc
+${PYSITELIB}/duplicity/backends/pcabackend.pyo
 ${PYSITELIB}/duplicity/backends/pydrivebackend.py
 ${PYSITELIB}/duplicity/backends/pydrivebackend.pyc
 ${PYSITELIB}/duplicity/backends/pydrivebackend.pyo
@@ -97,9 +105,18 @@ ${PYSITELIB}/duplicity/backends/pyrax_id
 ${PYSITELIB}/duplicity/backends/pyrax_identity/hubic.py
 ${PYSITELIB}/duplicity/backends/pyrax_identity/hubic.pyc
 ${PYSITELIB}/duplicity/backends/pyrax_identity/hubic.pyo
+${PYSITELIB}/duplicity/backends/rclonebackend.py
+${PYSITELIB}/duplicity/backends/rclonebackend.pyc
+${PYSITELIB}/duplicity/backends/rclonebackend.pyo
 ${PYSITELIB}/duplicity/backends/rsyncbackend.py
 ${PYSITELIB}/duplicity/backends/rsyncbackend.pyc
 ${PYSITELIB}/duplicity/backends/rsyncbackend.pyo
+${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/ssh_paramiko_backend.py
 ${PYSITELIB}/duplicity/backends/ssh_paramiko_backend.pyc
 ${PYSITELIB}/duplicity/backends/ssh_paramiko_backend.pyo
@@ -121,18 +138,21 @@ ${PYSITELIB}/duplicity/backends/webdavba
 ${PYSITELIB}/duplicity/cached_ops.py
 ${PYSITELIB}/duplicity/cached_ops.pyc
 ${PYSITELIB}/duplicity/cached_ops.pyo
-${PYSITELIB}/duplicity/collections.py
-${PYSITELIB}/duplicity/collections.pyc
-${PYSITELIB}/duplicity/collections.pyo
 ${PYSITELIB}/duplicity/commandline.py
 ${PYSITELIB}/duplicity/commandline.pyc
 ${PYSITELIB}/duplicity/commandline.pyo
-${PYSITELIB}/duplicity/compilec.py
-${PYSITELIB}/duplicity/compilec.pyc
-${PYSITELIB}/duplicity/compilec.pyo
+${PYSITELIB}/duplicity/config.py
+${PYSITELIB}/duplicity/config.pyc
+${PYSITELIB}/duplicity/config.pyo
 ${PYSITELIB}/duplicity/diffdir.py
 ${PYSITELIB}/duplicity/diffdir.pyc
 ${PYSITELIB}/duplicity/diffdir.pyo
+${PYSITELIB}/duplicity/dup_collections.py
+${PYSITELIB}/duplicity/dup_collections.pyc
+${PYSITELIB}/duplicity/dup_collections.pyo
+${PYSITELIB}/duplicity/dup_main.py
+${PYSITELIB}/duplicity/dup_main.pyc
+${PYSITELIB}/duplicity/dup_main.pyo
 ${PYSITELIB}/duplicity/dup_temp.py
 ${PYSITELIB}/duplicity/dup_temp.pyc
 ${PYSITELIB}/duplicity/dup_temp.pyo
@@ -151,9 +171,6 @@ ${PYSITELIB}/duplicity/file_naming.pyo
 ${PYSITELIB}/duplicity/filechunkio.py
 ${PYSITELIB}/duplicity/filechunkio.pyc
 ${PYSITELIB}/duplicity/filechunkio.pyo
-${PYSITELIB}/duplicity/globals.py
-${PYSITELIB}/duplicity/globals.pyc
-${PYSITELIB}/duplicity/globals.pyo
 ${PYSITELIB}/duplicity/globmatch.py
 ${PYSITELIB}/duplicity/globmatch.pyc
 ${PYSITELIB}/duplicity/globmatch.pyo
@@ -204,12 +221,15 @@ ${PYSITELIB}/duplicity/util.pyc
 ${PYSITELIB}/duplicity/util.pyo
 man/man1/duplicity.1
 man/man1/rdiffdir.1
-share/doc/${PKGNAME}/CHANGELOG
+share/doc/${PKGNAME}/AUTHORS
+share/doc/${PKGNAME}/CHANGELOG.md
 share/doc/${PKGNAME}/COPYING
-share/doc/${PKGNAME}/README
-share/doc/${PKGNAME}/README-LOG
-share/doc/${PKGNAME}/README-REPO
+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
@@ -227,8 +247,10 @@ 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
@@ -243,3 +265,4 @@ share/locale/tr/LC_MESSAGES/duplicity.mo
 share/locale/ug/LC_MESSAGES/duplicity.mo
 share/locale/uk/LC_MESSAGES/duplicity.mo
 share/locale/zh_CN/LC_MESSAGES/duplicity.mo
+share/locale/zh_TW/LC_MESSAGES/duplicity.mo

Index: pkgsrc/sysutils/duplicity/distinfo
diff -u pkgsrc/sysutils/duplicity/distinfo:1.25 pkgsrc/sysutils/duplicity/distinfo:1.26
--- pkgsrc/sysutils/duplicity/distinfo:1.25     Tue Feb 27 06:44:07 2018
+++ pkgsrc/sysutils/duplicity/distinfo  Thu Feb 11 10:40:35 2021
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.25 2018/02/27 06:44:07 wen Exp $
+$NetBSD: distinfo,v 1.26 2021/02/11 10:40:35 adam Exp $
 
-SHA1 (duplicity-0.7.17.tar.gz) = cf8344df73b04abe4246be0d987626e926a70420
-RMD160 (duplicity-0.7.17.tar.gz) = 20d6e1d63d3da925009709cafd3e721af68bcc2e
-SHA512 (duplicity-0.7.17.tar.gz) = a7fa3f26709bcb25be519a20d65a196072a49ca468ace84b4876a815efea23fc1ed5b77abf765475fb8a08e3138349bf1d48e0ce22816ef66526463b646e12a3
-Size (duplicity-0.7.17.tar.gz) = 1719145 bytes
-SHA1 (patch-aa) = f1210f703dccf759f234846a3139ce98063011cb
+SHA1 (duplicity-0.8.18.tar.gz) = 1213f1475fd071e7e72783c4e40aca91818f2a44
+RMD160 (duplicity-0.8.18.tar.gz) = 7f9633794d21b4f6e0f754823c64aba8727cb938
+SHA512 (duplicity-0.8.18.tar.gz) = d730c7b19f48254759fcb3985e9c64eab4218908fe042743cce256bb701e1969d8648eec78a67c52853840f9dd32ab054099ee7c239b5ab32e2cd06bba2b6c4b
+Size (duplicity-0.8.18.tar.gz) = 1340850 bytes
+SHA1 (patch-duplicity_gpginterface.py) = 3d765f1666f44bbf8cb535cba37b76f914ffdd93

Index: pkgsrc/sysutils/duplicity/options.mk
diff -u pkgsrc/sysutils/duplicity/options.mk:1.4 pkgsrc/sysutils/duplicity/options.mk:1.5
--- pkgsrc/sysutils/duplicity/options.mk:1.4    Fri Jan 26 14:53:05 2018
+++ pkgsrc/sysutils/duplicity/options.mk        Thu Feb 11 10:40:35 2021
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.4 2018/01/26 14:53:05 triaxx Exp $
+# $NetBSD: options.mk,v 1.5 2021/02/11 10:40:35 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.duplicity
 PKG_SUPPORTED_OPTIONS= gnupg2
-PKG_SUGGESTED_OPTIONS=
+PKG_SUGGESTED_OPTIONS= gnupg2
 
 .include "../../mk/bsd.options.mk"
 

Added files:

Index: pkgsrc/sysutils/duplicity/patches/patch-duplicity_gpginterface.py
diff -u /dev/null pkgsrc/sysutils/duplicity/patches/patch-duplicity_gpginterface.py:1.1
--- /dev/null   Thu Feb 11 10:40:35 2021
+++ pkgsrc/sysutils/duplicity/patches/patch-duplicity_gpginterface.py   Thu Feb 11 10:40:35 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-duplicity_gpginterface.py,v 1.1 2021/02/11 10:40:35 adam Exp $
+
+Provide path to gpg.
+
+--- duplicity/gpginterface.py.orig     2020-11-18 20:05:43.000000000 +0000
++++ duplicity/gpginterface.py
+@@ -286,7 +286,7 @@ class GnuPG(object):
+     """
+ 
+     def __init__(self):
+-        self.call = u'gpg'
++        self.call = u'@GPGPATH@'
+         self.passphrase = None
+         self.options = Options()
+ 



Home | Main Index | Thread Index | Old Index