lua 5.1.5-1 màj port

4 files changed, 7 insertions, 207 deletions

diff --git a/lua/.md5sum.i686 b/lua/.md5sum.i686
index cc6f0a7ad..cda9dd598 100644
--- a/lua/.md5sum.i686
+++ b/lua/.md5sum.i686
@@ -1,3 +1,3 @@
 249582bf1fd861ccf492d2c35a9fe732  lua-5.1.4-cflags.diff
 1239310e0c4a581c7831e596f95cc6cd  lua-5.1.4-patch-lua.patch
-d0870f2de55d59c1c8419f36e8fac150  lua-5.1.4.tar.gz
+2e115fe26e435e33b0d5c022e4490567  lua-5.1.5.tar.gz
diff --git a/lua/.md5sum.x86_64 b/lua/.md5sum.x86_64
index cc6f0a7ad..cda9dd598 100644
--- a/lua/.md5sum.x86_64
+++ b/lua/.md5sum.x86_64
@@ -1,3 +1,3 @@
 249582bf1fd861ccf492d2c35a9fe732  lua-5.1.4-cflags.diff
 1239310e0c4a581c7831e596f95cc6cd  lua-5.1.4-patch-lua.patch
-d0870f2de55d59c1c8419f36e8fac150  lua-5.1.4.tar.gz
+2e115fe26e435e33b0d5c022e4490567  lua-5.1.5.tar.gz
diff --git a/lua/Pkgfile b/lua/Pkgfile
index f4a551275..80da627af 100644
--- a/lua/Pkgfile
+++ b/lua/Pkgfile
@@ -1,28 +1,23 @@
-# $Id: build,v 1.9 2008/08/30 20:36:55 linda Exp root $
-# Description: A programming language designed for extending applications
+# Description: Langage de programmation léger.
 # URL: http://www.lua.org
 # Packager: Floreal Cabares, cabaflo at wanadoo dot fr
 # Depends on:
 # Run on:
 
 name=lua
-version=5.1.4
-release=3
+version=5.1.5
+release=1
 source=(http://www.lua.org/ftp/$name-$version.tar.gz 
-	lua-5.1.4-patch-lua.patch
 	lua-5.1.4-cflags.diff)
 
 build() {
 	cd $name-$version
-	patch < $SRC/lua-5.1.4-patch-lua.patch -d src
-	
 	[ `uname -i` == "x86_64" ] && patch -Np1 -i ../lua-5.1.4-cflags.diff
-  	[ `uname -i` == "x86_64" ] && export CFLAGS="$CFLAGS -fPIC"
+	[ `uname -i` == "x86_64" ] && export CFLAGS="$CFLAGS -fPIC"
 
-    	make linux
+	make linux
 	make INSTALL_TOP=$PKG/usr  install
 	mv $PKG/usr/{man,share/man}
 	rm -r $PKG/usr/share/lua
 	install -D -m 0644 etc/lua.pc $PKG/usr/lib/pkgconfig/lua.pc
 }
