Add upstream patch to support +4GiB file sizes. Bug #142945 by Vadim. Add

epunt_cxx for bug #185600 by Laurence Withers. Maintainer-needed commit.
Package-Manager: portage-2.1.3.12

5 files changed, 97 insertions, 9 deletions

diff --git a/net-libs/librsync/ChangeLog b/net-libs/librsync/ChangeLog
index 0f2abd468e63..b44024935f8d 100644
--- a/net-libs/librsync/ChangeLog
+++ b/net-libs/librsync/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/librsync
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/librsync/ChangeLog,v 1.25 2007/03/19 02:44:23 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/librsync/ChangeLog,v 1.26 2007/10/06 20:42:57 dirtyepic Exp $
+
+*librsync-0.9.7-r1 (06 Oct 2007)
+
+  06 Oct 2007; Ryan Hill <dirtyepic@gentoo.org>
+  +files/librsync-0.9.7-huge-files.patch, +librsync-0.9.7-r1.ebuild:
+  Add upstream patch to support +4GiB file sizes. Bug #142945 by Vadim. Add
+  epunt_cxx for bug #185600 by Laurence Withers. Maintainer-needed commit.
 
   19 Mar 2007; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
   Remove ka0ttic from metadata.xml due to retirement.
diff --git a/net-libs/librsync/Manifest b/net-libs/librsync/Manifest
index d4e1a82000d6..2e3d2b3b938e 100644
--- a/net-libs/librsync/Manifest
+++ b/net-libs/librsync/Manifest
@@ -1,20 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX librsync-0.9.7-huge-files.patch 1022 RMD160 f797d985fe43bf052657476e1141302d7137ade1 SHA1 739ceada1e264553832a04305a344941f1ad9b03 SHA256 37a6ccc39b7bec1765fb5a99cb3b1d6b1572ad611c0724c594f671d25246535d
+MD5 848ef3115dec77a6b981482d0ad903b2 files/librsync-0.9.7-huge-files.patch 1022
+RMD160 f797d985fe43bf052657476e1141302d7137ade1 files/librsync-0.9.7-huge-files.patch 1022
+SHA256 37a6ccc39b7bec1765fb5a99cb3b1d6b1572ad611c0724c594f671d25246535d files/librsync-0.9.7-huge-files.patch 1022
 DIST librsync-0.9.6.tar.gz 353581 RMD160 83782df9da89844a85122f6b635fce9c2e86bb8b SHA1 427856d33765c978e3a6392fb17b7adb2fcf02ff SHA256 c042da85cc3563380876bec9699b2eb503e7209ec17f76d2c42762bd39576347
 DIST librsync-0.9.7.tar.gz 453802 RMD160 39ca29334d0efabc0ee9e4d44abbe73a7d2fe831 SHA1 d575eb5cae7a815798220c3afeff5649d3e8b4ab SHA256 6633e4605662763a03bb6388529cbdfd3b11a9ec55b8845351c1bd9a92bc41d6
 EBUILD librsync-0.9.6.ebuild 704 RMD160 bae91db123394e16c14eea0f20419d50c85419c4 SHA1 195a1d5ae907740a75fd5b910a0ae1e960673ff1 SHA256 984b9cef0e70290de7e911e5f5fa63ed8a5148a131aeb047518c4dc251f98c79
 MD5 43320660d39f81ba519b1296d4b67ea2 librsync-0.9.6.ebuild 704
 RMD160 bae91db123394e16c14eea0f20419d50c85419c4 librsync-0.9.6.ebuild 704
 SHA256 984b9cef0e70290de7e911e5f5fa63ed8a5148a131aeb047518c4dc251f98c79 librsync-0.9.6.ebuild 704
+EBUILD librsync-0.9.7-r1.ebuild 828 RMD160 354d7015eff644764a160a6fa3ab5ac823d802d3 SHA1 a0daff099f8625e7abec16ba462f403eb7c16cab SHA256 c9ae937d02d59e01c62478c09e6fbb9c846b9793839014cfdead3fd06a8b6e21
+MD5 57102d5c5192d36f22ea056fb8766106 librsync-0.9.7-r1.ebuild 828
+RMD160 354d7015eff644764a160a6fa3ab5ac823d802d3 librsync-0.9.7-r1.ebuild 828
+SHA256 c9ae937d02d59e01c62478c09e6fbb9c846b9793839014cfdead3fd06a8b6e21 librsync-0.9.7-r1.ebuild 828
 EBUILD librsync-0.9.7.ebuild 687 RMD160 4898c465e6b021d2a176e5ad55b7c15bedfa2871 SHA1 516c366f0e1a94d5a55e00f63ae9aa6e181b8e67 SHA256 6d6cad1124c27ec89abbea8deee4ab08efc80be001cfef1979210a6507b9825b
 MD5 a21012b431e862ec11c2e86108f3f0e8 librsync-0.9.7.ebuild 687
 RMD160 4898c465e6b021d2a176e5ad55b7c15bedfa2871 librsync-0.9.7.ebuild 687
 SHA256 6d6cad1124c27ec89abbea8deee4ab08efc80be001cfef1979210a6507b9825b librsync-0.9.7.ebuild 687
