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 | 0e8fe11a2de998e0ab45f0908f090a6ca819c3be (patch) | |
| tree | e0dfee465ada00fe0cd06098f44372b69541f799 /net-irc/irssi | |
| parent | quoting (diff) | |
| download | gentoo-2-0e8fe11a2de998e0ab45f0908f090a6ca819c3be.tar.gz gentoo-2-0e8fe11a2de998e0ab45f0908f090a6ca819c3be.tar.bz2 gentoo-2-0e8fe11a2de998e0ab45f0908f090a6ca819c3be.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.
(Portage version: 2.1.5)
Diffstat (limited to 'net-irc/irssi')
| -rw-r--r-- | net-irc/irssi/ChangeLog | 7 | ||||
| -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 |
3 files changed, 27 insertions, 2 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/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() { |