Import of pkgsrc-2016Q3

net/librsync/Makefile

@@ -1,24 +1,21 @@
-# $NetBSD: Makefile,v 1.1 2015/09/12 22:54:01 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2016/09/20 08:26:50 wiz Exp $
 
-DISTNAME=	librsync-1.0.1
+DISTNAME=	librsync-2.0.0
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=librsync/}
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://librsync.sourcefrog.net/
 COMMENT=	rsync-like rolling checksum library
-
-GITHUB_TAG=	f32ed26d02b4d59aa0db215fb58c7a2536d19cb9
-
 LICENSE=	gnu-lgpl-v2.1
 
-USE_LIBTOOL=	yes
-USE_TOOLS+=	autoconf automake libtoolize perl
-
-GNU_CONFIGURE=	yes
-
-pre-configure:
-	cd ${WRKSRC} && ./autogen.sh
+USE_CMAKE=	yes
+USE_TOOLS+=	perl
+USE_LANGUAGES=	c c++
 
+.include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

net/librsync/PLIST

@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1 2015/09/12 22:54:01 joerg Exp $
+@comment $NetBSD: PLIST,v 1.2 2016/09/01 16:16:55 wiz Exp $
 bin/rdiff
 include/librsync-config.h
 include/librsync.h
-lib/librsync.la
-man/man1/rdiff.1
-man/man3/librsync.3
+lib/librsync.so
+lib/librsync.so.2
+lib/librsync.so.2.0.0

net/librsync/buildlink3.mk

@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2015/09/12 22:54:01 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2016/09/01 16:18:08 wiz Exp $
 
 BUILDLINK_TREE+=	librsync
 
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	librsync
 LIBRSYNC_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.librsync+=	librsync>=1.0.1
+BUILDLINK_ABI_DEPENDS.librsync+=	librsync>=2.0
 BUILDLINK_PKGSRCDIR.librsync?=	../../net/librsync
 .endif	# LIBRSYNC_BUILDLINK3_MK
 

net/librsync/distinfo

@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2015/09/14 13:33:21 joerg Exp $
+$NetBSD: distinfo,v 1.5 2016/09/20 08:26:50 wiz Exp $
 
-SHA1 (librsync-1.0.1-f32ed26d02b4d59aa0db215fb58c7a2536d19cb9.tar.gz) = 72ba18f73df99ca77335d0952bad3e0ca8f53e34
-RMD160 (librsync-1.0.1-f32ed26d02b4d59aa0db215fb58c7a2536d19cb9.tar.gz) = d027e202518252fd64ec11a0a21122ded262718a
-Size (librsync-1.0.1-f32ed26d02b4d59aa0db215fb58c7a2536d19cb9.tar.gz) = 140956 bytes
-SHA1 (patch-Makefile.am) = 196443871ed3795e62267e0a5399010d1031a584
-SHA1 (patch-delta.c) = e0025f414fe4b5b32dea17be033f7e2c1978f3f1
+SHA1 (librsync-2.0.0.tar.gz) = c24a623bba5f9eae48bd3b6cb99ee43d2a40b8c6
+RMD160 (librsync-2.0.0.tar.gz) = f44284c0d33b9fb6a9b8c107169549cf2d121273
+SHA512 (librsync-2.0.0.tar.gz) = 1a88dcc3aa60949e058c57eb0df3e0086823c493de40fed927246f5aada6274db57202074456a0ce5d9aa8b81b41836b0d6221ded6a75d43829572584177e8c0
+Size (librsync-2.0.0.tar.gz) = 155049 bytes
+SHA1 (patch-src_search.c) = 8da2885849e39999f36f9d7ce3824bc177033a53

net/librsync/patches/patch-Makefile.am

@@ -1,13 +0,0 @@
-$NetBSD: patch-Makefile.am,v 1.1 2015/09/12 22:54:01 joerg Exp $
-
---- Makefile.am.orig	2015-09-12 21:32:07.226531526 +0000
-+++ Makefile.am
-@@ -66,6 +66,7 @@ rdiff_DEPENDENCIES = librsync.la
- # this script is used to build prototab.[ch]
- noinst_SCRIPTS = mkprototab.pl
- 
-+prototab.c emit.c patch.c: prototab.h
- # Autogenerated by a script.
--prototab.c prototab.h: $(srcdir)/mkprototab.pl
-+prototab.h: $(srcdir)/mkprototab.pl
- 	perl $(srcdir)/mkprototab.pl prototab.c prototab.h

net/librsync/patches/patch-delta.c

