Move duplicity and rdiff-backup to the newer net/librsync.

6 files changed, 38 insertions, 10 deletions

diff --git a/sysutils/duplicity/Makefile b/sysutils/duplicity/Makefile
index 9406ff7a987..c30109059a7 100644
--- a/sysutils/duplicity/Makefile
+++ b/sysutils/duplicity/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2015/04/09 10:16:35 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.30 2015/09/17 17:53:35 joerg Exp $
 
 DISTNAME=		duplicity-0.6.25
+PKGREVISION=		1
 CATEGORIES=		sysutils net
 MASTER_SITES=		http://code.launchpad.net/duplicity/0.6-series/${PKGVERSION_NOREV}/+download/
 
@@ -42,8 +43,7 @@ SUBST_VARS.gpgpath=		GPGPATH
 post-extract:
 	cd ${WRKSRC} && ${CHMOD} go+r *
 
-BUILDLINK_API_DEPENDS.librsync+=	librsync>=0.9.6
-.include "../../devel/librsync/buildlink3.mk"
+.include "../../net/librsync/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/duplicity/distinfo b/sysutils/duplicity/distinfo
index 873a4881e22..6bb5168e52d 100644
--- a/sysutils/duplicity/distinfo
+++ b/sysutils/duplicity/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.17 2015/04/09 10:16:35 hiramatsu Exp $
+$NetBSD: distinfo,v 1.18 2015/09/17 17:53:35 joerg Exp $
 
 SHA1 (duplicity-0.6.25.tar.gz) = fe0b6b0b0dc7dbc02598d96567954b48c4308420
 RMD160 (duplicity-0.6.25.tar.gz) = a7457b3be4ea73707a1ef7b9021014a82f917eaa
 Size (duplicity-0.6.25.tar.gz) = 1269583 bytes
 SHA1 (patch-aa) = f1210f703dccf759f234846a3139ce98063011cb
+SHA1 (patch-duplicity___librsyncmodule.c) = 505d97e127051f6d7e4546e7343eea54a53083d2
diff --git a/sysutils/duplicity/patches/patch-duplicity___librsyncmodule.c b/sysutils/duplicity/patches/patch-duplicity___librsyncmodule.c
new file mode 100644
index 00000000000..63234926072
--- /dev/null
+++ b/sysutils/duplicity/patches/patch-duplicity___librsyncmodule.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-duplicity___librsyncmodule.c,v 1.1 2015/09/17 17:53:35 joerg Exp $
+
+--- duplicity/_librsyncmodule.c.orig	2014-10-20 19:09:10.000000000 +0000
++++ duplicity/_librsyncmodule.c
+@@ -67,8 +67,7 @@ _librsync_new_sigmaker(PyObject* self, P
+   sm = PyObject_New(_librsync_SigMakerObject, &_librsync_SigMakerType);
+   if (sm == NULL) return NULL;
+ 
+-  sm->sig_job = rs_sig_begin((size_t)blocklen,
+-                             (size_t)RS_DEFAULT_STRONG_LEN);
++  sm->sig_job = rs_sig_begin((size_t)blocklen, 8, RS_MD4_SIG_MAGIC);
+   return (PyObject*)sm;
+ }
+ 
diff --git a/sysutils/rdiff-backup/Makefile b/sysutils/rdiff-backup/Makefile
index 9c6d39e4d37..c6f6c8ba336 100644
--- a/sysutils/rdiff-backup/Makefile
+++ b/sysutils/rdiff-backup/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.47 2014/12/31 13:57:29 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2015/09/17 17:53:35 joerg Exp $
 
 DISTNAME=	rdiff-backup-1.2.8
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	sysutils net
 MASTER_SITES=	http://savannah.nongnu.org/download/rdiff-backup/
 
@@ -17,13 +17,11 @@ SUBST_FILES.path=	setup.py
 SUBST_SED.path=		-e "s|share/man|${PKGMANDIR}|"
 SUBST_MESSAGE.path=	Fixing path to manpages.
 
-BUILDLINK_API_DEPENDS.librsync+=	librsync>=0.9.6
-
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/examples.html \
 		${DESTDIR}${PREFIX}/share/doc/${DISTNAME}
 
-.include "../../devel/librsync/buildlink3.mk"
+.include "../../net/librsync/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../lang/python/distutils.mk"
 
diff --git a/sysutils/rdiff-backup/distinfo b/sysutils/rdiff-backup/distinfo
index 1896cdc397c..44eed1050f3 100644
--- a/sysutils/rdiff-backup/distinfo
+++ b/sysutils/rdiff-backup/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.17 2009/08/24 06:15:23 wiz Exp $
+$NetBSD: distinfo,v 1.18 2015/09/17 17:53:35 joerg Exp $
 
 SHA1 (rdiff-backup-1.2.8.tar.gz) = 14ffe4f5b46a8a96ded536c1d03ae5e85faae318
 RMD160 (rdiff-backup-1.2.8.tar.gz) = f7fb7a894afe17b495611a3738c85263ae72b2b5
 Size (rdiff-backup-1.2.8.tar.gz) = 196526 bytes
+SHA1 (patch-__librsyncmodule.c) = 765a6160708f0fd0a1bd5e17883954723c722e69
diff --git a/sysutils/rdiff-backup/patches/patch-__librsyncmodule.c b/sysutils/rdiff-backup/patches/patch-__librsyncmodule.c
new file mode 100644
index 00000000000..d1de01904fb
--- /dev/null
+++ b/sysutils/rdiff-backup/patches/patch-__librsyncmodule.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-__librsyncmodule.c,v 1.1 2015/09/17 17:53:35 joerg Exp $
+
+--- _librsyncmodule.c.orig	2015-09-17 15:50:26.000000000 +0000
++++ _librsyncmodule.c
+@@ -59,8 +59,7 @@ _librsync_new_sigmaker(PyObject* self, P
+   if (sm == NULL) return NULL;
+   sm->x_attr = NULL;
+ 
+-  sm->sig_job = rs_sig_begin((size_t)blocklen,
+-							 (size_t)RS_DEFAULT_STRONG_LEN);
++  sm->sig_job = rs_sig_begin((size_t)blocklen, 8, RS_MD4_SIG_MAGIC);
+   return (PyObject*)sm;
+ }
+