Add patch from upstream to fix segv on /quit with glib-2.10.

(Portage version: 2.1_pre10-r2)

4 files changed, 93 insertions, 1 deletions

diff --git a/net-irc/irssi/ChangeLog b/net-irc/irssi/ChangeLog
index fe1d74506177..639e8402c5ba 100644
--- a/net-irc/irssi/ChangeLog
+++ b/net-irc/irssi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-irc/irssi
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/ChangeLog,v 1.86 2006/04/30 00:26:38 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/ChangeLog,v 1.87 2006/05/05 04:36:42 exg Exp $
+
+*irssi-0.8.10-r3 (05 May 2006)
+
+  05 May 2006; Emanuele Giaquinta <exg@gentoo.org>
+  +files/irssi-0.8.10-dcc-segv.patch, +irssi-0.8.10-r3.ebuild:
+  Add patch from upstream to fix segv on /quit with glib-2.10.
 
   30 Apr 2006; Sven Wegener <swegener@gentoo.org>
   -files/irssi-0.8.9-64bit-exec-fix.patch, -files/0.8.9-gcc4-fix.patch,
diff --git a/net-irc/irssi/files/digest-irssi-0.8.10-r3 b/net-irc/irssi/files/digest-irssi-0.8.10-r3
new file mode 100644
index 000000000000..ac460babc5dd
--- /dev/null
+++ b/net-irc/irssi/files/digest-irssi-0.8.10-r3
@@ -0,0 +1,3 @@
+MD5 4b83d4047670eb75bd14ae1bdd68dc38 irssi-0.8.10.tar.bz2 933152
+RMD160 d2deaca1bf81184b6120bf5804de73b3ef0ac37b irssi-0.8.10.tar.bz2 933152
+SHA256 47344b444d78ad5965eb40cc4c8df8450fdc54135e2b058710ee8c500b958d6c irssi-0.8.10.tar.bz2 933152
diff --git a/net-irc/irssi/files/irssi-0.8.10-dcc-segv.patch b/net-irc/irssi/files/irssi-0.8.10-dcc-segv.patch
new file mode 100644
index 000000000000..60c8b2b12d48
--- /dev/null
+++ b/net-irc/irssi/files/irssi-0.8.10-dcc-segv.patch
@@ -0,0 +1,14 @@
+Index: src/irc/dcc/dcc.c
+===================================================================
+--- src/irc/dcc/dcc.c	(revision 3266)
++++ src/irc/dcc/dcc.c	(revision 4202)
+@@ -58,8 +58,8 @@
+ 
+ 	pos = gslist_find_string(dcc_types, type);
+ 	if (pos != NULL) {
++		g_free(pos->data);
+                 dcc_types = g_slist_remove(dcc_types, pos->data);
+-		g_free(pos->data);
+ 	}
+ }
+ 
diff --git a/net-irc/irssi/irssi-0.8.10-r3.ebuild b/net-irc/irssi/irssi-0.8.10-r3.ebuild
new file mode 100644
index 000000000000..bfc54a268946
--- /dev/null
+++ b/net-irc/irssi/irssi-0.8.10-r3.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/irssi-0.8.10-r3.ebuild,v 1.1 2006/05/05 04:36:42 exg Exp $
+
+inherit perl-app eutils flag-o-matic
+
+DESCRIPTION="A modular textUI IRC client with IPv6 support"
+HOMEPAGE="http://irssi.org/"
+SRC_URI="http://irssi.org/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="ipv6 perl ssl socks5"
+
+RDEPEND="!net-irc/irssi-svn
+	>=dev-libs/glib-2.2.1
+	sys-libs/ncurses
+	ssl? ( dev-libs/openssl )
+	perl? ( dev-lang/perl )
+	socks5? ( >=net-proxy/dante-1.1.18 )"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9.0"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-dcc-segv.patch
+}
+
+src_compile() {
+	# Irssi uses extern inlines and that needs at least -O
+	is-flag "-O*" || append-flags -O
+
+	econf \
+		--with-proxy \
+		--with-ncurses \
+		--with-perl-lib=vendor \
+		$(use_enable ssl) \
+		$(use_with perl) \
+		$(use_enable ipv6) \
+		$(use_with socks5 socks) \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	if use perl
+	then
+		for dir in "${S}"/src/perl/{common,irc,textui,ui}
+		do
+			cd "${dir}"
+			perl-app_src_prep
+		done
+		cd "${S}"
+	fi
+
+	make \
+		DESTDIR="${D}" \
+		docdir=/usr/share/doc/${PF} \
+		gnulocaledir="${D}"/usr/share/locale \
+		install || die "make install failed"
+
+	use perl && fixlocalpod
+
+	dodoc AUTHORS ChangeLog README TODO NEWS || die "dodoc failed"
+	dohtml -r "${S}"/docs/. || die "dohtml failed"
+}