Re: [UPDATE] sysutils/duplicity 1.0.0p1

2023-09-25 Thread Paul Galbraith 
Yeah I think you are right.  Updated just to keep the comment regarding 
version sensitivity between b2sdk <-> duplicity.


README added.



On 2023-09-25 7:33 a.m., Stuart Henderson wrote:

On 2023/09/25 11:21, Stuart Henderson wrote:

I think it's intentional that duplicity doesm't force a dependency on
support nodules for all backends, see DESCR

Though it could be improved e.g. by listing the actual packages needed
and duplicity "url" prefixes for the various things, and maybe moving
that to a pkg-readme following the standard template...


Yeah I think you are right.  Updated just to keep the comment regarding 
version sensitivity between b2sdk <-> duplicity.


README added.


Index: Makefile
===
RCS file: /cvs/ports/sysutils/duplicity/Makefile,v
retrieving revision 1.65
diff -u -p -u -r1.65 Makefile
--- Makefile    22 Apr 2023 19:08:22 -    1.65
+++ Makefile    26 Sep 2023 01:03:46 -
@@ -1,5 +1,8 @@
 COMMENT =        encrypted backup using rsync algorithm

+# If upgrading duplicity to >= 1.2.1 please also upgrade
+# net/py-b2sdk to >= 1.19.0 as well, see:
+# https://gitlab.com/duplicity/duplicity/-/issues/701
 MODPY_EGG_VERSION =    1.0.0
 DISTNAME =        duplicity-${MODPY_EGG_VERSION}

Index: pkg/PLIST
===
RCS file: /cvs/ports/sysutils/duplicity/pkg/PLIST,v
retrieving revision 1.26
diff -u -p -u -r1.26 PLIST
--- pkg/PLIST    22 Apr 2023 19:08:23 -    1.26
+++ pkg/PLIST    26 Sep 2023 01:03:46 -
@@ -245,6 +245,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/duplicity/util.py
 @man man/man1/duplicity.1
 @man man/man1/rdiffdir.1
+share/doc/pkg-readmes/${PKGSTEM}
 share/locale/bg/LC_MESSAGES/duplicity.mo
 share/locale/bs/LC_MESSAGES/duplicity.mo
 share/locale/ca/LC_MESSAGES/duplicity.mo
Index: pkg/README
===
RCS file: pkg/README
diff -N pkg/README
--- /dev/null    1 Jan 1970 00:00:00 -
+++ pkg/README    26 Sep 2023 01:03:46 -
@@ -0,0 +1,24 @@
++---
+| Running ${PKGSTEM} on OpenBSD
++---
+
+Duplicity supports many remote platforms & protocols for remote
+storage.  Please see the Duplicity's home webpage for information
+about some of these:
+
+    https://duplicity.gitlab.io/
+
+Many of the remote connection/storage strategies will require extra
+python libraries to be installed.  You can get a sense of what libs
+may be needed from the requirements.txt file:
+
+ https://gitlab.com/duplicity/duplicity/-/blob/main/requirements.txt
+
+For example, to use the Backblaze B2 protocol you would need to install
+the py3-b2sdk library.
+
+    pkg_add py3-b2sdk
+
+Some libraries may not be provided as OpenBSD packages, in which case
+you will need to use pip to install them.
+


Index: Makefile
===
RCS file: /cvs/ports/sysutils/duplicity/Makefile,v
retrieving revision 1.65
diff -u -p -u -r1.65 Makefile
--- Makefile22 Apr 2023 19:08:22 -  1.65
+++ Makefile26 Sep 2023 01:03:46 -
@@ -1,5 +1,8 @@
 COMMENT =  encrypted backup using rsync algorithm
 
+# If upgrading duplicity to >= 1.2.1 please also upgrade
+# net/py-b2sdk to >= 1.19.0 as well, see:
+# https://gitlab.com/duplicity/duplicity/-/issues/701
 MODPY_EGG_VERSION =1.0.0
 DISTNAME = duplicity-${MODPY_EGG_VERSION}
 
