Include a patch from upstream to fix a rare segmentation fault, notification by Phil Sutter via mail.

Package-Manager: portage-2.1.4

4 files changed, 45 insertions, 15 deletions

diff --git a/net-irc/irssi/ChangeLog b/net-irc/irssi/ChangeLog
index bdcb01f2438f..5e198c69c86c 100644
--- a/net-irc/irssi/ChangeLog
+++ b/net-irc/irssi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-irc/irssi
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/ChangeLog,v 1.130 2007/12/04 20:50:45 jer Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/ChangeLog,v 1.131 2008/01/20 23:09:38 swegener Exp $
+
+  20 Jan 2008; Sven Wegener <swegener@gentoo.org>
+  +files/irssi-0.8.12-svn-4627.patch, irssi-0.8.12.ebuild:
+  Include a patch from upstream to fix a rare segmentation fault, notification
+  by Phil Sutter via mail.
 
   04 Dec 2007; Jeroen Roovers <jer@gentoo.org> irssi-0.8.12.ebuild:
   Stable for HPPA too.
diff --git a/net-irc/irssi/Manifest b/net-irc/irssi/Manifest
index 8a3a0f0db704..755876da9239 100644
--- a/net-irc/irssi/Manifest
+++ b/net-irc/irssi/Manifest
@@ -1,20 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX irssi-0.8.12-svn-4627.patch 701 RMD160 a38716dedeee45a3cec0d34834df60bbcb72e5c6 SHA1 83101715f3387ebcc2b35cff787b405c4c1a939f SHA256 ff869e600656e620b142142d295a32898d4349e32ff98ef8b04930e792242681
+MD5 5f6a871c79689fe3c8fd76d64f6ffef8 files/irssi-0.8.12-svn-4627.patch 701
+RMD160 a38716dedeee45a3cec0d34834df60bbcb72e5c6 files/irssi-0.8.12-svn-4627.patch 701
+SHA256 ff869e600656e620b142142d295a32898d4349e32ff98ef8b04930e792242681 files/irssi-0.8.12-svn-4627.patch 701
 DIST irssi-0.8.11.tar.bz2 933075 RMD160 0ae3e2ba144783df3dd517be659b325e8bcf5354 SHA1 e6433e6d622a1ed09be4323105174433fd72516f SHA256 425cf24f13bfda05c6a468523cd2874d05675ea1bc4e37a8c284f2f78c2dd6b2
 DIST irssi-0.8.12.tar.bz2 935918 RMD160 0588e6c2df0425c4f36bd84c1621d9ad170b6a81 SHA1 00ecca04766c51feef057b2327f67166be473fa3 SHA256 462d634bb509cc2bdd550ee5c7b269495f3173721b7404f162ad1f69b49bfff0
 EBUILD irssi-0.8.11.ebuild 1262 RMD160 39ed1ca6e0cd9f16f078f8523afb360775b6fca8 SHA1 b0f8184fd47c1c0b625c98bbfe4a1632af3edf10 SHA256 b0bb1e1fa86bc89993f1fdf190478de5b82d89b96951b5e15a61f3309282656e
 MD5 f01a1f8d3abea618255ab9ec86c6cb11 irssi-0.8.11.ebuild 1262
 RMD160 39ed1ca6e0cd9f16f078f8523afb360775b6fca8 irssi-0.8.11.ebuild 1262
 SHA256 b0bb1e1fa86bc89993f1fdf190478de5b82d89b96951b5e15a61f3309282656e irssi-0.8.11.ebuild 1262
