On Fri, Sep 02, 2016 at 01:16:39PM +0200, Daniel Jakots wrote:
> On Fri, 2 Sep 2016 10:55:12 +0100, Stuart Henderson
> <s...@spacehopper.org> wrote:
>
> > On 2016/09/02 10:42, Daniel Jakots wrote:
> > > On Fri, 2 Sep 2016 10:25:13 +0200, Giovanni Bechis
> > > <giova...@paclan.it> wrote:
> > >
> > > > > - Exception: Platform OpenBSD-6.0-amd64-64bit not supported by
> > > > > tar/gtar.
> > > >
> > > > what about this one that fixes tar usage ?
> > > > (I am not sure if is gtar in Darwin is in /bin or somewhere
> > > > else)
> > >
> > > I doubt upstream accepts the patch and I'd rather have a failing
> > > test than maintaining the patch :)
> > >
> >
> > How about adding a patch to use /usr/local/bin/gtar on
> > (Open|Free|Net)BSD? I could understand upstream not wanting to change
> > the tar flags, but I don't see why they would have an issue with a
> > patch to use the correct path.
> >
with this diff I have only 2 test that are failing, I think that this patch
should be accepted upstream.
Cheers
Giovanni
Index: Makefile
===================================================================
RCS file: /var/cvs/ports/sysutils/duplicity/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- Makefile 9 Aug 2016 11:16:53 -0000 1.38
+++ Makefile 2 Sep 2016 14:25:12 -0000
@@ -5,7 +5,7 @@
COMMENT = encrypted backup using rsync algorithm
-MODPY_EGG_VERSION = 0.7.09
+MODPY_EGG_VERSION = 0.7.10
DISTNAME = duplicity-${MODPY_EGG_VERSION}
CATEGORIES = sysutils
@@ -33,13 +33,22 @@ RUN_DEPENDS += devel/py-pexpect \
gnupg-<2:security/gnupg \
sysutils/py-lockfile
-MAKE_ENV += LIBRSYNC_DIR=${LOCALBASE}
+TEST_DEPENDS = archivers/gtar \
+ archivers/par2cmdline \
+ devel/py-mock \
+ devel/py-pexpect \
+ sysutils/py-lockfile
-MODPY_ADJ_FILES = bin/duplicity bin/rdiffdir
+MAKE_ENV += LIBRSYNC_DIR=${LOCALBASE}
-# Some regression tests are hanging
-# TEST_DEPENDS = devel/py-mock
-NO_TEST = Yes
+MODPY_ADJ_FILES = bin/duplicity bin/rdiffdir \
+ testing/manual/backendtest \
+ testing/overrides/bin/hsi \
+ testing/overrides/bin/lftp \
+ testing/overrides/bin/ncftpget \
+ testing/overrides/bin/ncftpls \
+ testing/overrides/bin/ncftpput \
+ testing/overrides/bin/tahoe
post-extract:
chmod 644 ${WRKSRC}/bin/*.1
Index: distinfo
===================================================================
RCS file: /var/cvs/ports/sysutils/duplicity/distinfo,v
retrieving revision 1.21
diff -u -p -r1.21 distinfo
--- distinfo 9 Aug 2016 11:16:53 -0000 1.21
+++ distinfo 2 Sep 2016 07:34:40 -0000
@@ -1,2 +1,2 @@
-SHA256 (duplicity-0.7.09.tar.gz) = Qx5wYLobAoYF+CruIgJUNQaZjDhscAjNnf6XXpEoqLM=
-SIZE (duplicity-0.7.09.tar.gz) = 1542198
+SHA256 (duplicity-0.7.10.tar.gz) = SF/vFVJtFjwGHgDsCN4hbPfWUuZ9Qd5dw77Z+0IhSEI=
+SIZE (duplicity-0.7.10.tar.gz) = 1543523
Index: patches/patch-bin_duplicity
===================================================================
RCS file: /var/cvs/ports/sysutils/duplicity/patches/patch-bin_duplicity,v
retrieving revision 1.9
diff -u -p -r1.9 patch-bin_duplicity
--- patches/patch-bin_duplicity 9 Aug 2016 11:16:53 -0000 1.9
+++ patches/patch-bin_duplicity 2 Sep 2016 14:25:29 -0000
@@ -1,6 +1,12 @@
$OpenBSD: patch-bin_duplicity,v 1.9 2016/08/09 11:16:53 danj Exp $
---- bin/duplicity.orig Sun Jul 24 18:27:49 2016
-+++ bin/duplicity Wed Aug 3 18:47:34 2016
+--- bin/duplicity.orig Sat Aug 20 21:13:49 2016
++++ bin/duplicity Fri Sep 2 09:37:26 2016
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python2
++#!/usr/local/bin/python2.7
+ # -*- Mode:Python; indent-tabs-mode:nil; tab-width:4 -*-
+ #
+ # duplicity -- Encrypted bandwidth efficient backup
@@ -1268,10 +1268,12 @@ def check_resources(action):
log.ErrorCode.get_ulimit_failed)
maxopen = min([l for l in (soft, hard) if l > -1])
Index: patches/patch-testing_functional_test_restart_py
===================================================================
RCS file: patches/patch-testing_functional_test_restart_py
diff -N patches/patch-testing_functional_test_restart_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-testing_functional_test_restart_py 2 Sep 2016 14:57:40
-0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- testing/functional/test_restart.py.orig Fri Sep 2 16:48:03 2016
++++ testing/functional/test_restart.py Fri Sep 2 16:47:14 2016
+@@ -327,6 +327,8 @@ class RestartTestWithoutEncryption(RestartTest):
+ tarcmd = "tar"
+ elif platform.platform().startswith('Darwin'):
+ tarcmd = "gtar"
++ elif platform.platform().endswith('BSD'):
++ tarcmd = "gtar"
+ else:
+ raise Exception("Platform %s not supported by tar/gtar." %
platform.platform())
+
Index: pkg/PLIST
===================================================================
RCS file: /var/cvs/ports/sysutils/duplicity/pkg/PLIST,v
retrieving revision 1.17
diff -u -p -r1.17 PLIST
--- pkg/PLIST 9 Aug 2016 11:16:53 -0000 1.17
+++ pkg/PLIST 2 Sep 2016 07:34:40 -0000
@@ -2,12 +2,12 @@
bin/duplicity
bin/rdiffdir
lib/python${MODPY_VERSION}/site-packages/duplicity/
-lib/python${MODPY_VERSION}/site-packages/duplicity-0.7.9-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/duplicity-0.7.9-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/duplicity-0.7.9-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/duplicity-0.7.9-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/duplicity-0.7.9-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/duplicity-0.7.9-py${MODPY_VERSION}.egg-info/top_level.txt
+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/requires.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