-MISC ChangeLog 2734 RMD160 566875eb2d7ff4968dd199527ea689a1703b6834 SHA1 d590093a2001432377d604e9341a057cb2d29321 SHA256 11bb16f6ce71ad799b0d5206227d8aba01a7a03e44576c24d6898f5221426358
-MD5 3c25f0053b6ea074248208ac6740f606 ChangeLog 2734
-RMD160 566875eb2d7ff4968dd199527ea689a1703b6834 ChangeLog 2734
-SHA256 11bb16f6ce71ad799b0d5206227d8aba01a7a03e44576c24d6898f5221426358 ChangeLog 2734
+MISC ChangeLog 3040 RMD160 712fb1405bdab90ffbc6ea85979417fb9f236ff0 SHA1 ce24729daabb7e995cf3701b226beea99958e7d6 SHA256 4c32f63c2d7562c6d809e8d58d8e26770d500748350e8c0679d746c8fab3399d
+MD5 9e98b2d19124a6fc52c5faefa6d227bc ChangeLog 3040
+RMD160 712fb1405bdab90ffbc6ea85979417fb9f236ff0 ChangeLog 3040
+SHA256 4c32f63c2d7562c6d809e8d58d8e26770d500748350e8c0679d746c8fab3399d ChangeLog 3040
 MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829
 MD5 f8262495085fcfa7f25596eadfaa7a35 metadata.xml 236
 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae metadata.xml 236
@@ -25,10 +33,13 @@ SHA256 33daf85e275296b30c58351ee8744a9f563d8d686c6081ea677e4376f5c4fd76 files/di
 MD5 f29d3e4e6b7d4f0937de49dfe9115004 files/digest-librsync-0.9.7 244
 RMD160 c095a76941cc21e8eb929a2852508009599aba3b files/digest-librsync-0.9.7 244
 SHA256 0dd534715c2ebff8c80f02654314feaca7c5dec7f4f6327cf05c14b688a32f86 files/digest-librsync-0.9.7 244
+MD5 f29d3e4e6b7d4f0937de49dfe9115004 files/digest-librsync-0.9.7-r1 244
+RMD160 c095a76941cc21e8eb929a2852508009599aba3b files/digest-librsync-0.9.7-r1 244
+SHA256 0dd534715c2ebff8c80f02654314feaca7c5dec7f4f6327cf05c14b688a32f86 files/digest-librsync-0.9.7-r1 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFF/fjQugEuf3OQ0akRAkxfAJ4+aHh6htkkHaiUHmQZzQCEc8chsQCeMsbc
-RblRKEv7RiFmkK8lAxxYOCY=
-=892r
+iD8DBQFHB/NWiqiDRvmkBmIRAmsOAJ9vwQIDUCbcgyL4BbUm52FeG0jL1wCfbDte
+l06VCGOeBHcPcpcTRAsXShI=
+=swfz
 -----END PGP SIGNATURE-----
diff --git a/net-libs/librsync/files/digest-librsync-0.9.7-r1 b/net-libs/librsync/files/digest-librsync-0.9.7-r1
new file mode 100644
index 000000000000..99163abf7806
--- /dev/null
+++ b/net-libs/librsync/files/digest-librsync-0.9.7-r1
@@ -0,0 +1,3 @@
+MD5 24cdb6b78f45e0e83766903fd4f6bc84 librsync-0.9.7.tar.gz 453802
+RMD160 39ca29334d0efabc0ee9e4d44abbe73a7d2fe831 librsync-0.9.7.tar.gz 453802
+SHA256 6633e4605662763a03bb6388529cbdfd3b11a9ec55b8845351c1bd9a92bc41d6 librsync-0.9.7.tar.gz 453802
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/librsync-0.9.7-r1.ebuild b/net-libs/librsync/librsync-0.9.7-r1.ebuild
new file mode 100644
index 000000000000..112de79858da
--- /dev/null
+++ b/net-libs/librsync/librsync-0.9.7-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/librsync/librsync-0.9.7-r1.ebuild,v 1.1 2007/10/06 20:42:57 dirtyepic Exp $
+
+inherit eutils libtool
+
+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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Bug #142945
+	epatch "${FILESDIR}"/${P}-huge-files.patch
+
+	# Bug #185600
+	elibtoolize
+	epunt_cxx
+}
+
+src_compile() {
+	econf --enable-shared || die
+	emake || die
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die
+	dodoc NEWS AUTHORS THANKS README TODO
+}