-EBUILD irssi-0.8.12.ebuild 1265 RMD160 6c1e407dc93e2b55ccafd1f87f29675291d531a3 SHA1 7d3bd496b934c2d758ea135260f7768b2d6649b1 SHA256 fde52d25aebd502f967f813359cb064c4b16d9d9d7404cd8f91bd7bce3956421
-MD5 3f5ff8320e89b55ef1946dfa2c806c28 irssi-0.8.12.ebuild 1265
-RMD160 6c1e407dc93e2b55ccafd1f87f29675291d531a3 irssi-0.8.12.ebuild 1265
-SHA256 fde52d25aebd502f967f813359cb064c4b16d9d9d7404cd8f91bd7bce3956421 irssi-0.8.12.ebuild 1265
-MISC ChangeLog 17536 RMD160 c89a241ce03eee193c78551f7f7c29861b9df948 SHA1 216386f2d7812aaed4f8e754e6bd5b0d6e2094e1 SHA256 ee63ca3484b3882cfe68d9d0555f0fc7d103f6ec0387f808b6e120f0dd02785b
-MD5 d2680825a5298d2af029a2064141f77d ChangeLog 17536
-RMD160 c89a241ce03eee193c78551f7f7c29861b9df948 ChangeLog 17536
-SHA256 ee63ca3484b3882cfe68d9d0555f0fc7d103f6ec0387f808b6e120f0dd02785b ChangeLog 17536
+EBUILD irssi-0.8.12.ebuild 1321 RMD160 c40365c398a19a588310be828e93b45452284f3f SHA1 909a303e23948ae7429f2578bdf4d7dfaee48ebf SHA256 2ccc3e81fa1f627e5e7abfe81499eea559bf2ea3fba40e66f9f1b51e99b1bebd
+MD5 c1b635daf7fdf494a57a89d04b811b87 irssi-0.8.12.ebuild 1321
+RMD160 c40365c398a19a588310be828e93b45452284f3f irssi-0.8.12.ebuild 1321
+SHA256 2ccc3e81fa1f627e5e7abfe81499eea559bf2ea3fba40e66f9f1b51e99b1bebd irssi-0.8.12.ebuild 1321
+MISC ChangeLog 17757 RMD160 c92ccce312d133fe12972b5063633cd55d2372ce SHA1 55964d6750698406ca29db3d666f9d58be53f50d SHA256 14d443435812fb6f04b9a2ce909e5d4e66e0071f1d3d4ae6995086f387830b62
+MD5 ab2c0163beda598b10e66386fd46f68d ChangeLog 17757
+RMD160 c92ccce312d133fe12972b5063633cd55d2372ce ChangeLog 17757
+SHA256 14d443435812fb6f04b9a2ce909e5d4e66e0071f1d3d4ae6995086f387830b62 ChangeLog 17757
 MISC metadata.xml 270 RMD160 217b6381a937b94caa61f5d1dcbcdf24fe2852f1 SHA1 1e8951324990f813bd348ce2b1c4fc75cb097250 SHA256 4962741e0eded229c8ac0cca6dc8fed203d9b63ed7d8de546c661e6661579c75
 MD5 13c861176657f4c6fedd0f4d0331e4d4 metadata.xml 270
 RMD160 217b6381a937b94caa61f5d1dcbcdf24fe2852f1 metadata.xml 270
@@ -26,9 +30,9 @@ MD5 33bcafb9f4d87dc47999c08819dfeda9 files/digest-irssi-0.8.12 241
 RMD160 9e1cb75c63b8a2384376bcc55bddf75e5c82ab04 files/digest-irssi-0.8.12 241
 SHA256 533d7c7ef480b67762aa2b6c1489deaf042b72a5dc649391bb18276434e66689 files/digest-irssi-0.8.12 241
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.8 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iEYEARECAAYFAkeJ034ACgkQj9hvisErhMJC6QCgn8pHrbD2tpWT7IUlijqdd72E
-u3sAoKA5Rc42WOUZaJ7JXpIjFgwak1/5
-=qHd4
+iD8DBQFHk9S7I1lqEGTUzyQRAgzDAJ44wbbSrYZja7V4VgMMWKUihj/OawCghj0x
+zzD9h19X10mkg7EYhXfIgJQ=
+=FUDx
 -----END PGP SIGNATURE-----
diff --git a/net-irc/irssi/files/irssi-0.8.12-svn-4627.patch b/net-irc/irssi/files/irssi-0.8.12-svn-4627.patch
new file mode 100644
index 000000000000..046a1c207fa9
--- /dev/null
+++ b/net-irc/irssi/files/irssi-0.8.12-svn-4627.patch
@@ -0,0 +1,18 @@
+r4627 | exg | 2007-10-22 13:27:56 +0000 (Mon, 22 Oct 2007) | 3 lines
+
+Handle server == NULL case in skip_target, fix regression with irssi-icb.
+Patch by Stuart Henderson, bug #539.
+
+Index: trunk/src/fe-common/irc/fe-irc-messages.c
+===================================================================
+--- trunk/src/fe-common/irc/fe-irc-messages.c	(revision 4626)
++++ trunk/src/fe-common/irc/fe-irc-messages.c	(revision 4627)
+@@ -44,7 +44,7 @@
+ 	const char *val, *chars;
+ 
+ 	/* Quick check */
+-	if (server->prefix[(int)(unsigned char)*target] == 0)
++	if (server == NULL || server->prefix[(int)(unsigned char)*target] == 0)
+ 		return target;
+ 
+ 	/* Hack: for bahamut 1.4 which sends neither STATUSMSG nor
diff --git a/net-irc/irssi/irssi-0.8.12.ebuild b/net-irc/irssi/irssi-0.8.12.ebuild
index 1bc08440a33d..107320e7f291 100644
--- a/net-irc/irssi/irssi-0.8.12.ebuild
+++ b/net-irc/irssi/irssi-0.8.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/irssi-0.8.12.ebuild,v 1.7 2008/01/13 09:01:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/irssi-0.8.12.ebuild,v 1.8 2008/01/20 23:09:38 swegener Exp $
 
 inherit perl-module eutils
 
@@ -26,8 +26,11 @@ RDEPEND="${RDEPEND}
 
 src_unpack() {
 	unpack ${A}
+	cd "${S}"
 
 	epunt_cxx
+
+	epatch "${FILESDIR}"/${P}-svn-4627.patch
 }
 
 src_compile() {