svn commit: r432873 - in head/net/librsync2: . files

[Bryan Drewery]

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 at 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)