diff options
| author | tcely <tcely@users.noreply.github.com> | 2018-03-19 16:42:57 -0400 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2018-03-31 16:32:37 +0200 |
| commit | fdb3685140ff9fa22fe776c3b1c4bd25ecb4624c (patch) | |
| tree | 08060c3c8604f5a1dcaaa503f3b3f5dd4c8da9cc | |
| parent | c1cb630dc3f99db306a4e2181e676b0f47459d56 (diff) | |
| download | aports-fdb3685140ff9fa22fe776c3b1c4bd25ecb4624c.tar.bz2 aports-fdb3685140ff9fa22fe776c3b1c4bd25ecb4624c.tar.xz | |
main/librsync: upgrade to 2.0.2, modernize abuild
| -rw-r--r-- | main/librsync/0001-Handle-searched-checksum-is-bigger-than-any-existing.patch | 26 | ||||
| -rw-r--r-- | main/librsync/APKBUILD | 22 |
2 files changed, 10 insertions, 38 deletions
diff --git a/main/librsync/0001-Handle-searched-checksum-is-bigger-than-any-existing.patch b/main/librsync/0001-Handle-searched-checksum-is-bigger-than-any-existing.patch deleted file mode 100644 index 46be723351..0000000000 --- a/main/librsync/0001-Handle-searched-checksum-is-bigger-than-any-existing.patch +++ /dev/null @@ -1,26 +0,0 @@ -From e4f891a2bf923ce1a6b0867670db1dfc8e552981 Mon Sep 17 00:00:00 2001 -From: Victor Denisov <vdenisov@mirantis.com> -Date: Mon, 18 Jan 2016 23:00:58 -0800 -Subject: [PATCH] Handle searched checksum is bigger than any existing - -Fix for issue #50 ---- - src/search.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/search.c b/src/search.c -index 75433b4..fce3831 100644 ---- a/src/search.c -+++ b/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) --- -2.13.0 - diff --git a/main/librsync/APKBUILD b/main/librsync/APKBUILD index c1bdf7e495..2527cb2f3b 100644 --- a/main/librsync/APKBUILD +++ b/main/librsync/APKBUILD @@ -1,30 +1,28 @@ # Contributor: Jeremy Thomerson <jeremy@thomersonfamily.com> # Maintainer: Jeremy Thomerson <jeremy@thomersonfamily.com> pkgname=librsync -pkgver=2.0.0 -pkgrel=1 +pkgver=2.0.2 +pkgrel=0 pkgdesc="librsync implements the rolling-checksum algorithm of rsync" url="https://github.com/librsync/librsync" arch="all" license="LGPL-2.1" makedepends="cmake popt-dev bzip2-dev zlib-dev perl" subpackages="$pkgname-dev $pkgname-doc" -source="$pkgname-$pkgver.tar.gz::https://github.com/librsync/librsync/archive/v$pkgver.tar.gz - 0001-Handle-searched-checksum-is-bigger-than-any-existing.patch" -builddir="$srcdir"/$pkgname-$pkgver +source="$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/v$pkgver.tar.gz" +builddir="$srcdir/$pkgname-$pkgver" build() { cd "$builddir" - cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=release . || return 1 - make || return 1 + cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=release . + make } package() { cd "$builddir" - make DESTDIR="$pkgdir" install || return 1 - install -D -m644 doc/rdiff.1 "$pkgdir/usr/share/man/man1/rdiff.1" || return 1 - install -D -m644 doc/librsync.3 "$pkgdir/usr/share/man/man3/librsync.3" || return 1 + make DESTDIR="$pkgdir" install + install -D -m644 doc/rdiff.1 "$pkgdir/usr/share/man/man1/rdiff.1" + install -D -m644 doc/librsync.3 "$pkgdir/usr/share/man/man3/librsync.3" } -sha512sums="1a88dcc3aa60949e058c57eb0df3e0086823c493de40fed927246f5aada6274db57202074456a0ce5d9aa8b81b41836b0d6221ded6a75d43829572584177e8c0 librsync-2.0.0.tar.gz -ca34d1b6d0c227d582926e4342711a17604ece50b99bc5657758b50b405bc6df216c3c47d5ddb055f47d45b67ef056aefbd9d58317921202b68fc4c31433bcc4 0001-Handle-searched-checksum-is-bigger-than-any-existing.patch" +sha512sums="5d2bc1d62b37e9ed7416203615d0a0e3c05c4c884b5da63eda10dd5c985845b500331bce226e4d45676729382c85b41528282e25d491afda31ba434ac0fefad7 librsync-2.0.2.tar.gz" |