Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1474360011134300"
MIME-Version: 1.0
Date: Tue, 20 Sep 2016 08:26:51 +0000
From: "Thomas Klausner" <wiz@netbsd.org>
Subject: CVS commit: pkgsrc/net/librsync
To: pkgsrc-changes@NetBSD.org
Reply-To: wiz@netbsd.org
Message-Id: <20160920082651.10D15FBD1@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1474360011134300
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	wiz
Date:		Tue Sep 20 08:26:50 UTC 2016

Modified Files:
	pkgsrc/net/librsync: Makefile distinfo
Added Files:
	pkgsrc/net/librsync/patches: patch-src_search.c

Log Message:
librsync has a crash in rs_search_for_block documented here:
https://github.com/librsync/librsync/issues/50

Forwarded by Andy Carrel in PR 51841.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/librsync/Makefile \
    pkgsrc/net/librsync/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/librsync/patches/patch-src_search.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1474360011134300
Content-Disposition: inline
Content-Length: 2090
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/net/librsync/Makefile
diff -u pkgsrc/net/librsync/Makefile:1.4 pkgsrc/net/librsync/Makefile:1.5
--- pkgsrc/net/librsync/Makefile:1.4	Sun Sep 18 22:28:34 2016
+++ pkgsrc/net/librsync/Makefile	Tue Sep 20 08:26:50 2016
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2016/09/18 22:28:34 wiedi Exp $
+# $NetBSD: Makefile,v 1.5 2016/09/20 08:26:50 wiz Exp $
 
 DISTNAME=	librsync-2.0.0
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=librsync/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
Index: pkgsrc/net/librsync/distinfo
diff -u pkgsrc/net/librsync/distinfo:1.4 pkgsrc/net/librsync/distinfo:1.5
--- pkgsrc/net/librsync/distinfo:1.4	Thu Sep  1 16:16:55 2016
+++ pkgsrc/net/librsync/distinfo	Tue Sep 20 08:26:50 2016
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.4 2016/09/01 16:16:55 wiz Exp $
+$NetBSD: distinfo,v 1.5 2016/09/20 08:26:50 wiz Exp $
 
 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

Added files:

Index: pkgsrc/net/librsync/patches/patch-src_search.c
diff -u /dev/null pkgsrc/net/librsync/patches/patch-src_search.c:1.1
--- /dev/null	Tue Sep 20 08:26:51 2016
+++ pkgsrc/net/librsync/patches/patch-src_search.c	Tue Sep 20 08:26:50 2016
@@ -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)


--_----------=_1474360011134300--