pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/sysutils/duplicity update to 0.6.21
details: https://anonhg.NetBSD.org/pkgsrc/rev/0139beb9925f
branches: trunk
changeset: 617221:0139beb9925f
user: drochner <drochner%pkgsrc.org@localhost>
date: Thu Apr 11 16:27:45 2013 +0000
description:
update to 0.6.21
changes:
-many fixes
-new option: Generate encrypted backups without revealing the user's
key id via option --hidden-encrypt-key
-translation updates
-cleanup, doc improvement
pkgsrc changes:
-added option to use gnupg2
-drop py-boto dependency -- if we had a dependency for each possible
backend, it would be just too much. add a MESSAGE pointing to
some options and information
-minor cleanup
diffstat:
sysutils/duplicity/MESSAGE | 7 +++++++
sysutils/duplicity/Makefile | 29 ++++++++++++++++++++++-------
sysutils/duplicity/PLIST | 11 +++++++----
sysutils/duplicity/distinfo | 9 +++++----
sysutils/duplicity/patches/patch-aa | 15 +++++++++++++++
5 files changed, 56 insertions(+), 15 deletions(-)
diffs (133 lines):
diff -r c575c1311459 -r 0139beb9925f sysutils/duplicity/MESSAGE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/duplicity/MESSAGE Thu Apr 11 16:27:45 2013 +0000
@@ -0,0 +1,7 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2013/04/11 16:27:45 drochner Exp $
+Depending on the storage backend used, additional packages micht be needed:
+-Amazon S3 needs pkgsrc/net/py-boto.
+-For ssh/scp, pkgsrc/security/py-paramiko is recommended.
+-For more options, see the manpage.
+===========================================================================
diff -r c575c1311459 -r 0139beb9925f sysutils/duplicity/Makefile
--- a/sysutils/duplicity/Makefile Thu Apr 11 14:42:13 2013 +0000
+++ b/sysutils/duplicity/Makefile Thu Apr 11 16:27:45 2013 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2012/10/23 19:50:59 asau Exp $
+# $NetBSD: Makefile,v 1.24 2013/04/11 16:27:45 drochner Exp $
-DISTNAME= duplicity-0.6.19
+DISTNAME= duplicity-0.6.21
CATEGORIES= sysutils net
MASTER_SITES= http://code.launchpad.net/duplicity/0.6-series/${PKGVERSION_NOREV}/+download/
@@ -9,14 +9,20 @@
COMMENT= Remote encrypting incremental backup utility
LICENSE= gnu-gpl-v2
-DEPENDS+= gnupg>=1.0.0:../../security/gnupg
-DEPENDS+= ${PYPKGPREFIX}-boto>=1.6a:../../net/py-boto
-
USE_PKGLOCALEDIR= yes
-REPLACE_PYTHON+= *.py
+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
+GPGPATH= ${LOCALBASE}/bin/gpg2
+.else
+DEPENDS+= gnupg>=1.0.0:../../security/gnupg
+GPGPATH= ${LOCALBASE}/bin/gpg
+.endif
+
REPLACE_PYTHON+= bin/*
-REPLACE_PYTHON+= duplicity/*.py
SUBST_CLASSES+= fix-paths
SUBST_STAGE.fix-paths= pre-configure
@@ -25,6 +31,15 @@
SUBST_SED.fix-paths= -e 's,share/man/man1,${PKGMANDIR}/man1,'
SUBST_SED.fix-paths+= -e 's,share/locale,${PKGLOCALEDIR}/locale,'
+SUBST_CLASSES+= gpgpath
+SUBST_STAGE.gpgpath= pre-configure
+SUBST_FILES.gpgpath= duplicity/gpginterface.py
+SUBST_VARS.gpgpath= GPGPATH
+
+# XXX in 0.6.21, doc files are mode 0600
+post-extract:
+ cd ${WRKSRC} && ${CHMOD} go+r *
+
BUILDLINK_API_DEPENDS.librsync+= librsync>=0.9.6
.include "../../devel/librsync/buildlink3.mk"
.include "../../lang/python/distutils.mk"
diff -r c575c1311459 -r 0139beb9925f sysutils/duplicity/PLIST
--- a/sysutils/duplicity/PLIST Thu Apr 11 14:42:13 2013 +0000
+++ b/sysutils/duplicity/PLIST Thu Apr 11 16:27:45 2013 +0000
@@ -1,10 +1,7 @@
-@comment $NetBSD: PLIST,v 1.10 2012/09/05 10:05:43 wiz Exp $
+@comment $NetBSD: PLIST,v 1.11 2013/04/11 16:27:45 drochner Exp $
bin/duplicity
bin/rdiffdir
${PYSITELIB}/${EGG_FILE}
-${PYSITELIB}/duplicity/GnuPGInterface.py
-${PYSITELIB}/duplicity/GnuPGInterface.pyc
-${PYSITELIB}/duplicity/GnuPGInterface.pyo
${PYSITELIB}/duplicity/__init__.py
${PYSITELIB}/duplicity/__init__.pyc
${PYSITELIB}/duplicity/__init__.pyo
@@ -72,6 +69,9 @@
${PYSITELIB}/duplicity/backends/webdavbackend.py
${PYSITELIB}/duplicity/backends/webdavbackend.pyc
${PYSITELIB}/duplicity/backends/webdavbackend.pyo
+${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
@@ -108,6 +108,9 @@
${PYSITELIB}/duplicity/gpg.py
${PYSITELIB}/duplicity/gpg.pyc
${PYSITELIB}/duplicity/gpg.pyo
+${PYSITELIB}/duplicity/gpginterface.py
+${PYSITELIB}/duplicity/gpginterface.pyc
+${PYSITELIB}/duplicity/gpginterface.pyo
${PYSITELIB}/duplicity/lazy.py
${PYSITELIB}/duplicity/lazy.pyc
${PYSITELIB}/duplicity/lazy.pyo
diff -r c575c1311459 -r 0139beb9925f sysutils/duplicity/distinfo
--- a/sysutils/duplicity/distinfo Thu Apr 11 14:42:13 2013 +0000
+++ b/sysutils/duplicity/distinfo Thu Apr 11 16:27:45 2013 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.13 2012/09/05 10:05:43 wiz Exp $
+$NetBSD: distinfo,v 1.14 2013/04/11 16:27:45 drochner Exp $
-SHA1 (duplicity-0.6.19.tar.gz) = 07d72680d6b4850101a436f679793521a51f41ac
-RMD160 (duplicity-0.6.19.tar.gz) = 493336e8ac2c2f8a5dd15c441aa01d43aa426b06
-Size (duplicity-0.6.19.tar.gz) = 1131760 bytes
+SHA1 (duplicity-0.6.21.tar.gz) = 8594666f5312a7b367ab80b979d70a5c45f1145b
+RMD160 (duplicity-0.6.21.tar.gz) = 1d359227905e4bf37768b4053f52b8afbf0686a6
+Size (duplicity-0.6.21.tar.gz) = 1235340 bytes
+SHA1 (patch-aa) = f1210f703dccf759f234846a3139ce98063011cb
diff -r c575c1311459 -r 0139beb9925f sysutils/duplicity/patches/patch-aa
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/duplicity/patches/patch-aa Thu Apr 11 16:27:45 2013 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.4 2013/04/11 16:27:45 drochner Exp $
+
+prepare for SUBST
+
+--- duplicity/gpginterface.py.orig 2013-01-23 14:35:56.000000000 +0000
++++ duplicity/gpginterface.py
+@@ -281,7 +281,7 @@ class GnuPG:
+ """
+
+ def __init__(self):
+- self.call = 'gpg'
++ self.call = '@GPGPATH@'
+ self.passphrase = None
+ self.options = Options()
+
Home |
Main Index |
Thread Index |
Old Index