summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--development/lua/lua.SlackBuild18
-rw-r--r--development/lua/lua.info8
-rw-r--r--development/lua/patch-lua-5.1.4-4217
3 files changed, 11 insertions, 232 deletions
diff --git a/development/lua/lua.SlackBuild b/development/lua/lua.SlackBuild
index 18509b1725..c616ccc33e 100644
--- a/development/lua/lua.SlackBuild
+++ b/development/lua/lua.SlackBuild
@@ -12,8 +12,8 @@
# http://sam.zoy.org/wtfpl/COPYING for more details.
PRGNAM=lua
-VERSION=${VERSION:-5.1.4}
-BUILD=${BUILD:-7}
+VERSION=${VERSION:-5.1.5}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -50,10 +50,6 @@ tar xvf $CWD/$PRGNAM-${VERSION}.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
-# 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-4 )
-
# Fix up a to-be-installed header and the pkgconfig file
sed -i "s|/usr/local|/usr|" src/luaconf.h
sed -i "s|lib/lua|lib$LIBDIRSUFFIX/lua|" src/luaconf.h
@@ -78,12 +74,12 @@ make linux install \
mkdir -p shared
cd shared
ar -x $PKG/usr/lib${LIBDIRSUFFIX}/liblua.a
- gcc -ldl -lreadline -lhistory -lncurses -lm -shared *.o -o liblua.so.5.1.4
- cp -a liblua.so.5.1.4 $PKG/usr/lib${LIBDIRSUFFIX}
+ gcc -ldl -lreadline -lhistory -lncurses -lm -shared *.o -o liblua.so.$VERSION
+ cp -a liblua.so.$VERSION $PKG/usr/lib${LIBDIRSUFFIX}
( cd $PKG/usr/lib${LIBDIRSUFFIX}
- ln -s liblua.so.5.1.4 liblua.so.5.1
- ln -s liblua.so.5.1.4 liblua.so.5
- ln -s liblua.so.5.1.4 liblua.so
+ ln -s liblua.so.$VERSION liblua.so.5.1
+ ln -s liblua.so.$VERSION liblua.so.5
+ ln -s liblua.so.$VERSION liblua.so
)
cd ..
diff --git a/development/lua/lua.info b/development/lua/lua.info
index 876c5087bd..33ec254f53 100644
--- a/development/lua/lua.info
+++ b/development/lua/lua.info
@@ -1,10 +1,10 @@
PRGNAM="lua"
-VERSION="5.1.4"
+VERSION="5.1.5"
HOMEPAGE="http://www.lua.org"
-DOWNLOAD="http://www.lua.org/ftp/lua-5.1.4.tar.gz"
-MD5SUM="d0870f2de55d59c1c8419f36e8fac150"
+DOWNLOAD="http://www.lua.org/ftp/lua-5.1.5.tar.gz"
+MD5SUM="2e115fe26e435e33b0d5c022e4490567"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="ponce"
EMAIL="matteo.bernardini@gmail.com"
-APPROVED="Niels Horn"
+APPROVED="dsomero"
diff --git a/development/lua/patch-lua-5.1.4-4 b/development/lua/patch-lua-5.1.4-4
deleted file mode 100644
index 65aae60067..0000000000
--- a/development/lua/patch-lua-5.1.4-4
+++ /dev/null
@@ -1,217 +0,0 @@
-# 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-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
-+++ lcode.c 2011/01/31 14:53:16 2.25.1.5
-@@ -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.5 2011/01/31 14:53:16 roberto Exp $
- ** Code generator for Lua
- ** See Copyright Notice in lua.h
- */
-@@ -544,10 +544,6 @@
- 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;
-@@ -572,10 +568,6 @@
- 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;
---- 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;
- }
---- 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 @@
- /*
--** $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]);
---- 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 @@
- /*
--** $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 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.5 2011/08/17 20:43:11 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? */
-@@ -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;
- }
-- 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");
- }
generated by cgit v1.2.3 (git 2.26.2) at 2024-12-23 19:37:31 +0000