Index: pkg/PLIST
===
RCS file: /cvs/ports/sysutils/duplicity/pkg/PLIST,v
retrieving revision 1.26
diff -u -p -u -r1.26 PLIST
--- pkg/PLIST   22 Apr 2023 19:08:23 -  1.26
+++ pkg/PLIST   26 Sep 2023 01:03:46 -
@@ -245,6 +245,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/duplicity/util.py
 @man man/man1/duplicity.1
 @man man/man1/rdiffdir.1
+share/doc/pkg-readmes/${PKGSTEM}
 share/locale/bg/LC_MESSAGES/duplicity.mo
 share/locale/bs/LC_MESSAGES/duplicity.mo
 share/locale/ca/LC_MESSAGES/duplicity.mo
Index: pkg/README
===
RCS file: pkg/README
diff -N pkg/README
--- /dev/null   1 Jan 1970 00:00:00 -
+++ pkg/README  26 Sep 2023 01:03:46 -
@@ -0,0 +1,24 @@
++---
+| Running ${PKGSTEM} on OpenBSD
++---
+
+Duplicity supports many remote platforms & protocols for remote
+storage.  Please see the Duplicty's home webpage for information
+about some of these:
+
+   https://duplicity.gitlab.io/
+
+Many of the remote connection/storage strategies will require extra
+python libraries to be installed.  You can get a sense of what libs
+may be needed

Re: [UPDATE] sysutils/duplicity 1.0.0p1

