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

["Bernard Cafarelli" <voyageur@gentoo.org>]

commit:     e28b02899c01823dbec2d41261a1b532f5077f65
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  7 15:17:33 2020 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Tue Apr  7 15:17:41 2020 +0000
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 <voyageur <AT> 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..00000000000
--- 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 <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
deleted file mode 100644
index e35980a4d7a..00000000000
--- 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 <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
deleted file mode 100644
index 0859089b970..00000000000
--- a/net-libs/librsync/files/librsync-0.9.7-getopt.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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
deleted file mode 100644
index fef08941a44..00000000000
--- a/net-libs/librsync/files/librsync-0.9.7-huge-files.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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
deleted file mode 100644
index 782597c8fe2..00000000000
--- a/net-libs/librsync/files/librsync-0.9.7-implicit-declaration.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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/librsync-0.9.7-r3.ebuild b/net-libs/librsync/librsync-0.9.7-r3.ebuild
deleted file mode 100644
index cb7a0da16ce..00000000000
--- a/net-libs/librsync/librsync-0.9.7-r3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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="https://librsync.github.io/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/1"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 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
-}