subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: net\-libs\/librsync\/files\/, net\-libs\/librsync\/"

[gentoo-commits] repo/gentoo:master commit in: net-libs/librsync/files/, net-libs/librsync/

2020-04-07 Thread Bernard Cafarelli

commit: 445e9abb3b4e92f405df48ceda7608b9c9028461
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Tue Apr  7 16:01:53 2020 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Tue Apr  7 16:02:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=445e9abb

Revert "net-libs/librsync: drop old stable"

This reverts commit e28b02899c01823dbec2d41261a1b532f5077f65.
net-misc/dropbox has optional dependency on  gentoo.org>

 net-libs/librsync/Manifest |  1 +
 .../files/librsync-0.9.7-fix-testsuite.patch   | 15 +
 .../files/librsync-0.9.7-format-security.patch | 20 
 .../librsync/files/librsync-0.9.7-getopt.patch | 17 ++
 .../librsync/files/librsync-0.9.7-huge-files.patch | 31 +++
 .../librsync-0.9.7-implicit-declaration.patch  | 19 
 net-libs/librsync/librsync-0.9.7-r3.ebuild | 36 ++
 7 files changed, 139 insertions(+)

diff --git a/net-libs/librsync/Manifest b/net-libs/librsync/Manifest
index 04758c6b00f..1ba8bce2c89 100644
--- a/net-libs/librsync/Manifest
+++ b/net-libs/librsync/Manifest
@@ -1,3 +1,4 @@
+DIST librsync-0.9.7.tar.gz 453802 BLAKE2B 
0f8a7a758d847498876401aa04473946970be0257dc0cc4abce85adc7adb5d480d7a41e03d43f667e44ec646ce74a75dfa6b0c63c7f239338244b67eb432e31f
 SHA512 
339362fd01c94411849d3e4a6e95db1bef6cffa0475b1af49d73f11be0421a12d4c73ecbf1a272af01b2a21cec81b4a801c1f7d735e107d0242707fb4c45f9ef
 DIST librsync-2.0.1.tar.gz 169765 BLAKE2B 
3b3a109307dc03e567338709f1c3958a2ae7887165208848359677305f6a983edc1bc71c721dd3f414f77e0507426ae5bb59b9fde51595a92379227ac316127a
 SHA512 
70c1ed0f3a8ad8c1201ce67b5411c4aabb4c78ba9d60e4ee658d9a8818c6511322abd53b583869b8927a29b0f105e1a5c9b05efa748eb435e8fc3b7be3344e04
 DIST librsync-2.0.2.tar.gz 174480 BLAKE2B 
e77d554ad08a852459fe2798249f47ca7f26849b4b8622c5b64f7f9b6d23f1fedc443f747c7988679a3548ea1f6fd2902c424717faaf73a5cfd7e19012a2d72d
 SHA512 
5d2bc1d62b37e9ed7416203615d0a0e3c05c4c884b5da63eda10dd5c985845b500331bce226e4d45676729382c85b41528282e25d491afda31ba434ac0fefad7
 DIST librsync-2.1.0.tar.gz 175630 BLAKE2B 
effd2a8c79fae202921220db7581be1d9f7d278e6ee5155a23e586d9d4a7a27bbc4a50049ddca3b187a8e08451c6dcde7340d22be9fde0c2c12462392043fd8e
 SHA512 
9b91f4b696c1d1cdacb5c0679c7df7a92641e0a6a599c2e5de2bc0af3052b2045bb16c40b072c40859074d792c78c57afb0817917fa9843b179befa4506ebf04

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 000..e87c3d8f67b
--- /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 
+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 000..e35980a4d7a
--- /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 
+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 000..0859089b970
--- /dev/null
+++ b/net-libs/librsync/files/librsync-0.9.7-getopt.patch
@@ -0,0 +1,17 @@
+Patch by Daniel Baumann  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.0 
+0200
 librsync-0.9.7/rdiff.c.getopt  2008-12-20 13:45:58.0 