2023-09-25 Thread Stuart Henderson 
On 2023/09/25 11:21, Stuart Henderson wrote:
> On 2023/09/24 21:49, Paul Galbraith wrote:
> > Patch to add dependency on net/py-b2sdk to support backup to
> > Backblaze B2.  First class support for this platform is
> > already built into duplicity (https://duplicity.gitlab.io/).
> 
> I think it's intentional that duplicity doesm't force a dependency on
> support nodules for all backends, see DESCR

Though it could be improved e.g. by listing the actual packages needed
and duplicity "url" prefixes for the various things, and maybe moving
that to a pkg-readme following the standard template...

Re: [UPDATE] sysutils/duplicity 1.0.0p1

2023-09-25 Thread Stuart Henderson 
On 2023/09/24 21:49, Paul Galbraith wrote:
> Patch to add dependency on net/py-b2sdk to support backup to
> Backblaze B2.  First class support for this platform is
> already built into duplicity (https://duplicity.gitlab.io/).

I think it's intentional that duplicity doesm't force a dependency on
support nodules for all backends, see DESCR

Re: Update: sysutils/duplicity

2014-11-01 Thread Jérémie Courrèges-Anglas 

Thank you Jason for your update, which has just been committed.  Sorry
for the delay!

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Re: Update: sysutils/duplicity

2014-09-07 Thread Jim Razmus 
Just got back in town.  Working on my mail server now.  Sorry for the
trouble.

jim@

* Jason Tubnor ja...@tubnor.net [140825 22:26]:
 Ping?
 
 P.S.  Now also tested on macppc.  Maintainer email is also broken -
 maybe change back to ports@ or I'll take the maintainer status for it.
 
 Thx.
 
 -- Forwarded message --
 From: Jason Tubnor ja...@tubnor.net
 Date: 19 August 2014 12:49
 Subject: Update: sysutils/duplicity
 To: ports@openbsd.org, j...@openbsd.org
 
 
 Hi,
 
 This is an update, enhancement and build fix for sysutils/duplicity.  Notes 
 are:
 
 - Version bump from 0.6.23 to 0.6.24
 - Added archivers/par2cmdline for par2+ wrapper support
 - Remove ${MODPY_LIB_DEPENDS} due to make package reporting that it
 wasn't required
 - Added MODPY_SETUPTOOLS = Yes as the fake structure wasn't setup,
 causing setup.py to error and halt the make build process
 
 Please review and any feedback welcome.  Tested on amd64 only.
 
 Thanks.
 
 
 
 Index: sysutils/duplicity/Makefile
 ===
 RCS file: /cvs/ports/sysutils/duplicity/Makefile,v
 retrieving revision 1.29
 diff -u -p -u -p -r1.29 Makefile
 --- sysutils/duplicity/Makefile 14 Apr 2014 15:14:28 -  1.29
 +++ sysutils/duplicity/Makefile 19 Aug 2014 02:30:20 -
 @@ -1,8 +1,8 @@
 -# $OpenBSD: Makefile,v 1.29 2014/04/14 15:14:28 jca Exp $
 +# $OpenBSD: Makefile,v 1.30 2014/08/19 12:05:27 jca Exp $
 
  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
 
 @@ -20,13 +20,15 @@ MODULES =   lang/python
 
  WANTLIB += pthread rsync ${MODPY_WANTLIB}
 
 -LIB_DEPENDS += net/librsync \
 -   ${MODPY_LIB_DEPENDS}
 +LIB_DEPENDS += net/librsync
 
  RUN_DEPENDS += net/py-boto \
 net/ncftp \
 +   archivers/par2cmdline \
 security/py-gnupg \
 sysutils/py-lockfile
 +
 +MODPY_SETUPTOOLS = Yes
 
  MAKE_ENV +=LIBRSYNC_DIR=${LOCALBASE}
 
 
 Index: sysutils/duplicity/distinfo
 ===
 RCS file: /cvs/ports/sysutils/duplicity/distinfo,v
 retrieving revision 1.15
 diff -u -p -u -p -r1.15 distinfo
 --- sysutils/duplicity/distinfo 3 Apr 2014 07:59:35 -   1.15
 +++ sysutils/duplicity/distinfo 19 Aug 2014 02:31:24 -
 @@ -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: sysutils/duplicity/pkg/PLIST
 ===
 RCS file: /cvs/ports/sysutils/duplicity/pkg/PLIST,v
 retrieving revision 1.13
 diff -u -p -u -p -r1.13 PLIST
 --- sysutils/duplicity/pkg/PLIST3 Apr 2014 07:59:35 -   1.13
 +++ sysutils/duplicity/pkg/PLIST19 Aug 2014 02:32:08 -
 @@ -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

Re: Update: sysutils/duplicity

2014-09-01 Thread Antoine Jacoutot 
On Mon, Sep 01, 2014 at 07:33:21AM +1000, Jason Tubnor wrote:
 On 1 September 2014 04:12, Jérémie Courrèges-Anglas j...@wxcvbn.org wrote:
 
 
  Those deps are optional and I don't think it makes sense to ask users to
  install
  support for all backends supported by duplicity (the list is long).
 
 
 Ok with me.  The backends are in and the same outcome is achieved, be it
 with a little manual intervention.
 
 This said, 0.6.24 works fine here for my use case (which only involves
  sftp).  If you agree about the above points, this leads to this diff, to
  be committed when the python.port.mk issue is solved:
 
 
 For me, when REVISION is removed, I get when I 'make plist' [create a new
 plist] to do a diff against:
 
 lib/python${MODPY_VERSION}/site-packages/${FULLPKGNAME\-}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/${FULLPKGNAME\-}-py${MODPY_VERSION}.egg-info/PKG-INFO
 lib/python${MODPY_VERSION}/site-packages/${FULLPKGNAME\-}-py${MODPY_VERSION}.egg-info/SOURCES.txt
 lib/python${MODPY_VERSION}/site-packages/${FULLPKGNAME\-}-py${MODPY_VERSION}.egg-info/dependency_links.txt
 lib/python${MODPY_VERSION}/site-packages/${FULLPKGNAME\-}-py${MODPY_VERSION}.egg-info/top_level.txt
 
 which means it breaks when 'make package'.  To fix this, I leave the
 REVISION in and explicitly define the PKGNAME:
 
 REVISION =  1
 PKGNAME =   ${DISTNAME}
 
 Is it just me or is Jim's email address broken?  Maintainer needs to be
 looked at in some way possibly.
 
 On 1 September 2014 05:48, Giovanni Bechis giova...@paclan.it wrote:
 
 
  ok for me, maybe a multi package that adds dropbox, and other dependencies
  ?
  I do not care, I use only file and ssh backends but maybe it could be
  useful to someone else.
 
 
 A flavour sounds like a good idea and I'll work on that in spare time but
 don't let it hold this up.

I think a simple note in DESCR is enough.
No need for a FLAVOR nor imposing dependencies for all possible backends.

-- 
Antoine

Re: Update: sysutils/duplicity

2014-09-01 Thread Kirill Bychkov 
On Mon, September 1, 2014 01:33, Jason Tubnor wrote:
 On 1 September 2014 04:12, J?r?mie Courr?ges-Anglas j...@wxcvbn.org wrote:


 Those deps are optional and I don't think it makes sense to ask users to
 install
 support for all backends supported by duplicity (the list is long).


 Ok with me.  The backends are in and the same outcome is achieved, be it
 with a little manual intervention.

 This said, 0.6.24 works fine here for my use case (which only involves
 sftp).  If you agree about the above points, this leads to this diff, to
 be committed when the python.port.mk issue is solved:


 For me, when REVISION is removed, I get when I 'make plist' [create a new
 plist] to do a diff against:

 lib/python${MODPY_VERSION}/site-packages/${FULLPKGNAME\-}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/${FULLPKGNAME\-}-py${MODPY_VERSION}.egg-info/PKG-INFO
 lib/python${MODPY_VERSION}/site-packages/${FULLPKGNAME\-}-py${MODPY_VERSION}.egg-info/SOURCES.txt
 lib/python${MODPY_VERSION}/site-packages/${FULLPKGNAME\-}-py${MODPY_VERSION}.egg-info/dependency_links.txt
 lib/python${MODPY_VERSION}/site-packages/${FULLPKGNAME\-}-py${MODPY_VERSION}.egg-info/top_level.txt

 which means it breaks when 'make package'.  To fix this, I leave the
 REVISION in and explicitly define the PKGNAME:

${FULLPKGNAME\-} is your enemy. It's a common problem with update-plist for
python ports.


 REVISION =  1
 PKGNAME =   ${DISTNAME}

 Is it just me or is Jim's email address broken?  Maintainer needs to be
 looked at in some way possibly.

 On 1 September 2014 05:48, Giovanni Bechis giova...@paclan.it wrote:


 ok for me, maybe a multi package that adds dropbox, and other dependencies
 ?
 I do not care, I use only file and ssh backends but maybe it could be
 useful to someone else.


 A flavour sounds like a good idea and I'll work on that in spare time but
 don't let it hold this up.

 Thanks,

 Jason

Re: Update: sysutils/duplicity

2014-09-01 Thread Jérémie Courrèges-Anglas 
Antoine Jacoutot ajacou...@bsdfrog.org writes:

 On Mon, Sep 01, 2014 at 07:33:21AM +1000, Jason Tubnor wrote:

[...]

 A flavour sounds like a good idea and I'll work on that in spare time but
 don't let it hold this up.

 I think a simple note in DESCR is enough.
 No need for a FLAVOR nor imposing dependencies for all possible backends.

Indeed.  This can be done after this update goes in.

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Re: Update: sysutils/duplicity

2014-08-31 Thread Jérémie Courrèges-Anglas 
Giovanni Bechis giova...@paclan.it writes:

 On 08/28/14 00:57, Jason Tubnor wrote:
 On 27 August 2014 21:29, Jérémie Courrèges-Anglas j...@wxcvbn.org wrote:
 Untested so far, one nit below.

[...]

 ... the files are added here anyway.  The CHANGELOG says that it was
 fixed in this release, so it probably makes sense to ship those files
 now.  Anyone with a dropbox account?


 Correct, it isn't right.  It is either included or not included :-)
 
 I have just created a dropbox account specifically for testing, it isn't a
 feature that I use duplicity for.  All my testing was done on amd64, macppc
 with par2 (with and without), AWS S3, file and sftp.
 
 Dropbox testing has failed.  The py-dropbox API is needed it looks like,
 something else for me to look at if this feature is to be used.  At this
 point, I think, leave the @comment intact for the dpbxbackend and I'll
 revisit its inclusion when I have sorted the dependencies.
 
 Thoughts?
 
 from dropbox import client, rest, session, maybe py-dropbox or something 
 like that should be ported ?

While dropbox support might sound like a nice idea (thanks for your
work, Jason), I'd prefer to keep the RUN_DEPENDS list short. Those deps
are optional and I don't think it makes sense to ask users to install
support for all backends supported by duplicity (the list is long).

With this in mind, I suggest that archivers/par2cmdline isn't added to
RDEPS either.

About the LIB_DEPENDS change, the warning:

  LIB_DEPENDS devel/py-setuptools not needed for sysutils/duplicity ?

is due to a quirk in python.port.mk (MODPY_SETUPTOOLS=Yes leads to
LIB_DEPENDS containing setuptools).  duplicity does ship a .so linked
against libpython, thus it makes sense IMO to use MODPY_LIB_DEPENDS.
See http://marc.info/?l=openbsd-portsm=140950775609271w=2 for more
details.

This said, 0.6.24 works fine here for my use case (which only involves
sftp).  If you agree about the above points, this leads to this diff, to
be committed when the python.port.mk issue is solved:

Index: Makefile
===
RCS file: /cvs/ports/sysutils/duplicity/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- Makefile14 Apr 2014 15:14:28 -  1.29
+++ Makefile31 Aug 2014 14:43:01 -
@@ -2,9 +2,8 @@
 
 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
 
@@ -17,6 +16,7 @@ MAINTAINER =  Jim Razmus II jim@openbsd.
 PERMIT_PACKAGE_CDROM = Yes
 
 MODULES =  lang/python
+MODPY_SETUPTOOLS = Yes
 
 WANTLIB += pthread rsync ${MODPY_WANTLIB}
 
@@ -30,7 +30,8 @@ RUN_DEPENDS +=net/py-boto \
 
 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: /cvs/ports/sysutils/duplicity/distinfo,v
retrieving revision 1.15
diff -u -p -r1.15 distinfo
--- distinfo3 Apr 2014 07:59:35 -   1.15
+++ distinfo31 Aug 2014 14:43:01 -
@@ -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: pkg/PLIST
===
RCS file: /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 -   1.13
+++ pkg/PLIST   31 Aug 2014 14:43:01 -
@@ -2,7 +2,11 @@
 bin/duplicity
 bin/rdiffdir
 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 +33,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/duplicity/backends/botobackend.pyc

Re: Update: sysutils/duplicity

2014-08-31 Thread Giovanni Bechis 
On Sun, Aug 31, 2014 at 08:12:37PM +0200, Jérémie Courrèges-Anglas wrote:
 Giovanni Bechis giova...@paclan.it writes:
 
  On 08/28/14 00:57, Jason Tubnor wrote:
  On 27 August 2014 21:29, Jérémie Courrèges-Anglas j...@wxcvbn.org wrote:
  Untested so far, one nit below.
 
 [...]
 
  ... the files are added here anyway.  The CHANGELOG says that it was
  fixed in this release, so it probably makes sense to ship those files
  now.  Anyone with a dropbox account?
 
 
  Correct, it isn't right.  It is either included or not included :-)
  
  I have just created a dropbox account specifically for testing, it isn't a
  feature that I use duplicity for.  All my testing was done on amd64, macppc
  with par2 (with and without), AWS S3, file and sftp.
  
  Dropbox testing has failed.  The py-dropbox API is needed it looks like,
  something else for me to look at if this feature is to be used.  At this
  point, I think, leave the @comment intact for the dpbxbackend and I'll
  revisit its inclusion when I have sorted the dependencies.
  
  Thoughts?
  
  from dropbox import client, rest, session, maybe py-dropbox or something 
  like that should be ported ?
 
 While dropbox support might sound like a nice idea (thanks for your
 work, Jason), I'd prefer to keep the RUN_DEPENDS list short. Those deps
 are optional and I don't think it makes sense to ask users to install
 support for all backends supported by duplicity (the list is long).
 
 With this in mind, I suggest that archivers/par2cmdline isn't added to
 RDEPS either.
 
 About the LIB_DEPENDS change, the warning:
 
   LIB_DEPENDS devel/py-setuptools not needed for sysutils/duplicity ?
 
 is due to a quirk in python.port.mk (MODPY_SETUPTOOLS=Yes leads to
 LIB_DEPENDS containing setuptools).  duplicity does ship a .so linked
 against libpython, thus it makes sense IMO to use MODPY_LIB_DEPENDS.
 See http://marc.info/?l=openbsd-portsm=140950775609271w=2 for more
 details.
 
 This said, 0.6.24 works fine here for my use case (which only involves
 sftp).  If you agree about the above points, this leads to this diff, to
 be committed when the python.port.mk issue is solved:
 
ok for me, maybe a multi package that adds dropbox, and other dependencies ?
I do not care, I use only file and ssh backends but maybe it could be useful to 
someone else.
 Cheers
  Giovanni

Re: Update: sysutils/duplicity

2014-08-28 Thread Giovanni Bechis 
On 08/28/14 00:57, Jason Tubnor wrote:
 On 27 August 2014 21:29, Jérémie Courrèges-Anglas j...@wxcvbn.org wrote:
 

 Untested so far, one nit below.

 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 -   1.13
 +++ pkg/PLIST   21 Aug 2014 10:27:13 -
 @@ -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

 Doesn't look right, since...

 -@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

 ... the files are added here anyway.  The CHANGELOG says that it was
 fixed in this release, so it probably makes sense to ship those files
 now.  Anyone with a dropbox account?


 Correct, it isn't right.  It is either included or not included :-)
 
 I have just created a dropbox account specifically for testing, it isn't a
 feature that I use duplicity for.  All my testing was done on amd64, macppc
 with par2 (with and without), AWS S3, file and sftp.
 
 Dropbox testing has failed.  The py-dropbox API is needed it looks like,
 something else for me to look at if this feature is to be used.  At this
 point, I think, leave the @comment intact for the dpbxbackend and I'll
 revisit its inclusion when I have sorted the dependencies.
 
 Thoughts?
 
from dropbox import client, rest, session, maybe py-dropbox or something like 
that should be ported ?
 Cheers
  Giovanni

Re: Update: sysutils/duplicity

2014-08-27 Thread Jérémie Courrèges-Anglas 

(Adding Jim to the Cc: list.)

Giovanni Bechis giova...@paclan.it writes:

 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

Jim, do you want to keep/drop/share maintainership?

 if there are no objections I will commit this diff in a few days (if 
 ${DAYJOB} permits).

Untested so far, one nit below.

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 -   1.13
+++ pkg/PLIST   21 Aug 2014 10:27:13 -
@@ -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

Doesn't look right, since...

 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

... the files are added here anyway.  The CHANGELOG says that it was
fixed in this release, so it probably makes sense to ship those files
now.  Anyone with a dropbox account?

 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


-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Re: Update: sysutils/duplicity

2014-08-27 Thread Jason Tubnor 
On 27 August 2014 21:29, Jérémie Courrèges-Anglas j...@wxcvbn.org wrote:


 Untested so far, one nit below.

 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 -   1.13
 +++ pkg/PLIST   21 Aug 2014 10:27:13 -
 @@ -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

 Doesn't look right, since...

 -@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

 ... the files are added here anyway.  The CHANGELOG says that it was
 fixed in this release, so it probably makes sense to ship those files
 now.  Anyone with a dropbox account?


Correct, it isn't right.  It is either included or not included :-)

I have just created a dropbox account specifically for testing, it isn't a
feature that I use duplicity for.  All my testing was done on amd64, macppc
with par2 (with and without), AWS S3, file and sftp.

Dropbox testing has failed.  The py-dropbox API is needed it looks like,
something else for me to look at if this feature is to be used.  At this
point, I think, leave the @comment intact for the dpbxbackend and I'll
revisit its inclusion when I have sorted the dependencies.

Thoughts?

Re: Update: sysutils/duplicity

2014-08-26 Thread Giovanni Bechis 
On Tue, Aug 26, 2014 at 01:25:38PM +1000, Jason Tubnor wrote:
 Ping?
 
 P.S.  Now also tested on macppc.  Maintainer email is also broken -
 maybe change back to ports@ or I'll take the maintainer status for it.
 
I will commit it in a couple of days, do you want to take maintainership
or do you prefer to set ports@ as maintainer ?
 Cheers
  Giovanni

Re: Update: sysutils/duplicity

2014-08-26 Thread Jason Tubnor 
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

Cheers,

Jason

Re: Update: sysutils/duplicity

2014-08-26 Thread Giovanni Bechis 
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
 
 Cheers,
 
 Jason
 
Diff attached, regression tests seems to hang for me, I have not tried yet if 
this is a regression in 0.6.24 or if it is present in previous versions as well.
 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 -	1.29
+++ Makefile	26 Aug 2014 12:12:57 -
@@ -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
@@ -20,18 +19,21 @@ MODULES =	lang/python
 
 WANTLIB +=	pthread rsync ${MODPY_WANTLIB}
 
-LIB_DEPENDS +=	net/librsync \
-		${MODPY_LIB_DEPENDS}
+LIB_DEPENDS +=	net/librsync
 
-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
-NO_TEST =	Yes
+#NO_TEST =	Yes
+TEST_DEPENDS =	devel/py-mock
 
 # XXX 600 mode prevents from reading the man page;
 # check if still required at next update
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 -	1.15
+++ distinfo	21 Aug 2014 10:20:13 -
@@ -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: 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 -	1.13
+++ pkg/PLIST	21 Aug 2014 10:27:13 -
@@ -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

Re: Update: sysutils/duplicity

2014-08-26 Thread Giovanni Bechis 
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
--- Makefile14 Apr 2014 15:14:28 -  1.29
+++ Makefile26 Aug 2014 16:49:11 -
@@ -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
--- distinfo3 Apr 2014 07:59:35 -   1.15
+++ distinfo21 Aug 2014 10:20:13 -
@@ -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 -   1.5
+++ patches/patch-bin_duplicity 26 Aug 2014 16:42:31 -
@@ -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 -  1.1
+++ patches/patch-bin_duplicity_1   26 Aug 2014 16:42:15 -
@@ -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.1Mon 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.1Tue 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

Re: Update: sysutils/duplicity

2014-08-25 Thread Jason Tubnor 
Ping?

P.S.  Now also tested on macppc.  Maintainer email is also broken -
maybe change back to ports@ or I'll take the maintainer status for it.

Thx.

-- Forwarded message --
From: Jason Tubnor ja...@tubnor.net
Date: 19 August 2014 12:49
Subject: Update: sysutils/duplicity
To: ports@openbsd.org, j...@openbsd.org


Hi,

This is an update, enhancement and build fix for sysutils/duplicity.  Notes are:

- Version bump from 0.6.23 to 0.6.24
- Added archivers/par2cmdline for par2+ wrapper support
- Remove ${MODPY_LIB_DEPENDS} due to make package reporting that it
wasn't required
- Added MODPY_SETUPTOOLS = Yes as the fake structure wasn't setup,
causing setup.py to error and halt the make build process

Please review and any feedback welcome.  Tested on amd64 only.

Thanks.



Index: sysutils/duplicity/Makefile
===
RCS file: /cvs/ports/sysutils/duplicity/Makefile,v
retrieving revision 1.29
diff -u -p -u -p -r1.29 Makefile
--- sysutils/duplicity/Makefile 14 Apr 2014 15:14:28 -  1.29
+++ sysutils/duplicity/Makefile 19 Aug 2014 02:30:20 -
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.29 2014/04/14 15:14:28 jca Exp $
+# $OpenBSD: Makefile,v 1.30 2014/08/19 12:05:27 jca Exp $

 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

@@ -20,13 +20,15 @@ MODULES =   lang/python

 WANTLIB += pthread rsync ${MODPY_WANTLIB}

-LIB_DEPENDS += net/librsync \
-   ${MODPY_LIB_DEPENDS}
+LIB_DEPENDS += net/librsync

 RUN_DEPENDS += net/py-boto \
net/ncftp \
+   archivers/par2cmdline \
security/py-gnupg \
sysutils/py-lockfile
+
+MODPY_SETUPTOOLS = Yes

 MAKE_ENV +=LIBRSYNC_DIR=${LOCALBASE}


Index: sysutils/duplicity/distinfo
===
RCS file: /cvs/ports/sysutils/duplicity/distinfo,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 distinfo
--- sysutils/duplicity/distinfo 3 Apr 2014 07:59:35 -   1.15
+++ sysutils/duplicity/distinfo 19 Aug 2014 02:31:24 -
@@ -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: sysutils/duplicity/pkg/PLIST
===
RCS file: /cvs/ports/sysutils/duplicity/pkg/PLIST,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 PLIST
--- sysutils/duplicity/pkg/PLIST3 Apr 2014 07:59:35 -   1.13
+++ sysutils/duplicity/pkg/PLIST19 Aug 2014 02:32:08 -
@@ -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

Re: update: sysutils/duplicity-0.6.10

2010-09-21 Thread Jim Razmus 
* Stefan Sperling s...@openbsd.org [100921 15:31]:
 Light testing suggests that it works.
 
 ok?
 

Does MASTER_SITES need to be updated similar to my older patch?
http://bitbucket.org/bonetruck/my-ports-wip/src/tip/sysutils_duplicity

Can you confirm what destination(s) you've backed up to and restored
from?  e.g. FTP, AWS, etc

Thanks,
jim@

 Index: Makefile
 ===
 RCS file: /cvs/ports/sysutils/duplicity/Makefile,v
 retrieving revision 1.10
 diff -u -p -r1.10 Makefile
 --- Makefile  30 Aug 2010 17:57:31 -  1.10
 +++ Makefile  21 Sep 2010 13:51:50 -
 @@ -2,9 +2,8 @@
  
  COMMENT =encrypted backup using rsync algorithm
  
 -MODPY_EGG_VERSION = 0.6.06
 +MODPY_EGG_VERSION = 0.6.10
  DISTNAME =   duplicity-${MODPY_EGG_VERSION}
 -REVISION =   0
  
  CATEGORIES = sysutils
  
 Index: distinfo
 ===
 RCS file: /cvs/ports/sysutils/duplicity/distinfo,v
 retrieving revision 1.6
 diff -u -p -r1.6 distinfo
 --- distinfo  5 Dec 2009 14:45:08 -   1.6
 +++ distinfo  21 Sep 2010 13:52:03 -
 @@ -1,5 +1,5 @@
 -MD5 (duplicity-0.6.06.tar.gz) = q7u83kryTv/7whhYPVgUUw==
 -RMD160 (duplicity-0.6.06.tar.gz) = eGf7pPxaJQoAMANN2J/vdN89+70=
 -SHA1 (duplicity-0.6.06.tar.gz) = Rbw4L10bBZYNO0VJKz4sRKDqdog=
 -SHA256 (duplicity-0.6.06.tar.gz) = 
 D5zdov5vWCfTdDW8AxXklh29jy7doKFfzDMYQIQnSLw=
 -SIZE (duplicity-0.6.06.tar.gz) = 274888
 +MD5 (duplicity-0.6.10.tar.gz) = iHjTtj/LobcjPhHFgpuWnA==
 +RMD160 (duplicity-0.6.10.tar.gz) = NsyrKhb9FojkyYMH2RDVTDN5cm0=
 +SHA1 (duplicity-0.6.10.tar.gz) = nlVCfv8P6BesrrfqzBU+5Bc7Is0=
 +SHA256 (duplicity-0.6.10.tar.gz) = 
 XH045Y+GZwXik7vwau+XPjLxlrD6T2M0M6CuctiyMoQ=
 +SIZE (duplicity-0.6.10.tar.gz) = 291633

Re: update: sysutils/duplicity-0.6.10

2010-09-21 Thread Stefan Sperling 
On Tue, Sep 21, 2010 at 04:35:27PM -0400, Jim Razmus wrote:
 * Stefan Sperling s...@openbsd.org [100921 15:31]:
  Light testing suggests that it works.
  
  ok?
  
 
 Does MASTER_SITES need to be updated similar to my older patch?
 http://bitbucket.org/bonetruck/my-ports-wip/src/tip/sysutils_duplicity

The http://download.savannah.nongnu.org/releases/duplicity location
works fine.

 Can you confirm what destination(s) you've backed up to and restored
 from?  e.g. FTP, AWS, etc

I've only tested file:// and ssh://. I've just started playing with this
today, so my usage pattern is probably not representative. Someone who
relies on duplicity (you? :) should test the update before it gets committed.