update to librsync-2.0.1, switch to libb2 from ports rather than the internal

copy. from Björn Ketelaars who tested lightly with rdiff-backup. (I checked
that duplicity still starts and confirmed it's able to load librsync/libb2
from python ok).

net/librsync/Makefile

@@ -1,13 +1,12 @@
-# $OpenBSD: Makefile,v 1.18 2017/05/14 18:51:22 jca Exp $
+# $OpenBSD: Makefile,v 1.19 2018/02/08 22:35:19 sthen Exp $
 
 COMMENT=	library for delta compression of streams
 
-V=		2.0.0
+V=		2.0.1
-REVISION=	0
 DISTNAME=	librsync-$V
 DISTFILES=	${DISTNAME}{v$V}.tar.gz
 
-SHARED_LIBS +=	rsync                3.0      # 2.0
+SHARED_LIBS +=	rsync                4.0      # 2.0
 
 CATEGORIES=	net
 
@@ -16,14 +15,16 @@ HOMEPAGE=	https://github.com/librsync/librsync
 # LGPLv2.1+
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB += bz2 c popt z
+WANTLIB += b2 c popt
 
 MASTER_SITES=	https://github.com/librsync/librsync/archive/
 
 MODULES=	devel/cmake
 
-LIB_DEPENDS=	archivers/bzip2 \
+LIB_DEPENDS=	devel/popt \
-		devel/popt
+		security/libb2
+
+CONFIGURE_ARGS=	-DUSE_LIBB2=ON
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/rdiff.1 ${PREFIX}/man/man1

net/librsync/distinfo

@@ -1,2 +1,2 @@
-SHA256 (librsync-2.0.0.tar.gz) = tcTdEUKJgyA5OXeJ5C1P8NEQitqJznTxmZOYWT+uIWk=
+SHA256 (librsync-2.0.1.tar.gz) = b85pBBqk/HKiHxqygKcpm4LfKx+gol2Glf1SfmdSYl4=
-SIZE (librsync-2.0.0.tar.gz) = 155049
+SIZE (librsync-2.0.1.tar.gz) = 169765

net/librsync/patches/patch-src_search_c

@@ -1,24 +0,0 @@
-$OpenBSD: patch-src_search_c,v 1.1 2017/05/14 18:51:22 jca Exp $
-
-commit 1765ad0d416113fdb2f411470abc4fee68571461
-Author: Victor Denisov <vdenisov@mirantis.com>
-Date:   Mon Jan 18 23:00:58 2016 -0800
-
-     Handle searched checksum is bigger than any existing
-
-     Fix for issue #50
-
-https://github.com/librsync/librsync/commit/c2daedb5835f5301de50b44add166344e1ef6b02
-
-Index: src/search.c
---- src/search.c.orig
-+++ src/search.c
-@@ -218,7 +218,7 @@ rs_search_for_block(rs_weak_sum_t weak_sum,
- 	    r = m;
-     }
- 
--    if (l == r) {
-+    if ((l == r) && (l <= bucket->r)) {
- 	int i = sig->targets[l].i;
- 	rs_block_sig_t *b = &(sig->block_sigs[i]);
- 	if (weak_sum != b->weak_sum)

net/librsync/patches/patch-tests_hashtable_test_c

@@ -0,0 +1,13 @@
+$OpenBSD: patch-tests_hashtable_test_c,v 1.1 2018/02/08 22:35:19 sthen Exp $
+
+Index: tests/hashtable_test.c
+--- tests/hashtable_test.c.orig
++++ tests/hashtable_test.c
+@@ -27,7 +27,6 @@
+ #include "hashtable.h"
+ 
+ /* Key type for the hashtable. */
+-typedef int key_t;
+ void key_init(key_t *k, int i)
+ {
+     /* This is chosen to cause bad key collisions and clustering. */

net/librsync/patches/patch-tests_rdiff_bad_option_sh

@@ -0,0 +1,11 @@
+$OpenBSD: patch-tests_rdiff_bad_option_sh,v 1.1 2018/02/08 22:35:19 sthen Exp $
+
+Index: tests/rdiff_bad_option.sh
+--- tests/rdiff_bad_option.sh.orig
++++ tests/rdiff_bad_option.sh
+@@ -1,4 +1,4 @@
+-#! /bin/bash -ex
++#! /bin/sh -ex
+ 
+ # librsync -- the library for network deltas
+ 

net/librsync/pkg/PLIST

@@ -1,6 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.4 2017/04/23 22:13:36 jca Exp $
+@comment $OpenBSD: PLIST,v 1.5 2018/02/08 22:35:19 sthen Exp $
 @bin bin/rdiff
-include/librsync-config.h
 include/librsync.h
 @lib lib/librsync.so.${LIBrsync_VERSION}
 @man man/man1/rdiff.1