diff options
| author |   Jim Ramsay <lack@gentoo.org> | 2009-04-08 16:40:32 +0000 |
|---|---|---|
| committer | Jim Ramsay <lack@gentoo.org> | 2009-04-08 16:40:32 +0000 |
| commit | 5d568f7c0689384c1d48dbcdbd06723bebe397ad (patch) | |
| tree | 80bc2b6a77acabff329015231f5aa90f2046463b /x11-wm/fluxbox | |
| parent | Stable on alpha, bug #246953 (diff) | |
| download | gentoo-2-5d568f7c0689384c1d48dbcdbd06723bebe397ad.tar.gz gentoo-2-5d568f7c0689384c1d48dbcdbd06723bebe397ad.tar.bz2 gentoo-2-5d568f7c0689384c1d48dbcdbd06723bebe397ad.zip | |
Fix hang reported in #263379
(Portage version: 2.2_rc27/cvs/Linux x86_64)
Diffstat (limited to 'x11-wm/fluxbox')
| -rw-r--r-- | x11-wm/fluxbox/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-wm/fluxbox/files/keyparse_hang.patch | 13 | ||||
| -rw-r--r-- | x11-wm/fluxbox/fluxbox-1.1.0.1.ebuild | 5 | ||||
| -rw-r--r-- | x11-wm/fluxbox/fluxbox-1.1.1.ebuild | 5 |
4 files changed, 26 insertions, 3 deletions
diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog index 306d41bd048e..c4c95352f9b6 100644 --- a/x11-wm/fluxbox/ChangeLog +++ b/x11-wm/fluxbox/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-wm/fluxbox # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.264 2009/03/16 12:56:54 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.265 2009/04/08 16:40:32 lack Exp $ + + 08 Apr 2009; Jim Ramsay <lack@gentoo.org> +files/keyparse_hang.patch, + fluxbox-1.1.0.1.ebuild, fluxbox-1.1.1.ebuild: + Fix hang reported in #263379 16 Mar 2009; Raúl Porcel <armin76@gentoo.org> fluxbox-1.1.1.ebuild, fluxbox-9999.ebuild: diff --git a/x11-wm/fluxbox/files/keyparse_hang.patch b/x11-wm/fluxbox/files/keyparse_hang.patch new file mode 100644 index 000000000000..b9f8a5896a74 --- /dev/null +++ b/x11-wm/fluxbox/files/keyparse_hang.patch @@ -0,0 +1,13 @@ +diff --git a/src/FbTk/StringUtil.hh b/src/FbTk/StringUtil.hh +index 75fa69e..35f23a2 100644 +--- a/src/FbTk/StringUtil.hh ++++ b/src/FbTk/StringUtil.hh +@@ -84,7 +84,7 @@ static void stringTokensBetween(Container &container, const std::string &in, + while (true) { + err = getStringBetween(token, in.c_str() + pos, first, last, ok_chars, + allow_nesting); +- if (err == 0) ++ if (err <= 0) + break; + container.push_back(token); + pos += err; diff --git a/x11-wm/fluxbox/fluxbox-1.1.0.1.ebuild b/x11-wm/fluxbox/fluxbox-1.1.0.1.ebuild index 0fedf3e12e05..efe4ad17716f 100644 --- a/x11-wm/fluxbox/fluxbox-1.1.0.1.ebuild +++ b/x11-wm/fluxbox/fluxbox-1.1.0.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.0.1.ebuild,v 1.3 2009/03/08 19:47:56 gentoofan23 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.0.1.ebuild,v 1.4 2009/04/08 16:40:32 lack Exp $ EAPI="2" inherit eutils @@ -47,6 +47,9 @@ src_unpack() { # things with style ebuilds. epatch "${FILESDIR}/${PV}/gentoo_style_location.patch" + # Patch to handle a broken key file gracefully, #263379 + epatch "${FILESDIR}/keyparse_hang.patch" + # Add in the Gentoo -r number to fluxbox -version output. if [[ "${PR}" == "r0" ]] ; then suffix="gentoo" diff --git a/x11-wm/fluxbox/fluxbox-1.1.1.ebuild b/x11-wm/fluxbox/fluxbox-1.1.1.ebuild index c63f2343541c..d64b0a8744e2 100644 --- a/x11-wm/fluxbox/fluxbox-1.1.1.ebuild +++ b/x11-wm/fluxbox/fluxbox-1.1.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.1.ebuild,v 1.4 2009/03/16 12:56:54 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.1.ebuild,v 1.5 2009/04/08 16:40:32 lack Exp $ EAPI="2" inherit eutils @@ -47,6 +47,9 @@ src_unpack() { # things with style ebuilds. epatch "${FILESDIR}/gentoo_style_location-1.1.x.patch" + # Patch to handle a broken key file gracefully, #263379 + epatch "${FILESDIR}/keyparse_hang.patch" + # Add in the Gentoo -r number to fluxbox -version output. if [[ "${PR}" == "r0" ]] ; then suffix="gentoo" |