summaryrefslogtreecommitdiff
path: root/net-libs/librsync
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2017-10-09 18:53:29 +0100
committerV3n3RiX <venerix@redcorelinux.org>2017-10-09 18:53:29 +0100
commit4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch)
treeba5f07bf3f9d22d82e54a462313f5d244036c768 /net-libs/librsync
reinit the tree, so we can have metadata
Diffstat (limited to 'net-libs/librsync')
-rw-r--r--net-libs/librsync/Manifest14
-rw-r--r--net-libs/librsync/files/librsync-0.9.7-fix-testsuite.patch15
-rw-r--r--net-libs/librsync/files/librsync-0.9.7-format-security.patch20
-rw-r--r--net-libs/librsync/files/librsync-0.9.7-getopt.patch17
-rw-r--r--net-libs/librsync/files/librsync-0.9.7-huge-files.patch31
-rw-r--r--net-libs/librsync/files/librsync-0.9.7-implicit-declaration.patch19
-rw-r--r--net-libs/librsync/files/librsync-2.0.0-search.patch12
-rw-r--r--net-libs/librsync/librsync-0.9.7-r3.ebuild36
-rw-r--r--net-libs/librsync/librsync-2.0.0-r1.ebuild30
-rw-r--r--net-libs/librsync/librsync-2.0.0.ebuild27
-rw-r--r--net-libs/librsync/metadata.xml17
11 files changed, 238 insertions, 0 deletions
diff --git a/net-libs/librsync/Manifest b/net-libs/librsync/Manifest
new file mode 100644
index 000000000000..a3ffbf9528ef
--- /dev/null
+++ b/net-libs/librsync/Manifest
@@ -0,0 +1,14 @@
+AUX librsync-0.9.7-fix-testsuite.patch 538 SHA256 6ec3ba6a9a78bd2481dbffa4d14fc3a97e8de802abb9514d980396fddcee6dd3 SHA512 d4a31fbb9b1c9b9e47b32151ae65f0a77e95ab9b8a899db50907cb356544fa065efbecee1133e10c66abada847411377d7b9472fffa8a88839c04728130490c1 WHIRLPOOL 6dd020d8fc9fc0844d9025e65e3c4d6c6d2cb6d2baeb16bd4008d0c766cf7fcc8585dea7bd38e613b5a82a79cd49ec52f2411736a61c3cfce5ad2b7119f2eb92
+AUX librsync-0.9.7-format-security.patch 679 SHA256 e67422c82b51f8d2f21740f3bcbed24a9ad75604888ff612307b942c38cc4071 SHA512 d5dd6e6d088f56d2dda13007f6803984d7fcc51ac660969d093c0e4dc48b828eb5c036cf74a2d8bd13c3f4d2f4af58902f91d2b04c371f82b02cbf6ac2e6ba93 WHIRLPOOL 1fdeb15fb90e44b89f5c65200fda7a7ce5315259157cda930636454f929b33c39b961495137fe2897586a5019c4db66976d425412648a179361cb6b880cbf702
+AUX librsync-0.9.7-getopt.patch 899 SHA256 5bb3d9aeb44ad2b73dc765e6b6665b73c4060b0547b15ff060a4e0f1368b2abc SHA512 6805197797eba2b994ccf79ab31e6a7cd2e607ad7f6d6fa30d68b94d58396ee477d2e3ef54705bf874e0d5a8cc58d96048d89800fbb2afbdaddf469caba7484b WHIRLPOOL 666d52d10af09ca8c99f5510d34c3292ddc069ee5402f6dfece4bc5c546ab3cb74cd30a3022641ef7a1e0a724152012ea594d93d368498d6370479362cbb4af2
+AUX librsync-0.9.7-huge-files.patch 1022 SHA256 37a6ccc39b7bec1765fb5a99cb3b1d6b1572ad611c0724c594f671d25246535d SHA512 e45d0422f7b0fc092b3e41be4ba29305de4940380f3946551e38516a0ccd314a767c0c91e2e4efcd75c2e3ebe684675dc49c37081fa38036c774a81fc68e8855 WHIRLPOOL 34229ec439287df73fe194c4b181c48d325802605d6e26652f727f4674b0f90c9ef819cde2544621ed06971c5bb82de7cc1bc4edb3cc89ce5c72d097d2c0bfa1
+AUX librsync-0.9.7-implicit-declaration.patch 568 SHA256 03a298158970f2be70d9d05a0505b79b534d1619bc6d4c00194cae0d6d587d3c SHA512 58dafcc71c52bf50e8ffc2729bbe54ba2022e16e851499218c724e101813b957b769511ab83a3f29ab359e3c3b4860867b71f97bd4bfa79d5ee69d53fe369f20 WHIRLPOOL 6faaba1b40343265795a228eead0fe223837eddeb469deee148c7e3c00133d810fc61623899f3bc3140d70adf6f664656aa7504aa4d127d14b56be43376bc0a2
+AUX librsync-2.0.0-search.patch 358 SHA256 3a94ba9d2b0847d0dade733c9f4f456f910f26b1e010a115acd0fb74ec8e71f8 SHA512 06f64c2d95fde23cda01c35d39e0d4d7e81b10750e0e23f87751a356fff7707bfe8481788aef14649875ff65f900c254f612217ee0bf3ddbc06d0471cc5106d7 WHIRLPOOL fc4ae314bf7c71d427b64df9fbe0376733c686eccfe4c2ce96538c9b9acd09412b6c990c740ad388f32b94855586fed9d9a0167bf2ebc87a9adb11b1b7bc28df
+DIST librsync-0.9.7.tar.gz 453802 SHA256 6633e4605662763a03bb6388529cbdfd3b11a9ec55b8845351c1bd9a92bc41d6 SHA512 339362fd01c94411849d3e4a6e95db1bef6cffa0475b1af49d73f11be0421a12d4c73ecbf1a272af01b2a21cec81b4a801c1f7d735e107d0242707fb4c45f9ef WHIRLPOOL 7cf5cc675c4bf4e041d9132f0a8311f83e827bfa7dd75180f3153cabeab41a94011e1a9b56e63a61dbe119444e2c24a39054986d97b686db99293ad9177b2bf7
+DIST librsync-2.0.0.tar.gz 155049 SHA256 b5c4dd114289832039397789e42d4ff0d1108ada89ce74f1999398593fae2169 SHA512 1a88dcc3aa60949e058c57eb0df3e0086823c493de40fed927246f5aada6274db57202074456a0ce5d9aa8b81b41836b0d6221ded6a75d43829572584177e8c0 WHIRLPOOL a09e76a712ca21a37bc3d06cf2f97a0e7201cfcf82c18cbebf3f07bfd453ac3503d18c900b7c1136e0319ec7f3b7c4a6c43611648c78b31fe13c7298ccf016e0
+EBUILD librsync-0.9.7-r3.ebuild 879 SHA256 10d0895baf99f03c235de45ee3d334759e433dc23a3444e4e4d7e9edecc2c864 SHA512 9c47fefe790a75f0b8921ae400bfc811e8376dcacbd50a4399b49cf390c56dd942dc9f535210f5228606c4069743f1399eb6add6dba7182bdbce89935f02bf8a WHIRLPOOL 784d22288456cf9d994beb650a6631f3e4e0c17d1d22b673fcca2aa611aa81049f0e0ccca09883d5a90348f2f84c6f15512cd92df62a5cbbc62ff67020e4a1b2
+EBUILD librsync-2.0.0-r1.ebuild 833 SHA256 feb82050baa431fcc0eb901cfe6e88022813750fc8916915eb362a90da6deab7 SHA512 3aa8f98be81b376a3d9339e08dbc23a3ce052efeb35c1dcf68a24e9b120e701d58201a14ea0651a5e401501b63227e49e34defdaa3516c799cafaa3ac0fb795d WHIRLPOOL 16b3bac7fa29708703e38b4569ab83450ec6b5d353aa6263bb897ef8baddc35d3d401f16752bcc8024a7f869fd61425cfc764c03a4149018d0a4ef24fbfc1eee
+EBUILD librsync-2.0.0.ebuild 764 SHA256 cd23c43d8611be927f3ff3d7c6500e2c07eeba3aebd44c694dafacba84afc616 SHA512 6a838f1028a13fc27a224fc3be357efc647218bec0b2fd6d0a147118ddaa56f65da13801bddb616a5a1f63b3b9fa3ba971df51c379d985285815cbe8d0ce2f86 WHIRLPOOL 8d2c72e537d85ebe6731cbe01173ba5076f94a04d7183e1b45d241afbe10e09534ba141c9a85596818b8edfa778493b810c66eebc6892bf84bb1a75be5a5ec89
+MISC ChangeLog 6265 SHA256 f7570dcc522328911493ce9390eb94c934819f1fdb527afbedabc0cff0e18a3a SHA512 aee1a18202c634b5e69186f161ec8682bd6051b3c24f44302579b9ed753d710c062f500d0fe3e66ef4418e7122fb574188f6da74e238608dceee7c67dffa08f8 WHIRLPOOL c29ce69104b65ff1588ce5e6266224dbecde9503e437654e4ed738794107c6ae6f3ae8b1136c7da847881566bdc29bc41304c2e1ef197449f1e8d8fa25e8a92f
+MISC ChangeLog-2015 6029 SHA256 89da3593c12b4488f605a06b090d097763499cf690588d88003ac46669653bce SHA512 3156822c3f2131358e41252515b0957e0ce7d9ed49ffd66cc3a7a2572a75f6e89e67f964981e1dfc1e961f5987b508a672f67a6d3cff0a88ed2bfdf6063d2a31 WHIRLPOOL c3cbdf9e6a55298c24b97f7d5f0f0f003bdbc4b6fb79343f7f55668b7590ffbf5ca46aa57ee8c120c8d5846372b185150ea35592173566ed2af7654e996b008c
+MISC metadata.xml 582 SHA256 40ac98e93641574f4c086ac298744372169748ac39e6681eac95d7c199594052 SHA512 ab091ce5da3fd3c86489dbc3e2cc72ef66bf2d757005e85e7a6dcca0a31c2e7539216686080bc38240c60e120ebc41104b96ba9d7d7bf1499b1373547a226bbf WHIRLPOOL 15e4ab2a4707432cc03bbf72bb57b349e399cb356667431d620ae953ef828a34051127fc0bd85c1bc5ab13e23b7b74947d32f54ea57c28c6d130325b6aebd252
diff --git a/net-libs/librsync/files/librsync-0.9.7-fix-testsuite.patch b/net-libs/librsync/files/librsync-0.9.7-fix-testsuite.patch
new file mode 100644
index 000000000000..e87c3d8f67b5
--- /dev/null
+++ b/net-libs/librsync/files/librsync-0.9.7-fix-testsuite.patch
@@ -0,0 +1,15 @@
+Description: Fix running tests with the parallel harness
+Author: Andrey Rahmatullin <wrar@wrar.name>
+Last-Update: 2013-06-26
+
+--- a/testsuite/Makefile.am
++++ b/testsuite/Makefile.am
+@@ -29,7 +29,7 @@ isprefix_driver_LDADD = ../isprefix.o # XXX: should link replaced functions
+ # failed. Generally these tests should be ordered so that more basic
+ # tests are run first.
+
+-TESTS_ENVIRONMENT = $(SH) $(srcdir)/driver.sh
++TEST_LOG_COMPILER = $(SH) $(srcdir)/driver.sh
+
+ TESTS = \
+ signature.test mutate.test sources.test isprefix.test \
diff --git a/net-libs/librsync/files/librsync-0.9.7-format-security.patch b/net-libs/librsync/files/librsync-0.9.7-format-security.patch
new file mode 100644
index 000000000000..e35980a4d7a0
--- /dev/null
+++ b/net-libs/librsync/files/librsync-0.9.7-format-security.patch
@@ -0,0 +1,20 @@
+Description: Always use a format string in printf
+ Fix the warning: buf.c:216:9: error: format not a string literal and no
+ format arguments [-Werror=format-security]
+Author: Andrey Rahmatullin <wrar@wrar.name>
+Forwarded: no
+Last-Update: 2012-02-05
+
+diff --git a/buf.c b/buf.c
+index 7f4e7a0..3a83f2b 100644
+--- a/buf.c
++++ b/buf.c
+@@ -213,7 +213,7 @@ rs_result rs_file_copy_cb(void *arg, rs_long_t pos, size_t *len, void **buf)
+
+ got = fread(*buf, 1, *len, f);
+ if (got == -1) {
+- rs_error(strerror(errno));
++ rs_error("%s", strerror(errno));
+ return RS_IO_ERROR;
+ } else if (got == 0) {
+ rs_error("unexpected eof on fd%d", fileno(f));
diff --git a/net-libs/librsync/files/librsync-0.9.7-getopt.patch b/net-libs/librsync/files/librsync-0.9.7-getopt.patch
new file mode 100644
index 000000000000..0859089b970a
--- /dev/null
+++ b/net-libs/librsync/files/librsync-0.9.7-getopt.patch
@@ -0,0 +1,17 @@
+Patch by Daniel Baumann <daniel@debian.org> for librsync >= 0.9.7, which makes
+rdiff aware of -i and -z getopt options mentioned in --help output. For further
+information, please have a look to Debian bug ID #435894.
+
+--- librsync-0.9.7/rdiff.c 2004-09-17 23:35:50.000000000 +0200
++++ librsync-0.9.7/rdiff.c.getopt 2008-12-20 13:45:58.000000000 +0100
+@@ -97,8 +97,8 @@
+ { "sum-size", 'S', POPT_ARG_INT, &strong_len },
+ { "statistics", 's', POPT_ARG_NONE, &show_stats },
+ { "stats", 0, POPT_ARG_NONE, &show_stats },
+- { "gzip", 0, POPT_ARG_NONE, 0, OPT_GZIP },
+- { "bzip2", 0, POPT_ARG_NONE, 0, OPT_BZIP2 },
++ { "gzip", 'z', POPT_ARG_NONE, 0, OPT_GZIP },
++ { "bzip2", 'i', POPT_ARG_NONE, 0, OPT_BZIP2 },
+ { "paranoia", 0, POPT_ARG_NONE, &rs_roll_paranoia },
+ { 0 }
+ };
diff --git a/net-libs/librsync/files/librsync-0.9.7-huge-files.patch b/net-libs/librsync/files/librsync-0.9.7-huge-files.patch
new file mode 100644
index 000000000000..fef08941a44f
--- /dev/null
+++ b/net-libs/librsync/files/librsync-0.9.7-huge-files.patch
@@ -0,0 +1,31 @@
+diff -urN librsync-0.9.7/mdfour.h librsync-0.9.7dev/mdfour.h
+--- librsync-0.9.7/mdfour.h 2004-02-07 18:17:57.000000000 -0500
++++ librsync-0.9.7dev/mdfour.h 2006-03-06 03:21:46.000000000 -0500
+@@ -24,7 +24,7 @@
+ #include "types.h"
+
+ struct rs_mdfour {
+- int A, B, C, D;
++ unsigned int A, B, C, D;
+ #if HAVE_UINT64
+ uint64_t totalN;
+ #else
+diff -urN librsync-0.9.7/patch.c librsync-0.9.7dev/patch.c
+--- librsync-0.9.7/patch.c 2004-09-17 17:35:50.000000000 -0400
++++ librsync-0.9.7dev/patch.c 2006-03-06 03:21:06.000000000 -0500
+@@ -214,12 +214,12 @@
+ void *buf, *ptr;
+ rs_buffers_t *buffs = job->stream;
+
+- len = job->basis_len;
+-
+ /* copy only as much as will fit in the output buffer, so that we
+ * don't have to block or store the input. */
+- if (len > buffs->avail_out)
++ if (job->basis_len > buffs->avail_out)
+ len = buffs->avail_out;
++ else
++ len = job->basis_len;
+
+ if (!len)
+ return RS_BLOCKED;
diff --git a/net-libs/librsync/files/librsync-0.9.7-implicit-declaration.patch b/net-libs/librsync/files/librsync-0.9.7-implicit-declaration.patch
new file mode 100644
index 000000000000..782597c8fe2b
--- /dev/null
+++ b/net-libs/librsync/files/librsync-0.9.7-implicit-declaration.patch
@@ -0,0 +1,19 @@
+Description: Fix -Wimplicit-function-declaration warning in the test suite
+ Fix the warning: isprefix.driver.c:43:5: warning: implicit declaration of
+ function ‘strcmp’ [-Wimplicit-function-declaration]
+Author: Andrey Rahmatullin <wrar@wrar.name>
+Forwarded: no
+Last-Update: 2012-02-05
+
+diff --git a/testsuite/isprefix.driver.c b/testsuite/isprefix.driver.c
+index a9fd77b..df558c2 100644
+--- a/testsuite/isprefix.driver.c
++++ b/testsuite/isprefix.driver.c
+@@ -21,6 +21,7 @@
+
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+
+ #include "isprefix.h"
+
diff --git a/net-libs/librsync/files/librsync-2.0.0-search.patch b/net-libs/librsync/files/librsync-2.0.0-search.patch
new file mode 100644
index 000000000000..93b4106ee8b5
--- /dev/null
+++ b/net-libs/librsync/files/librsync-2.0.0-search.patch
@@ -0,0 +1,12 @@
+diff -Naur a/src/search.c b/src/search.c
+--- a/src/search.c 2015-11-29 21:43:12.000000000 +0100
++++ b/src/search.c 2016-01-31 19:11:54.847933060 +0100
+@@ -218,7 +218,7 @@
+ 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 a/net-libs/librsync/librsync-0.9.7-r3.ebuild b/net-libs/librsync/librsync-0.9.7-r3.ebuild
new file mode 100644
index 000000000000..b8622f08e3f3
--- /dev/null
+++ b/net-libs/librsync/librsync-0.9.7-r3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils
+
+DESCRIPTION="Flexible remote checksum-based differencing"
+HOMEPAGE="http://librsync.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/1"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="static-libs"
+
+RDEPEND="dev-libs/popt"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-huge-files.patch
+ "${FILESDIR}"/${P}-format-security.patch
+ "${FILESDIR}"/${P}-getopt.patch
+ "${FILESDIR}"/${P}-implicit-declaration.patch
+ "${FILESDIR}"/${P}-fix-testsuite.patch
+ )
+
+src_prepare() {
+ sed \
+ -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' \
+ -i configure.ac || die
+
+ autotools-utils_src_prepare
+}
diff --git a/net-libs/librsync/librsync-2.0.0-r1.ebuild b/net-libs/librsync/librsync-2.0.0-r1.ebuild
new file mode 100644
index 000000000000..06a1bbbf47c3
--- /dev/null
+++ b/net-libs/librsync/librsync-2.0.0-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="Remote delta-compression library"
+HOMEPAGE="http://librsync.sourcefrog.net/"
+SRC_URI="https://github.com/librsync/librsync/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+RDEPEND="dev-libs/popt"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ # isprefix_test does not work in portage environment
+ sed -i '169 s/^/#/' CMakeLists.txt || die
+
+ # fix compiling with multilib-strict feature enabled
+ sed -i "242 s/lib/$(get_libdir)/" CMakeLists.txt || die
+
+ # fix bug 573144
+ epatch "${FILESDIR}/${P}-search.patch"
+
+ cmake-utils_src_prepare
+}
diff --git a/net-libs/librsync/librsync-2.0.0.ebuild b/net-libs/librsync/librsync-2.0.0.ebuild
new file mode 100644
index 000000000000..af13ecd767c4
--- /dev/null
+++ b/net-libs/librsync/librsync-2.0.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="Remote delta-compression library"
+HOMEPAGE="http://librsync.sourcefrog.net/"
+SRC_URI="https://github.com/librsync/librsync/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+RDEPEND="dev-libs/popt"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ # isprefix_test does not work in portage environment
+ sed -i '169 s/^/#/' CMakeLists.txt || die
+
+ # fix compiling with multilib-strict feature enabled
+ sed -i "242 s/lib/$(get_libdir)/" CMakeLists.txt || die
+
+ cmake-utils_src_prepare
+}
diff --git a/net-libs/librsync/metadata.xml b/net-libs/librsync/metadata.xml
new file mode 100644
index 000000000000..cf1a9d9c7db6
--- /dev/null
+++ b/net-libs/librsync/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>axelgenus@gmail.com</email>
+ <name>Alessandro Calorì</name>
+ <description>Proxied maintainer; set to assignee in all bugs</description>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">librsync</remote-id>
+ <remote-id type="github">librsync/librsync</remote-id>
+ </upstream>
+</pkgmetadata>