summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharlie Shepherd <masterdriverz@gentoo.org>2007-01-23 20:57:20 +0000
committerCharlie Shepherd <masterdriverz@gentoo.org>2007-01-23 20:57:20 +0000
commit14b27a45822b673aadee21021890f35d9efa8f93 (patch)
tree1d9dafe3dfe768d5247294b247238b7b9546892e /dev-util/xxdiff
parentRevision bump, closing the recently discovered PaX expand_stack() vulnerability. (diff)
downloadgentoo-2-14b27a45822b673aadee21021890f35d9efa8f93.tar.gz
gentoo-2-14b27a45822b673aadee21021890f35d9efa8f93.tar.bz2
gentoo-2-14b27a45822b673aadee21021890f35d9efa8f93.zip
Change yacc dep to || ( sys-devel/bison dev-util/yacc ). Thanks to Castagnola Roberto, bug 163451
(Portage version: 2.1.2_rc4-r3)
Diffstat (limited to 'dev-util/xxdiff')
-rw-r--r--dev-util/xxdiff/ChangeLog7
-rw-r--r--dev-util/xxdiff/xxdiff-3.2.ebuild4
2 files changed, 8 insertions, 3 deletions
diff --git a/dev-util/xxdiff/ChangeLog b/dev-util/xxdiff/ChangeLog
index 31970dd2576b..84358103b15b 100644
--- a/dev-util/xxdiff/ChangeLog
+++ b/dev-util/xxdiff/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-util/xxdiff
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/ChangeLog,v 1.33 2007/01/23 00:12:48 masterdriverz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/ChangeLog,v 1.34 2007/01/23 20:57:20 masterdriverz Exp $
+
+ 23 Jan 2007; Charlie Shepherd <masterdriverz@gentoo.org>
+ xxdiff-3.2.ebuild:
+ Change yacc dep to || ( sys-devel/bison dev-util/yacc ). Thanks to
+ Castagnola Roberto, bug 163451
*xxdiff-3.2 (23 Jan 2007)
diff --git a/dev-util/xxdiff/xxdiff-3.2.ebuild b/dev-util/xxdiff/xxdiff-3.2.ebuild
index e5ec626d767f..09de99e586dc 100644
--- a/dev-util/xxdiff/xxdiff-3.2.ebuild
+++ b/dev-util/xxdiff/xxdiff-3.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/xxdiff-3.2.ebuild,v 1.1 2007/01/23 00:12:48 masterdriverz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/xxdiff-3.2.ebuild,v 1.2 2007/01/23 20:57:20 masterdriverz Exp $
inherit distutils eutils kde-functions
@@ -16,7 +16,7 @@ IUSE="kde python"
DEPEND="=x11-libs/qt-3*
kde? ( >=kde-base/kdelibs-3.1 )
sys-devel/flex
- dev-util/yacc"
+ || ( sys-devel/bison dev-util/yacc )"
RDEPEND="${DEPEND}
sys-apps/diffutils"