From owner-svn-ports-all@freebsd.org  Mon Jan 30 21:34:52 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 783C6CC8608;
 Mon, 30 Jan 2017 21:34:52 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 479431B17;
 Mon, 30 Jan 2017 21:34:52 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0ULYpiQ079870;
 Mon, 30 Jan 2017 21:34:51 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0ULYpnR079868;
 Mon, 30 Jan 2017 21:34:51 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201701302134.v0ULYpnR079868@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Mon, 30 Jan 2017 21:34:51 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r432873 - in head/net/librsync2: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Jan 2017 21:34:52 -0000

Author: bdrewery
Date: Mon Jan 30 21:34:51 2017
New Revision: 432873
URL: https://svnweb.freebsd.org/changeset/ports/432873

Log:
  - Apply a patch from upstream for fix rs_search_for_block bug [1]
    Fixes a sysutils/duplicity crash [2]
  
  PR:		216569 [1]
  PR:		216542 [2]
  Obtained from:	https://github.com/librsync/librsync/commit/c2daedb5835f5301de50b44add166344e1ef6b02
  Submitted by:	Danilo G. Baio (dbaio) <dbaio@bsd.com.br>

Added:
  head/net/librsync2/files/
  head/net/librsync2/files/patch-src_search.c   (contents, props changed)
Modified:
  head/net/librsync2/Makefile

Modified: head/net/librsync2/Makefile
==============================================================================
--- head/net/librsync2/Makefile	Mon Jan 30 21:28:03 2017	(r432872)
+++ head/net/librsync2/Makefile	Mon Jan 30 21:34:51 2017	(r432873)
@@ -4,6 +4,7 @@
 PORTNAME=	librsync
 PORTVERSION=	2.0.0
 DISTVERSIONPREFIX=v
+PORTREVISION=	1
 CATEGORIES=	net devel
 PKGNAMESUFFIX=	2
 

Added: head/net/librsync2/files/patch-src_search.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/librsync2/files/patch-src_search.c	Mon Jan 30 21:34:51 2017	(r432873)
@@ -0,0 +1,12 @@
+# https://github.com/librsync/librsync/pull/59/files
+--- src/search.c.orig	2015-11-29 20:43:12 UTC
++++ 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)