Commit 9c511ad9 authored by abveritas's avatar abveritas

continued glibc updates, m4, autoconf, bison, flex, iw, crda

parent 3dd648e5
......@@ -9,7 +9,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=autoconf
pkgver=2.68
pkgrel=1
pkgrel=2
pkgdesc="A GNU tool for automatically configuring source code"
arch=('any')
license=('GPL2' 'GPL3' 'custom')
......
......@@ -9,7 +9,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=bison
pkgver=2.5
pkgrel=1
pkgrel=2
pkgdesc="The GNU general-purpose parser generator"
arch=('i686' 'x86_64')
license=('GPL3')
......
# $Id: PKGBUILD 40883 2009-05-31 17:12:07Z thomas $
# Maintainer: Thomas Bächler <thomas@archlinux.org>
#
# Core Packages for Chakra, part of chakra-project.org
#
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=crda
pkgver=1.1.0
pkgver=1.1.1
pkgrel=1
pkgdesc="Central Regulatory Domain Agent"
arch=(i686 x86_64)
......@@ -13,7 +19,7 @@ makedepends=('python-m2crypto')
install=crda.install
source=(http://wireless.kernel.org/download/crda/${pkgname}-${pkgver}.tar.bz2
crda.rc)
md5sums=('6004584d2e39e899f7642b141dd72028'
md5sums=('5fc77af68b3e21736b8ef2f8b061c810'
'014eef3f8655e9a130064ec6891317fc')
build() {
......
# $Id: PKGBUILD 41636 2009-06-06 06:14:45Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
#
# Core Packages for Chakra, part of chakra-project.org
#
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
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,14 +19,23 @@ depends=('glibc' 'm4' 'sh')
install=flex.install
source=(http://downloads.sourceforge.net/sourceforge/flex/flex-$pkgver.tar.bz2
flex-2.5.35-gcc44.patch
flex-2.5.35-hardening.patch
flex-2.5.35-missing-prototypes.patch
flex-2.5.35-sign.patch
lex.sh)
md5sums=('10714e50cea54dc7a227e3eddcd44d57'
'e4444ef5c07db71a43280be74139bdea'
'de952b3ed7cc074bc8c3e6ab73634048'
'6b83f56b1b654c6a321cdc530a3ec68d'
'd87fd9e9762ba7e230d516bdcf1c8c6f'
'f725259ec23a9e87ee29e2ef82eda9a5')
build() {
cd $srcdir/$pkgname-$pkgver || return 1
patch -Np1 -i $srcdir/flex-2.5.35-gcc44.patch || return 1
patch -Np1 -i $srcdir/flex-2.5.35-hardening.patch || return 1
patch -Np1 -i $srcdir/flex-2.5.35-missing-prototypes.patch || return 1
patch -Np1 -i $srcdir/flex-2.5.35-sign.patch || return 1
./configure --prefix=/usr \
--mandir=/usr/share/man --infodir=/usr/share/info || return 1
......@@ -34,7 +48,5 @@ build() {
install -Dm644 COPYING \
$pkgdir/usr/share/licenses/$pkgname/license.txt || return 1
rm -f $pkgdir/usr/share/info/dir
gzip -9 $pkgdir/usr/share/info/*
}
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 )",
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.000000000 +0200
+++ flex-2.5.35/flex.skl 2010-07-13 17:23:49.000000000 +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.000000000 +0200
+++ flex-2.5.35/skel.c 2010-07-14 13:16:05.000000000 +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-bison-bridge",
"m4_ifdef( [[M4_YY_NO_GET_LVAL]],,",
"[[",
--- flex-2.5.35/gen.c-orig 2008-04-30 22:51:08.000000000 +0200
+++ flex-2.5.35/gen.c 2008-04-30 22:51:14.000000000 +0200
@@ -1890,7 +1890,7 @@
outn ("\tif ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \\");
outn ("\t\t{ \\");
outn ("\t\tint c = '*'; \\");
- outn ("\t\tint n; \\");
+ outn ("\t\tunsigned n; \\");
outn ("\t\tfor ( n = 0; n < max_size && \\");
outn ("\t\t\t (c = getc( yyin )) != EOF && c != '\\n'; ++n ) \\");
outn ("\t\t\tbuf[n] = (char) c; \\");
# $Id: PKGBUILD 89940 2010-09-05 11:20:33Z thomas $
# Maintainer: Thomas Bächler <thomas@archlinux.org>
#
# Core Packages for Chakra, part of chakra-project.org
#
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=iw
pkgver=0.9.20
pkgver=0.9.22
pkgrel=1
pkgdesc="nl80211 based CLI configuration utility for wireless devices"
arch=("i686" "x86_64")
......@@ -12,13 +18,13 @@ depends=("libnl")
makedepends=("kernel-headers")
source=(http://wireless.kernel.org/download/$pkgname/$pkgname-$pkgver.tar.bz2
version-sh.patch)
sha256sums=('2d665fbfbe4fd6a40159fb821518fc5337da37448416405b936a393a14cbc7d3'
'1ffbbca148b3c29446e2116e114d30b866dadbdf54cd276db02bd09e52bedf19')
sha256sums=('138ce4dc827d8b0af55fe1c444e749b985c1540d791b27922aad880d12908bb1'
'92a556cd1a958e45cf891223876c61150b937f1aacf6c8044a4ab53830efe21e')
build() {
patch -Np0 -i ${srcdir}/version-sh.patch || return 1
cd ${pkgname}-${pkgver}
cd "$srcdir"/$pkgname-$pkgver
make || return 1
make DESTDIR=$pkgdir install
......
--- iw-0.9.20/version.sh.orig 2010-07-14 17:02:21.000000000 +0000
+++ iw-0.9.20/version.sh 2010-09-21 22:39:53.739802790 +0000
--- iw-0.9.22/version.sh.orig
+++ iw-0.9.22/version.sh
@@ -5,20 +5,20 @@
echo '#include "iw.h"' > "$OUT"
......
# $Id: PKGBUILD 70182 2010-02-25 10:44:28Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Contributor: Andreas Radke <andyrtr@archlinux.org>
#
# Core Packages for Chakra, part of chakra-project.org
#
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=m4
pkgver=1.4.14
pkgver=1.4.16
pkgrel=1
pkgdesc="m4 macro processor"
arch=('i686' 'x86_64')
......@@ -13,7 +18,7 @@ install=m4.install
groups=('base-devel')
depends=('glibc' 'bash')
source=(ftp://ftp.gnu.org/gnu/m4/$pkgname-$pkgver.tar.xz)
md5sums=('e2b871099546846d1df586f195f79b53')
md5sums=('7548ec061a1ba993790159764f522d0e')
build() {
cd ${srcdir}/$pkgname-$pkgver
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment