development/lua: Updated with newest patches from upstream.

Signed-off-by: Niels Horn <niels.horn@slackbuilds.org>

4 files changed, 56 insertions, 11 deletions

diff --git a/development/lua/lua.SlackBuild b/development/lua/lua.SlackBuild
index 20b7816da02b..18509b172582 100644
--- a/development/lua/lua.SlackBuild
+++ b/development/lua/lua.SlackBuild
@@ -13,7 +13,7 @@
 
 PRGNAM=lua
 VERSION=${VERSION:-5.1.4}
-BUILD=${BUILD:-6}
+BUILD=${BUILD:-7}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -50,9 +50,9 @@ tar xvf $CWD/$PRGNAM-${VERSION}.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 
-# apply patch-lua-5.1.4-2
+# apply patch-lua-5.1.4-4
 # http://www.lua.org/bugs.html#5.1.4
-( cd src ; patch -p0 < $CWD/patch-lua-5.1.4-3 )
+( cd src ; patch -p0 < $CWD/patch-lua-5.1.4-4 )
 
 # Fix up a to-be-installed header and the pkgconfig file
 sed -i "s|/usr/local|/usr|" src/luaconf.h
diff --git a/development/lua/lua.info b/development/lua/lua.info
index 8f44ca779957..876c5087bd2d 100644
--- a/development/lua/lua.info
+++ b/development/lua/lua.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="ponce"
 EMAIL="matteo.bernardini@gmail.com"
-APPROVED="rworkman"
+APPROVED="Niels Horn"
diff --git a/development/lua/patch-lua-5.1.4-3 b/development/lua/patch-lua-5.1.4-4
index 77cce80bd30e..65aae6006787 100644
--- a/development/lua/patch-lua-5.1.4-3
+++ b/development/lua/patch-lua-5.1.4-4
@@ -1,10 +1,10 @@
-# patch-lua-5.1.4-3 created 2011-03-16T19:06:31-0300
+# patch-lua-5.1.4-4 created 2011-10-29T14:56:19-0200
 # 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-3
-#	patch < patch-lua-5.1.4-3
+#	wget http://www.lua.org/ftp/patch-lua-5.1.4-4
+#	patch < patch-lua-5.1.4-4
 # use curl -O -R if you don't have wget
 
 --- lcode.c	2007/12/28 15:32:23	2.25.1.3
@@ -55,6 +55,23 @@
    lua_getfenv(L, 1);
    return 1;
  }
+--- lgc.c	2007/12/27 13:02:25	2.38.1.1
++++ lgc.c	2011/03/18 18:05:38	2.38.1.2
+@@ -1,5 +1,5 @@
+ /*
+-** $Id: lgc.c,v 2.38.1.1 2007/12/27 13:02:25 roberto Exp $
++** $Id: lgc.c,v 2.38.1.2 2011/03/18 18:05:38 roberto Exp $
+ ** Garbage Collector
+ ** See Copyright Notice in lua.h
+ */
+@@ -627,7 +627,6 @@
+     }
+   }
+   else {
+-    lua_assert(g->totalbytes >= g->estimate);
+     setthreshold(g);
+   }
+ }
 --- 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 @@
@@ -115,6 +132,26 @@
    /* fill it with pre-defined loaders */
    for (i=0; loaders[i] != NULL; i++) {
      lua_pushcfunction(L, loaders[i]);
+--- lparser.c	2007/12/28 15:32:23	2.42.1.3
++++ lparser.c	2011/10/21 19:31:42	2.42.1.4
+@@ -1,5 +1,5 @@
+ /*
+-** $Id: lparser.c,v 2.42.1.3 2007/12/28 15:32:23 roberto Exp $
++** $Id: lparser.c,v 2.42.1.4 2011/10/21 19:31:42 roberto Exp $
+ ** Lua Parser
+ ** See Copyright Notice in lua.h
+ */
+@@ -374,9 +374,9 @@
+   lua_assert(luaG_checkcode(f));
+   lua_assert(fs->bl == NULL);
+   ls->fs = fs->prev;
+-  L->top -= 2;  /* remove table and prototype from the stack */
+   /* last token read was anchored in defunct function; must reanchor it */
+   if (fs) anchor_token(ls);
++  L->top -= 2;  /* remove table and prototype from the stack */
+ }
+ 
+ 
 --- 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 @@
@@ -143,11 +180,11 @@
        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
++++ lvm.c	2011/08/17 20:43:11	2.63.1.5
 @@ -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 $
++** $Id: lvm.c,v 2.63.1.5 2011/08/17 20:43:11 roberto Exp $
  ** Lua virtual machine
  ** See Copyright Notice in lua.h
  */
@@ -159,7 +196,15 @@
    for (loop = 0; loop < MAXTAGLOOP; loop++) {
      const TValue *tm;
      if (ttistable(t)) {  /* `t' is a table? */
-@@ -152,7 +153,9 @@
+@@ -141,6 +142,7 @@
+       if (!ttisnil(oldval) ||  /* result is no nil? */
+           (tm = fasttm(L, h->metatable, TM_NEWINDEX)) == NULL) { /* or no TM? */
+         setobj2t(L, oldval, val);
++        h->flags = 0;
+         luaC_barriert(L, h, val);
+         return;
+       }
+@@ -152,7 +154,9 @@
        callTM(L, tm, t, key, val);
        return;
      }
diff --git a/development/lua/slack-desc b/development/lua/slack-desc
index e5f5a065beff..a75570ce06b5 100644
--- a/development/lua/slack-desc
+++ b/development/lua/slack-desc
@@ -7,7 +7,7 @@
 
    |-----handy-ruler------------------------------------------------------|
 lua: Lua (a powerful, fast, light-weight, embeddable scripting language)
-lua: 
+lua:
 lua: Lua combines simple procedural syntax with powerful data description 
 lua: constructs based on associative arrays and extensible semantics.
 lua: Lua is dynamically typed, runs by interpreting bytecode for a