+0100
+@@ -97,8 +97,8 @@
+ { "sum-size",'S', POPT_ARG_INT,  _len },
+ { "statistics",  's', POPT_ARG_NONE, _stats },
+ {

[gentoo-commits] repo/gentoo:master commit in: net-libs/librsync/files/, net-libs/librsync/

2020-04-07 Thread Bernard Cafarelli

commit: e28b02899c01823dbec2d41261a1b532f5077f65
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Tue Apr  7 15:17:33 2020 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Tue Apr  7 15:17:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e28b0289

net-libs/librsync: drop old stable

Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Bernard Cafarelli  gentoo.org>

 net-libs/librsync/Manifest |  1 -
 .../files/librsync-0.9.7-fix-testsuite.patch   | 15 -
 .../files/librsync-0.9.7-format-security.patch | 20 
 .../librsync/files/librsync-0.9.7-getopt.patch | 17 --
 .../librsync/files/librsync-0.9.7-huge-files.patch | 31 ---
 .../librsync-0.9.7-implicit-declaration.patch  | 19 
 net-libs/librsync/librsync-0.9.7-r3.ebuild | 36 --
 7 files changed, 139 deletions(-)

diff --git a/net-libs/librsync/Manifest b/net-libs/librsync/Manifest
index 1ba8bce2c89..04758c6b00f 100644
--- a/net-libs/librsync/Manifest
+++ b/net-libs/librsync/Manifest
@@ -1,4 +1,3 @@
-DIST librsync-0.9.7.tar.gz 453802 BLAKE2B 
0f8a7a758d847498876401aa04473946970be0257dc0cc4abce85adc7adb5d480d7a41e03d43f667e44ec646ce74a75dfa6b0c63c7f239338244b67eb432e31f
 SHA512 
339362fd01c94411849d3e4a6e95db1bef6cffa0475b1af49d73f11be0421a12d4c73ecbf1a272af01b2a21cec81b4a801c1f7d735e107d0242707fb4c45f9ef
 DIST librsync-2.0.1.tar.gz 169765 BLAKE2B 
3b3a109307dc03e567338709f1c3958a2ae7887165208848359677305f6a983edc1bc71c721dd3f414f77e0507426ae5bb59b9fde51595a92379227ac316127a
 SHA512 
70c1ed0f3a8ad8c1201ce67b5411c4aabb4c78ba9d60e4ee658d9a8818c6511322abd53b583869b8927a29b0f105e1a5c9b05efa748eb435e8fc3b7be3344e04
 DIST librsync-2.0.2.tar.gz 174480 BLAKE2B 
e77d554ad08a852459fe2798249f47ca7f26849b4b8622c5b64f7f9b6d23f1fedc443f747c7988679a3548ea1f6fd2902c424717faaf73a5cfd7e19012a2d72d
 SHA512 
5d2bc1d62b37e9ed7416203615d0a0e3c05c4c884b5da63eda10dd5c985845b500331bce226e4d45676729382c85b41528282e25d491afda31ba434ac0fefad7
 DIST librsync-2.1.0.tar.gz 175630 BLAKE2B 
effd2a8c79fae202921220db7581be1d9f7d278e6ee5155a23e586d9d4a7a27bbc4a50049ddca3b187a8e08451c6dcde7340d22be9fde0c2c12462392043fd8e
 SHA512 
9b91f4b696c1d1cdacb5c0679c7df7a92641e0a6a599c2e5de2bc0af3052b2045bb16c40b072c40859074d792c78c57afb0817917fa9843b179befa4506ebf04

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
deleted file mode 100644
index e87c3d8f67b..000
--- a/net-libs/librsync/files/librsync-0.9.7-fix-testsuite.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Fix running tests with the parallel harness
-Author: Andrey Rahmatullin 
-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
deleted file mode 100644
index e35980a4d7a..000
--- a/net-libs/librsync/files/librsync-0.9.7-format-security.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-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 
-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
deleted file mode 100644
index 0859089b970..000
--- a/net-libs/librsync/files/librsync-0.9.7-getopt.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Patch by Daniel Baumann  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.0 
+0200
-+++ librsync-0.9.7/rdiff.c.getopt  2008-12-20 13:45:58.0 
+0100
-@@ -97,8 +97,8 @@
- { "sum-size",'S', POPT_ARG_INT,  _len },
- { "statistics",  's', POPT_ARG_NONE, _stats },
- { "stats",0,

[gentoo-commits] repo/gentoo:master commit in: net-libs/librsync/files/, net-libs/librsync/

2017-11-15 Thread Sergei Trofimovich

commit: 062d4fa546fea8d8b2812c8d19d3343784184d3c
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Wed Nov 15 20:51:44 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Nov 15 20:52:16 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=062d4fa5

net-libs/librsync: bump up to 2.0.1, bug #635834

Fixes md4 support on big-endian platforms.

Bug: https://github.com/librsync/librsync/issues/132
Closes: https://bugs.gentoo.org/635834
Package-Manager: Portage-2.3.14, Repoman-2.3.6

 net-libs/librsync/Manifest |  1 +
 .../librsync/files/librsync-2.0.1-libdir.patch | 15 
 net-libs/librsync/librsync-2.0.1.ebuild| 27 ++
 3 files changed, 43 insertions(+)

diff --git a/net-libs/librsync/Manifest b/net-libs/librsync/Manifest
index 224f662d0ab..29c6ce2775f 100644
--- a/net-libs/librsync/Manifest
+++ b/net-libs/librsync/Manifest
@@ -1,2 +1,3 @@
 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
+DIST librsync-2.0.1.tar.gz 169765 SHA256 
6fce69041aa4fc72a21f1ab280a7299b82df2b1fa0a25d8695fd527e6752625e SHA512 
70c1ed0f3a8ad8c1201ce67b5411c4aabb4c78ba9d60e4ee658d9a8818c6511322abd53b583869b8927a29b0f105e1a5c9b05efa748eb435e8fc3b7be3344e04
 WHIRLPOOL 
cc1a9fbd5fd2b83fadc6cb8426d6b58b09f0c8d71462efa883ee2fda0778c65f8ab2a04b5047e6d7401f78a5d3f223b0848ec4d0accf8d05e6237a70d2f42b5d

diff --git a/net-libs/librsync/files/librsync-2.0.1-libdir.patch 
b/net-libs/librsync/files/librsync-2.0.1-libdir.patch
new file mode 100644
index 000..50460dfdbf1
--- /dev/null
+++ b/net-libs/librsync/files/librsync-2.0.1-libdir.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f40bf1d..b123d09 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -333,5 +333,9 @@ endif (ENABLE_COMPRESSION)
+ set_target_properties(rsync PROPERTIES VERSION ${LIBRSYNC_VERSION}
+ SOVERSION ${LIBRSYNC_MAJOR_VERSION})
+-install(TARGETS rsync ${INSTALL_TARGETS_DEFAULT_ARGS} DESTINATION lib)
++
++if (NOT TARGET_LIBDIR)
++  set(TARGET_LIBDIR lib)
++endif()
++install(TARGETS rsync ${INSTALL_TARGETS_DEFAULT_ARGS} DESTINATION 
${TARGET_LIBDIR})
+ 
+ 

diff --git a/net-libs/librsync/librsync-2.0.1.ebuild 
b/net-libs/librsync/librsync-2.0.1.ebuild
new file mode 100644
index 000..931a6a6f450
--- /dev/null
+++ b/net-libs/librsync/librsync-2.0.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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}"
+
+PATCHES=("${FILESDIR}"/${PN}-2.0.1-libdir.patch)
+
+src_configure() {
+   local mycmakeargs=(
+   -DTARGET_LIBDIR=$(get_libdir)
+   )
+
+   cmake-utils_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/librsync/files/, net-libs/librsync/

2016-02-24 Thread Patrice Clement

commit: 9a0c447fdcd8e3777d6a872a54d7d54d00653b72
Author: Alessandro Calorì  gmail  com>
AuthorDate: Wed Feb 24 14:55:37 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Wed Feb 24 14:55:37 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a0c447f

net-libs/librsync: fix typo and patch for v0.9.7

Fixed a typo in the ebuild and the testsuite patch for librsync 0.9.7.

Gentoo-bug: #575556

Package-Manager: portage-2.2.26

 net-libs/librsync/files/librsync-0.9.7-fix-testsuite.patch | 14 +++---
 net-libs/librsync/librsync-0.9.7-r3.ebuild |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

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
index df35f09..e87c3d8 100644
--- a/net-libs/librsync/files/librsync-0.9.7-fix-testsuite.patch
+++ b/net-libs/librsync/files/librsync-0.9.7-fix-testsuite.patch
@@ -6,10 +6,10 @@ Last-Update: 2013-06-26
 +++ 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   \
+ # 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/librsync-0.9.7-r3.ebuild 
b/net-libs/librsync/librsync-0.9.7-r3.ebuild
index b365d55..2451aef 100644
--- a/net-libs/librsync/librsync-0.9.7-r3.ebuild
+++ b/net-libs/librsync/librsync-0.9.7-r3.ebuild
@@ -25,7 +25,7 @@ PATCHES=(
"${FILESDIR}"/${P}-format-security.patch
"${FILESDIR}"/${P}-getopt.patch
"${FILESDIR}"/${P}-implicit-declaration.patch
-   "${FILESDIR}"/${P}-fix-testsuite.ebuild
+   "${FILESDIR}"/${P}-fix-testsuite.patch
)
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: net-libs/librsync/files/, net-libs/librsync/

2016-02-23 Thread Ian Delaney

commit: a22a824f29b79da0bf9821bd53b56f130a31674e
Author: Alessandro Calorì  gmail  com>
AuthorDate: Tue Feb 23 10:10:07 2016 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Tue Feb 23 10:10:07 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a22a824f

net-libs/librsync: fix testsuite for v0.9.7, fix bug #511954
Added "librsync-0.9.7-fix-testsuite.patch" to fix compilation of librsync 0.9.7
when "test" feature is enabled in Portage. The patch has been sourced from the
Debian package librsync1-0.9.7-10 and has been provided by Andrey Rahmatullin.

Gentoo-bug: #511954

Package-Manager: portage-2.2.26

 .../librsync/files/librsync-0.9.7-fix-testsuite.patch | 15 +++
 net-libs/librsync/librsync-0.9.7-r3.ebuild|  3 ++-
 2 files changed, 17 insertions(+), 1 deletion(-)

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 000..df35f09
--- /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 
+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/librsync-0.9.7-r3.ebuild 
b/net-libs/librsync/librsync-0.9.7-r3.ebuild
index 704e50c..b365d55 100644
--- a/net-libs/librsync/librsync-0.9.7-r3.ebuild
+++ b/net-libs/librsync/librsync-0.9.7-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -25,6 +25,7 @@ PATCHES=(
"${FILESDIR}"/${P}-format-security.patch
"${FILESDIR}"/${P}-getopt.patch
"${FILESDIR}"/${P}-implicit-declaration.patch
+   "${FILESDIR}"/${P}-fix-testsuite.ebuild
)
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: net-libs/librsync/files/, net-libs/librsync/

2016-01-31 Thread Patrice Clement

commit: 0e25711b949a24d962f1319ecc34c671b7f4b370
Author: Alessandro Calorì  gmail  com>
AuthorDate: Sun Jan 31 18:58:32 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sun Jan 31 18:59:20 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e25711b

net-libs/librsync: fix bug #573144

 .../librsync/files/librsync-2.0.0-search.patch | 12 +
 net-libs/librsync/librsync-2.0.0-r1.ebuild | 31 ++
 2 files changed, 43 insertions(+)

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 000..93b4106
--- /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.0 +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-2.0.0-r1.ebuild 
b/net-libs/librsync/librsync-2.0.0-r1.ebuild
new file mode 100644
index 000..69b6692
--- /dev/null
+++ b/net-libs/librsync/librsync-2.0.0-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 
~x86-interix ~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
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/librsync/files/, net-libs/librsync/

[gentoo-commits] repo/gentoo:master commit in: net-libs/librsync/files/, net-libs/librsync/

[gentoo-commits] repo/gentoo:master commit in: net-libs/librsync/files/, net-libs/librsync/

[gentoo-commits] repo/gentoo:master commit in: net-libs/librsync/files/, net-libs/librsync/

[gentoo-commits] repo/gentoo:master commit in: net-libs/librsync/files/, net-libs/librsync/

[gentoo-commits] repo/gentoo:master commit in: net-libs/librsync/files/, net-libs/librsync/

6 matches

Site Navigation

Mail list logo

Footer information