Fix a crash in scgi_local or scgi_port when calling freeaddrinfo with a NULL pointer. Patch by Josef Drexler.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.25.8 i686

4 files changed, 100 insertions, 2 deletions

diff --git a/net-p2p/rtorrent/ChangeLog b/net-p2p/rtorrent/ChangeLog
index 51f2ef4c6e5b..f354a6fcbce5 100644
--- a/net-p2p/rtorrent/ChangeLog
+++ b/net-p2p/rtorrent/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-p2p/rtorrent
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/ChangeLog,v 1.117 2008/08/25 20:23:23 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/ChangeLog,v 1.118 2008/08/26 21:04:10 loki_val Exp $
+
+*rtorrent-0.8.2-r5 (26 Aug 2008)
+
+  26 Aug 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/rtorrent-0.8.2-fix_scgi_crash.patch, +rtorrent-0.8.2-r5.ebuild:
+  Fix a crash in scgi_local or scgi_port when calling freeaddrinfo with a
+  NULL pointer. Patch by Josef Drexler.
 
   25 Aug 2008; Jeroen Roovers <jer@gentoo.org> rtorrent-0.8.2-r3.ebuild:
   Stable for HPPA (bug #233122).
diff --git a/net-p2p/rtorrent/Manifest b/net-p2p/rtorrent/Manifest
index 0166f4d4fcc2..6bc7d7ecf42e 100644
--- a/net-p2p/rtorrent/Manifest
+++ b/net-p2p/rtorrent/Manifest
@@ -2,6 +2,7 @@ AUX rtorrent-0.8.0+gcc-4.3.patch 1902 RMD160 36665695d0bfe42d3e90ebb2c803291cab2
 AUX rtorrent-0.8.2-fix-configure-execinfo.patch 505 RMD160 4c6d475f02ceb90fde5aa57cb5c661c15340f45e SHA1 8d1865c2d6588571a027955895cbc16837b53531 SHA256 76b9f89404a140bbe54ef49becc8b6eb4e1c6b8b8c95eded31320ac78173b191
 AUX rtorrent-0.8.2-fix_conn_type_seed.patch 872 RMD160 6d459a60e57702d83801c03a756db2adebbc25f3 SHA1 640231a849def797f07278aa1fc71a6f1164044d SHA256 0974025e834799c0d145673d14df4aa7cb1d7421f1a194304ca728d21abedd5b
 AUX rtorrent-0.8.2-fix_load_cache.patch 580 RMD160 a9c9804e37f4e242a68b60fa01eed52e981a6a2c SHA1 e3301560b70be479bbacb3f27e3d992d60dc8bb4 SHA256 7f7dac70d8e5f04248108f558959b49361d9f3598250fec2eadcf45cf0bce49b
+AUX rtorrent-0.8.2-fix_scgi_crash.patch 656 RMD160 24447e6dac267fb5f7a3d8837744a900effefede SHA1 77142a8b3ce9d423eab3f6445e3041216ee1dae1 SHA256 f102facf32a8be73a9a85e443e8db24044f4913d5a08446b502b5d5984177ac7
 AUX rtorrent-0.8.2-fix_start_stop_filter.patch 701 RMD160 6b109e050cc1e66d2d9874bce0fdf599188978c9 SHA1 3289506a9c76d080edbeb3ef1a42694a64da6c4d SHA256 d422c5d9a82a0d799f3b949e4b0d2fd293d98baab1fb293642544895ece75926
 AUX rtorrent-0.8.2-fix_utf8_filenames.patch 8196 RMD160 80af83b87f3794a3e6d9c1216df3559c38f12df0 SHA1 d1e4615aaefab05731010dc05167e912974581bc SHA256 84df9c827d63b81387e7720bbc9436765a940c18f972e655ecc8bc562039c532
 AUX rtorrent-0.8.2-gcc34.patch 659 RMD160 c89a0c7b2acb6db4ce19fbb7a75f1da65638cd2b SHA1 d1afe3ca20a9b9b60056b7941ae7f81dcee558a0 SHA256 a89b48546be2c0728129feff223ed4e03a7c40bbc37e9bead9c13cf20c5cd00d
@@ -10,5 +11,6 @@ DIST rtorrent-0.8.2.tar.gz 506015 RMD160 e86b0082d1788e4e7cd8fcf631f7f857d642c79
 EBUILD rtorrent-0.7.9.ebuild 1321 RMD160 05dae6bd7b6c85a3a10f227db1461dd1fce65e46 SHA1 eeb3d6cca988d634a1db59d80271707c6630721b SHA256 1ea31a9d4ebb2a54ee6a287120d40415216d0703abf047013e17cf62f7bbdedc
 EBUILD rtorrent-0.8.2-r3.ebuild 1939 RMD160 ecb052649f7c396eb3cfad1984b36a70dc8abf07 SHA1 fe0ad6400ddef8fbaa328903de9880bb0a6b200d SHA256 e504ced699267c0a307751a78f06cf0e75eeb52f802bb6aa8760bd5c63efb5d6
 EBUILD rtorrent-0.8.2-r4.ebuild 2080 RMD160 fe2c3227e1d5094b607d4148ffd1b5bfa2e8d33f SHA1 25d68feb5509563e7a0b2546fc0721c76af87866 SHA256 7b389671eb2563e27b83569ac240ac6219d2dcc3597c16ef351451d01ebe45dd
-MISC ChangeLog 16978 RMD160 73af2e2460c222d1a36aa09995e76c1a838e68b8 SHA1 8675ff1f2352adf033e37eb3475c6fe9702be27b SHA256 c8beba89168a282eb33dab316effeec240c4e7aeca6a0fc28435effeec04a59f
+EBUILD rtorrent-0.8.2-r5.ebuild 2128 RMD160 20c65333e2aa66605cac2729d483e19504b9f562 SHA1 2191b0d5d714026da3adc73b97a234a6403dd156 SHA256 1ba34392f8a133c9d6a6fc6fd8c8f3be6f2728255693e9d123df0d1007e5ccfe
+MISC ChangeLog 17258 RMD160 1dc04e2ac45318d1eda8e8c463da966b86cee4d7 SHA1 f4f50ab37e3168f8e5ebbde28eebeb12bf290d5e SHA256 b9f549ac2257ae51ed31ff56667a6ec3f9edfc4dc774bf2e0816c46144f6a547
 MISC metadata.xml 592 RMD160 e65e635c888aaa1932efb1d3684643f814f92710 SHA1 189fe22f0af84cc26784ee5b0e3390eac001d9df SHA256 d0659456da6746a9a6f0c7a10f5fad958d2c0bcf56750d18c26e3cfad5dd6560
diff --git a/net-p2p/rtorrent/files/rtorrent-0.8.2-fix_scgi_crash.patch b/net-p2p/rtorrent/files/rtorrent-0.8.2-fix_scgi_crash.patch
new file mode 100644
index 000000000000..acc80ae10d05
--- /dev/null
+++ b/net-p2p/rtorrent/files/rtorrent-0.8.2-fix_scgi_crash.patch
@@ -0,0 +1,19 @@
+# Fix a crash in scgi_local or scgi_port when calling
+# freeaddrinfo with a NULL pointer.
+Index: rtorrent/src/command_network.cc
+===================================================================
+--- rtorrent/src/command_network.cc	(revision 1063)
++++ rtorrent/src/command_network.cc	(working copy)
+@@ -261,10 +261,10 @@
+       break;
+     }
+ 
+-    rak::address_info::free_address_info(ai);
++    if (ai != NULL) rak::address_info::free_address_info(ai);
+ 
+   } catch (torrent::local_error& e) {
+-    rak::address_info::free_address_info(ai);
++    if (ai != NULL) rak::address_info::free_address_info(ai);
+ 
+     throw torrent::input_error(e.what());
+   }
diff --git a/net-p2p/rtorrent/rtorrent-0.8.2-r5.ebuild b/net-p2p/rtorrent/rtorrent-0.8.2-r5.ebuild
new file mode 100644
index 000000000000..cc15c05c4e55
--- /dev/null
+++ b/net-p2p/rtorrent/rtorrent-0.8.2-r5.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/rtorrent-0.8.2-r5.ebuild,v 1.1 2008/08/26 21:04:10 loki_val Exp $
+
+inherit eutils autotools toolchain-funcs flag-o-matic
+
+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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug ipv6 xmlrpc"
+
+DEPEND=">=net-libs/libtorrent-0.12.${PV##*.}
+	>=dev-libs/libsigc++-2
+	>=net-misc/curl-7.18
+	sys-libs/ncurses
+	xmlrpc? ( dev-libs/xmlrpc-c )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-0.8.0+gcc-4.3.patch
+	epatch "${FILESDIR}"/${P}-fix_start_stop_filter.patch
+	epatch "${FILESDIR}"/${P}-fix_conn_type_seed.patch
+	epatch "${FILESDIR}"/${P}-fix_load_cache.patch
+	epatch "${FILESDIR}"/${P}-fix_utf8_filenames.patch
+	epatch "${FILESDIR}"/${P}-fix-configure-execinfo.patch
+	epatch "${FILESDIR}"/${P}-gcc34.patch
+	epatch "${FILESDIR}"/${P}-fix_scgi_crash.patch
+	eautoreconf
+}
+
+src_compile() {
+	replace-flags -Os -O2
+	append-flags -fno-strict-aliasing
+
+	if [[ $(tc-arch) = "x86" ]]; then
+		filter-flags -fomit-frame-pointer -fforce-addr
+	fi
+
+	econf \
+		$(use_enable debug) \
+		$(use_enable ipv6) \
+		$(use_with xmlrpc xmlrpc-c) \
+		--disable-dependency-tracking \
+		|| die "econf failed"
+
+	emake || die "emake failed"
+}
+
+pkg_postinst() {
+	elog "rtorrent now supports a configuration file."
+	elog "A sample configuration file for rtorrent can be found"
+	elog "in ${ROOT}usr/share/doc/${PF}/rtorrent.rc.gz."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS README TODO doc/rtorrent.rc
+}
+
+pkg_postinst() {
+	ewarn "If you're upgrading from rtorrent <0.8.0, you will have to delete your"
+	ewarn "session directory or run the fixSession080-c.py script from this address:"
+	ewarn "http://rssdler.googlecode.com/files/fixSession080-c.py"
+	ewarn "See http://libtorrent.rakshasa.no/wiki/LibTorrentKnownIssues for more info."
+}