fixed bug #358271

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

4 files changed, 107 insertions, 3 deletions

diff --git a/net-p2p/rtorrent/ChangeLog b/net-p2p/rtorrent/ChangeLog
index d0b7ce381d97..8055f5dfea11 100644
--- a/net-p2p/rtorrent/ChangeLog
+++ b/net-p2p/rtorrent/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-p2p/rtorrent
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/ChangeLog,v 1.156 2010/08/18 04:39:57 jer Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/ChangeLog,v 1.157 2011/03/28 10:52:45 wired Exp $
+
+*rtorrent-0.8.6-r2 (28 Mar 2011)
+
+  28 Mar 2011; Alex Alexander <wired@gentoo.org> +rtorrent-0.8.6-r2.ebuild,
+  +files/rtorrent-0.8.6-ncurses.patch:
+  fixed bug #358271
 
   18 Aug 2010; Jeroen Roovers <jer@gentoo.org> rtorrent-0.8.6-r1.ebuild:
   Stable for HPPA (bug #311143).
diff --git a/net-p2p/rtorrent/Manifest b/net-p2p/rtorrent/Manifest
index e89de6a882bd..68d0b871d3f9 100644
--- a/net-p2p/rtorrent/Manifest
+++ b/net-p2p/rtorrent/Manifest
@@ -1,11 +1,33 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX rtorrent-0.8.2-gcc34.patch 659 RMD160 c89a0c7b2acb6db4ce19fbb7a75f1da65638cd2b SHA1 d1afe3ca20a9b9b60056b7941ae7f81dcee558a0 SHA256 a89b48546be2c0728129feff223ed4e03a7c40bbc37e9bead9c13cf20c5cd00d
 AUX rtorrent-0.8.6-canvas-fix.patch 11607 RMD160 01f3be5ecf0769a44e31f9852eb3da5454e85c75 SHA1 4d60d95845df05c9864ca50d3f84726d2b93ab14 SHA256 a843dcd8c3b7fe0179c24d53cb485d2f11156a189e58911bbd14e5e30db71925
+AUX rtorrent-0.8.6-ncurses.patch 572 RMD160 c0e390c444e50d69d8dbe4727c76b5962651a570 SHA1 2267dce2ddfb1ea865ba50c95e4a5beaf24da533 SHA256 4bcc6f33fad67d14f44cfdc63409fc94ef917dc120c46e60ce175d36af3fcb02
 AUX rtorrentd.conf 13 RMD160 aafd4d8440f40ae380b482876968f80267dff3bd SHA1 8b50885e27a2ff85cd28fccb56c11ead26d0ba49 SHA256 6725e7a3ed74f1432bd6b317f2aec7f9609bc20dd81dbbfcc632342c9f99177b
 AUX rtorrentd.init 709 RMD160 c615550d62bf8a7a9d91140e1cd8075429e2865c SHA1 d1102674a40a00dd5b124b0d619541b9fdf58fcc SHA256 7c01751832043828667dce8180d0885ad562fcd9d2aa03bc3c7d46106ceedcad
 DIST rtorrent-0.8.5.tar.gz 512889 RMD160 ebf5bc3a39ec8b9905513a706a480452498ca991 SHA1 ebab4af5c3c5f31803e0880fadd303ecbc6adba8 SHA256 0ec6991772e9318fa5e687b5c2c8b5e0166d8def8d729373e8ae20b815984665
 DIST rtorrent-0.8.6.tar.gz 521045 RMD160 3d5109d4ee26c663b376e0b9f610ab6055c57ba9 SHA1 ffce3959ba91738bb444d689db3db1e2375b14ce SHA256 8c96c68e1524162abd1fc4b612d0c3d924fccc25159c0b3f208e69281f0b32db
 EBUILD rtorrent-0.8.5.ebuild 2000 RMD160 0c6823b9621504141aa3f59f20944f3e47d10e1c SHA1 a7a67e6efbdd3af293278deb1f3d66df82386774 SHA256 39ba63825c2982b48bcfdb6ed4b2364e38118e8d38d204df1c5fdabc6006ca69
 EBUILD rtorrent-0.8.6-r1.ebuild 1596 RMD160 c4558712e434a91bd49bb99049badd7e8c1e975f SHA1 e2c47673cea00308d5dc63dcce21dfa4229ff8f3 SHA256 1c177f4f112c0e21611f404f1c15d98ec1be13f92fdc0e54bb587bd3c9677ce5
+EBUILD rtorrent-0.8.6-r2.ebuild 1660 RMD160 472d6ac7e907f628f218e87c0f9e6d88528e4d87 SHA1 01a250035a75cd56965c9d20652dc8bd2ed3c045 SHA256 7ad3524127003ed2c9324d5d29ad705ce828bd79a8b1b424d1fdfbc2673d8d74
 EBUILD rtorrent-0.8.6.ebuild 1260 RMD160 1d11acf95e73102ffaa158211d447750572b3dda SHA1 9d407e75bb2af04f96e9a27240436af6fb723b5c SHA256 bec7c3c93a1764903200e13fa0e77377af870da05acb6e8856ce9702877fd1b9
-MISC ChangeLog 22623 RMD160 07c49397f25ece06d2f14304720b6d651e89f34b SHA1 5c8ff1c03239687fdae9d6bc7829e6368730c57d SHA256 4301398417b8a22552b212987e794feac1f804ce688d06e8215202143bfa87f8
+MISC ChangeLog 22795 RMD160 227ed4be0d876b37bc3b841cccb603003c1447b2 SHA1 490c49a3c4bb8e9a51ccc322995e20d4124da7eb SHA256 133d27624080330ba550bb61958a9bea689f5b8239e786126829ae1edde44eea
 MISC metadata.xml 392 RMD160 45e0a49396ec9062dec01e806cafeee78ed65b5f SHA1 772978675923bad143b16b772257ea5fb868bf56 SHA256 fd16df5847e039632256655ff60ce329cbdd92b87f3397b8810e1665480c62a2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCAAGBQJNkGlCAAoJEDZF8K7rm0r6P0AQAJd9ZalKYd2F3AhbxiC+YHOQ
+YYHeoUPh4657V1Nx0YswMNpjrkrD9Nv0XeKrZTSljg+zbKe+b6a9s0qEcmzErqdt
+99r+/rbQOdW7UgqOQX2Z7w0c48TCj6XBKr9rIYYLQdceqHD+S8IUdcYFop+5+zvL
+tv0D9f0eYi40VKWpzrpM0AachS6GB1wdJdTQeZbTSzp67RkAqBB5VBHrKQh9ccho
+mjMfmpolD72M27VaiR85FW93wEhs41vTR+W5+s9gwtQiwdqOqTVLFhPghHWRVZeW
+4j0wKra9b7xuJJ89+q3/KHpGUrHzDlhrvgwrAZDWPhB20EifLMr0smDeGDx6uosJ
+0Id5M2FRFUsc1h982q8uRDBrmkAsdxQohHH6dShINm0ckNWiFyRmcZPk0fHRVzAj
+j+TG4siTZfU3rnY+pvsIUoE7XPI5FdJKov0BGB6dky0A7/Se+YKW2jxsgbaHlRcX
+je5fUFGN/w4f5w/tGCrVMs8sjkkGMkis7F2ztP4JyW0DxTE10j7GEXrUAMi/2lpC
+RIK0ZcWWB2NL2Gklvu0FvCC+jGim74ppeyHMnrOKGRx6slKktKhemWeXWGVyi7re
+dim5NxWp8xmU6zI45tPLYeemoLAsvrH4sKwBBNPAVoXeLOdlEGfHN34/gFawbyL3
+eF6m/UA6ps1dYGfqxpKy
+=KUxC
+-----END PGP SIGNATURE-----
diff --git a/net-p2p/rtorrent/files/rtorrent-0.8.6-ncurses.patch b/net-p2p/rtorrent/files/rtorrent-0.8.6-ncurses.patch
new file mode 100644
index 000000000000..0dabca3c88b8
--- /dev/null
+++ b/net-p2p/rtorrent/files/rtorrent-0.8.6-ncurses.patch
@@ -0,0 +1,16 @@
+rtorrent segfaults with latest ncurses (5.8).
+this patch fixes the issue.
+
+https://bugs.gentoo.org/show_bug.cgi?id=358271
+https://bugzilla.redhat.com/show_bug.cgi?id=682454
+http://libtorrent.rakshasa.no/ticket/2518
+--- src/display/canvas.h
++++ src/display/canvas.h
+@@ -48,7 +48,7 @@ class Canvas {
+ public:
+   typedef std::vector<Attributes> attributes_list;
+ 
+-  Canvas(int x = 0, int y = 0, int width = 0, int height = 0) :
++  Canvas(int x = 0, int y = 0, int width = 1, int height = 1) :
+     m_window(newwin(height, width, y, x)) {}
+   ~Canvas() { delwin(m_window); }
diff --git a/net-p2p/rtorrent/rtorrent-0.8.6-r2.ebuild b/net-p2p/rtorrent/rtorrent-0.8.6-r2.ebuild
new file mode 100644
index 000000000000..f49560280b7d
--- /dev/null
+++ b/net-p2p/rtorrent/rtorrent-0.8.6-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/rtorrent-0.8.6-r2.ebuild,v 1.1 2011/03/28 10:52:45 wired Exp $
+
+EAPI=2
+
+inherit eutils
+
+DESCRIPTION="BitTorrent Client using libtorrent"
+HOMEPAGE="http://libtorrent.rakshasa.no/"
+SRC_URI="http://libtorrent.rakshasa.no/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="daemon debug ipv6 xmlrpc"
+
+COMMON_DEPEND=">=net-libs/libtorrent-0.12.${PV##*.}
+	>=dev-libs/libsigc++-2.2.2:2
+	>=net-misc/curl-7.19.1
+	sys-libs/ncurses
+	xmlrpc? ( dev-libs/xmlrpc-c )"
+RDEPEND="${COMMON_DEPEND}
+	daemon? ( app-misc/screen )"
+DEPEND="${COMMON_DEPEND}
+	dev-util/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-canvas-fix.patch
+
+	# bug #358271
+	epatch "${FILESDIR}"/${P}-ncurses.patch
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		$(use_enable debug) \
+		$(use_enable ipv6) \
+		$(use_with xmlrpc xmlrpc-c)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS README TODO doc/rtorrent.rc
+
+	if use daemon; then
+		newinitd "${FILESDIR}/rtorrentd.init" rtorrentd || die "newinitd failed"
+		newconfd "${FILESDIR}/rtorrentd.conf" rtorrentd || die "newconfd failed"
+	fi
+}
+
+pkg_postinst() {
+	elog "rtorrent colors patch"
+	elog "Set colors using the options below in .rtorrent.rc:"
+	elog "Options: done_fg_color, done_bg_color, active_fg_color, active_bg_color"
+	elog "Colors: 0 = black, 1 = red, 2 = green, 3 = yellow, 4 = blue,"
+	elog "5 = magenta, 6 = cyan and 7 = white"
+	elog "Example: done_fg_color = 1"
+}