old

(Portage version: 2.2_rc33/cvs/Linux x86_64)

11 files changed, 7 insertions, 441 deletions

diff --git a/sys-devel/flex/ChangeLog b/sys-devel/flex/ChangeLog
index dc57d05f179b..cfd2fefe4e8f 100644
--- a/sys-devel/flex/ChangeLog
+++ b/sys-devel/flex/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/flex
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/ChangeLog,v 1.81 2009/03/26 04:27:50 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/ChangeLog,v 1.82 2009/05/29 13:16:17 vapier Exp $
+
+  29 May 2009; Mike Frysinger <vapier@gentoo.org>
+  -files/flex-2.5.4-glibc22.patch, -flex-2.5.4a-r6.ebuild,
+  -files/flex-2.5.4a-gcc3.patch, -files/flex-2.5.4a-gcc31.patch,
+  -files/flex-2.5.4a-skel.patch, -files/flex-configure-LANG.patch:
+  Punt old package vuln to GLSA 200603-07 #271673.
 
   26 Mar 2009; Ryan Hill <dirtyepic@gentoo.org>
   +files/flex-2.5.35-gcc44.patch, flex-2.5.35.ebuild:
diff --git a/sys-devel/flex/files/flex-2.5.31-include.patch b/sys-devel/flex/files/flex-2.5.31-include.patch
deleted file mode 100644
index 8769d0db928f..000000000000
--- a/sys-devel/flex/files/flex-2.5.31-include.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Remove stupid -I path because it screws up cross-compiling bad.
-
---- Makefile.in
-+++ Makefile.in
-@@ -290,7 +290,7 @@
- 
- 
- localedir = $(datadir)/locale
--AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -I@includedir@ -I$(top_srcdir)/intl
-+AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl
- 
- # Run GNU indent on sources. Don't run this unless all the sources compile cleanly.
- #
diff --git a/sys-devel/flex/files/flex-2.5.33-isatty.patch b/sys-devel/flex/files/flex-2.5.33-isatty.patch
deleted file mode 100644
index 2231531569c7..000000000000
--- a/sys-devel/flex/files/flex-2.5.33-isatty.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Declare the isatty prototype all the time ... otherwise packages like
-doxygen and ttmkfdir fail to build.
-
-http://bugs.gentoo.org/119598
-
---- flex/scan.c
-+++ flex/scan.c
-@@ -4179,9 +4179,19 @@
- 
- #ifndef YY_ALWAYS_INTERACTIVE
- #ifndef YY_NEVER_INTERACTIVE
-+#ifndef _UNISTD_H /* assume unistd.h has isatty() for us */
--#ifndef __cplusplus
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+#ifdef __THROW /* this is a gnuism */
-+extern int isatty YY_PARAMS(( int )) __THROW;
-+#else
- extern int isatty YY_PARAMS(( int ));
-+#endif
--#endif /* __cplusplus */
-+#ifdef __cplusplus
-+}
-+#endif
-+#endif
- #endif /* !YY_NEVER_INTERACTIVE */
- #endif /* !YY_ALWAYS_INTERACTIVE */
- 
---- flex/skel.c
-+++ flex/skel.c
-@@ -2183,9 +2183,19 @@
-   "[[",
-   "    m4_ifdef( [[M4_YY_NEVER_INTERACTIVE]],,",
-   "    [[",
-+  "#ifndef _UNISTD_H /* assume unistd.h has isatty() for us */",
--  "#ifndef __cplusplus",
-+  "#ifdef __cplusplus",
-+  "extern \"C\" {",
-+  "#endif",
-+  "#ifdef __THROW /* this is a gnuism */",
-+  "extern int isatty M4_YY_PARAMS( int ) __THROW;",
-+  "#else",
-   "extern int isatty M4_YY_PARAMS( int );",
-+  "#endif",
--  "#endif /* __cplusplus */",
-+  "#ifdef __cplusplus",
-+  "}",
-+  "#endif",
-+  "#endif",
-   "    ]])",
-   "]])",
-   "%endif",
diff --git a/sys-devel/flex/files/flex-2.5.33-setlocale.patch b/sys-devel/flex/files/flex-2.5.33-setlocale.patch
deleted file mode 100644
index fead8ed8e9b4..000000000000
--- a/sys-devel/flex/files/flex-2.5.33-setlocale.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-fix from upstream cvs
-
-http://bugs.gentoo.org/186092
-
---- flex/main.c	2006/10/22 22:17:38	2.131
-+++ flex/main.c	2007/04/14 12:27:58	2.132
-@@ -213,6 +213,7 @@
- #if ENABLE_NLS
- #if HAVE_LOCALE_H
- 	setlocale (LC_MESSAGES, "");
-+        setlocale (LC_CTYPE, "");
- 	textdomain (PACKAGE);
- 	bindtextdomain (PACKAGE, LOCALEDIR);
- #endif
diff --git a/sys-devel/flex/files/flex-2.5.4-glibc22.patch b/sys-devel/flex/files/flex-2.5.4-glibc22.patch
deleted file mode 100644
index 299aa70b4ec7..000000000000
--- a/sys-devel/flex/files/flex-2.5.4-glibc22.patch
+++ /dev/null
@@ -1,108 +0,0 @@
---- flex-2.5.4/initscan.c.broken	Sat Sep 30 16:50:31 2000
-+++ flex-2.5.4/initscan.c	Sat Sep 30 16:51:34 2000
-@@ -10,7 +10,7 @@
- #define YY_FLEX_MINOR_VERSION 5
- 
- #include <stdio.h>
--
-+#include <unistd.h>
- 
- /* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
- #ifdef c_plusplus
-@@ -23,7 +23,6 @@
- #ifdef __cplusplus
- 
- #include <stdlib.h>
--#include <unistd.h>
- 
- /* Use prototypes in function declarations. */
- #define YY_USE_PROTOS
-@@ -3310,12 +3309,6 @@
- 	yy_flex_free( (void *) b );
- 	}
- 
--
--#ifndef YY_ALWAYS_INTERACTIVE
--#ifndef YY_NEVER_INTERACTIVE
--extern int isatty YY_PROTO(( int ));
--#endif
--#endif
- 
- #ifdef YY_USE_PROTOS
- void yy_init_buffer( YY_BUFFER_STATE b, FILE *file )
---- flex-2.5.4/flex.skl.broken	Sat Sep 30 16:51:05 2000
-+++ flex-2.5.4/flex.skl	Sat Sep 30 16:52:24 2000
-@@ -10,6 +10,7 @@
- 
- %-
- #include <stdio.h>
-+#include <unistd.h>
- %*
- 
- 
-@@ -27,7 +28,6 @@
- %+
- class istream;
- %*
--#include <unistd.h>
- 
- /* Use prototypes in function declarations. */
- #define YY_USE_PROTOS
-@@ -1177,11 +1177,6 @@
- 
- 
- %-
--#ifndef YY_ALWAYS_INTERACTIVE
--#ifndef YY_NEVER_INTERACTIVE
--extern int isatty YY_PROTO(( int ));
--#endif
--#endif
- 
- #ifdef YY_USE_PROTOS
- void yy_init_buffer( YY_BUFFER_STATE b, FILE *file )
-@@ -1192,7 +1187,6 @@
- #endif
- 
- %+
--extern "C" int isatty YY_PROTO(( int ));
- void yyFlexLexer::yy_init_buffer( YY_BUFFER_STATE b, istream* file )
- %*
- 
---- flex-2.5.4/skel.c.broken	Sat Sep 30 16:52:34 2000
-+++ flex-2.5.4/skel.c	Sat Sep 30 16:53:15 2000
-@@ -15,6 +15,7 @@
-   "",
-   "%-",
-   "#include <stdio.h>",
-+  "#include <unistd.h>",
-   "%*",
-   "",
-   "",
-@@ -32,7 +33,6 @@
-   "%+",
-   "class istream;",
-   "%*",
--  "#include <unistd.h>",
-   "",
-   "/* Use prototypes in function declarations. */",
-   "#define YY_USE_PROTOS",
-@@ -1182,11 +1182,6 @@
-   "",
-   "",
-   "%-",
--  "#ifndef YY_ALWAYS_INTERACTIVE",
--  "#ifndef YY_NEVER_INTERACTIVE",
--  "extern int isatty YY_PROTO(( int ));",
--  "#endif",
--  "#endif",
-   "",
-   "#ifdef YY_USE_PROTOS",
-   "void yy_init_buffer( YY_BUFFER_STATE b, FILE *file )",
-@@ -1197,7 +1192,6 @@
-   "#endif",
-   "",
-   "%+",
--  "extern \"C\" int isatty YY_PROTO(( int ));",
-   "void yyFlexLexer::yy_init_buffer( YY_BUFFER_STATE b, istream* file )",
-   "%*",
-   "",
diff --git a/sys-devel/flex/files/flex-2.5.4a-gcc3.patch b/sys-devel/flex/files/flex-2.5.4a-gcc3.patch
deleted file mode 100644
index a73dc41bd26c..000000000000
--- a/sys-devel/flex/files/flex-2.5.4a-gcc3.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- flex-2.5.4/skel.c.orig	Tue Nov  6 17:29:12 2001
-+++ flex-2.5.4/skel.c	Tue Nov  6 17:28:49 2001
-@@ -31,7 +31,7 @@
-   "",
-   "#include <stdlib.h>",
-   "%+",
--  "class istream;",
-+  "#include <iostream.h>",
-   "%*",
-   "",
-   "/* Use prototypes in function declarations. */",
diff --git a/sys-devel/flex/files/flex-2.5.4a-gcc31.patch b/sys-devel/flex/files/flex-2.5.4a-gcc31.patch
deleted file mode 100644
index a8c01811923d..000000000000
--- a/sys-devel/flex/files/flex-2.5.4a-gcc31.patch
+++ /dev/null
@@ -1,94 +0,0 @@
---- flex-2.5.4/skel.c.gcc31	Wed Feb 20 12:15:18 2002
-+++ flex-2.5.4/skel.c	Wed Feb 20 12:15:18 2002
-@@ -31,7 +31,8 @@
-   "",
-   "#include <stdlib.h>",
-   "%+",
--  "#include <iostream.h>",
-+  "#include <iostream>",
-+  "using namespace std;",
-   "%*",
-   "",
-   "/* Use prototypes in function declarations. */",
---- flex-2.5.4/FlexLexer.h.gcc31	Sun Jul 27 04:41:38 1997
-+++ flex-2.5.4/FlexLexer.h	Fri Mar  1 20:38:04 2002
-@@ -44,7 +44,7 @@
- #ifndef __FLEX_LEXER_H
- // Never included before - need to define base class.
- #define __FLEX_LEXER_H
--#include <iostream.h>
-+#include <iostream>
- 
- extern "C++" {
- 
-@@ -61,14 +61,14 @@
- 	virtual void
- 		yy_switch_to_buffer( struct yy_buffer_state* new_buffer ) = 0;
- 	virtual struct yy_buffer_state*
--		yy_create_buffer( istream* s, int size ) = 0;
-+		yy_create_buffer( std::istream* s, int size ) = 0;
- 	virtual void yy_delete_buffer( struct yy_buffer_state* b ) = 0;
--	virtual void yyrestart( istream* s ) = 0;
-+	virtual void yyrestart( std::istream* s ) = 0;
- 
- 	virtual int yylex() = 0;
- 
- 	// Call yylex with new input/output sources.
--	int yylex( istream* new_in, ostream* new_out = 0 )
-+	int yylex( std::istream* new_in, std::ostream* new_out = 0 )
- 		{
- 		switch_streams( new_in, new_out );
- 		return yylex();
-@@ -76,8 +76,8 @@
- 
- 	// Switch to new input/output streams.  A nil stream pointer
- 	// indicates "keep the current one".
--	virtual void switch_streams( istream* new_in = 0,
--					ostream* new_out = 0 ) = 0;
-+	virtual void switch_streams( std::istream* new_in = 0,
-+				     std::ostream* new_out = 0 ) = 0;
- 
- 	int lineno() const		{ return yylineno; }
- 
-@@ -104,17 +104,17 @@
- public:
- 	// arg_yyin and arg_yyout default to the cin and cout, but we
- 	// only make that assignment when initializing in yylex().
--	yyFlexLexer( istream* arg_yyin = 0, ostream* arg_yyout = 0 );
-+	yyFlexLexer( std::istream* arg_yyin = 0, std::ostream* arg_yyout = 0 );
- 
- 	virtual ~yyFlexLexer();
- 
- 	void yy_switch_to_buffer( struct yy_buffer_state* new_buffer );
--	struct yy_buffer_state* yy_create_buffer( istream* s, int size );
-+	struct yy_buffer_state* yy_create_buffer( std::istream* s, int size );
- 	void yy_delete_buffer( struct yy_buffer_state* b );
--	void yyrestart( istream* s );
-+	void yyrestart( std::istream* s );
- 
- 	virtual int yylex();
--	virtual void switch_streams( istream* new_in, ostream* new_out );
-+	virtual void switch_streams( std::istream* new_in, std::ostream* new_out );
- 
- protected:
- 	virtual int LexerInput( char* buf, int max_size );
-@@ -125,7 +125,7 @@
- 	int yyinput();
- 
- 	void yy_load_buffer_state();
--	void yy_init_buffer( struct yy_buffer_state* b, istream* s );
-+	void yy_init_buffer( struct yy_buffer_state* b, std::istream* s );
- 	void yy_flush_buffer( struct yy_buffer_state* b );
- 
- 	int yy_start_stack_ptr;
-@@ -140,8 +140,8 @@
- 	yy_state_type yy_try_NUL_trans( yy_state_type current_state );
- 	int yy_get_next_buffer();
- 
--	istream* yyin;	// input source for default LexerInput
--	ostream* yyout;	// output sink for default LexerOutput
-+	std::istream* yyin;	// input source for default LexerInput
-+	std::ostream* yyout;	// output sink for default LexerOutput
- 
- 	struct yy_buffer_state* yy_current_buffer;
- 
diff --git a/sys-devel/flex/files/flex-2.5.4a-skel.patch b/sys-devel/flex/files/flex-2.5.4a-skel.patch
deleted file mode 100644
index 5f8222adf248..000000000000
--- a/sys-devel/flex/files/flex-2.5.4a-skel.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- flex-2.5.4/skel.c.skel	Wed Aug 25 14:02:51 1999
-+++ flex-2.5.4/skel.c	Wed Aug 25 14:03:16 1999
-@@ -454,7 +454,7 @@
-   "YY_DECL",
-   "	{",
-   "	register yy_state_type yy_current_state;",
--  "	register char *yy_cp, *yy_bp;",
-+  "	register char *yy_cp = NULL, *yy_bp = NULL;",
-   "	register int yy_act;",
-   "",
-   "%% user's declarations go here",
diff --git a/sys-devel/flex/files/flex-configure-LANG.patch b/sys-devel/flex/files/flex-configure-LANG.patch
deleted file mode 100644
index 3ef76ef911c0..000000000000
--- a/sys-devel/flex/files/flex-configure-LANG.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-The LANG vars aren't reset early enough so when sed tries to use [a-zA-Z] in 
-option parsing, it may break.
-
-http://bugs.gentoo.org/103483
-
---- configure
-+++ configure
-@@ -54,6 +54,16 @@
- infodir='${prefix}/info'
- mandir='${prefix}/man'
- 
-+# NLS nuisances.
-+# Only set these to C if already set.  These must not be set unconditionally
-+# because not all systems understand e.g. LANG=C (notably SCO).
-+# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-+# Non-C LC_CTYPE values break the ctype check.
-+if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-+if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-+
- # Initialize some other variables.
- subdirs=
- MFLAGS= MAKEFLAGS=
-@@ -452,16 +463,6 @@
-   esac
- done
- 
--# NLS nuisances.
--# Only set these to C if already set.  These must not be set unconditionally
--# because not all systems understand e.g. LANG=C (notably SCO).
--# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
--# Non-C LC_CTYPE values break the ctype check.
--if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
--if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
--if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
--if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
--
- # confdefs.h avoids OS command line length limits that DEFS can exceed.
- rm -rf conftest* confdefs.h
- # AIX cpp loses on an empty file, so make sure it contains at least a newline.
diff --git a/sys-devel/flex/flex-2.5.33-r3.ebuild b/sys-devel/flex/flex-2.5.33-r3.ebuild
deleted file mode 100644
index 781259beed99..000000000000
--- a/sys-devel/flex/flex-2.5.33-r3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/flex-2.5.33-r3.ebuild,v 1.11 2007/12/13 04:11:26 vapier Exp $
-
-inherit eutils flag-o-matic
-
-#DEB_VER=36
-DESCRIPTION="GNU lexical analyser generator"
-HOMEPAGE="http://flex.sourceforge.net/"
-SRC_URI="mirror://sourceforge/flex/${P}.tar.bz2"
-#	mirror://debian/pool/main/f/flex/${PN}_${PV}-${DEB_VER}.diff.gz"
-
-LICENSE="FLEX"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="nls static"
-
-DEPEND="nls? ( sys-devel/gettext )"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	[[ -n ${DEB_VER} ]] && epatch "${WORKDIR}"/${PN}_${PV}-${DEB_VER}.diff
-	epatch "${FILESDIR}"/${PN}-2.5.31-include.patch
-	epatch "${FILESDIR}"/${P}-isatty.patch #119598
-	epatch "${FILESDIR}"/${P}-pic.patch
-	epatch "${FILESDIR}"/${P}-setlocale.patch #186092
-	touch doc/flex.1 #187505
-}
-
-src_compile() {
-	use static && append-ldflags -static
-	econf $(use_enable nls) || die
-	emake || die
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS ONEWS README* THANKS TODO
-	dosym flex /usr/bin/lex
-}
diff --git a/sys-devel/flex/flex-2.5.4a-r6.ebuild b/sys-devel/flex/flex-2.5.4a-r6.ebuild
deleted file mode 100644
index 38f9718f78ee..000000000000
--- a/sys-devel/flex/flex-2.5.4a-r6.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/flex-2.5.4a-r6.ebuild,v 1.14 2008/12/07 03:08:55 vapier Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="GNU lexical analyser generator"
-HOMEPAGE="http://lex.sourceforge.net/"
-SRC_URI="mirror://gentoo/${P}.tar.gz
-	http://dev.gentoo.org/~vapier/dist/${P}-autoconf.patch.bz2
-	mirror://gentoo/${P}-autoconf.patch.bz2"
-
-LICENSE="FLEX"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
-IUSE="static"
-
-DEPEND=""
-
-S=${WORKDIR}/${P/a/}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	# Some Redhat patches to fix various problems
-	epatch "${FILESDIR}"/flex-2.5.4-glibc22.patch
-	epatch "${FILESDIR}"/flex-2.5.4a-gcc3.patch
-	epatch "${FILESDIR}"/flex-2.5.4a-gcc31.patch
-	epatch "${FILESDIR}"/flex-2.5.4a-skel.patch
-
-	# included autotools are crusty, lets polish em up
-	epatch "${WORKDIR}"/${P}-autoconf.patch
-	epatch "${FILESDIR}"/${PN}-configure-LANG.patch
-}
-
-src_compile() {
-	tc-export AR CC RANLIB
-	use static && append-ldflags -static
-	econf || die "econf failed"
-	emake -j1 .bootstrap || die "emake bootstrap failed"
-	emake || die "emake failed"
-}
-
-src_test() {
-	make bigcheck || die "Test phase failed"
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die "make install failed"
-	dodoc NEWS README
-	dosym flex /usr/bin/lex
-}