diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2017-01-31 05:34:51 +0800 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2017-01-31 05:34:51 +0800 |
| commit | e51b8cee501b839ec7949be6512881616ccc731e (patch) | |
| tree | 9bac1f55e45df5392e5333caa05c38c16f136fa9 /net | |
| parent | d87bc67be3050c09e960aa0312ef9588530353e4 (diff) | |
| download | freebsd-ports-gnome-e51b8cee501b839ec7949be6512881616ccc731e.tar.gz freebsd-ports-gnome-e51b8cee501b839ec7949be6512881616ccc731e.tar.zst freebsd-ports-gnome-e51b8cee501b839ec7949be6512881616ccc731e.zip | |
- 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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/librsync2/Makefile | 1 | ||||
| -rw-r--r-- | net/librsync2/files/patch-src_search.c | 12 |
2 files changed, 13 insertions, 0 deletions
diff --git a/net/librsync2/Makefile b/net/librsync2/Makefile index 9893de528d7d..b07b18b55b2d 100644 --- a/net/librsync2/Makefile +++ b/net/librsync2/Makefile @@ -4,6 +4,7 @@ PORTNAME= librsync PORTVERSION= 2.0.0 DISTVERSIONPREFIX=v +PORTREVISION= 1 CATEGORIES= net devel PKGNAMESUFFIX= 2 diff --git a/net/librsync2/files/patch-src_search.c b/net/librsync2/files/patch-src_search.c new file mode 100644 index 000000000000..077c192f7464 --- /dev/null +++ b/net/librsync2/files/patch-src_search.c @@ -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) |