NetBSD Problem Report #51061
From www@NetBSD.org Sun Apr 10 20:06:14 2016
Return-Path: <www@NetBSD.org>
Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK))
by mollari.NetBSD.org (Postfix) with ESMTPS id 8D4407A221
for <gnats-bugs@gnats.NetBSD.org>; Sun, 10 Apr 2016 20:06:14 +0000 (UTC)
Message-Id: <20160410200613.2CDA47A3D8@mollari.NetBSD.org>
Date: Sun, 10 Apr 2016 20:06:13 +0000 (UTC)
From: triaxx@triaxx.org
Reply-To: triaxx@triaxx.org
To: gnats-bugs@NetBSD.org
Subject: sysutils/duplicity update to 0.7.07
X-Send-Pr-Version: www-1.0
>Number: 51061
>Category: pkg
>Synopsis: sysutils/duplicity update to 0.7.07
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: bsiegert
>State: closed
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Sun Apr 10 20:10:00 +0000 2016
>Closed-Date: Thu Jul 07 08:44:35 +0000 2016
>Last-Modified: Thu Jul 07 08:44:35 +0000 2016
>Originator: Frédéric Fauberteau
>Release: pkgsrc-2015Q4
>Organization:
>Environment:
NetBSD trashware 7.0_STABLE NetBSD 7.0_STABLE (TRASHWARE) #1: Sat Dec 5 19:26:52 CET 2015 triaxx@hydralisk:/home/triaxx/dev/nbsd/netbsd-7/usr/objs/sys/arch/amd64/compile/TRASHWARE amd64
>Description:
Update to 0.7.07:
- add options.mk
- replace LOCALBASE with EVAL_PREFIX (thanks to pkglint)
If this patch is accepted, don't remember to update doc/TODO ;)
>How-To-Repeat:
>Fix:
diff -ruN sysutils/duplicity/Makefile local/duplicity/Makefile
--- sysutils/duplicity/Makefile 2016-01-05 08:48:55.000000000 +0100
+++ local/duplicity/Makefile 2016-04-10 21:22:53.000000000 +0200
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2015/12/05 21:25:58 adam Exp $
+# $NetBSD$
-DISTNAME= duplicity-0.6.26
+DISTNAME= duplicity-0.7.07
CATEGORIES= sysutils net
-MASTER_SITES= http://code.launchpad.net/duplicity/0.6-series/${PKGVERSION_NOREV}/+download/
+MASTER_SITES= http://code.launchpad.net/duplicity/0.7-series/${PKGVERSION_NOREV}/+download/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.nongnu.org/duplicity/
@@ -11,19 +11,12 @@
USE_PKGLOCALEDIR= yes
-PKG_OPTIONS_VAR= PKG_OPTIONS.duplicity
-PKG_SUPPORTED_OPTIONS= gnupg2
+.include "options.mk"
+
DEPENDS+= ${PYPKGPREFIX}-lockfile>=0.9.1:../../devel/py-lockfile
-.include "../../mk/bsd.options.mk"
-.if !empty(PKG_OPTIONS:Mgnupg2)
-DEPENDS+= gnupg2-[0-9]*:../../security/gnupg2
-GPGPATH= ${LOCALBASE}/bin/gpg2
-.else
-DEPENDS+= gnupg>=1.0.0:../../security/gnupg
-GPGPATH= ${LOCALBASE}/bin/gpg
-.endif
-REPLACE_PYTHON+= bin/*
+REPLACE_PYTHON+= bin/duplicity \
+ bin/rdiffdir
PYTHON_VERSIONS_INCOMPATIBLE= 33 34 35 # not yet ported as of 0.6.22
SUBST_CLASSES+= fix-paths
@@ -41,6 +34,9 @@
# XXX in 0.6.21, doc files are mode 0600
#post-extract:
# cd ${WRKSRC} && ${CHMOD} go+r *
+# XXX in 0.7.07, executable bit set on duplicity.1
+post-extract:
+ ${CHMOD} -x ${WRKSRC}/bin/duplicity.1
.include "../../lang/python/application.mk"
.include "../../lang/python/egg.mk"
diff -ruN sysutils/duplicity/PLIST local/duplicity/PLIST
--- sysutils/duplicity/PLIST 2014-05-12 22:39:33.000000000 +0200
+++ local/duplicity/PLIST 2016-04-10 21:25:34.000000000 +0200
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.13 2014/05/12 20:39:33 riz Exp $
+@comment $NetBSD$
bin/duplicity
bin/rdiffdir
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/duplicity-0.7.7-py2.7.egg-info/PKG-INFO
+${PYSITELIB}/duplicity-0.7.7-py2.7.egg-info/SOURCES.txt
+${PYSITELIB}/duplicity-0.7.7-py2.7.egg-info/dependency_links.txt
+${PYSITELIB}/duplicity-0.7.7-py2.7.egg-info/requires.txt
+${PYSITELIB}/duplicity-0.7.7-py2.7.egg-info/top_level.txt
${PYSITELIB}/duplicity/__init__.py
${PYSITELIB}/duplicity/__init__.pyc
${PYSITELIB}/duplicity/__init__.pyo
@@ -30,27 +31,27 @@
${PYSITELIB}/duplicity/backends/_cf_pyrax.py
${PYSITELIB}/duplicity/backends/_cf_pyrax.pyc
${PYSITELIB}/duplicity/backends/_cf_pyrax.pyo
-${PYSITELIB}/duplicity/backends/_ssh_paramiko.py
-${PYSITELIB}/duplicity/backends/_ssh_paramiko.pyc
-${PYSITELIB}/duplicity/backends/_ssh_paramiko.pyo
-${PYSITELIB}/duplicity/backends/_ssh_pexpect.py
-${PYSITELIB}/duplicity/backends/_ssh_pexpect.pyc
-${PYSITELIB}/duplicity/backends/_ssh_pexpect.pyo
+${PYSITELIB}/duplicity/backends/acdclibackend.py
+${PYSITELIB}/duplicity/backends/acdclibackend.pyc
+${PYSITELIB}/duplicity/backends/acdclibackend.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
+${PYSITELIB}/duplicity/backends/copycombackend.py
+${PYSITELIB}/duplicity/backends/copycombackend.pyc
+${PYSITELIB}/duplicity/backends/copycombackend.pyo
${PYSITELIB}/duplicity/backends/dpbxbackend.py
${PYSITELIB}/duplicity/backends/dpbxbackend.pyc
${PYSITELIB}/duplicity/backends/dpbxbackend.pyo
-${PYSITELIB}/duplicity/backends/ftpbackend.py
-${PYSITELIB}/duplicity/backends/ftpbackend.pyc
-${PYSITELIB}/duplicity/backends/ftpbackend.pyo
-${PYSITELIB}/duplicity/backends/ftpsbackend.py
-${PYSITELIB}/duplicity/backends/ftpsbackend.pyc
-${PYSITELIB}/duplicity/backends/ftpsbackend.pyo
${PYSITELIB}/duplicity/backends/gdocsbackend.py
${PYSITELIB}/duplicity/backends/gdocsbackend.pyc
${PYSITELIB}/duplicity/backends/gdocsbackend.pyo
@@ -60,33 +61,66 @@
${PYSITELIB}/duplicity/backends/hsibackend.py
${PYSITELIB}/duplicity/backends/hsibackend.pyc
${PYSITELIB}/duplicity/backends/hsibackend.pyo
+${PYSITELIB}/duplicity/backends/hubicbackend.py
+${PYSITELIB}/duplicity/backends/hubicbackend.pyc
+${PYSITELIB}/duplicity/backends/hubicbackend.pyo
${PYSITELIB}/duplicity/backends/imapbackend.py
${PYSITELIB}/duplicity/backends/imapbackend.pyc
${PYSITELIB}/duplicity/backends/imapbackend.pyo
+${PYSITELIB}/duplicity/backends/lftpbackend.py
+${PYSITELIB}/duplicity/backends/lftpbackend.pyc
+${PYSITELIB}/duplicity/backends/lftpbackend.pyo
${PYSITELIB}/duplicity/backends/localbackend.py
${PYSITELIB}/duplicity/backends/localbackend.pyc
${PYSITELIB}/duplicity/backends/localbackend.pyo
+${PYSITELIB}/duplicity/backends/mediafirebackend.py
+${PYSITELIB}/duplicity/backends/mediafirebackend.pyc
+${PYSITELIB}/duplicity/backends/mediafirebackend.pyo
${PYSITELIB}/duplicity/backends/megabackend.py
${PYSITELIB}/duplicity/backends/megabackend.pyc
${PYSITELIB}/duplicity/backends/megabackend.pyo
+${PYSITELIB}/duplicity/backends/multibackend.py
+${PYSITELIB}/duplicity/backends/multibackend.pyc
+${PYSITELIB}/duplicity/backends/multibackend.pyo
+${PYSITELIB}/duplicity/backends/ncftpbackend.py
+${PYSITELIB}/duplicity/backends/ncftpbackend.pyc
+${PYSITELIB}/duplicity/backends/ncftpbackend.pyo
+${PYSITELIB}/duplicity/backends/onedrivebackend.py
+${PYSITELIB}/duplicity/backends/onedrivebackend.pyc
+${PYSITELIB}/duplicity/backends/onedrivebackend.pyo
+${PYSITELIB}/duplicity/backends/par2backend.py
+${PYSITELIB}/duplicity/backends/par2backend.pyc
+${PYSITELIB}/duplicity/backends/par2backend.pyo
+${PYSITELIB}/duplicity/backends/pydrivebackend.py
+${PYSITELIB}/duplicity/backends/pydrivebackend.pyc
+${PYSITELIB}/duplicity/backends/pydrivebackend.pyo
+${PYSITELIB}/duplicity/backends/pyrax_identity/__init__.py
+${PYSITELIB}/duplicity/backends/pyrax_identity/__init__.pyc
+${PYSITELIB}/duplicity/backends/pyrax_identity/__init__.pyo
+${PYSITELIB}/duplicity/backends/pyrax_identity/hubic.py
+${PYSITELIB}/duplicity/backends/pyrax_identity/hubic.pyc
+${PYSITELIB}/duplicity/backends/pyrax_identity/hubic.pyo
${PYSITELIB}/duplicity/backends/rsyncbackend.py
${PYSITELIB}/duplicity/backends/rsyncbackend.pyc
${PYSITELIB}/duplicity/backends/rsyncbackend.pyo
-${PYSITELIB}/duplicity/backends/sshbackend.py
-${PYSITELIB}/duplicity/backends/sshbackend.pyc
-${PYSITELIB}/duplicity/backends/sshbackend.pyo
+${PYSITELIB}/duplicity/backends/ssh_paramiko_backend.py
+${PYSITELIB}/duplicity/backends/ssh_paramiko_backend.pyc
+${PYSITELIB}/duplicity/backends/ssh_paramiko_backend.pyo
+${PYSITELIB}/duplicity/backends/ssh_pexpect_backend.py
+${PYSITELIB}/duplicity/backends/ssh_pexpect_backend.pyc
+${PYSITELIB}/duplicity/backends/ssh_pexpect_backend.pyo
${PYSITELIB}/duplicity/backends/swiftbackend.py
${PYSITELIB}/duplicity/backends/swiftbackend.pyc
${PYSITELIB}/duplicity/backends/swiftbackend.pyo
+${PYSITELIB}/duplicity/backends/sxbackend.py
+${PYSITELIB}/duplicity/backends/sxbackend.pyc
+${PYSITELIB}/duplicity/backends/sxbackend.pyo
${PYSITELIB}/duplicity/backends/tahoebackend.py
${PYSITELIB}/duplicity/backends/tahoebackend.pyc
${PYSITELIB}/duplicity/backends/tahoebackend.pyo
${PYSITELIB}/duplicity/backends/webdavbackend.py
${PYSITELIB}/duplicity/backends/webdavbackend.pyc
${PYSITELIB}/duplicity/backends/webdavbackend.pyo
-${PYSITELIB}/duplicity/backends/~par2wrapperbackend.py
-${PYSITELIB}/duplicity/backends/~par2wrapperbackend.pyc
-${PYSITELIB}/duplicity/backends/~par2wrapperbackend.pyo
${PYSITELIB}/duplicity/cached_ops.py
${PYSITELIB}/duplicity/cached_ops.pyc
${PYSITELIB}/duplicity/cached_ops.pyo
@@ -123,6 +157,9 @@
${PYSITELIB}/duplicity/globals.py
${PYSITELIB}/duplicity/globals.pyc
${PYSITELIB}/duplicity/globals.pyo
+${PYSITELIB}/duplicity/globmatch.py
+${PYSITELIB}/duplicity/globmatch.pyc
+${PYSITELIB}/duplicity/globmatch.pyo
${PYSITELIB}/duplicity/gpg.py
${PYSITELIB}/duplicity/gpg.pyc
${PYSITELIB}/duplicity/gpg.pyo
@@ -147,9 +184,6 @@
${PYSITELIB}/duplicity/path.py
${PYSITELIB}/duplicity/path.pyc
${PYSITELIB}/duplicity/path.pyo
-${PYSITELIB}/duplicity/pexpect.py
-${PYSITELIB}/duplicity/pexpect.pyc
-${PYSITELIB}/duplicity/pexpect.pyo
${PYSITELIB}/duplicity/progress.py
${PYSITELIB}/duplicity/progress.pyc
${PYSITELIB}/duplicity/progress.pyo
@@ -159,9 +193,6 @@
${PYSITELIB}/duplicity/selection.py
${PYSITELIB}/duplicity/selection.pyc
${PYSITELIB}/duplicity/selection.pyo
-${PYSITELIB}/duplicity/static.py
-${PYSITELIB}/duplicity/static.pyc
-${PYSITELIB}/duplicity/static.pyo
${PYSITELIB}/duplicity/statistics.py
${PYSITELIB}/duplicity/statistics.pyc
${PYSITELIB}/duplicity/statistics.pyo
@@ -171,9 +202,6 @@
${PYSITELIB}/duplicity/tempdir.py
${PYSITELIB}/duplicity/tempdir.pyc
${PYSITELIB}/duplicity/tempdir.pyo
-${PYSITELIB}/duplicity/urlparse_2_5.py
-${PYSITELIB}/duplicity/urlparse_2_5.pyc
-${PYSITELIB}/duplicity/urlparse_2_5.pyo
${PYSITELIB}/duplicity/util.py
${PYSITELIB}/duplicity/util.pyc
${PYSITELIB}/duplicity/util.pyo
@@ -184,21 +212,27 @@
share/doc/${PKGNAME}/README
share/doc/${PKGNAME}/README-LOG
share/doc/${PKGNAME}/README-REPO
-share/doc/${PKGNAME}/tarfile-CHANGES
-share/doc/${PKGNAME}/tarfile-LICENSE
share/locale/bg/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/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/km/LC_MESSAGES/duplicity.mo
+share/locale/ms/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
@@ -210,4 +244,5 @@
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/zh_CN/LC_MESSAGES/duplicity.mo
diff -ruN sysutils/duplicity/distinfo local/duplicity/distinfo
--- sysutils/duplicity/distinfo 2016-01-05 08:48:55.000000000 +0100
+++ local/duplicity/distinfo 2016-04-10 21:24:28.000000000 +0200
@@ -1,7 +1,7 @@
$NetBSD: distinfo,v 1.19 2015/10/17 13:18:14 adam Exp $
-SHA1 (duplicity-0.6.26.tar.gz) = ba6760852f0ed90d7fedade6d5fc72806added04
-RMD160 (duplicity-0.6.26.tar.gz) = 14a5f5ac3dcef81c4d7d488d9a8562d59b527838
-SHA512 (duplicity-0.6.26.tar.gz) = 0cd02984eda99c81a30c9ac9926c41df0597f8f287a3e8ccd7d6fb9d420159028112be6b3fc8acf9b413940c07d0e754b2a509b6bca52965d2c333d4bcec8689
-Size (duplicity-0.6.26.tar.gz) = 1270436 bytes
+SHA1 (duplicity-0.7.07.tar.gz) = 9a1d35add7a4a35464bed3bfda23df14c1774058
+RMD160 (duplicity-0.7.07.tar.gz) = ec62dfc8daa015d7aade3f100ef48eac13bc6b01
+SHA512 (duplicity-0.7.07.tar.gz) = 9bc626e7a3913d5e511e6e70534fb5803eab3b1bdc80c99f3cb54740b05efd3eae26fd0fcadab433fe912a6b5fca4ed564b1551e3126d36ddafd003325b23a7c
+Size (duplicity-0.7.07.tar.gz) = 1538252 bytes
SHA1 (patch-aa) = f1210f703dccf759f234846a3139ce98063011cb
diff -ruN sysutils/duplicity/options.mk local/duplicity/options.mk
--- sysutils/duplicity/options.mk 1970-01-01 01:00:00.000000000 +0100
+++ local/duplicity/options.mk 2016-04-10 21:01:46.000000000 +0200
@@ -0,0 +1,16 @@
+# $NetBSD$
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.duplicity
+PKG_SUPPORTED_OPTIONS= gnupg2
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mgnupg2)
+DEPENDS+= gnupg2-[0-9]*:../../security/gnupg2
+EVAL_PREFIX= GNUPG2_PREFIX=gnupg2
+GPGPATH= ${GNUPG2_PREFIX}/bin/gpg2
+.else
+DEPENDS+= gnupg>=1.0.0:../../security/gnupg
+EVAL_PREFIX= GNUPG_PREFIX=gnupg
+GPGPATH= ${GNUPG_PREFIX}/bin/gpg
+.endif
>Release-Note:
>Audit-Trail:
From: "Benny Siegert" <bsiegert@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc:
Subject: PR/51061 CVS commit: pkgsrc/sysutils/duplicity
Date: Mon, 18 Apr 2016 17:49:21 +0000
Module Name: pkgsrc
Committed By: bsiegert
Date: Mon Apr 18 17:49:21 UTC 2016
Modified Files:
pkgsrc/sysutils/duplicity: Makefile PLIST distinfo
Added Files:
pkgsrc/sysutils/duplicity: options.mk
Log Message:
Update duplicity to 0.7.07. From Frédéric Fauberteau in PR pkg/51061.
New in v0.7.07 (2016/04/10)
---------------------------
* Merged in lp:~matthew-t-bentley/duplicity/b2
- Fix import and error typos.
- Allow multiple backups in the same bucket.
- Fixes bug #1523498.
- A couple fixes allowing multiple backups to be hosted in different
folders in the same bucket as well as some logging for -v9.
* Random stuff:
- remove RPM stuff from makedist
- have makedist pull directly from VCS, not local dir
- update po translation directory and build process
- clean up some odd error messages
- move Pep8 ignores to tox.ini
- supply correct path for pydevd under Mac
- fix some tests to run under Linux and Mac
* Partial fix for bug #1529606 - shell code injection in lftpbackend
- still need to fix the other backends that spawn shell commands
* Make test_restart compatible with both GNUtar and BSDtar
* Fix stupid issue with functional test path for duplicity
* Applied patch from shaochun to fix bug #1531154,
- --file-changed failed when file contains spaces
* Applied patch from abeverly to fix bug #1475890
- allow port to be specified along with hostname on S3
- adjusted help text and man page to reflect the change
* Undo changes to test_restart.py. GNU tar is needed.
* Fix minor pep8 nit in collections.py
* Applied changes from ralle-ubuntu to fix bug 1072130.
- duplicity does not support ftpes://
* Fixed bug #1296793 - Failed to create bucket
- use S3Connection.lookup() to check bucket exists
- skips Boto's Exception processing for this check
- dupe of bug #1507109 and bug #1537185
* Merged in lp:~mifchip/duplicity/duplicity
- fix bug #1313964, absolute path doesn't work for FTP
* Merged in lp:~fpytloun/duplicity/webdav-gssapi
- support GSSAPI authentication in webdav backend
* Add more pylint ignore warnings tags
* Adjust so test_restart.py can run on Mac as well
* Fix for bug #1538333 - assert filecount == len(self.files_changed)
- added flush after every write for all FileobjHooked files which
should prevent some errors when duplicity is forcibly closed.
* Fix bug #1540279 - mistake in --help
* Applied patch from kay-diam to fix error handling in ssh pexpect,
fixes bug #1541314
* Fixed a patching error in ssh_pexpect_backend.py
* Merged in lp:~fpytloun/duplicity/webdav-gssapi-fix
- Make kerberos optional for webdav backend
* Merged in lp:~harningt/duplicity/multibackend-mirror
- This changeset addresses multibackend handling to permit a
mirroring option in addition to its "stripe" mode to make it
a redundancy tool vs space-expansion tool. To do this without
changing the configuration too much, I used the query string
that would generally go unused for files to specify behavior
that applies to all items inside the configuration file.
* Added acdclibackend.py from Stefan Breunig and Malay Shah
- renamed from amazoncloudbackend to stress use of acd_cli
* Fixed some 2to3 and Pep8 issues that had crept in
* Backed out changes made by patching for bug #1541314. These
patches should not have been applied to the 0.7 series.
* Merged in lp:~rye/duplicity/mediafire
- Backend for https://www.mediafire.com
- Requires https://pypi.python.org/pypi/mediafire/ installed.
* Reverted changes made in rev 1164 w.r.t. getting the source from
VCS rather than local directory. Fixes bug #1548080.
* More fixes to dist/makedist to make it more OS agnostic.
* Merged in lp:~ed.so/duplicity/webdav.lftp.ssl-overhaul
duplicity.1, commandline.py, globals.py
- added --ssl-cacert-path parameter
backend.py
- make sure url path component is properly url decoded,
in case it contains special chars (eg. @ or space)
lftpbackend.py
- quote _all_ cmd line params
- added missing lftp+ftpes protocol
- fix empty list result when chdir failed silently
- added ssl_cacert_path support
webdavbackend.py
- add ssl default context support for python 2.7.9+
(using system certs eg. in /etc/ssl/certs)
- added ssl_cacert_path support for python 2.7.9+
- gettext wrapped all log messages
- minor refinements
* Applied patch from Dmitry Nezhevenko to upgrade dropbox backend:
- update to SDK v2
- use chunked upload
* Merged in lp:~aaron-whitehouse/duplicity/improve_present_get_sf_man_page
- Improve man page entry for --exclude-if-present
* Merged in lp:~aaron-whitehouse/duplicity/split_glob_matching_from_select
- Move glob matching code out of selection.py's Select function and
into globmatch.py.
* Fix bug reported on the mailing list from Mark Grandi (assertion error
while backing up). In file_naming.parse() the filename was being lower
cased prior to parsing. If you had used a prefix with mixed case, we
were writing the file properly, but could not find it in the backend.
* Merged in lp:~duplicity-team/duplicity/po-updates
New in v0.7.06 (2015/12/07)
---------------------------
* Merged in lp:~mnjul/duplicity/s3-infreq-access
- This adds support for AWS S3's newly announced Infrequent Access
storage class and is intended to implement Blueprint:
https://blueprints.launchpad.net/duplicity/+spec/aws-s3-std-ia-class .
- A new command line option, --s3-use-ia, is added, and boto backend
will automatically use the correct storage class value depending on
whether --s3-use-rrs and --s3-use-ia is set. Command line parser will
prompt error if both --s3-use-ia and --s3-use-rrs are used together,
as they conflict with each other.
- The manpage has been updated giving a short explanation on the new
option. Its wording derives from Amazon's official announcement:
https://aws.amazon.com/about-aws/whats-new/2015/09/announcing-new-\
amazon-s3-storage-class-and-lower-glacier-prices/
* The ptyprocess module no longer supports Python 2.6, so fix tox.ini to
use an older version. Make explicit environs for all tests.
* Upgrade to newest version of pep8 and pylint. Add three ignores
to test_pep8 and one to test_pylint to get the rest to pass. They
* Applied patch from Alexander Zangerl to update to changes in lockfile
API 0.9 and later. Updated README to notify users.
* Modded tox.ini to use the latest lockfile.
* Merged in lp:~ed.so/duplicity/setup.shebang
- Having the python interpreter searched in the PATH is much more
flexible than the /usr/bin/python inserted into our scripts shebang
by setuptools. This patch prevents that. don't touch my shebang! :)
* Cleanup issues around Launchpad build, mainly lockfile >= 0.9.
* Merged in lp:~michal-s/duplicity/duplicity
- WindowsAzureMissingResourceError and WindowsAzureConflictError
changed due to SDK changes.
are all valid in our case.
* Reversed previous changes to lockfile. Now it will take any version
extant in the LP build repository. (PyPi is not avail in LP build).
* Merged in lp:~ed.so/duplicity/tempfile.tempdir
- make sure packages using python's tempfile create temp files in
duplicity's temp dir
* Fixed bug #1511308 - Cannot restore no-encryption, no-compression backup
- Corrected code to include plain file in write_multivolume()
- Added PlainWriteFile() to gpg.py
* Merged in lp:~michal-s/duplicity/duplicity
- Fix azurebackend storage class import
* Merged in lp:~feraudet/duplicity/fix
- Fix missing SWIFT_ENDPOINT_TYPE env var, bug 1519694.
* Fix bug #1520691 - Shell Code Injection in hsi backend
- Replace use of os.popen3() with subprocess equivalent.
- Added code to expand relative program path to full path.
- Fix hisbackend where it expected a list not a string.
* Merged in lp:~noizyland/duplicity/azurebackend-fixes
- Support new version of Azure Storage SDK
- Refactor _list method to support containers with >5000 blobs
* Merged in lp:~matthew-t-bentley/duplicity/b2
- Adds a backed for BackBlaze's (currently beta) B2 backup service.
- This adds backends/b2backend.py, modifies log.py to add an
error code and modifies commandline.py to add the b2://
example to the help text.
* Pep8 corrections for recently released code.
* Fixed bug #1260666 universally by splitting the filelist for
delete before passing to backend.
* Fixed bug #1369243 by adjusting messages to be more readable.
* Fixed bug #1375019 with patch from Eric Bavier (home to tmp).
* Fixed bug #1379575 with patch from Tim Ruffing (shorten webdav response).
* Fixed bug #1492301 with patch from askretov (manually refresh oauth).
New in v0.7.05 (2015/09/15)
---------------------------
* Merged in lp:~aaron-whitehouse/duplicity/fix_patch_error
- Change use of mock.patch in unit tests to accommodate the obsolete
version of python-mock on the build server.
* Fixed Bug 1476019 S3 storage bucket not being automatically created
with patch from abeverley
* Merged in lp:~aaron-whitehouse/duplicity/launchpad_tox_profile
- Add tox testing profile that mimics the packages installed on the
Launchpad build server, to reduce the likelihood of tests passing
our test suite, but failing on the build server (e.g. because of
the out-of-date mock version).
* Merged in lp:~aaron-whitehouse/duplicity/disable_code_tests_for_lpbuildd
- Set RUN_CODE_TESTS to 0 for lpbuildd tox profile, reflecting its value
on the Launchpad build server (and therefore skipping PEP8, 2to3 and
pylint). More accurately reflects the system we are mimicking and saves
approximately 1 minute per test run.
* Fixed Bug 1438170 duplicity crashes on resume when using gpg-agent with
patch from Artur Bodera (abodera). Applied the same patch to incremental
resumes as well.
* Merged in lp:~w.baranowski/duplicity/selection_debug
- This little patch logs debug messages concerning path selection process,
and so allows users to debug their include/exclude configuration.
* Merged in lp:~germar/duplicity/par2removefix
- After reorganisation in revision 981 and the fix for bug #1406173 the
par2backend does not remove .par2 files anymore when removing
duplicity-*.gpg files.
- This banch adds an unfiltered_list() method which is used in
delete() and delete_list()
* Updated man pages to reflect more contributors.
* Fix bug #1493573. Correct option typo in man page.
* Fix bug #1494228 CygWin: TypeError: basis_file must be a (true) file
- The problem that caused the change to tempfile.TemporaryFile was due
to the fact that os.tmpfile always creates its file in the system
temp directory, not in the directory specified. The fix applied was
to use os.tmpfile in cygwin/windows and tempfile.TemporaryFile in all
the rest. This means that cygwin is now broken with respect to temp
file placement of this one file (deleted automatically on close).
* Merged in lp:~bmerry/duplicity/pydrive-id-cache
- This fixes the issue a number of users (including myself) have been
having with duplicity creating files with duplicate filenames on
Google Drive. It keeps a runtime cache of filename to object ID
mappings, so that once it has uploaded an object it won't be fooled
by weakly consistent directory listings.
* Merged in lp:~duplicity-team/duplicity/po-updates
New in v0.7.04 (2015/08/02)
---------------------------
* Merged in lp:~noizyland/duplicity/fix-progress
- Fixes bug 1264744. selection.filelist_globbing_get_sfs leaves the
filelist file object's position at the end of the file. When the
--progress option is used the filelists need to be read twice. On
the second read nothing is read from the file because file has
already been read and the position is EOF. This patch calls seek(0)
on the filelist to reset the position to BOF so that subsequent
read() calls will return data.
* Added pylint ignore error in webdavbackend.py.
* Merged in lp:~bmerry/duplicity/pydrive-regular
- This implements the proposal made by somebody else
(http://lists.gnu.org/archive/html/duplicity-talk/2015-02/msg00037.html)
to allow the pydrive backend to work with a normal drive account instead
of a service account. It seems to be working for me: I was able to migrate
seamlessly from the gdocs backend. It's set up so that a service account
can still be used, depending on which environment variable is set.
The man page is updated to describe how to use the new functionality.
* Merged in lp:~ed.so/duplicity/gdocs.pydrive
- make pydrive new gdocs default backend
- keep gdata backend as gdata+gdocs://
* Merged in lp:~raymii/duplicity/fix-swiftbackend-max-10000-files-in-list
- Swiftclient by default returns at max 10000 files. By adding
full_listing=True we make sure all objects are returned.
Ref: https://lists.nongnu.org/archive/html/duplicity-talk/2015-05/msg00060.html
and http://docs.openstack.org/developer/python-swiftclient/swiftclient.html#swiftclient.client.get_container
* Fix a couple of PEP8 glitches.
* Fixed bug 791794 - description of --gpg-options is misleading, Simply
needed to add the '--' before the options as in "--opt1 --opt2=parm".
* Fixed bug 1465335 - pydrive still use files in trash can - with patch
from Kuang-che Wu to ignore trashed files.
* Fixed bug 1452263 - par2 option not working on small processors - with patch
from Kuang-che Wu to ignore default 30 second timeout.
* Fixed bug 1466160 - pydrive backend is slow to remove old backup set - with
patch from Kuang-che Wu to implement _delete_list().
* Fixed bug 1466582 - reduce unnecessary syscall with --exclude-if-present - with
patch from Kuang-che Wu to make sure resulting path is a directory.
* Merged in lp:~ed.so/duplicity/gpg.binary
- new parameter --gpg-binary allows user to point to a different gpg binary,
not necessarily in path
* Merged in lp:~aaron-whitehouse/duplicity/fix_POTFILES.in_and_run-tests
- Fixed two filename references in po/POTFILES.in, a mistake which crept in in
rev 1093 and caused testing/run-tests to fail with "IndexError: list index
out of range".
* Merged in lp:~aaron-whitehouse/duplicity/reactivate_progress_test
- Re-enable the test of the --progress option (test_exclude_filelist_progress_option),
which was marked as an expected failure. The issue causing this test to fail was
fixed in revision 1095 and the test now passes.
* Fixed bug 1471348 Multi back-end doesn't work with hubiC
- added init of appropriate superclass in both cases.
* Fixed bug 1471348 Multi back-end doesn't work with hubiC (again)
- hubiC should reach up to duplicity.backend.__init__
* Merged in lp:~aaron-whitehouse/duplicity/bug_884371
- Fixed Bug #884371 - Stopped an exclude glob trumping an earlier scan glob, but also
ensured that an exclude glob is not trumped by a later include. This fix is important,
as without it files that are specified to be included are not being backed up as expected.
- Fixed Bug #932482 - a trailing slash at the end of globs no longer prevents them working
as expected.
* Merged in lp:~aaron-whitehouse/duplicity/reenable_tests
- Re-enable unit.test_selection tests that had been temporarily commented out.
* Merged in lp:~aaron-whitehouse/duplicity/trailing_slash_match_dirs
- Made globs with trailing slashes only match directories, not files, fixing Bug #1479545.
* Merged in lp:~aaron-whitehouse/duplicity/improve_tox_and_python2-6_testing
- Testing improvements, particularly in relation to testing against Python version 2.6:
* tox.ini fixed so that it is possible to run individual tests against both Python 2.6 and 2.7;
* updated test_code.py to use unittest2 for Python versions < 2.7 (instead of failing);
* ./run-tests now correctly runs all tests against both Python 2.6 and 2.7; and
* improved testing directions in README-REPO.
* Merged in lp:~dag-stenstad/duplicity/swift_authversion_3_support
- Added support for Openstack Identity v3 in the Swift backend.
* Merged in lp:~aaron-whitehouse/duplicity/fix_2to3_issues
- Fixed 2to3 issues. Updated README-REPO with more test information. Updated pylint and
test_diff2 descriptions to make it clear these require packages to be installed on the
sytem to pass. All tests pass on Python 2.6 and Python 2.7 as at this revision.
New in v0.7.03 (2015/05/11)
---------------------------
* Merged in lp:~aaron-whitehouse/duplicity/filelist_combine
- Merged globbing and non-globbing filelists to use the same code path
and all accept globbing characters. Added deprecation warning to the
--exclude-globbing-filelist and include-globbing-filelist options in
commandline.py and hid them from help output. Updated the manual
(and unit tests) accordingly.
- Note that this does trigger a change in behaviour for duplicity.
Previously, include patterns in include-filelist did not match files
in a directory that was included, so /usr/local in an include file
would not have matched /usr/local/doc. Now, this folder would be
included, as would occur if --include or the old
--include-globbing-filelist was used. Additional lines will therefore
need to be added to filelists to unambiguously exclude unwanted
subfolders, if this is intended.
- Mark --include-filelist-stdin and --exclude-fielist-stdin for
deprecation and hide from --help output.
* Fix bug 1432999 with hint from Antoine Afalo.
- '/'s at end of destination cause problems with onedrivebackend.
* Fix bug 1434702 with help from Robin Nehls
- incorrect response BackendException while downloading signatures file.
* Fix bug 1437789 with patch from pdf
- par2backend.py incorrect syntax in get()
* Merge in lp:~stynor/duplicity/multi-backend
- A new backend that allows use of more than one backend stores (e.g. to
combine the available space from more than one cloud provider to make
a larger store available to duplicity).
* Move requirements section lower in manpage.
* Merge in lp:~cemsbr/duplicity/duplicity
- Fix bug 1432229 in Copy.com backend:
Reply header has no content-type for JSON detection. Now, we also check
whether the content starts with '{'.
* Fixed bug 1444404 with patch from Samu Nuutamo
- rdiffdir patch crashes if a regular file is changed to a non-regular
file (symlink, fifo, ...)
* Fixed bug 1448249 and bug 1449151 thanks to David Coppit.
- When patching, close base file before renaming
- Enable --ignore-errors flag in rdiffdir
* Added ability to get single file status from collection-status with
patch from jitao (bug 1044715), like so:
$ duplicity collection-status --file-changed c1 file://./foo
* Merge in lp:~sjakthol/duplicity/onedrive-error-message
- Add proper error message for OneDrive backend when python-requests or
python-requests-oauthlib is not installed (bug 1453355).
New in v0.7.02 (2015/03/10)
---------------------------
* Merged in lp:~vincegt/duplicity/swift_regionname
- Fixes bug #1376628
- Add mapping of SWIFT_REGIONNAME to select region inside SWIFT when a
provider proposes more than one region.
* Merged in lp:~aaron-whitehouse/duplicity/progress_option_error
- Added test_exclude_globbing_filelist_progress_option into
functional/test_selection.py, which shows the error reported in
Bug #1264744 - that the --exclude-globbing-filelist does not backup
the correct files if the --progress option is used. Test is marked as
an expected failure so as not to cause the test suite to fail.
* Merged in lp:~noizyland/duplicity/fix_azurebackend_container_names
- Azure Backend examples have underscores in the container names. These
are not valid Azure container names. The underscores have been replaced
with hypens and a note about valid container names added to the man page.
- Also corrects a problem where Azure Exceptions were returing unicode
strings that were not being handled correctly.
* Merged in lp:~user3942934/duplicity/pydrive
- Currently duplicity uses gdocs backend for Google Drive backups.
gdocs uses deprecated API and don't allow backups for managed Google
accounts. (see https://bugs.launchpad.net/duplicity/+bug/1315684)
- Added pydrive backend that solves both of those problems. Published
also on https://github.com/westerngateguard/duplicity-pydrive-backend.
* Fixed some tabs/spaces problems that were causing install failures.
* Fixed variable typo in commandline.py that was causing build fails.
* Merged in lp:~duplicity-team/duplicity/po-updates
* Remove 'gs' and 's3+http' from uses_netloc[]. Fixes Bug 1411803.
* Fixed bug # 1414418
- Aligned commandline.py options and help display contents.
- Aligned commandline.py options and manpage contents.
* Changed --s3_multipart_max_timeout to --s3-multipart-max-timeout to be
consistent with commandline option naming conventions.
* Applied patch from Adam Reichold to fix bug # 1413792.
* Merged in lp:~angusgr/duplicity/exclude-older-than
- Add "--exclude-older-than" commandline option, that allows you to only
back up files with a modification date newer than a particular threshold.
* Merged in lp:~aaron-whitehouse/duplicity/bug_884371_asterisks_in_includes
- Added tests to unit/test_selection.py and funtional/test_selection.py
to show the behaviour reported in Bug #884371, i.e. that selection is
incorrect when there is a * or ** on an include line of a filelist or
commandline --include.
* Merged in lp:~aaron-whitehouse/duplicity/bug_932482_trailing_slashes_and_wildcards_error
- Added functional and unit tests to show Bug #932482 - that selection does
not work correctly when excludes (in a filelist or in a commandline option)
contain both a single or double asterisk and a trailing slash.
* Misc fixes for the following PEP8 issues:
- E111, E121, E122, E124, E125, E126, E127, E128, E201, E202, E203,
E231, E241, E251, E261, E262, E271, E272, E301, E302, E303, E401,
E502, E701, E702, E703, E711, E721, W291, W292, W293, W391
- to run pep8 on duplicity use 'pep8 --ignore=E501'
- see http://pep8.readthedocs.org
* Fixes for 2to3 issues
* Fix spelling error in manpage, bug 1419314.
* Fix _librsyncmodule.c compilation, bug 1416344, thanks to Kari Hautio.
* Really fix bug 1416344 based on comment #5 by Roman Tereshonkov.
* Fix for --pydevd debug environment and location under Eclipse.
* Fix for bug where scp was actually working as scp and not working with
rsync.net because of using extraneous test command in restricted shell.
Was trying "test -d 'foo' || mkdir -p 'foo'", now only "mkdir -p foo".
* remove extraneous string format arg in previous scp fix.
New in v0.7.01 (2015/01/11)
---------------------------
Enhancements:
* Undid move of testing/test_code.py. Instead I fixed it
so that it would not run during PPA build. It now needs
the setting RUN_CODE_TESTS=1 in the environment which is
supplied in the tox.ini file.
* Moved testing/test_code.py to testing/manual/code_test.py
so PPA builds would succeed. Should be moved back later.
* Remove valid_extension() check from file_naming.py. It was
causing failed tests for short filenames. Thanks edso.
* Partial fix for PPA build failures, new backend name.
* Merged in lp:~ed.so/duplicity/fix.dpbx.import
- fix dpbx import error import lazily
* Merged in lp:~hooloovoo/duplicity/fix-typo-in-test-description
- Fixed spelling mistake/typo in a description of a test.
* Merged in lp:~mterry/duplicity/missing-unicode-escape
- Convert restore_dir to unicode before printing.
* Merged in lp:~ed.so/duplicity/lftp.ncftp.and.prefixes
- retire --ssh-backend, --use-scp parameters
- introduce scheme prefixes for alternative backend selection
e.g. ncftp+ftp://, see manpage
- scp is now selected via scheme e.g. scp://
- added lftp fish, webdav(s), sftp support
* Merged in lp:~mterry/duplicity/code-nits
- Fix some pylint/pep8 nits that prevented the test_code.py test from passing.
* Merged in lp:~mterry/duplicity/debian-dir
- Add a debian/ directory to make it easier to manage the PPAs for duplicity.
* In webdavbackend.py:
- Fixed bug 1396106 with change by Tim Ruffing, mispelled member.
- Added missing 'self.' before member in error message.
* Merged in lp:~adrien-delhorme/duplicity/hubic
- Add Hubic support through pyrax and a custom pyrax_identity module.
* Fixed bug 1385599 with changes by Yannick Molin. SSL settings are now
conditioned on protocol ftp or ftps.
* Partial fix of bug 1236248 with changes by az, manpage warning about
--extra-clean, however, recovery with missing sig files is broken.
* Fixed bug 1255453 with changes by Gaudenz Steinlin, report backend import
results, both normal and failed, at INFO log level.
* Manually merged in lp:~m4ktub/duplicity/0.6-reliability
- Per fix proposed in Bug #1395341.
* Modded .bzrignore to ignore *.egg test dependencies, normalized, sorted.
* Merged in lp:~ed.so/duplicity/paramiko.identyfile
- fix identity file parsing of --ssh-options for paramiko
- manpage fixes
* Source formatted, using PyDev, all source files to fix some easily fixed
PEP8 issues. Use ignore space when comparing against previous versions.
* Merge in lp:~andol/duplicity/signkeyformat
- Allow --sign-key to use short format, long format alt. full fingerprint.
* Merge in lp:~hooloovoo/duplicity/verify-not-check-source
- Tests to validate that duplicity does not check filesystem source during
verify unless --compare-data is specified
* Merge in lp:~ed.so/duplicity/move_netloc
- move netloc usage definitions into respective backends
- fix "[Question #259173]: rsync backend fails"
https://answers.launchpad.net/duplicity/+question/259173
* Make ssh an unsupported backend scheme
* Temporarily disable RsyncBackendTest and test_verify_changed_source_file
* Merge in lp:~hooloovoo/duplicity/test-verify-improvements
- Fix up test_verify, which was a bit of a mess:
- Simplify test_verify.py to just do a simple backup and verify on a
single file in each test.
- Modify tests to correctly use --compare-data option.
- Add tests for when the source files have atime/mtime manipulated.
* Fix duplicity verify to ignore the file system when globals.compare_data is
False. This means that verify only validates the viability of the backup
itself unless --compare-data is specified.
* Reenable test_verify_changed_source_file test
* Merged in lp:~hooloovoo/duplicity/add-additional-verify-tests-for-corrupted-archives
- Add tests to test_verify.py to test that verify fails if the archive
file is corrupted. Changed file objects to use the with keyword to ensure
that the file is properly closed.
- Small edit to find statement in verify_test.sh to make it work as
expected (enclose string in quotes).
* Merged in lp:~hooloovoo/duplicity/add-else-to-badupload-try-except
- Badupload test previously did not have an else in the try-except. The
test passed if the except was triggered, but would also pass if the
test did not trigger an error at all.
* Fixed bug 1406173 by applying patch supplied in report
- Ignore .par2 files in remote file list
* Removed redundant shell test testing/verify_test.sh
* Misc fixes for the following PEP8 issues:
- E211, E221, E222, E225, E226, E228
- see http://pep8.readthedocs.org
* Fixed bug 1278529 by applying patch supplied in report
- Use get_bucket() rather than lookup() on S3 to get proper error msg.
* Merged in lp:~stapelberg+ubuntu/duplicity/add-onedrive-backend
- Add a Microsoft OneDrive backend
* Merged in lp:~hooloovoo/duplicity/filelist_select_bug_1408411
- Adds functional test cases that fail because of Bug #1408411 (commented
out), to assist in fixing that bug.
* Merged in lp:~hooloovoo/duplicity/process_filelists_for_spaces_etc
- Process filelists to remove imperfections such as blank lines, comments
and leading/trailing whitespace. Also correctly processes quoted folders
containing spaces in their names. Extensive unit and functional tests to
test these changes (and selection more generally).
- The branch does add an additional folder to testfiles.tar.gz called
select2. This included a folder with a trailing space, to test the quote
test. The subfolders also have clearer names than in the "select" folder
(eg "1sub2sub3") which makes it easier to keep track of issues in tests.
* Merged in lp:~9-sa/duplicity/FixBug1408289
- Fix bug #1408289
- Wrong attribute name prevented raise of client exception, working now
* Merged in lp:~noizyland/duplicity/azurebackend
- Add backend for Azure Blob Storage Service
New in v0.7.00 (2014/10/23)
---------------------------
Enhancements:
* Adjust unit tests to expect single FTP backend
* Merged in lp:~moritzm/duplicity/duplicity
- Use lftp for both FTP and FTPS
* Merged in lp:~ed.so/duplicity/0.7-dpbx.importfix
- fix this showstopper with the dropbox backend
"NameError: global name 'rest' is not defined"
* Merged in lp:~jflaker/duplicity/BugFix1325215
- The reference to "--progress_rate" in the man page as a parameter is
incorrect. Should be "--progress-rate".
* Merged in lp:~hooloovoo/duplicity/updated-README-REPO
- Changes to README-REPO to reflect the restructuring of the directories.
* Fixed bug 1375304 with patch supplied by Aleksandar Ivanovic
* Merged in lp:~ed.so/duplicity/webdav200fix-0.7
- webdav backend fix "BackendException: Bad status code 200 reason OK. " when
restarting an interrupted backup and overwriting partially uploaded volumes.
* Merged in lp:~mterry/duplicity/require-2.6
- Require at least Python 2.6.
- Our code base already requires 2.6, because 2.6-isms have crept in. Usually
because we or a contributor didn't think to test with 2.4. And frankly,
I'm not even sure how to test with 2.4 on a modern system.
* Merged in lp:~mterry/duplicity/drop-pexpect
- Drop our local copy of pexpect in favor of a system version.
- It's only used by the pexpect ssh backend (and if you're opting into that,
you probably can expect that you will need pexpect) and the tests.
- I've done a quick smoketest (backed up and restored using
--ssh-backend=pexpect) and it seemed to work fine with a modern version
of pexpect.
* Merged in lp:~mterry/duplicity/2.6isms
- Here's a whole stack of minor syntax modernizations that will become
necessary in python3. They all work in python2.6.
- I've added a new test to keep us honest and prevent backsliding on these
modernizations. It runs 2to3 and will fail the test if 2to3 finds anything
that needs fixing (with a specific set of exceptions carved out).
- This branch has most of the easy 2to3 fixes, the ones with obvious and
safe syntax changes.
- We could just let 2to3 do them for us, but ideally we use 2to3 as little
as possible, since it doesn't always know how to solve a given problem.
I will propose a branch later that actually does use 2to3 to generate
python3 versions of duplicity if they are requested. But this is a first
step to clean up the code base.
* Merged in lp:~mterry/duplicity/drop-static
- Drop static.py.
- This is some of the oldest code in duplicity! A bzr blame says it is
unmodified (except for whitespace / comment changes) since revision 1.
- But it's not needed anymore. Not really even since we updated to python2.4,
which introduced the @staticmethod decorator. So this branch drops it and
its test file.
* Merged in lp:~mterry/duplicity/py3-map-filter
- In py3, map and filter return iterable objects, not lists. So in each case
we use them, I've either imported the future version or switched to a list
comprehension if we really wanted a list.
* Merged in lp:~mterry/duplicity/backend-unification
- Reorganize and simplify backend code. Specifically:
- Formalize the expected API between backends and duplicity. See the new
file duplicity/backends/README for the instructions I've given authors.
- Add some tests for our backend wrapper class as well as some tests for
individual backends. For several backends that have some commands do all
the heavy lifting (hsi, tahoe, ftp), I've added fake little mock commands
so that we can test them locally. This doesn't truly test our integration
with those commands, but at least lets us test the backend glue code.
- Removed a lot of duplicate and unused code which backends were using (or
not using). This branch drops 700 lines of code (~20%)
in duplicity/backends!
- Simplified expectations of backends. Our wrapper code now does all the
retrying, and all the exception handling. Backends can 'fire and forget'
trusting our wrappers to give the user a reasonable error message.
Obviously, backends can also add more details and make nicer error
messages. But they don't *have* to.
- Separate out the backend classes from our wrapper class. Now there is no
possibility of namespace collision. All our API methods use one
underscore. Anything else (zero or two underscores) are for the backend
class's use.
- Added the concept of a 'backend prefix' which is used by par2 and gio
backends to provide generic support for "schema+" in urls -- like par2+
or gio+. I've since marked the '--gio' flag as deprecated, in favor of
'gio+'. Now you can even nest such backends like
par2+gio+file://blah/blah.
- The switch to control which cloudfiles backend had a typo. I fixed this,
but I'm not sure I should have? If we haven't had complaints, maybe we
can just drop the old backend.
- I manually tested all the backends we have (except hsi and tahoe -- but
those are simple wrappers around commands and I did test those via mocks
per above). I also added a bunch more manual backend tests to
./testing/manual/backendtest.py, which can now be run like the above to
test all the files you have configured in config.py or you can pass it a
URL which it will use for testing (useful for backend authors).
* Merged in lp:~mterry/duplicity/py2.6.0
- Support python 2.6.0.
- Without this branch, we only support python >= 2.6.5 because that's when
python's urlparse.py module became its more modern incarnation. (I won't
get into the wisdom of them making such a change in the middle of the
2.6 lifecycle.)
- Also, the version of lockfile that I have (0.8) doesn't work with python
2.6.0 or 2.6.1 due to their implementation of
threading.current_thread().ident returning None unexpectedly. So this
branch tells lockfile not to worry about adding the current thread's
identifier to the lock filename (we don't need a separate lock per thread,
since our locking is per process).
- I've tested with 2.6.0 and 2.7.6 (both extremes of our current support).
* Update shebang line to python2 instead of python to avoid confusion.
* Merged in lp:~3v1n0/duplicity/copy.com-backend
- I've added a backend for Copy.com cloud storage, this supports all the
required operations and works as it should from my tests.
- You can use it by calling duplicity with something like:
copy://account@email.com:your-password@copy.com/duplicity
- The only thing I've concerns with is the optimized support for _delete_list
which can't be enabled here because the test_delete_list tries also to
delete a not-existing files, and it requires the backend not to raise an
exception in that case (is this somewhat wanted or could we do the same as
for _delete or _query?)
* Merged in lp:~ed.so/duplicity/webdav200fix-0.7
- webdav backend fix "BackendException: Bad status code 200 reason OK. " when
restarting an interrupted backup and overwriting partially uploaded volumes.
* Merged in lp:~mterry/duplicity/webdav-fixes
- This branch fixes two issues I saw when testing the webdav backend:
- 1) Errors like the following: "Attempt 1 failed. BackendException: File
/tmp/duplicity-LQ1a0i-tempdir/mktemp-u2aiyX-2 not found locally after get
from backend". These were caused by the _get() method not calling setdata()
on the local path object, so the rest of the code thought it didn't exist.
- 2) Some odd issues from stale responses/data. We have a couple places in
webdavbackend.py where we close the connection before making a request
because of this problem. But I've changed it to do it every time, more
reliably, by putting a _close() call inside the request() method.
- With this, the webdav backend seems fine to me.
* Merged in lp:~antmak/duplicity/0.7-par2-fix
- Useful fix for verbatim par2cmdline options (like "-t" in par2-tbb version)
* Fixed bug 1327550: OverflowError: signed integer is greater than maximum
- Major and minor device numbers are supposed to be one byte each. Someone
has crafted a special system image using OpenVZ where the major and minor
device numbers are much larger (ploop devices). We treat them as (0,0).
* Added sxbacked.py, Skylable backend. Waiting on man page updates.
* Merged in lp:~ed.so/duplicity/manpage.verify
- Clarify verify's functionality as wished for by a user surprised with a big
bandwidth bill from rackspace.
* Merged in lp:~jeffreydavidrogers/duplicity/duplicity
- This change fixes two small typos in the duplicity man page.
* Merged in lp:~johnleach/duplicity/1315437-swift-container-create
- Check to see if the swift container exists before trying to create it,
in case we don't have permissions to create containers. Fixes #1315437
* Merged in lp:~ed.so/duplicity/manpage.blocksize
- add --max_blocksize doc
- reorder 'a note on filename prefixes' into alphabetical order
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 pkgsrc/sysutils/duplicity/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/sysutils/duplicity/PLIST
cvs rdiff -u -r1.19 -r1.20 pkgsrc/sysutils/duplicity/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/duplicity/options.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Responsible-Changed-From-To: pkg-manager->bsiegert
Responsible-Changed-By: bsiegert@NetBSD.org
Responsible-Changed-When: Mon, 18 Apr 2016 17:51:55 +0000
Responsible-Changed-Why:
State-Changed-From-To: open->closed
State-Changed-By: bsiegert@NetBSD.org
State-Changed-When: Mon, 18 Apr 2016 17:51:55 +0000
State-Changed-Why:
Committed, thanks!
From: "Benny Siegert" <bsiegert@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc:
Subject: PR/51061 CVS commit: pkgsrc/doc
Date: Mon, 18 Apr 2016 17:51:11 +0000
Module Name: pkgsrc
Committed By: bsiegert
Date: Mon Apr 18 17:51:11 UTC 2016
Modified Files:
pkgsrc/doc: CHANGES-2016 TODO
Log Message:
+duplicity-0.7.07, PR pkg/51061.
To generate a diff of this commit:
cvs rdiff -u -r1.1628 -r1.1629 pkgsrc/doc/CHANGES-2016
cvs rdiff -u -r1.15794 -r1.15795 pkgsrc/doc/TODO
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
From: =?UTF-8?Q?Fr=C3=A9d=C3=A9ric_Fauberteau?= <triaxx@triaxx.org>
To: gnats-bugs@netbsd.org
Cc: bsiegert@netbsd.org
Subject: Re: pkg/51061 (sysutils/duplicity update to 0.7.07)
Date: Sun, 22 May 2016 12:17:39 +0000
Le 2016-04-18 17:51, bsiegert@NetBSD.org a écrit :
> Synopsis: sysutils/duplicity update to 0.7.07
>
> Responsible-Changed-From-To: pkg-manager->bsiegert
> Responsible-Changed-By: bsiegert@NetBSD.org
> Responsible-Changed-When: Mon, 18 Apr 2016 17:51:55 +0000
> Responsible-Changed-Why:
>
>
> State-Changed-From-To: open->closed
> State-Changed-By: bsiegert@NetBSD.org
> State-Changed-When: Mon, 18 Apr 2016 17:51:55 +0000
> State-Changed-Why:
> Committed, thanks!
I don't know if I would open another PR to follow on from this one.
I forgot a read permission on a manpage in my previous patch. Afterwards
EVAL_PREFIX does not seem used any more in 2016Q1. Then I update the
package to the last version that fixes the following bugs:
New in v0.7.07.1 (2016/04/19)
---------------------------
* Fixed bug #1568677 duplicity fails to use existing S3 bucket in boto
backend
- bug introduced by incomplete fix of bug #1296793
- simplified setting of bucket locations
* Fixed bug #1569523 get_bucket unknown keyword location and my_location
name error
- bug introduced in improper fix of bug #1568677
- gotta love those inconsistent APIs
* Fixed bug #1571134 incompatible with python-oauth2client version 2.x
and #1558155 PyDrive backend broken, needs update to oauth2client
library
- used patch from https://bugs.debian.org/820725 but made changes
to allow the user to continue using the old version
* Fixed bug #1570293 duplicity is very slow due to excessive fsync
- removed flush() after write.
- revert to previous version
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/duplicity/Makefile,v
retrieving revision 1.33
diff -u -r1.33 Makefile
--- Makefile 18 Apr 2016 17:49:20 -0000 1.33
+++ Makefile 22 May 2016 09:30:17 -0000
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.33 2016/04/18 17:49:20 bsiegert Exp $
-DISTNAME= duplicity-0.7.07
+DISTNAME= duplicity-0.7.07.1
CATEGORIES= sysutils net
MASTER_SITES= http://code.launchpad.net/duplicity/0.7-series/${PKGVERSION_NOREV}/+download/
@@ -37,6 +37,7 @@
# XXX in 0.7.07, executable bit set on duplicity.1
post-extract:
${CHMOD} -x ${WRKSRC}/bin/duplicity.1
+ ${CHMOD} go+r ${WRKSRC}/bin/*.1
.include "../../lang/python/application.mk"
.include "../../lang/python/egg.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/duplicity/PLIST,v
retrieving revision 1.14
diff -u -r1.14 PLIST
--- PLIST 18 Apr 2016 17:49:20 -0000 1.14
+++ PLIST 22 May 2016 09:30:17 -0000
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.14 2016/04/18 17:49:20 bsiegert Exp $
+@comment $NetBSD$
bin/duplicity
bin/rdiffdir
-${PYSITELIB}/duplicity-0.7.7-py2.7.egg-info/PKG-INFO
-${PYSITELIB}/duplicity-0.7.7-py2.7.egg-info/SOURCES.txt
-${PYSITELIB}/duplicity-0.7.7-py2.7.egg-info/dependency_links.txt
-${PYSITELIB}/duplicity-0.7.7-py2.7.egg-info/requires.txt
-${PYSITELIB}/duplicity-0.7.7-py2.7.egg-info/top_level.txt
+${PYSITELIB}/duplicity-0.7.7.1-py2.7.egg-info/PKG-INFO
+${PYSITELIB}/duplicity-0.7.7.1-py2.7.egg-info/SOURCES.txt
+${PYSITELIB}/duplicity-0.7.7.1-py2.7.egg-info/dependency_links.txt
+${PYSITELIB}/duplicity-0.7.7.1-py2.7.egg-info/requires.txt
+${PYSITELIB}/duplicity-0.7.7.1-py2.7.egg-info/top_level.txt
${PYSITELIB}/duplicity/__init__.py
${PYSITELIB}/duplicity/__init__.pyc
${PYSITELIB}/duplicity/__init__.pyo
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/duplicity/distinfo,v
retrieving revision 1.20
diff -u -r1.20 distinfo
--- distinfo 18 Apr 2016 17:49:20 -0000 1.20
+++ distinfo 22 May 2016 09:30:17 -0000
@@ -1,7 +1,7 @@
$NetBSD: distinfo,v 1.20 2016/04/18 17:49:20 bsiegert Exp $
-SHA1 (duplicity-0.7.07.tar.gz) =
9a1d35add7a4a35464bed3bfda23df14c1774058
-RMD160 (duplicity-0.7.07.tar.gz) =
ec62dfc8daa015d7aade3f100ef48eac13bc6b01
-SHA512 (duplicity-0.7.07.tar.gz) =
9bc626e7a3913d5e511e6e70534fb5803eab3b1bdc80c99f3cb54740b05efd3eae26fd0fcadab433fe912a6b5fca4ed564b1551e3126d36ddafd003325b23a7c
-Size (duplicity-0.7.07.tar.gz) = 1538252 bytes
+SHA1 (duplicity-0.7.07.1.tar.gz) =
2aa0bea171a02cb074d86145dcf9c9328867e7c8
+RMD160 (duplicity-0.7.07.1.tar.gz) =
31fa6c10928376729dc413ed3d677c76bc6997d9
+SHA512 (duplicity-0.7.07.1.tar.gz) =
363266232763791bac9e84a9e345dda6ffa278a89597a094540088e12e47b56cb2459f72073c0020b77504514149b1ccb9bed7a67e516443a674975954f49129
+Size (duplicity-0.7.07.1.tar.gz) = 1539310 bytes
SHA1 (patch-aa) = f1210f703dccf759f234846a3139ce98063011cb
Index: options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/duplicity/options.mk,v
retrieving revision 1.1
diff -u -r1.1 options.mk
--- options.mk 18 Apr 2016 17:49:20 -0000 1.1
+++ options.mk 22 May 2016 09:30:17 -0000
@@ -7,10 +7,8 @@
.if !empty(PKG_OPTIONS:Mgnupg2)
DEPENDS+= gnupg2-[0-9]*:../../security/gnupg2
-EVAL_PREFIX= GNUPG2_PREFIX=gnupg2
-GPGPATH= ${GNUPG2_PREFIX}/bin/gpg2
+GPGPATH= ${LOCALBASE}/bin/gpg2
.else
DEPENDS+= gnupg>=1.0.0:../../security/gnupg
-EVAL_PREFIX= GNUPG_PREFIX=gnupg
-GPGPATH= ${GNUPG_PREFIX}/bin/gpg
+GPGPATH= ${LOCALBASE}/bin/gpg
.endif
State-Changed-From-To: closed->open
State-Changed-By: dholland@NetBSD.org
State-Changed-When: Tue, 24 May 2016 16:22:04 +0000
State-Changed-Why:
more changes have come in
(probably better to file a new PR in this kind of case, but we can run with
this one)
From: Benny Siegert <bsiegert@NetBSD.org>
To: =?UTF-8?B?RnLDqWTDqXJpYyBGYXViZXJ0ZWF1?= <triaxx@triaxx.org>
Cc: gnats-bugs@netbsd.org
Subject: Re: pkg/51061 (sysutils/duplicity update to 0.7.07)
Date: Tue, 24 May 2016 21:02:47 +0200
The egg-info lines in the PLIST should be using EGG_INFODIR.
Unfortunately, setuptools changes the "0.7.07.1" version into
"0.7.7.1". Do you have an idea why that could be?
From: Benny Siegert <bsiegert@NetBSD.org>
To: =?UTF-8?B?RnLDqWTDqXJpYyBGYXViZXJ0ZWF1?= <triaxx@triaxx.org>
Cc: gnats-bugs@netbsd.org
Subject: Re: pkg/51061 (sysutils/duplicity update to 0.7.07)
Date: Tue, 24 May 2016 21:06:50 +0200
On Tue, May 24, 2016 at 9:02 PM, Benny Siegert <bsiegert@netbsd.org> wrote:
> The egg-info lines in the PLIST should be using EGG_INFODIR.
> Unfortunately, setuptools changes the "0.7.07.1" version into
> "0.7.7.1". Do you have an idea why that could be?
Another comment as I see this: The MESSAGE says:
Depending on the storage backend used, additional packages might be needed:
-Amazon S3 needs pkgsrc/net/py-boto.
-Dropbox needs pkgsrc/net/py-dropbox.
-For ssh/scp, pkgsrc/security/py-paramiko is recommended.
How about just making them hard dependencies? They will make the
package useful by default.
From: "Benny Siegert" <bsiegert@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc:
Subject: PR/51061 CVS commit: pkgsrc/sysutils/duplicity
Date: Tue, 24 May 2016 19:10:46 +0000
Module Name: pkgsrc
Committed By: bsiegert
Date: Tue May 24 19:10:46 UTC 2016
Modified Files:
pkgsrc/sysutils/duplicity: Makefile PLIST distinfo options.mk
Log Message:
Update duplicity to 0.7.07.1. From Frederic Fauberteau in PR pkg/51061.
New in v0.7.07.1 (2016/04/19)
---------------------------
* Fixed bug #1568677 duplicity fails to use existing S3 bucket in boto backend
- bug introduced by incomplete fix of bug #1296793
- simplified setting of bucket locations
* Fixed bug #1569523 get_bucket unknown keyword location and my_location name error
- bug introduced in improper fix of bug #1568677
- gotta love those inconsistent APIs
* Fixed bug #1571134 incompatible with python-oauth2client version 2.x
and #1558155 PyDrive backend broken, needs update to oauth2client library
- used patch from https://bugs.debian.org/820725 but made changes
to allow the user to continue using the old version
* Fixed bug #1570293 duplicity is very slow due to excessive fsync
- removed flush() after write.
- revert to previous version
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 pkgsrc/sysutils/duplicity/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/sysutils/duplicity/PLIST
cvs rdiff -u -r1.20 -r1.21 pkgsrc/sysutils/duplicity/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/duplicity/options.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
From: =?UTF-8?Q?Fr=C3=A9d=C3=A9ric_Fauberteau?= <triaxx@triaxx.org>
To: gnats-bugs@netbsd.org
Cc:
Subject: Re: pkg/51061 (sysutils/duplicity update to 0.7.07)
Date: Tue, 24 May 2016 20:14:03 +0000
Le 2016-05-24 19:05, Benny Siegert a écrit :
> The following reply was made to PR pkg/51061; it has been noted by
> GNATS.
>
> From: Benny Siegert <bsiegert@NetBSD.org>
> To: =?UTF-8?B?RnLDqWTDqXJpYyBGYXViZXJ0ZWF1?= <triaxx@triaxx.org>
> Cc: gnats-bugs@netbsd.org
> Subject: Re: pkg/51061 (sysutils/duplicity update to 0.7.07)
> Date: Tue, 24 May 2016 21:02:47 +0200
>
> The egg-info lines in the PLIST should be using EGG_INFODIR.
> Unfortunately, setuptools changes the "0.7.07.1" version into
> "0.7.7.1". Do you have an idea why that could be?
I had a look in lang/python/egg.mk but I don't understand why the
version is stripped. There is the same behavior at Debian:
https://packages.debian.org/sid/amd64/duplicity/filelist. I will
investigate.
From: =?UTF-8?Q?Fr=C3=A9d=C3=A9ric_Fauberteau?= <triaxx@triaxx.org>
To: gnats-bugs@netbsd.org
Cc:
Subject: Re: pkg/51061 (sysutils/duplicity update to 0.7.07)
Date: Tue, 24 May 2016 20:39:37 +0000
Le 2016-05-24 19:10, Benny Siegert a écrit :
> The following reply was made to PR pkg/51061; it has been noted by
> GNATS.
>
> From: Benny Siegert <bsiegert@NetBSD.org>
> To: =?UTF-8?B?RnLDqWTDqXJpYyBGYXViZXJ0ZWF1?= <triaxx@triaxx.org>
> Cc: gnats-bugs@netbsd.org
> Subject: Re: pkg/51061 (sysutils/duplicity update to 0.7.07)
> Date: Tue, 24 May 2016 21:06:50 +0200
>
> On Tue, May 24, 2016 at 9:02 PM, Benny Siegert <bsiegert@netbsd.org>
> wrote:
> > The egg-info lines in the PLIST should be using EGG_INFODIR.
> > Unfortunately, setuptools changes the "0.7.07.1" version into
> > "0.7.7.1". Do you have an idea why that could be?
>
>
> Another comment as I see this: The MESSAGE says:
>
> Depending on the storage backend used, additional packages might be
> needed:
> -Amazon S3 needs pkgsrc/net/py-boto.
> -Dropbox needs pkgsrc/net/py-dropbox.
> -For ssh/scp, pkgsrc/security/py-paramiko is recommended.
>
> How about just making them hard dependencies? They will make the
> package useful by default.
Amazon S3 and dropbox dependencies could be parameterized in options.mk
but (1) it just had 5 python packages and (2) neither amazons3 nor
dropbox are in mk/default/options.descrition.
The EGG_NAME variable you added seems to have no effect.
How about this patch?
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/duplicity/Makefile,v
retrieving revision 1.34
diff -u -u -r1.34 Makefile
--- Makefile 24 May 2016 19:10:46 -0000 1.34
+++ Makefile 24 May 2016 20:31:31 -0000
@@ -1,6 +1,7 @@
# $NetBSD: Makefile,v 1.34 2016/05/24 19:10:46 bsiegert Exp $
DISTNAME= duplicity-0.7.07.1
+PKGREVISION= 1
CATEGORIES= sysutils net
MASTER_SITES=
http://code.launchpad.net/duplicity/0.7-series/${PKGVERSION_NOREV}/+download/
@@ -14,6 +15,9 @@
.include "options.mk"
DEPENDS+= ${PYPKGPREFIX}-lockfile>=0.9.1:../../devel/py-lockfile
+DEPENDS+= ${PYPKGPREFIX}-boto-[0-9]*:../../net/py-boto
+DEPENDS+= ${PYPKGPREFIX}-dropbox-[0-9]*:../../net/py-dropbox
+DEPENDS+= ${PYPKGPREFIX}-paramiko-[0-9]*:../../security/py-paramiko
REPLACE_PYTHON+= bin/duplicity \
bin/rdiffdir
From: David Holland <dholland-pbugs@netbsd.org>
To: gnats-bugs@NetBSD.org
Cc:
Subject: Re: pkg/51061 (sysutils/duplicity update to 0.7.07)
Date: Thu, 26 May 2016 04:10:11 +0000
On Tue, May 24, 2016 at 08:40:01PM +0000, Fr?d?ric Fauberteau wrote:
> Amazon S3 and dropbox dependencies could be parameterized in options.mk
> but (1) it just had 5 python packages and (2) neither amazons3 nor
> dropbox are in mk/default/options.descrition.
Things can be added to options.description you know :-)
--
David A. Holland
dholland@netbsd.org
From: =?UTF-8?Q?Fr=C3=A9d=C3=A9ric_Fauberteau?= <triaxx@triaxx.org>
To: gnats-bugs@netbsd.org
Cc:
Subject: Re: pkg/51061 (sysutils/duplicity update to 0.7.07)
Date: Thu, 26 May 2016 13:58:04 +0200
Le 2016-05-26 06:15, David Holland a écrit :
> The following reply was made to PR pkg/51061; it has been noted by
> GNATS.
>
> From: David Holland <dholland-pbugs@netbsd.org>
> To: gnats-bugs@NetBSD.org
> Cc:
> Subject: Re: pkg/51061 (sysutils/duplicity update to 0.7.07)
> Date: Thu, 26 May 2016 04:10:11 +0000
>
> On Tue, May 24, 2016 at 08:40:01PM +0000, Fr?d?ric Fauberteau wrote:
> > Amazon S3 and dropbox dependencies could be parameterized in
> options.mk
> > but (1) it just had 5 python packages and (2) neither amazons3 nor
> > dropbox are in mk/default/options.descrition.
>
> Things can be added to options.description you know :-)
>
> --
> David A. Holland
> dholland@netbsd.org
OK, right !
How about the following patch:
Index: mk/defaults/options.description
===================================================================
RCS file: /cvsroot/pkgsrc/mk/defaults/options.description,v
retrieving revision 1.507
diff -u -u -r1.507 options.description
--- mk/defaults/options.description 7 Mar 2016 12:05:01 -0000 1.507
+++ mk/defaults/options.description 26 May 2016 11:38:05 -0000
@@ -10,6 +10,7 @@
amanda-fqdn Use FQDN's in Amanda.
amanda-smb Enable SMB backup support.
amanda-ssh Enable ssh as a transport.
+amazons3 Enable Amazon S3 support.
amtterm-gamt Build amtterm GUI version (gamt).
amule-alc Build aMule LinkCreator GUI version.
amule-alcc Build aMule LinkCreator for console.
@@ -133,6 +134,7 @@
doxygen Include doxygen based document.
drac Enable DRAC support.
dri Enable Direct Rendering support.
+dropbox Enable Dropbox support.
drupal-xmlservices Enable XML-based services.
dspam-preferences-extension Enable preferences extension.
dspam-verbose-debug Enable verbose debugging support.
Index: sysutils/duplicity/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/duplicity/Makefile,v
retrieving revision 1.34
diff -u -u -r1.34 Makefile
--- sysutils/duplicity/Makefile 24 May 2016 19:10:46 -0000 1.34
+++ sysutils/duplicity/Makefile 26 May 2016 11:39:23 -0000
@@ -1,6 +1,7 @@
# $NetBSD: Makefile,v 1.34 2016/05/24 19:10:46 bsiegert Exp $
DISTNAME= duplicity-0.7.07.1
+PKGREVISION= 1
CATEGORIES= sysutils net
MASTER_SITES= http://code.launchpad.net/duplicity/0.7-series/${PKGVERSION_NOREV}/+download/
@@ -14,6 +15,7 @@
.include "options.mk"
DEPENDS+= ${PYPKGPREFIX}-lockfile>=0.9.1:../../devel/py-lockfile
+DEPENDS+= ${PYPKGPREFIX}-paramiko-[0-9]*:../../security/py-paramiko
REPLACE_PYTHON+= bin/duplicity \
bin/rdiffdir
Index: sysutils/duplicity/options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/duplicity/options.mk,v
retrieving revision 1.2
diff -u -u -r1.2 options.mk
--- sysutils/duplicity/options.mk 24 May 2016 19:10:46 -0000 1.2
+++ sysutils/duplicity/options.mk 26 May 2016 11:39:24 -0000
@@ -1,10 +1,19 @@
# $NetBSD: options.mk,v 1.2 2016/05/24 19:10:46 bsiegert Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.duplicity
-PKG_SUPPORTED_OPTIONS= gnupg2
+PKG_SUPPORTED_OPTIONS= amazons3 dropbox gnupg2
+PKG_SUGGESTED_OPTIONS= amazons3 dropbox
.include "../../mk/bsd.options.mk"
+.if !empty(PKG_OPTIONS:Mamazons3)
+DEPENDS+= ${PYPKGPREFIX}-boto-[0-9]*:../../net/py-boto
+.endif
+
+.if !empty(PKG_OPTIONS:Mdropbox)
+DEPENDS+= ${PYPKGPREFIX}-dropbox-[0-9]*:../../net/py-dropbox
+.endif
+
.if !empty(PKG_OPTIONS:Mgnupg2)
DEPENDS+= gnupg2-[0-9]*:../../security/gnupg2
GPGPATH= ${PREFIX}/bin/gpg2
State-Changed-From-To: open->closed
State-Changed-By: bsiegert@NetBSD.org
State-Changed-When: Thu, 07 Jul 2016 08:44:35 +0000
State-Changed-Why:
Superseded by update to 0.7.08.
>Unformatted:
(Contact us)
$NetBSD: query-full-pr,v 1.39 2013/11/01 18:47:49 spz Exp $
$NetBSD: gnats_config.sh,v 1.8 2006/05/07 09:23:38 tsutsui Exp $
Copyright © 1994-2014
The NetBSD Foundation, Inc. ALL RIGHTS RESERVED.
Home