@@ -1,77 +0,0 @@
-$NetBSD: patch-delta.c,v 1.1 2015/09/14 13:33:21 joerg Exp $
-
---- delta.c.orig	2015-09-14 08:28:47.000000000 +0000
-+++ delta.c
-@@ -126,12 +126,12 @@ static rs_result rs_delta_s_scan(rs_job_
- static rs_result rs_delta_s_flush(rs_job_t *job);
- static rs_result rs_delta_s_end(rs_job_t *job);
- void rs_getinput(rs_job_t *job);
--inline int rs_findmatch(rs_job_t *job, rs_long_t *match_pos, size_t *match_len);
--inline rs_result rs_appendmatch(rs_job_t *job, rs_long_t match_pos, size_t match_len);
--inline rs_result rs_appendmiss(rs_job_t *job, size_t miss_len);
--inline rs_result rs_appendflush(rs_job_t *job);
--inline rs_result rs_processmatch(rs_job_t *job);
--inline rs_result rs_processmiss(rs_job_t *job);
-+static inline int rs_findmatch(rs_job_t *job, rs_long_t *match_pos, size_t *match_len);
-+static inline rs_result rs_appendmatch(rs_job_t *job, rs_long_t match_pos, size_t match_len);
-+static inline rs_result rs_appendmiss(rs_job_t *job, size_t miss_len);
-+static inline rs_result rs_appendflush(rs_job_t *job);
-+static inline rs_result rs_processmatch(rs_job_t *job);
-+static inline rs_result rs_processmiss(rs_job_t *job);
- 
- /**
-  * \brief Get a block of data if possible, and see if it matches.
-@@ -255,7 +255,7 @@ void rs_getinput(rs_job_t *job) {
-  * forwards beyond the block boundaries. Extending backwards would require
-  * decrementing scoop_pos as appropriate.
-  */
--inline int rs_findmatch(rs_job_t *job, rs_long_t *match_pos, size_t *match_len) {
-+static inline int rs_findmatch(rs_job_t *job, rs_long_t *match_pos, size_t *match_len) {
-     /* calculate the weak_sum if we don't have one */
-     if (job->weak_sum.count == 0) {
-         /* set match_len to min(block_len, scan_avail) */
-@@ -282,7 +282,7 @@ inline int rs_findmatch(rs_job_t *job, r
- /**
-  * Append a match at match_pos of length match_len to the delta, extending
-  * a previous match if possible, or flushing any previous miss/match. */
--inline rs_result rs_appendmatch(rs_job_t *job, rs_long_t match_pos, size_t match_len)
-+static inline rs_result rs_appendmatch(rs_job_t *job, rs_long_t match_pos, size_t match_len)
- {
-     rs_result result=RS_DONE;
-     
-@@ -313,7 +313,7 @@ inline rs_result rs_appendmatch(rs_job_t
-  * 
-  * This also breaks misses up into block_len segments to avoid accumulating
-  * too much in memory. */
--inline rs_result rs_appendmiss(rs_job_t *job, size_t miss_len)
-+static inline rs_result rs_appendmiss(rs_job_t *job, size_t miss_len)
- {
-     rs_result result=RS_DONE;
-     
-@@ -330,7 +330,7 @@ inline rs_result rs_appendmiss(rs_job_t 
- /**
-  * Flush any accumulating hit or miss, appending it to the delta.
-  */
--inline rs_result rs_appendflush(rs_job_t *job)
-+static inline rs_result rs_appendflush(rs_job_t *job)
- {
-     /* if last is a match, emit it and reset last by resetting basis_len */
-     if (job->basis_len) {
-@@ -361,7 +361,7 @@ inline rs_result rs_appendflush(rs_job_t
-  * scoop_pos appropriately. In the future this could be used for something
-  * like context compressing of miss data. Note that it also calls
-  * rs_tube_catchup to output any pending output. */
--inline rs_result rs_processmatch(rs_job_t *job)
-+static inline rs_result rs_processmatch(rs_job_t *job)
- {
-     job->scoop_avail-=job->scoop_pos;
-     job->scoop_next+=job->scoop_pos;
-@@ -383,7 +383,7 @@ inline rs_result rs_processmatch(rs_job_
-  * 
-  * In the future this could do compression of miss data before outputing
-  * it. */
--inline rs_result rs_processmiss(rs_job_t *job)
-+static inline rs_result rs_processmiss(rs_job_t *job)
- {
-     rs_tube_copy(job, job->scoop_pos);
-     job->scoop_pos=0;

net/librsync/patches/patch-src_search.c

@@ -0,0 +1,16 @@
+$NetBSD: patch-src_search.c,v 1.1 2016/09/20 08:26:50 wiz Exp $
+
+librsync has a crash in rs_search_for_block documented here:
+https://github.com/librsync/librsync/issues/50
+
+--- src/search.c.orig	2015-11-29 20:43:12.000000000 +0000
++++ src/search.c
+@@ -218,7 +218,7 @@ rs_search_for_block(rs_weak_sum_t weak_s
+ 	    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)