net/librsync received an update, which includes a number of performance improvements and bug fixes. Changelog can be found at https://github.com/librsync/librsync/releases
- diffing nm output indicated that old functions have been removed, and new functions added. As such the shared lib received a major number bump - instead of using the included libb2 blake2 implementation switch to the version in ports - compression is turned of by default as it is not functional (https://github.com/librsync/librsync/issues/8). Removed archivers/bzip from LDEP, and synced WANTLIB Output make test: 100% tests passed, 0 tests failed out of 12 Tested lightly with sysutils/rdiff-backup. -- Björn Ketelaars GPG key: 0x4F0E5F21 diff --git Makefile Makefile index bc8fad67ad3..782ecd6fe76 100644 --- Makefile +++ Makefile @@ -2,12 +2,11 @@ COMMENT= library for delta compression of streams -V= 2.0.0 -REVISION= 0 +V= 2.0.1 DISTNAME= librsync-$V DISTFILES= ${DISTNAME}{v$V}.tar.gz -SHARED_LIBS += rsync 3.0 # 2.0 +SHARED_LIBS += rsync 4.0 # 2.0 CATEGORIES= net @@ -16,14 +15,16 @@ HOMEPAGE= https://github.com/librsync/librsync # LGPLv2.1+ PERMIT_PACKAGE_CDROM= Yes -WANTLIB += bz2 c popt z +WANTLIB += b2 c popt MASTER_SITES= https://github.com/librsync/librsync/archive/ MODULES= devel/cmake -LIB_DEPENDS= archivers/bzip2 \ - devel/popt +LIB_DEPENDS= devel/popt \ + security/libb2 + +CONFIGURE_ARGS= -DUSE_LIBB2=ON post-install: ${INSTALL_MAN} ${WRKSRC}/doc/rdiff.1 ${PREFIX}/man/man1 diff --git distinfo distinfo index b36acc6082e..3c1ace85300 100644 --- distinfo +++ distinfo @@ -1,2 +1,2 @@ -SHA256 (librsync-2.0.0.tar.gz) = tcTdEUKJgyA5OXeJ5C1P8NEQitqJznTxmZOYWT+uIWk= -SIZE (librsync-2.0.0.tar.gz) = 155049 +SHA256 (librsync-2.0.1.tar.gz) = b85pBBqk/HKiHxqygKcpm4LfKx+gol2Glf1SfmdSYl4= +SIZE (librsync-2.0.1.tar.gz) = 169765 diff --git patches/patch-src_search_c patches/patch-src_search_c deleted file mode 100644 index 13593790858..00000000000 --- patches/patch-src_search_c +++ /dev/null @@ -1,24 +0,0 @@ -$OpenBSD: patch-src_search_c,v 1.1 2017/05/14 18:51:22 jca Exp $ - -commit 1765ad0d416113fdb2f411470abc4fee68571461 -Author: Victor Denisov <vdeni...@mirantis.com> -Date: Mon Jan 18 23:00:58 2016 -0800 - - Handle searched checksum is bigger than any existing - - Fix for issue #50 - -https://github.com/librsync/librsync/commit/c2daedb5835f5301de50b44add166344e1ef6b02 - -Index: src/search.c ---- src/search.c.orig -+++ src/search.c -@@ -218,7 +218,7 @@ rs_search_for_block(rs_weak_sum_t weak_sum, - 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) diff --git patches/patch-tests_hashtable_test_c patches/patch-tests_hashtable_test_c new file mode 100644 index 00000000000..8d7672b5ae9 --- /dev/null +++ patches/patch-tests_hashtable_test_c @@ -0,0 +1,13 @@ +$OpenBSD$ + +Index: tests/hashtable_test.c +--- tests/hashtable_test.c.orig ++++ tests/hashtable_test.c +@@ -27,7 +27,6 @@ + #include "hashtable.h" + + /* Key type for the hashtable. */ +-typedef int key_t; + void key_init(key_t *k, int i) + { + /* This is chosen to cause bad key collisions and clustering. */ diff --git patches/patch-tests_rdiff_bad_option_sh patches/patch-tests_rdiff_bad_option_sh new file mode 100644 index 00000000000..1e1ec02eb6c --- /dev/null +++ patches/patch-tests_rdiff_bad_option_sh @@ -0,0 +1,11 @@ +$OpenBSD$ + +Index: tests/rdiff_bad_option.sh +--- tests/rdiff_bad_option.sh.orig ++++ tests/rdiff_bad_option.sh +@@ -1,4 +1,4 @@ +-#! /bin/bash -ex ++#! /bin/sh -ex + + # librsync -- the library for network deltas + diff --git pkg/PLIST pkg/PLIST index 3120fce1270..99ecc5ab356 100644 --- pkg/PLIST +++ pkg/PLIST @@ -1,6 +1,5 @@ @comment $OpenBSD: PLIST,v 1.4 2017/04/23 22:13:36 jca Exp $ @bin bin/rdiff -include/librsync-config.h include/librsync.h @lib lib/librsync.so.${LIBrsync_VERSION} @man man/man1/rdiff.1
