On Tue, Aug 26, 2014 at 02:26:14PM +0200, Giovanni Bechis wrote:
> On 08/26/14 12:43, Jason Tubnor wrote:
> > On 26 August 2014 16:33, Giovanni Bechis <giova...@paclan.it> wrote:
> >
> >> I will commit it in a couple of days, do you want to take maintainership
> >> or do you prefer to set ports@ as maintainer ?
> >
> > Thanks Giovanni. I'll take the maintainership on. Jason Tubnor
> > <ja...@tubnor.net>
> >
if there are no objections I will commit this diff in a few days (if ${DAYJOB}
permits).
Cheers
Giovanni
Index: Makefile
===================================================================
RCS file: /var/cvs/ports/sysutils/duplicity/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- Makefile 14 Apr 2014 15:14:28 -0000 1.29
+++ Makefile 26 Aug 2014 16:49:11 -0000
@@ -2,16 +2,15 @@
COMMENT = encrypted backup using rsync algorithm
-MODPY_EGG_VERSION = 0.6.23
+MODPY_EGG_VERSION = 0.6.24
DISTNAME = duplicity-${MODPY_EGG_VERSION}
-REVISION = 1
CATEGORIES = sysutils
HOMEPAGE = http://www.nongnu.org/duplicity/
MASTER_SITES = ${MASTER_SITE_SAVANNAH:=duplicity/}
-MAINTAINER = Jim Razmus II <j...@openbsd.org>
+MAINTAINER = Jason Tubnor <ja...@tubnor.net>
# GPLv2
PERMIT_PACKAGE_CDROM = Yes
@@ -22,15 +21,18 @@ WANTLIB += pthread rsync ${MODPY_WANTLIB
LIB_DEPENDS += net/librsync \
${MODPY_LIB_DEPENDS}
-
-RUN_DEPENDS += net/py-boto \
+RUN_DEPENDS += archivers/par2cmdline \
+ net/py-boto \
net/ncftp \
security/py-gnupg \
sysutils/py-lockfile
+MODPY_SETUPTOOLS = Yes
+
MAKE_ENV += LIBRSYNC_DIR=${LOCALBASE}
-# Tests in ${WRKSRC}/testing directory require bash to run and they all fail
+# Some regression tests are hanging
+# TEST_DEPENDS = devel/py-mock
NO_TEST = Yes
# XXX 600 mode prevents from reading the man page;
Index: distinfo
===================================================================
RCS file: /var/cvs/ports/sysutils/duplicity/distinfo,v
retrieving revision 1.15
diff -u -p -r1.15 distinfo
--- distinfo 3 Apr 2014 07:59:35 -0000 1.15
+++ distinfo 21 Aug 2014 10:20:13 -0000
@@ -1,2 +1,2 @@
-SHA256 (duplicity-0.6.23.tar.gz) = ehfx4QOV3tzzIEvFOSW7ncu/KnVSybCW6+cn7OucDGA=
-SIZE (duplicity-0.6.23.tar.gz) = 1260261
+SHA256 (duplicity-0.6.24.tar.gz) = HUHXVmOPVRBvlQHD25TMvGVoqoVrpTHgftLPt2C2JFA=
+SIZE (duplicity-0.6.24.tar.gz) = 1268175
Index: patches/patch-bin_duplicity
===================================================================
RCS file: /var/cvs/ports/sysutils/duplicity/patches/patch-bin_duplicity,v
retrieving revision 1.5
diff -u -p -r1.5 patch-bin_duplicity
--- patches/patch-bin_duplicity 3 Apr 2014 07:59:35 -0000 1.5
+++ patches/patch-bin_duplicity 26 Aug 2014 16:42:31 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-bin_duplicity,v 1.5 2014/04/03 07:59:35 ajacoutot Exp $
---- bin/duplicity.orig Fri Jan 24 13:47:38 2014
-+++ bin/duplicity Mon Mar 24 11:28:16 2014
-@@ -1211,9 +1211,12 @@ def check_resources(action):
+--- bin/duplicity.orig Fri May 9 15:27:41 2014
++++ bin/duplicity Tue Aug 26 18:34:02 2014
+@@ -1223,9 +1223,12 @@ def check_resources(action):
log.ErrorCode.get_ulimit_failed)
maxopen = min([l for l in (soft, hard) if l > -1])
if maxopen < 1024:
Index: patches/patch-bin_duplicity_1
===================================================================
RCS file: /var/cvs/ports/sysutils/duplicity/patches/patch-bin_duplicity_1,v
retrieving revision 1.1
diff -u -p -r1.1 patch-bin_duplicity_1
--- patches/patch-bin_duplicity_1 14 Apr 2014 15:14:29 -0000 1.1
+++ patches/patch-bin_duplicity_1 26 Aug 2014 16:42:15 -0000
@@ -1,8 +1,8 @@
$OpenBSD: patch-bin_duplicity_1,v 1.1 2014/04/14 15:14:29 jca Exp $
Document the ssh backend change from paramiko to pexpect.
---- bin/duplicity.1.orig Mon Apr 14 11:44:24 2014
-+++ bin/duplicity.1 Mon Apr 14 15:16:56 2014
-@@ -104,7 +104,7 @@ There are two
+--- bin/duplicity.1.orig Fri May 9 15:27:41 2014
++++ bin/duplicity.1 Tue Aug 26 18:34:02 2014
+@@ -108,7 +108,7 @@ There are two
for scp/sftp/ssh access (also see
.BR "A NOTE ON SSH BACKENDS" ).
.TP
@@ -11,7 +11,7 @@ Document the ssh backend change from par
.B paramiko
(SSH2 for python)
- http://pypi.python.org/pypi/paramiko (downloads);
http://github.com/paramiko/paramiko (project page)
-@@ -113,7 +113,7 @@ for scp/sftp/ssh access (also see
+@@ -117,7 +117,7 @@ for scp/sftp/ssh access (also see
(Python Cryptography Toolkit)
- http://www.dlitz.net/software/pycrypto/
.TP
@@ -20,7 +20,7 @@ Document the ssh backend change from par
.B sftp/scp client binaries
OpenSSH - http://www.openssh.com/
.TP
-@@ -823,9 +823,9 @@ This password is also used for passphrase-protected ss
+@@ -874,9 +874,9 @@ This password is also used for passphrase-protected ss
.TP
.BI "--ssh-backend " backend
Allows the explicit selection of a ssh backend. Defaults to
@@ -32,7 +32,7 @@ Document the ssh backend change from par
.br
See also
.BR "A NOTE ON SSH BACKENDS" .
-@@ -1511,7 +1511,7 @@ backend allows to define
+@@ -1578,7 +1578,7 @@ backend allows to define
.BR --scp-command " and"
.BR --sftp-command .
.PP
@@ -41,7 +41,7 @@ Document the ssh backend change from par
is a complete reimplementation of ssh protocols natively in python. Advantages
are speed and maintainability. Minor disadvantage is that extra packages are
needed as listed in
-@@ -1524,7 +1524,7 @@ mode (
+@@ -1591,7 +1591,7 @@ mode (
.I --use-scp
) though scp access is used for put/get operations but listing is done via
ssh remote shell.
.PP
Index: patches/patch-duplicity_globals_py
===================================================================
RCS file: /var/cvs/ports/sysutils/duplicity/patches/patch-duplicity_globals_py,v
retrieving revision 1.1
diff -u -p -r1.1 patch-duplicity_globals_py
--- patches/patch-duplicity_globals_py 14 Apr 2014 15:14:29 -0000 1.1
+++ patches/patch-duplicity_globals_py 26 Aug 2014 16:42:15 -0000
@@ -1,8 +1,8 @@
$OpenBSD: patch-duplicity_globals_py,v 1.1 2014/04/14 15:14:29 jca Exp $
Switch the default ssh backend from paramiko to pexpect.
---- duplicity/globals.py.orig Mon Apr 14 00:01:15 2014
-+++ duplicity/globals.py Mon Apr 14 00:02:16 2014
-@@ -213,8 +213,8 @@ sftp_command = None
+--- duplicity/globals.py.orig Fri May 9 15:27:41 2014
++++ duplicity/globals.py Tue Aug 26 18:34:02 2014
+@@ -231,8 +231,8 @@ sftp_command = None
# default to batch mode using public-key encryption
ssh_askpass = False
Index: patches/patch-setup_py
===================================================================
RCS file: /var/cvs/ports/sysutils/duplicity/patches/patch-setup_py,v
retrieving revision 1.5
diff -u -p -r1.5 patch-setup_py
--- patches/patch-setup_py 19 Feb 2012 17:49:53 -0000 1.5
+++ patches/patch-setup_py 26 Aug 2014 16:42:15 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-setup_py,v 1.5 2012/02/19 17:49:53 ajacoutot Exp $
---- setup.py.orig Fri Nov 25 20:20:20 2011
-+++ setup.py Thu Feb 16 14:06:06 2012
-@@ -42,17 +42,9 @@ if os.name == 'posix':
+--- setup.py.orig Fri May 9 15:27:41 2014
++++ setup.py Tue Aug 26 18:34:02 2014
+@@ -45,17 +45,9 @@ if os.name == 'posix':
incdir_list = [os.path.join(LIBRSYNC_DIR, 'include')]
libdir_list = [os.path.join(LIBRSYNC_DIR, 'lib')]
@@ -19,4 +19,4 @@ $OpenBSD: patch-setup_py,v 1.5 2012/02/1
- 'CHANGELOG']),
]
- assert os.path.exists("po"), "Missing 'po' directory."
+ top_dir = os.path.dirname(os.path.abspath(__file__))
Index: pkg/PLIST
===================================================================
RCS file: /var/cvs/ports/sysutils/duplicity/pkg/PLIST,v
retrieving revision 1.13
diff -u -p -r1.13 PLIST
--- pkg/PLIST 3 Apr 2014 07:59:35 -0000 1.13
+++ pkg/PLIST 21 Aug 2014 10:27:13 -0000
@@ -1,8 +1,14 @@
@comment $OpenBSD: PLIST,v 1.13 2014/04/03 07:59:35 ajacoutot Exp $
bin/duplicity
bin/rdiffdir
+@comment
lib/python${MODPY_VERSION}/site-packages/duplicity/backends/dpbxbackend.py
+@comment
lib/python${MODPY_VERSION}/site-packages/duplicity/backends/dpbxbackend.pyc
lib/python${MODPY_VERSION}/site-packages/duplicity/
-lib/python${MODPY_VERSION}/site-packages/duplicity-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/duplicity-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/duplicity-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/duplicity-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/duplicity-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/duplicity-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/duplicity/__init__.py
lib/python${MODPY_VERSION}/site-packages/duplicity/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/duplicity/_librsync.so
@@ -29,8 +35,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/duplicity/backends/botobackend.pyc
lib/python${MODPY_VERSION}/site-packages/duplicity/backends/cfbackend.py
lib/python${MODPY_VERSION}/site-packages/duplicity/backends/cfbackend.pyc
-@comment
lib/python${MODPY_VERSION}/site-packages/duplicity/backends/dpbxbackend.py
-@comment
lib/python${MODPY_VERSION}/site-packages/duplicity/backends/dpbxbackend.pyc
+lib/python${MODPY_VERSION}/site-packages/duplicity/backends/dpbxbackend.py
+lib/python${MODPY_VERSION}/site-packages/duplicity/backends/dpbxbackend.pyc
lib/python${MODPY_VERSION}/site-packages/duplicity/backends/ftpbackend.py
lib/python${MODPY_VERSION}/site-packages/duplicity/backends/ftpbackend.pyc
lib/python${MODPY_VERSION}/site-packages/duplicity/backends/ftpsbackend.py
@@ -55,10 +61,10 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/duplicity/backends/swiftbackend.pyc
lib/python${MODPY_VERSION}/site-packages/duplicity/backends/tahoebackend.py
lib/python${MODPY_VERSION}/site-packages/duplicity/backends/tahoebackend.pyc
-lib/python${MODPY_VERSION}/site-packages/duplicity/backends/u1backend.py
-lib/python${MODPY_VERSION}/site-packages/duplicity/backends/u1backend.pyc
lib/python${MODPY_VERSION}/site-packages/duplicity/backends/webdavbackend.py
lib/python${MODPY_VERSION}/site-packages/duplicity/backends/webdavbackend.pyc
+lib/python${MODPY_VERSION}/site-packages/duplicity/backends/~par2wrapperbackend.py
+lib/python${MODPY_VERSION}/site-packages/duplicity/backends/~par2wrapperbackend.pyc
lib/python${MODPY_VERSION}/site-packages/duplicity/cached_ops.py
lib/python${MODPY_VERSION}/site-packages/duplicity/cached_ops.pyc
lib/python${MODPY_VERSION}/site-packages/duplicity/collections.py
@@ -95,8 +101,6 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/duplicity/log.pyc
lib/python${MODPY_VERSION}/site-packages/duplicity/manifest.py
lib/python${MODPY_VERSION}/site-packages/duplicity/manifest.pyc
-lib/python${MODPY_VERSION}/site-packages/duplicity/misc.py
-lib/python${MODPY_VERSION}/site-packages/duplicity/misc.pyc
lib/python${MODPY_VERSION}/site-packages/duplicity/patchdir.py
lib/python${MODPY_VERSION}/site-packages/duplicity/patchdir.pyc
lib/python${MODPY_VERSION}/site-packages/duplicity/path.py
