[arch-commits] Commit in flex/trunk (4 files)
Date: Saturday, July 21, 2012 @ 06:31:39
Author: allan
Revision: 163834
upgpkg: flex 2.5.36-1
upstream update
Deleted:
flex/trunk/flex-2.5.35-gcc44.patch
flex/trunk/flex-2.5.35-hardening.patch
flex/trunk/flex-2.5.35-missing-prototypes.patch
flex/trunk/flex-2.5.35-sign.patch
--+
flex-2.5.35-gcc44.patch | 22 -
flex-2.5.35-hardening.patch | 36 --
flex-2.5.35-missing-prototypes.patch | 53 -
flex-2.5.35-sign.patch | 11 --
4 files changed, 122 deletions(-)
Deleted: flex-2.5.35-gcc44.patch
===
--- flex-2.5.35-gcc44.patch 2012-07-21 10:29:53 UTC (rev 163833)
+++ flex-2.5.35-gcc44.patch 2012-07-21 10:31:39 UTC (rev 163834)
@@ -1,22 +0,0 @@
-diff -urNp flex-2.5.35.orig/flex.skl flex-2.5.35/flex.skl
flex-2.5.35.orig/flex.skl 2009-04-20 03:09:46.0 +0530
-+++ flex-2.5.35/flex.skl 2009-04-20 07:46:58.0 +0530
-@@ -217,6 +217,7 @@ m4preproc_include(`flexint.h')
- /* begin standard C++ headers. */
- #include
- #include
-+#include
- #include
- #include
- /* end standard C++ headers. */
-diff -urNp flex-2.5.35.orig/skel.c flex-2.5.35/skel.c
flex-2.5.35.orig/skel.c2009-04-20 03:09:46.0 +0530
-+++ flex-2.5.35/skel.c 2009-04-20 07:46:40.0 +0530
-@@ -284,6 +284,7 @@ const char *skel[] = {
- "/* begin standard C++ headers. */",
- "#include ",
- "#include ",
-+ "#include ",
- "#include ",
- "#include ",
- "/* end standard C++ headers. */",
Deleted: flex-2.5.35-hardening.patch
===
--- flex-2.5.35-hardening.patch 2012-07-21 10:29:53 UTC (rev 163833)
+++ flex-2.5.35-hardening.patch 2012-07-21 10:31:39 UTC (rev 163834)
@@ -1,36 +0,0 @@
-diff -u flex-2.5.35/scan.c flex-2.5.35/scan.c
flex-2.5.35/scan.c
-+++ flex-2.5.35/scan.c
-@@ -2096,7 +2096,7 @@
- /* This used to be an fputs(), but since the string might contain NUL's,
- * we now use fwrite().
- */
--#define ECHO fwrite( yytext, yyleng, 1, yyout )
-+#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
- #endif
-
- /* Gets input and stuffs it into "buf". number of characters read, or
YY_NULL,
-diff -u flex-2.5.35/flex.skl flex-2.5.35/flex.skl
flex-2.5.35/flex.skl
-+++ flex-2.5.35/flex.skl
-@@ -1075,7 +1075,7 @@
- /* This used to be an fputs(), but since the string might contain NUL's,
- * we now use fwrite().
- */
--#define ECHO fwrite( yytext, yyleng, 1, yyout )
-+#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
- %endif
- %if-c++-only C++ definition
- #define ECHO LexerOutput( yytext, yyleng )
-diff -u flex-2.5.35/skel.c flex-2.5.35/skel.c
flex-2.5.35/skel.c
-+++ flex-2.5.35/skel.c
-@@ -1142,7 +1142,7 @@
- "/* This used to be an fputs(), but since the string might contain NUL's,",
- " * we now use fwrite().",
- " */",
-- "#define ECHO fwrite( yytext, yyleng, 1, yyout )",
-+ "#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)",
- "%endif",
- "%if-c++-only C++ definition",
- "#define ECHO LexerOutput( yytext, yyleng )",
Deleted: flex-2.5.35-missing-prototypes.patch
===
--- flex-2.5.35-missing-prototypes.patch2012-07-21 10:29:53 UTC (rev
163833)
+++ flex-2.5.35-missing-prototypes.patch2012-07-21 10:31:39 UTC (rev
163834)
@@ -1,53 +0,0 @@
-diff -up flex-2.5.35/flex.skl\~ flex-2.5.35/flex.skl
flex-2.5.35/flex.skl~ 2010-07-13 17:18:43.0 +0200
-+++ flex-2.5.35/flex.skl 2010-07-13 17:23:49.0 +0200
-@@ -960,6 +960,22 @@ m4_ifdef( [[M4_YY_NO_SET_LINENO]],,
- void yyset_lineno M4_YY_PARAMS( int line_number M4_YY_PROTO_LAST_ARG );
- ]])
-
-+m4_ifdef( [[M4_YY_REENTRANT]],
-+[[
-+m4_ifdef( [[M4_YY_NO_GET_COLUMN]],,
-+[[
-+int yyget_column M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );
-+]])
-+]])
-+
-+m4_ifdef( [[M4_YY_REENTRANT]],
-+[[
-+m4_ifdef( [[M4_YY_NO_SET_COLUMN]],,
-+[[
-+void yyset_column M4_YY_PARAMS( int column_no M4_YY_PROTO_LAST_ARG );
-+]])
-+]])
-+
- %if-bison-bridge
- m4_ifdef( [[M4_YY_NO_GET_LVAL]],,
- [[
-
-Diff finished. Tue Jul 13 17:27:50 2010
flex-2.5.35/skel.c~2010-07-14 13:15:42.0 +0200
-+++ flex-2.5.35/skel.c 2010-07-14 13:16:05.0 +0200
-@@ -1027,6 +1027,22 @@
- "void yyset_lineno M4_YY_PARAMS( int line_number M4_YY_PROTO_LAST_ARG );",
- "]])",
- "",
-+ "m4_ifdef( [[M4_YY_REENTRANT]],",
-+ "[[",
-+ "m4_ifdef( [[M4_YY_NO_GET_COLUMN]],,",
-+ "[[",
-+ "int yyget_column M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );",
-+ "]])",
-+ "]])",
-+ "",
-+ "m4_ifdef( [[M4_YY_REENTRANT]],",
-+ "[[",
-+ "m4_ifdef( [[M4_YY_NO_SET_COLUMN]],,",
-+ "[[",
-+ "void yyset_column M4_YY_PARAMS( int column_no M4_YY_PROTO_LAST_ARG );",
-+ "]])",
-+ "]])",
-+ "",
- "%if-b
[arch-commits] Commit in flex/trunk (4 files)
Date: Thursday, September 23, 2010 @ 10:30:47
Author: allan
Revision: 91170
upgpkg: flex 2.5.35-4
use fedora/debian patchset
Added:
flex/trunk/flex-2.5.35-hardening.patch
flex/trunk/flex-2.5.35-missing-prototypes.patch
flex/trunk/flex-2.5.35-sign.patch
Modified:
flex/trunk/PKGBUILD
--+
PKGBUILD | 39
flex-2.5.35-hardening.patch | 36 ++
flex-2.5.35-missing-prototypes.patch | 53 +
flex-2.5.35-sign.patch | 11 ++
4 files changed, 127 insertions(+), 12 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-09-23 14:15:02 UTC (rev 91169)
+++ PKGBUILD2010-09-23 14:30:47 UTC (rev 91170)
@@ -4,7 +4,7 @@
pkgname=flex
pkgver=2.5.35
-pkgrel=3
+pkgrel=4
pkgdesc="A tool for generating text-scanning programs"
arch=('i686' 'x86_64')
url="http://flex.sourceforge.net";
@@ -14,27 +14,42 @@
install=flex.install
source=(http://downloads.sourceforge.net/sourceforge/flex/flex-$pkgver.tar.bz2
flex-2.5.35-gcc44.patch
- lex.sh)
+flex-2.5.35-hardening.patch
+flex-2.5.35-missing-prototypes.patch
+flex-2.5.35-sign.patch
+lex.sh)
md5sums=('10714e50cea54dc7a227e3eddcd44d57'
'eef5c07db71a43280be74139bdea'
+ 'de952b3ed7cc074bc8c3e6ab73634048'
+ '6b83f56b1b654c6a321cdc530a3ec68d'
+ 'd87fd9e9762ba7e230d516bdcf1c8c6f'
'f725259ec23a9e87ee29e2ef82eda9a5')
build() {
- cd $srcdir/$pkgname-$pkgver || return 1
- patch -Np1 -i $srcdir/flex-2.5.35-gcc44.patch || return 1
-
+ cd $srcdir/$pkgname-$pkgver
+
+ patch -Np1 -i $srcdir/flex-2.5.35-gcc44.patch
+ patch -Np1 -i $srcdir/flex-2.5.35-hardening.patch
+ patch -Np1 -i $srcdir/flex-2.5.35-missing-prototypes.patch
+ patch -Np1 -i $srcdir/flex-2.5.35-sign.patch
+
./configure --prefix=/usr \
---mandir=/usr/share/man --infodir=/usr/share/info || return 1
- make || return 1
+--mandir=/usr/share/man --infodir=/usr/share/info
+ make
+ make check
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+
make prefix=$pkgdir/usr \
mandir=$pkgdir/usr/share/man \
infodir=$pkgdir/usr/share/info \
-install || return 1
- install -Dm755 $srcdir/lex.sh $pkgdir/usr/bin/lex || return 1
+install
+ install -Dm755 $srcdir/lex.sh $pkgdir/usr/bin/lex
install -Dm644 COPYING \
- $pkgdir/usr/share/licenses/$pkgname/license.txt || return 1
+ $pkgdir/usr/share/licenses/$pkgname/license.txt
- rm -f $pkgdir/usr/share/info/dir
- gzip -9 $pkgdir/usr/share/info/*
}
+
Added: flex-2.5.35-hardening.patch
===
--- flex-2.5.35-hardening.patch (rev 0)
+++ flex-2.5.35-hardening.patch 2010-09-23 14:30:47 UTC (rev 91170)
@@ -0,0 +1,36 @@
+diff -u flex-2.5.35/scan.c flex-2.5.35/scan.c
+--- flex-2.5.35/scan.c
flex-2.5.35/scan.c
+@@ -2096,7 +2096,7 @@
+ /* This used to be an fputs(), but since the string might contain NUL's,
+ * we now use fwrite().
+ */
+-#define ECHO fwrite( yytext, yyleng, 1, yyout )
++#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
+ #endif
+
+ /* Gets input and stuffs it into "buf". number of characters read, or
YY_NULL,
+diff -u flex-2.5.35/flex.skl flex-2.5.35/flex.skl
+--- flex-2.5.35/flex.skl
flex-2.5.35/flex.skl
+@@ -1075,7 +1075,7 @@
+ /* This used to be an fputs(), but since the string might contain NUL's,
+ * we now use fwrite().
+ */
+-#define ECHO fwrite( yytext, yyleng, 1, yyout )
++#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
+ %endif
+ %if-c++-only C++ definition
+ #define ECHO LexerOutput( yytext, yyleng )
+diff -u flex-2.5.35/skel.c flex-2.5.35/skel.c
+--- flex-2.5.35/skel.c
flex-2.5.35/skel.c
+@@ -1142,7 +1142,7 @@
+ "/* This used to be an fputs(), but since the string might contain NUL's,",
+ " * we now use fwrite().",
+ " */",
+- "#define ECHO fwrite( yytext, yyleng, 1, yyout )",
++ "#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)",
+ "%endif",
+ "%if-c++-only C++ definition",
+ "#define ECHO LexerOutput( yytext, yyleng )",
Added: flex-2.5.35-missing-prototypes.patch
===
--- flex-2.5.35-missing-prototypes.patch(rev 0)
+++ flex-2.5.35-missing-prototypes.patch2010-09-23 14:30:47 UTC (rev
91170)
@@ -0,0 +1,53 @@
+diff -up flex-2.5.35/flex.skl\~ flex-2.5.35/flex.skl
+--- flex-2.5.35/flex.skl~ 2010-07-13 17:18:43.0 +0200
flex-2.5.35/flex.skl 2010-07-13 17:23:49.0 +0200
+@@ -960,6 +960,22 @@ m4_ifdef( [[M4_YY_NO_SET_LINENO]],,
+ void yyset_lineno M4_YY_PARAMS( int line_number M4_YY_PROTO_LAST_ARG );
+ ]])
+
++m4_ifdef( [[M4_YY_REENTRANT]],
+
