lack 09/04/08 16:40:32
Modified: fluxbox-1.1.0.1.ebuild ChangeLog
fluxbox-1.1.1.ebuild
Log:
Fix hang reported in #263379
(Portage version: 2.2_rc27/cvs/Linux x86_64)
Revision Changes Path
1.4 x11-wm/fluxbox/fluxbox-1.1.0.1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.0.1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.0.1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.0.1.ebuild?r1=1.3&r2=1.4
Index: fluxbox-1.1.0.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.0.1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fluxbox-1.1.0.1.ebuild 8 Mar 2009 19:47:56 -0000 1.3
+++ fluxbox-1.1.0.1.ebuild 8 Apr 2009 16:40:32 -0000 1.4
@@ -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 @@
# 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"
1.265 x11-wm/fluxbox/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/fluxbox/ChangeLog?rev=1.265&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/fluxbox/ChangeLog?rev=1.265&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/fluxbox/ChangeLog?r1=1.264&r2=1.265
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -r1.264 -r1.265
--- ChangeLog 16 Mar 2009 12:56:54 -0000 1.264
+++ ChangeLog 8 Apr 2009 16:40:32 -0000 1.265
@@ -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@g.o> +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@g.o> fluxbox-1.1.1.ebuild,
fluxbox-9999.ebuild:
1.5 x11-wm/fluxbox/fluxbox-1.1.1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.1.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.1.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.1.ebuild?r1=1.4&r2=1.5
Index: fluxbox-1.1.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.1.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fluxbox-1.1.1.ebuild 16 Mar 2009 12:56:54 -0000 1.4
+++ fluxbox-1.1.1.ebuild 8 Apr 2009 16:40:32 -0000 1.5
@@ -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 @@
# 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"
|