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

Package-Manager: portage-2.1_pre10-r2

5 files changed, 108 insertions, 15 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/Manifest b/net-irc/irssi/Manifest
index c4fe086d6c34..ac6443bbd972 100644
--- a/net-irc/irssi/Manifest
+++ b/net-irc/irssi/Manifest
@@ -1,6 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX irssi-0.8.10-dcc-segv.patch 375 RMD160 f40bc076227ec8f734a708bbd54a2c50c02f54c9 SHA1 2e3ff3a793d9dad33368fe64c0931926b708cb42 SHA256 b9c0735b7b4eb5283052eaa91c558e66dadc07f191f5bee2f33fdb426c1ae731 size 375
+MD5 3af168cfb7b1a624b165c50882a064bf files/irssi-0.8.10-dcc-segv.patch 375
+RMD160 f40bc076227ec8f734a708bbd54a2c50c02f54c9 files/irssi-0.8.10-dcc-segv.patch 375
+SHA256 b9c0735b7b4eb5283052eaa91c558e66dadc07f191f5bee2f33fdb426c1ae731 files/irssi-0.8.10-dcc-segv.patch 375
 AUX irssi-socks-fix.patch 551 RMD160 e9b9e9cc1aa433887aab3dfe2011cfc3500a737a SHA1 b483544df582e5726a3588067f60d249c9e5f130 SHA256 e169b5ff5ef6fef8167bc75a76d8c05fcc27f1b84cb89b8190e451974cd2bdd3 size 551
 MD5 c3b74cff45778ccaab4b0c05f85139cd files/irssi-socks-fix.patch 551
 RMD160 e9b9e9cc1aa433887aab3dfe2011cfc3500a737a files/irssi-socks-fix.patch 551
@@ -10,14 +11,18 @@ EBUILD irssi-0.8.10-r2.ebuild 1513 RMD160 4769eb47f52af4bce00d31c916633f76f1de6d
 MD5 b548acb546499194c119b497e7ea5130 irssi-0.8.10-r2.ebuild 1513
 RMD160 4769eb47f52af4bce00d31c916633f76f1de6d7a irssi-0.8.10-r2.ebuild 1513
 SHA256 d92e98d8795fa55eb10994d41db5944906b677466b30da2b3c2edec43ddf9dc3 irssi-0.8.10-r2.ebuild 1513
+EBUILD irssi-0.8.10-r3.ebuild 1592 RMD160 e28da1f7bb46a4cfbec8fe0f4e6f719ee45bdedc SHA1 3239b5dc5742814d233ff7c1c345cdf4bf9f2d86 SHA256 35d37484a0a9f52ab8b0eb23b49c9467e65478b73e562735df0ad2e0ec078292 size 1592
+MD5 461e992620e3c4ed6347829487c8d77e irssi-0.8.10-r3.ebuild 1592
+RMD160 e28da1f7bb46a4cfbec8fe0f4e6f719ee45bdedc irssi-0.8.10-r3.ebuild 1592
+SHA256 35d37484a0a9f52ab8b0eb23b49c9467e65478b73e562735df0ad2e0ec078292 irssi-0.8.10-r3.ebuild 1592
 EBUILD irssi-0.8.10.ebuild 1935 RMD160 ff5f4638faab4aeac2eded1662228100b906548d SHA1 5da2ef525513d1845e0452fbcb33f34d730557d5 SHA256 3a8772fcf97771d0749455e98102a6c7a368b3b87d8f206270d18d9fe35193fe size 1935
 MD5 9e9726875dd602e865db71bb038b06a5 irssi-0.8.10.ebuild 1935
 RMD160 ff5f4638faab4aeac2eded1662228100b906548d irssi-0.8.10.ebuild 1935
 SHA256 3a8772fcf97771d0749455e98102a6c7a368b3b87d8f206270d18d9fe35193fe irssi-0.8.10.ebuild 1935
-MISC ChangeLog 12428 RMD160 e63e16294eff3324d673e332f2015c892bc0a449 SHA1 eabf27f535fc62969eccd759b1b66d768e48e7e6 SHA256 475f8b975cbe423ef73bfe3495df2aa28619f52427f69bbadd8cffeb6ba64c02 size 12428
-MD5 3462a2f593666ca29714ebd4418f2c31 ChangeLog 12428
-RMD160 e63e16294eff3324d673e332f2015c892bc0a449 ChangeLog 12428
-SHA256 475f8b975cbe423ef73bfe3495df2aa28619f52427f69bbadd8cffeb6ba64c02 ChangeLog 12428
+MISC ChangeLog 12633 RMD160 1d5dcdff5b344dbaa8c106353890395f2814edd7 SHA1 bf5d5b1870bc45a39d4c09a178182c1934c05439 SHA256 64d87fe2eabc99e0af3ea0b356d260980456915ecdfc0cd0882d9527e464b394 size 12633
+MD5 17ba5d7ac6eb4916443ffb76d0dc3259 ChangeLog 12633
+RMD160 1d5dcdff5b344dbaa8c106353890395f2814edd7 ChangeLog 12633
+SHA256 64d87fe2eabc99e0af3ea0b356d260980456915ecdfc0cd0882d9527e464b394 ChangeLog 12633
 MISC metadata.xml 270 RMD160 217b6381a937b94caa61f5d1dcbcdf24fe2852f1 SHA1 1e8951324990f813bd348ce2b1c4fc75cb097250 SHA256 4962741e0eded229c8ac0cca6dc8fed203d9b63ed7d8de546c661e6661579c75 size 270
 MD5 13c861176657f4c6fedd0f4d0331e4d4 metadata.xml 270
 RMD160 217b6381a937b94caa61f5d1dcbcdf24fe2852f1 metadata.xml 270
@@ -28,10 +33,6 @@ SHA256 1dab7a50598c9d2558e943839307ddbca382a6d660836e4e96938aa751a71c6f files/di
 MD5 69ba435722f9d4b994e1b15f88115495 files/digest-irssi-0.8.10-r2 241
 RMD160 0cf93da2e9af40d771aeb0879d0aa596dc21dac7 files/digest-irssi-0.8.10-r2 241
 SHA256 1dab7a50598c9d2558e943839307ddbca382a6d660836e4e96938aa751a71c6f files/digest-irssi-0.8.10-r2 241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEVAQ/I1lqEGTUzyQRAhd8AJ9xBbGvnlHAzaVlwSa5xWgb8x8P5wCfVk/V
-ng/OxwNQA2sPgaR8ohJ9JfM=
-=oSU6
------END PGP SIGNATURE-----
+MD5 69ba435722f9d4b994e1b15f88115495 files/digest-irssi-0.8.10-r3 241
+RMD160 0cf93da2e9af40d771aeb0879d0aa596dc21dac7 files/digest-irssi-0.8.10-r3 241
+SHA256 1dab7a50598c9d2558e943839307ddbca382a6d660836e4e96938aa751a71c6f files/digest-irssi-0.8.10-r3 241
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"
+}