Attachment #195776 for bug #230154




# $FreeBSD$

PORTNAME=	librsync
PORTVERSION=	2.0.2
DISTVERSIONPREFIX=v
PORTREVISION=	1
CATEGORIES=	net devel
PKGNAMESUFFIX=	2



CONFLICTS=	librsync-[0-9]* librsync1-[0-9]*

USES=		cmake
USE_LDCONFIG=	yes
USE_GITHUB=	yes

USES=		cmake perl5
USE_PERL5=	build
USE_LDCONFIG=	yes

post-install:
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/librsync.so.2.0.2
	${INSTALL_MAN} ${WRKSRC}/doc/librsync.3 ${STAGEDIR}${MANPREFIX}/man/man3
	${INSTALL_MAN} ${WRKSRC}/doc/rdiff.1 ${STAGEDIR}${MANPREFIX}/man/man1


Lines 1-3 Link Here

(-)net/librsync2/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1485198270	1	TIMESTAMP = 1532885272
2	SHA256 (librsync-librsync-v2.0.0_GH0.tar.gz) = b5c4dd114289832039397789e42d4ff0d1108ada89ce74f1999398593fae2169	2	SHA256 (librsync-librsync-v2.0.2_GH0.tar.gz) = e67b9520ee84f7239be6e948795803bd95495091cc00bf6d0e8c6976032a4af1
3	SIZE (librsync-librsync-v2.0.0_GH0.tar.gz) = 155049	3	SIZE (librsync-librsync-v2.0.2_GH0.tar.gz) = 174480




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

Lines 1-8 Link Here

(-)net/librsync2/pkg-plist (-2 / +1 lines)
1	bin/rdiff	1	bin/rdiff
2	include/librsync.h	2	include/librsync.h
3	include/librsync-config.h
4	lib/librsync.so	3	lib/librsync.so
5	lib/librsync.so.2	4	lib/librsync.so.2
6	lib/librsync.so.2.0.0	5	lib/librsync.so.2.0.2
7	man/man1/rdiff.1.gz	6	man/man1/rdiff.1.gz
8	man/man3/librsync.3.gz	7	man/man3/librsync.3.gz

Return to bug 230154

Lines 2-10 Link Here

(-)net/librsync2/Makefile (-7 / +4 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= librsync	4	PORTNAME= librsync
5	PORTVERSION= 2.0.0	5	PORTVERSION= 2.0.2
6	DISTVERSIONPREFIX=v	6	DISTVERSIONPREFIX=v
7	PORTREVISION= 1
8	CATEGORIES= net devel	7	CATEGORIES= net devel
9	PKGNAMESUFFIX= 2	8	PKGNAMESUFFIX= 2
10		9
Lines 18-31 Link Here
18		17
19	CONFLICTS= librsync-[0-9]* librsync1-[0-9]*	18	CONFLICTS= librsync-[0-9]* librsync1-[0-9]*
20		19
		20	USES= cmake
		21	USE_LDCONFIG= yes
21	USE_GITHUB= yes	22	USE_GITHUB= yes
22		23
23	USES= cmake perl5
24	USE_PERL5= build
25	USE_LDCONFIG= yes
26
27	post-install:	24	post-install:
28	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/librsync.so.2.0.0	25	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/librsync.so.2.0.2
29	${INSTALL_MAN} ${WRKSRC}/doc/librsync.3 ${STAGEDIR}${MANPREFIX}/man/man3	26	${INSTALL_MAN} ${WRKSRC}/doc/librsync.3 ${STAGEDIR}${MANPREFIX}/man/man3
30	${INSTALL_MAN} ${WRKSRC}/doc/rdiff.1 ${STAGEDIR}${MANPREFIX}/man/man1	27	${INSTALL_MAN} ${WRKSRC}/doc/rdiff.1 ${STAGEDIR}${MANPREFIX}/man/man1
31		28

Lines 1-12 Link Here

(-)net/librsync2/files/patch-src_search.c (-12 lines)
1	# https://github.com/librsync/librsync/pull/59/files
2	--- src/search.c.orig 2015-11-29 20:43:12 UTC
3	+++ src/search.c
4	@@ -218,7 +218,7 @@ rs_search_for_block(rs_weak_sum_t weak_s
5	r = m;
6	}
7
8	- if (l == r) {
9	+ if ((l == r) && (l <= bucket->r)) {
10	int i = sig->targets[l].i;
11	rs_block_sig_t *b = &(sig->block_sigs[i]);
12	if (weak_sum != b->weak_sum)