-  
diff --git a/lua/lua-5.1.4-patch-lua.patch b/lua/lua-5.1.4-patch-lua.patch
deleted file mode 100644
index ebfe43835..000000000
--- a/lua/lua-5.1.4-patch-lua.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-# patch-lua-5.1.4-2 created 2010-05-14T21:02:40-0300
-# apply to a pristine copy of Lua 5.1.4 with:
-#	wget http://www.lua.org/ftp/lua-5.1.4.tar.gz
-#	tar zxf lua-5.1.4.tar.gz
-#	cd lua-5.1.4/src
-#	wget http://www.lua.org/ftp/patch-lua-5.1.4-2
-#	patch < patch-lua-5.1.4-2
-# use curl -O -R if you don't have wget
-
---- lcode.c	2007/12/28 15:32:23	2.25.1.3
-+++ lcode.c	2009/06/15 14:12:25	2.25.1.4
-@@ -1,5 +1,5 @@
- /*
--** $Id: lcode.c,v 2.25.1.3 2007/12/28 15:32:23 roberto Exp $
-+** $Id: lcode.c,v 2.25.1.4 2009/06/15 14:12:25 roberto Exp $
- ** Code generator for Lua
- ** See Copyright Notice in lua.h
- */
-@@ -544,15 +544,18 @@
-       pc = NO_JUMP;  /* always true; do nothing */
-       break;
-     }
--    case VFALSE: {
--      pc = luaK_jump(fs);  /* always jump */
--      break;
--    }
-     case VJMP: {
-       invertjump(fs, e);
-       pc = e->u.s.info;
-       break;
-     }
-+    case VFALSE: {
-+      if (!hasjumps(e)) {
-+        pc = luaK_jump(fs);  /* always jump */
-+        break;
-+      }
-+      /* else go through */
-+    }
-     default: {
-       pc = jumponcond(fs, e, 0);
-       break;
-@@ -572,14 +575,17 @@
-       pc = NO_JUMP;  /* always false; do nothing */
-       break;
-     }
--    case VTRUE: {
--      pc = luaK_jump(fs);  /* always jump */
--      break;
--    }
-     case VJMP: {
-       pc = e->u.s.info;
-       break;
-     }
-+    case VTRUE: {
-+      if (!hasjumps(e)) {
-+        pc = luaK_jump(fs);  /* always jump */
-+        break;
-+      }
-+      /* else go through */
-+    }
-     default: {
-       pc = jumponcond(fs, e, 1);
-       break;
---- ldblib.c	2008/01/21 13:11:21	1.104.1.3
-+++ ldblib.c	2009/08/04 18:50:18	1.104.1.4
-@@ -1,5 +1,5 @@
- /*
--** $Id: ldblib.c,v 1.104.1.3 2008/01/21 13:11:21 roberto Exp $
-+** $Id: ldblib.c,v 1.104.1.4 2009/08/04 18:50:18 roberto Exp $
- ** Interface from Lua to its debug API
- ** See Copyright Notice in lua.h
- */
-@@ -45,6 +45,7 @@
- 
- 
- static int db_getfenv (lua_State *L) {
-+  luaL_checkany(L, 1);
-   lua_getfenv(L, 1);
-   return 1;
- }
---- liolib.c	2008/01/18 17:47:43	2.73.1.3
-+++ liolib.c	2010/05/14 15:33:51	2.73.1.4
-@@ -1,5 +1,5 @@
- /*
--** $Id: liolib.c,v 2.73.1.3 2008/01/18 17:47:43 roberto Exp $
-+** $Id: liolib.c,v 2.73.1.4 2010/05/14 15:33:51 roberto Exp $
- ** Standard I/O (and system) library
- ** See Copyright Notice in lua.h
- */
-@@ -276,7 +276,10 @@
-     lua_pushnumber(L, d);
-     return 1;
-   }
--  else return 0;  /* read fails */
-+  else {
-+    lua_pushnil(L);  /* "result" to be removed */
-+    return 0;  /* read fails */
-+  }
- }
- 
- 
---- llex.c	2007/12/27 13:02:25	2.20.1.1
-+++ llex.c	2009/11/23 14:58:22	2.20.1.2
-@@ -1,5 +1,5 @@
- /*
--** $Id: llex.c,v 2.20.1.1 2007/12/27 13:02:25 roberto Exp $
-+** $Id: llex.c,v 2.20.1.2 2009/11/23 14:58:22 roberto Exp $
- ** Lexical Analyzer
- ** See Copyright Notice in lua.h
- */
-@@ -118,8 +118,10 @@
-   lua_State *L = ls->L;
-   TString *ts = luaS_newlstr(L, str, l);
-   TValue *o = luaH_setstr(L, ls->fs->h, ts);  /* entry for `str' */
--  if (ttisnil(o))
-+  if (ttisnil(o)) {
-     setbvalue(o, 1);  /* make sure `str' will not be collected */
-+    luaC_checkGC(L);
-+  }
-   return ts;
- }
- 
---- loadlib.c	2008/08/06 13:29:28	1.52.1.3
-+++ loadlib.c	2009/09/09 13:17:16	1.52.1.4
-@@ -1,5 +1,5 @@
- /*
--** $Id: loadlib.c,v 1.52.1.3 2008/08/06 13:29:28 roberto Exp $
-+** $Id: loadlib.c,v 1.52.1.4 2009/09/09 13:17:16 roberto Exp $
- ** Dynamic library loader for Lua
- ** See Copyright Notice in lua.h
- **
-@@ -639,7 +639,7 @@
-   lua_pushvalue(L, -1);
-   lua_replace(L, LUA_ENVIRONINDEX);
-   /* create `loaders' table */
--  lua_createtable(L, 0, sizeof(loaders)/sizeof(loaders[0]) - 1);
-+  lua_createtable(L, sizeof(loaders)/sizeof(loaders[0]) - 1, 0);
-   /* fill it with pre-defined loaders */
-   for (i=0; loaders[i] != NULL; i++) {
-     lua_pushcfunction(L, loaders[i]);
---- lstrlib.c	2008/07/11 17:27:21	1.132.1.4
-+++ lstrlib.c	2010/05/14 15:34:19	1.132.1.5
-@@ -1,5 +1,5 @@
- /*
--** $Id: lstrlib.c,v 1.132.1.4 2008/07/11 17:27:21 roberto Exp $
-+** $Id: lstrlib.c,v 1.132.1.5 2010/05/14 15:34:19 roberto Exp $
- ** Standard library for string operations and pattern-matching
- ** See Copyright Notice in lua.h
- */
-@@ -754,6 +754,7 @@
- 
- 
- static int str_format (lua_State *L) {
-+  int top = lua_gettop(L);
-   int arg = 1;
-   size_t sfl;
-   const char *strfrmt = luaL_checklstring(L, arg, &sfl);
-@@ -768,7 +769,8 @@
-     else { /* format item */
-       char form[MAX_FORMAT];  /* to store the format (`%...') */
-       char buff[MAX_ITEM];  /* to store the formatted item */
--      arg++;
-+      if (++arg > top)
-+        luaL_argerror(L, arg, "no value");
-       strfrmt = scanformat(L, strfrmt, form);
-       switch (*strfrmt++) {
-         case 'c': {
---- lvm.c	2007/12/28 15:32:23	2.63.1.3
-+++ lvm.c	2009/07/01 21:10:33	2.63.1.4
-@@ -1,5 +1,5 @@
- /*
--** $Id: lvm.c,v 2.63.1.3 2007/12/28 15:32:23 roberto Exp $
-+** $Id: lvm.c,v 2.63.1.4 2009/07/01 21:10:33 roberto Exp $
- ** Lua virtual machine
- ** See Copyright Notice in lua.h
- */
-@@ -133,6 +133,7 @@
- 
- void luaV_settable (lua_State *L, const TValue *t, TValue *key, StkId val) {
-   int loop;
-+  TValue temp;
-   for (loop = 0; loop < MAXTAGLOOP; loop++) {
-     const TValue *tm;
-     if (ttistable(t)) {  /* `t' is a table? */
-@@ -152,7 +153,9 @@
-       callTM(L, tm, t, key, val);
-       return;
-     }
--    t = tm;  /* else repeat with `tm' */ 
-+    /* else repeat with `tm' */
-+    setobj(L, &temp, tm);  /* avoid pointing inside table (may rehash) */
-+    t = &temp;
-   }
-   luaG_runerror(L, "loop in settable");
- }