Update to EAPI 2 and fix parsing of torrents with negative ints.

Package-Manager: portage-2.2.0_alpha13/cvs/Linux x86_64

4 files changed, 70 insertions, 4 deletions

diff --git a/net-p2p/ctorrent/ChangeLog b/net-p2p/ctorrent/ChangeLog
index 5f83b375356d..4638d754cbcf 100644
--- a/net-p2p/ctorrent/ChangeLog
+++ b/net-p2p/ctorrent/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-p2p/ctorrent
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/ctorrent/ChangeLog,v 1.50 2010/09/19 17:55:11 armin76 Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/ctorrent/ChangeLog,v 1.51 2011/01/16 01:15:49 vapier Exp $
+
+*ctorrent-3.3.2-r2 (16 Jan 2011)
+
+  16 Jan 2011; Mike Frysinger <vapier@gentoo.org> +ctorrent-3.3.2-r2.ebuild,
+  +files/ctorrent-3.3.2-negative-ints.patch:
+  Update to EAPI 2 and fix parsing of torrents with negative ints.
 
   19 Sep 2010; Raúl Porcel <armin76@gentoo.org> ctorrent-3.3.2-r1.ebuild:
   arm/s390/sh stable wrt #266953
diff --git a/net-p2p/ctorrent/Manifest b/net-p2p/ctorrent/Manifest
index 2437128f2a45..2f31cfa6c5b3 100644
--- a/net-p2p/ctorrent/Manifest
+++ b/net-p2p/ctorrent/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX ctorrent-3.3.2-negative-ints.patch 442 RMD160 ed140f91cd162f97f9d4de2969b6737ba79ab095 SHA1 b1e48e16310f1091a19211d1035115fd8c68cce8 SHA256 b79e6211c085a1ca676c85b30354b1afc0537e67046c953532c0e0953523a17b
 AUX ctorrent-CVE-2009-1759.patch 10931 RMD160 6475b7ac0ed33a355bed33f1ead0a2014c3f3174 SHA1 e984eb0f637a7775910f9852ac938d5b1ac5c93c SHA256 4d2735ca6bf8704097eae5ee79936d2be6a55074bce86bf74b79dd428a405293
 DIST ctorrent-dnh3.3.2.tar.gz 219053 RMD160 5db2613109fc7e55e7ccdf0d2da12e352c99b385 SHA1 d4e221f0292268f80e2430ce9d451dd64cf1ffaa SHA256 c87366c91475931f75b924119580abd06a7b3cb3f00fef47346552cab1e24863
 EBUILD ctorrent-3.3.2-r1.ebuild 823 RMD160 a72b56ecb3ddc6818a7aa438f32f94c2f445dcf7 SHA1 fe653f4ea30e56941282a0330d109e9b72c85592 SHA256 f272180e52ab4d6039b4a213b6710ef0ddebdb395101072b7bdd4bcfe77f835c
-EBUILD ctorrent-3.3.2.ebuild 721 RMD160 292c38db9abe02086a404360f3fb48709f70eda9 SHA1 c3c0a9d5319dc433b69187ab00829605a0037181 SHA256 3617a2a356d736e7aff72bdd124e6e770bf65c8ee91fe009ae18719478d0dc5a
-MISC ChangeLog 6736 RMD160 a258a2cb159c504bcede287964cfa4f429618820 SHA1 f01041bb830d2e7f9d850797c3a839bd783130f2 SHA256 af1baafe74dc32f55a4d9cca0f2418cce18414bfdf9769d4d54cf7a238ddfd5f
+EBUILD ctorrent-3.3.2-r2.ebuild 827 RMD160 941548e8ff26ec78772fdc145d0999e31bb11017 SHA1 e5d12887da1999ae6ce44e0467420db007240222 SHA256 7803a836911f4e47b7fcc262f682160ae6509ef850ab7163f788803f1d4813c3
+MISC ChangeLog 6959 RMD160 0dd4dcd7e9959b2344be0130b8876cdd99d3d806 SHA1 10e271c7fe6ca234601a752be4eaa655439b8d04 SHA256 921a1742290175c9024ae228dffb000efcebaee602228274b150099b33244fae
 MISC metadata.xml 160 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd SHA1 813ef5bc57f6a8d95e7cab7a745a2a824858f49c SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iF4EAREIAAYFAk0yRukACgkQaC/OocHi7Ja+LQD/SepiOWLBlRMLdUdOlc7RY4/R
+Y102t9dKDLeGzbcd3S8A/jI3NgbrIWkZHj6L9IEe/ttaobhs25idcwycl7Jz56iK
+=IRwk
+-----END PGP SIGNATURE-----
diff --git a/net-p2p/ctorrent/ctorrent-3.3.2-r2.ebuild b/net-p2p/ctorrent/ctorrent-3.3.2-r2.ebuild
new file mode 100644
index 000000000000..3616987313ba
--- /dev/null
+++ b/net-p2p/ctorrent/ctorrent-3.3.2-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/ctorrent/ctorrent-3.3.2-r2.ebuild,v 1.1 2011/01/16 01:15:49 vapier Exp $
+
+EAPI="2"
+
+inherit eutils
+
+MY_P="${PN}-dnh${PV}"
+
+DESCRIPTION="Enhanced CTorrent is a BitTorrent console client written in C and C++"
+HOMEPAGE="http://www.rahul.net/dholmes/ctorrent/"
+SRC_URI="mirror://sourceforge/dtorrent/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+DEPEND="dev-libs/openssl"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-CVE-2009-1759.patch
+	epatch "${FILESDIR}"/${P}-negative-ints.patch
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog README-DNH.TXT README NEWS
+}
diff --git a/net-p2p/ctorrent/files/ctorrent-3.3.2-negative-ints.patch b/net-p2p/ctorrent/files/ctorrent-3.3.2-negative-ints.patch
new file mode 100644
index 000000000000..c3f98c713d01
--- /dev/null
+++ b/net-p2p/ctorrent/files/ctorrent-3.3.2-negative-ints.patch
@@ -0,0 +1,17 @@
+allow negative integers ... should fix random "error, initial meta info failed"
+
+https://sourceforge.net/tracker/?func=detail&aid=3159066&group_id=202532&atid=981959
+
+--- ctorrent-dnh3.3.2/bencode.cpp
++++ ctorrent-dnh3.3.2/bencode.cpp
+@@ -44,6 +44,10 @@
+     p++; len--;
+   }
+ 
++  if( *p == '-'){
++    p++; len--;
++  }
++
+   for(psave = p; len && isdigit(*p); p++,len--) ;
+ 
+   if(!len || MAX_INT_SIZ < (p - psave) || *p != endchar) return 0;