Fix hang reported in #263379

Package-Manager: portage-2.2_rc27/cvs/Linux x86_64

5 files changed, 30 insertions, 6 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/Manifest b/x11-wm/fluxbox/Manifest
index e45f9e02a613..3008000318a4 100644
--- a/x11-wm/fluxbox/Manifest
+++ b/x11-wm/fluxbox/Manifest
@@ -5,6 +5,7 @@ AUX 1.1.0.1/gentoo_style_location.patch 711 RMD160 d6d358759ba664bcfcf098f47d37f
 AUX fluxbox.desktop 202 RMD160 255bb2cdae75e1fc204d4b60f39c8aba66770e7a SHA1 d57b4d0fad653660cc6cf0a2cd808b7a34d72b95 SHA256 8859f44f3eccc7b3e08c9f61f40351c49cd77c4624aabe3029572a3412687834
 AUX fluxbox.xsession 2004 RMD160 9a5f192628d6d888734f24b9ff4f6f1b7e8f178b SHA1 ec59f4611868866b8bc6d7fc9762bbc9bca640c3 SHA256 dbff4840a2c32c8ab837e4f34cb002f810dccca107f5e04a28c22d33db2a59bd
 AUX gentoo_style_location-1.1.x.patch 711 RMD160 d6d358759ba664bcfcf098f47d37f206387de007 SHA1 1ac6b515ab6004757cd5217cb74c892feb5ea5ee SHA256 84aba82bc9ab3a9dcdeb3857eb7ee0236a8ec96ae77e29cd0455813bac473915
+AUX keyparse_hang.patch 516 RMD160 1a806a5f23dcdad6073e7787b6a402b0dd5b8845 SHA1 7b4cdb0c738ff6ea476658721d3291856c4d696b SHA256 d2c94615b8def1e5e8da87b53c104579fe7dd42bb46718acdffeb0742aae8691
 AUX styles-menu-commonbox 127 RMD160 e5668235e10ffa8fa73683d23d4483c85bf4296e SHA1 59c6aed23a105536de1b1264f94ee75008d74557 SHA256 44a56b182b0da9bf26ac41ff7e5ea8da3ddb7c5cbca0f554e3c74f15c72a3d98
 AUX styles-menu-fluxbox 117 RMD160 a2f3ced8acd6bd9057aea30b6ca374cff7d3db3e SHA1 99692536559b07878054852e17171d4ef5f79a76 SHA256 f5829a442d8653941e2741ab73f49e9d9c95fc8129531e4197730c0bbb2f2989
 AUX styles-menu-user 93 RMD160 2a6831b45ce1d655586b699d16c0547de201d187 SHA1 84a02411e552875877c169a08b49dc452176c474 SHA256 5f708a443c602485d958cb21cf55d9680e86aa3369215552c35ed9f46429e946
@@ -13,8 +14,8 @@ DIST fluxbox-1.1.0.1.tar.bz2 778639 RMD160 319158d5c618302a3505db8e58de60bef82ee
 DIST fluxbox-1.1.1.tar.bz2 777660 RMD160 aabfdd10c835d0ef903885646a7f34f7df75af17 SHA1 6d49deb6c4c7d73f7567e1cf7d2575c7edc4825f SHA256 903f676a71a301513cd0b3db17e49f88c8d91583793176c4c70358a3012cca34
 EBUILD fluxbox-1.0.0-r2.ebuild 3276 RMD160 841ef4db96203fe011f1df58707f4b3277bc8113 SHA1 2903a80836247319ef209043199419dad14e68f0 SHA256 073d59b4454cdb15cb366bc1db8f1617a28f6de6bdef92360db2ac1a08fd2865
 EBUILD fluxbox-1.0.0.ebuild 3140 RMD160 5aeae8a078a67f9e6db1b9ac5daa70cc87d13bc4 SHA1 2af62fb34ba4ac56868db7f9e594b6ed2ae2f322 SHA256 e53bc5de76018b26269b8a89abd92b7633b13415cbb4d3957cca18bc259ddc4d
-EBUILD fluxbox-1.1.0.1.ebuild 3076 RMD160 0a9e59f20a774f86cacd70c035e05388c6339dd9 SHA1 4281e0cb7110a47206789a35331bd1ae8c4b3bee SHA256 718eaae3cf4f1dd9d03fc21fcebdc292a657761b4f71f7db9211977f16240594
-EBUILD fluxbox-1.1.1.ebuild 3075 RMD160 dae05a17edf0be94ac8ba31861a914b6edc52deb SHA1 dc4e88efe5e863ee13e3c609509a0fd6a083562b SHA256 6a174ca1a266c85984c9e85c9b99483eb93acb14b16b628ee78fa363ea4220b2
+EBUILD fluxbox-1.1.0.1.ebuild 3169 RMD160 374266575329074827199235f61f0bf1a9da04d2 SHA1 73fff6e5f0f8c170848f59e06856300eb166778f SHA256 9f30f9b6023fa194fc451a128de84c154d4f8b699dc1aef009079e591082c4c6
+EBUILD fluxbox-1.1.1.ebuild 3172 RMD160 626cc619938637af4f57a5bae189e1db44b495e2 SHA1 26eb65b11c11d9138bb081f6bfb959bcc407d29d SHA256 1a3eb3a42ffc0066c29e22e8049d7273f5d5f3fb27f3c1de232853216389485b
 EBUILD fluxbox-9999.ebuild 3131 RMD160 c8d34fce442c29e0ebfff88ba96c0fcbe7d6d165 SHA1 12281f92b56c7d2fc59123fffd17d3a0e9948b33 SHA256 24a445b5b69a7efef3723687a7828eb4a7aa7534eb072e87fa483b779131e918
-MISC ChangeLog 48904 RMD160 46ad3d03349ad5124fbee32e9f098748135e5c4a SHA1 1397a938bac05d088e09850cfaa89b190cc74524 SHA256 fe589760e4d4c0fa7f3d6f4a2c7f04a120ab5947a22a2a53a7a35eb487f98c89
+MISC ChangeLog 49053 RMD160 1c324f92828c92e894e42faceacfdea765788415 SHA1 3a4db19feea9411122237d8ba20b3225f3cde569 SHA256 6a281450b78bf7b7c42e4cfc29105b15afefe81732fb340ddfb636292e5e3708
 MISC metadata.xml 890 RMD160 c07e8a6d876e730c1608809d2b6294cf1511bbb3 SHA1 dd886d7bba0ff28bcda9f82d356bd1b1d0d183e8 SHA256 47616493ac1ab0f7858e5f7b55b61b3e17ec0cb992ce2a5f3858a47250a3926f
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"