diff options
| author |   Sven Wegener <swegener@gentoo.org> | 2008-05-17 09:59:06 +0000 |
|---|---|---|
| committer | Sven Wegener <swegener@gentoo.org> | 2008-05-17 09:59:06 +0000 |
| commit | 1ed41a7144dadea83a0987d9b798a85316b361ab (patch) | |
| tree | ff15da9f8f8eb515907832678559c48073308110 /net-irc | |
| parent | quoting (diff) | |
| download | historical-1ed41a7144dadea83a0987d9b798a85316b361ab.tar.gz historical-1ed41a7144dadea83a0987d9b798a85316b361ab.tar.bz2 historical-1ed41a7144dadea83a0987d9b798a85316b361ab.zip | |
Add a patch submitted to upstream that fixes a segfault in irssi, that happens when we have no /usr/lib/gconv available, bug #163685.
Package-Manager: portage-2.1.5
Diffstat (limited to 'net-irc')
| -rw-r--r-- | net-irc/irssi/ChangeLog | 7 | ||||
| -rw-r--r-- | net-irc/irssi/Manifest | 11 | ||||
| -rw-r--r-- | net-irc/irssi/files/irssi-0.8.12-svn-4829.patch | 19 | ||||
| -rw-r--r-- | net-irc/irssi/irssi-0.8.12.ebuild | 3 |
4 files changed, 33 insertions, 7 deletions
diff --git a/net-irc/irssi/ChangeLog b/net-irc/irssi/ChangeLog index 887c6c122736..872ccf52a55b 100644 --- a/net-irc/irssi/ChangeLog +++ b/net-irc/irssi/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-irc/irssi # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/ChangeLog,v 1.133 2008/02/27 21:08:34 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/ChangeLog,v 1.134 2008/05/17 09:59:06 swegener Exp $ + + 17 May 2008; Sven Wegener <swegener@gentoo.org> + +files/irssi-0.8.12-svn-4829.patch, irssi-0.8.12.ebuild: + Add a patch submitted to upstream that fixes a segfault in irssi, that + happens when we have no /usr/lib/gconv available, bug #163685. 27 Feb 2008; Sven Wegener <swegener@gentoo.org> -irssi-0.8.11.ebuild: Cleanup. diff --git a/net-irc/irssi/Manifest b/net-irc/irssi/Manifest index 4015654965c4..9f1b64ea6295 100644 --- a/net-irc/irssi/Manifest +++ b/net-irc/irssi/Manifest @@ -2,14 +2,15 @@ Hash: SHA1 AUX irssi-0.8.12-svn-4627.patch 701 RMD160 a38716dedeee45a3cec0d34834df60bbcb72e5c6 SHA1 83101715f3387ebcc2b35cff787b405c4c1a939f SHA256 ff869e600656e620b142142d295a32898d4349e32ff98ef8b04930e792242681 +AUX irssi-0.8.12-svn-4829.patch 924 RMD160 35a9e33ff801663911c9c9a36af836733333a710 SHA1 11edfa08d880ab9b1f00c1e8cd973dc7d96f69f4 SHA256 eaebef6519a3f10b085547a6a18a768e68ac68b74ed7252d834e5cdb6e4335f5 DIST irssi-0.8.12.tar.bz2 935918 RMD160 0588e6c2df0425c4f36bd84c1621d9ad170b6a81 SHA1 00ecca04766c51feef057b2327f67166be473fa3 SHA256 462d634bb509cc2bdd550ee5c7b269495f3173721b7404f162ad1f69b49bfff0 -EBUILD irssi-0.8.12.ebuild 1318 RMD160 597ffffff2b56954eb5ae3a6d8bd52567d254ab1 SHA1 5e694cde7fab9f7d757a890bdd79472056cf028b SHA256 e237bb858131252a1388d02aca086ce4debb936235556eaf268c5aae5cef32fb -MISC ChangeLog 17938 RMD160 3ecda5b289aad3eba2f8f939506863cb3289485f SHA1 6954dde8b8d6feb0e7cdb490c3cea20ffd5fef3c SHA256 d0d1881f21e9e3fee9d358057498c46198a9d392ae130459fc87b1464ec51c82 +EBUILD irssi-0.8.12.ebuild 1363 RMD160 340c8b97fb553ec804767719c358637d4d22e8b6 SHA1 55e73244247ad966391ae2f693fc46461f045c89 SHA256 14fd2e9d0d38fcdf7082f47ba47192680396d0155cd39e24af4be4927f8482bc +MISC ChangeLog 18186 RMD160 e1c69df79153828963e1bc674e4902229c5565db SHA1 a27c02f59393917842da6e4506bc26dc80c2628e SHA256 f6595b2cff10e68f9457425600ff9ff669a38d9da93c9c22a684b6931c0901a9 MISC metadata.xml 270 RMD160 217b6381a937b94caa61f5d1dcbcdf24fe2852f1 SHA1 1e8951324990f813bd348ce2b1c4fc75cb097250 SHA256 4962741e0eded229c8ac0cca6dc8fed203d9b63ed7d8de546c661e6661579c75 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.7 (GNU/Linux) -iD8DBQFHxdFXI1lqEGTUzyQRAnPyAKDXmLJzoR42lrEjA4q8XE0RiEWcqwCdGTaV -MpE9poMHk/Eya+2gnMl+58U= -=juTA +iD8DBQFILqxzI1lqEGTUzyQRAsIhAKDGF0a4Krhpe4Xkck/cI8o/vHjZmgCfUUFk +ult+TOZDelqjxzR7RCFTFfw= +=tlYZ -----END PGP SIGNATURE----- diff --git a/net-irc/irssi/files/irssi-0.8.12-svn-4829.patch b/net-irc/irssi/files/irssi-0.8.12-svn-4829.patch new file mode 100644 index 000000000000..ca6824e546ba --- /dev/null +++ b/net-irc/irssi/files/irssi-0.8.12-svn-4829.patch @@ -0,0 +1,19 @@ +r4829 | exg | 2008-05-17 11:42:23 +0200 (Sa, 17 Mai 2008) | 4 lines + +Pass NULL to settings_set_str to reset recode_fallback to its default +value rather than hardcoding the string, fixes also a possible invalid +g_free reported by Sven Wegener. + +Index: irssi/src/fe-common/core/fe-recode.c +=================================================================== +--- irssi/src/fe-common/core/fe-recode.c (revision 4828) ++++ irssi/src/fe-common/core/fe-recode.c (revision 4829) +@@ -160,7 +160,7 @@ + if (!is_valid_charset(recode_fallback)) { + signal_emit("error command", 2, GINT_TO_POINTER(CMDERR_INVALID_CHARSET), recode_fallback); + g_free(recode_fallback); +- recode_fallback = is_valid_charset(old_recode_fallback) ? g_strdup(old_recode_fallback) : "ISO8859-1"; ++ recode_fallback = is_valid_charset(old_recode_fallback) ? g_strdup(old_recode_fallback) : NULL; + settings_set_str("recode_fallback", recode_fallback); + } + diff --git a/net-irc/irssi/irssi-0.8.12.ebuild b/net-irc/irssi/irssi-0.8.12.ebuild index 568e9498c9a4..8d21c183b15b 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.9 2008/02/20 20:05:06 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/irssi-0.8.12.ebuild,v 1.10 2008/05/17 09:59:06 swegener Exp $ inherit perl-module eutils @@ -31,6 +31,7 @@ src_unpack() { epunt_cxx epatch "${FILESDIR}"/${P}-svn-4627.patch + epatch "${FILESDIR}"/${P}-svn-4829.patch } src_compile() { |