diff options
| author | wiz <wiz@pkgsrc.org> | 2016-09-20 08:26:50 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2016-09-20 08:26:50 +0000 |
| commit | 9522b69691e67254842932995095be1da20f7ce7 (patch) | |
| tree | 49214da4221bd9d60876ae6a81073ad8433b4ff1 /net/librsync | |
| parent | 59aabe78a7641d2ef977dbc723e6ff26ff4ecff0 (diff) | |
| download | pkgsrc-9522b69691e67254842932995095be1da20f7ce7.tar.gz | |
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.
Diffstat (limited to 'net/librsync')
| -rw-r--r-- | net/librsync/Makefile | 3 | ||||
| -rw-r--r-- | net/librsync/distinfo | 3 | ||||
| -rw-r--r-- | net/librsync/patches/patch-src_search.c | 16 |
3 files changed, 20 insertions, 2 deletions
diff --git a/net/librsync/Makefile b/net/librsync/Makefile index 057d900a2ce..8a3dc45809f 100644 --- a/net/librsync/Makefile +++ b/net/librsync/Makefile @@ -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} diff --git a/net/librsync/distinfo b/net/librsync/distinfo index ee5aeb01536..c39300de2c5 100644 --- a/net/librsync/distinfo +++ b/net/librsync/distinfo @@ -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 diff --git a/net/librsync/patches/patch-src_search.c b/net/librsync/patches/patch-src_search.c new file mode 100644 index 00000000000..2d069d0c13d --- /dev/null +++ b/net/librsync/patches/patch-src_search.c @@ -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) |