[40705] trunk/dports/lang/lua
pmq at macports.org
pmq at macports.org
Sat Oct 11 09:46:16 PDT 2008
Revision: 40705
http://trac.macports.org/changeset/40705
Author: pmq at macports.org
Date: 2008-10-11 09:46:15 -0700 (Sat, 11 Oct 2008)
Log Message:
-----------
Version bump to 5.1.4.
Remove obsolete patch.
Closes #16816.
Modified Paths:
--------------
trunk/dports/lang/lua/Portfile
Removed Paths:
-------------
trunk/dports/lang/lua/files/patch-lua-5.1.3.diff
Modified: trunk/dports/lang/lua/Portfile
===================================================================
--- trunk/dports/lang/lua/Portfile 2008-10-11 16:40:53 UTC (rev 40704)
+++ trunk/dports/lang/lua/Portfile 2008-10-11 16:46:15 UTC (rev 40705)
@@ -3,8 +3,7 @@
PortSystem 1.0
name lua
-version 5.1.3
-revision 3
+version 5.1.4
categories lang
platforms darwin
maintainers pmq openmaintainer
@@ -16,8 +15,8 @@
homepage http://www.lua.org
master_sites ${homepage}/ftp/
-checksums sha1 89bc9f5a351402565b8077e8123327e7cd15f004 \
- rmd160 1c5979dd4986057fef325aa2af0c872bbecab92e
+checksums sha1 2b11c8e60306efb7f0734b747588f57995493db7 \
+ rmd160 c867c8364295d3e4fb4e4d8ebb27fa2b2312cdef
depends_lib port:readline
build.target macosx
@@ -25,8 +24,6 @@
test.run yes
test.env DYLD_LIBRARY_PATH=./lib
-patchfiles patch-lua-5.1.3.diff
-
post-patch {
reinplace "s|/usr/local|${prefix}|g" ${worksrcpath}/Makefile
reinplace "s|/usr/local|${prefix}|g" ${worksrcpath}/src/luaconf.h
Deleted: trunk/dports/lang/lua/files/patch-lua-5.1.3.diff
===================================================================
--- trunk/dports/lang/lua/files/patch-lua-5.1.3.diff 2008-10-11 16:40:53 UTC (rev 40704)
+++ trunk/dports/lang/lua/files/patch-lua-5.1.3.diff 2008-10-11 16:46:15 UTC (rev 40705)
@@ -1,248 +0,0 @@
-# patch-lua-5.1.3 created 2008-05-08T13:59:25-0300
-# get the latest version at http://www.lua.org/ftp/patch-lua-5.1.3
---- src/lapi.c 2008/01/03 15:20:39 2.55.1.3
-+++ src/lapi.c 2008/02/14 16:46:39 2.55.1.4
-@@ -1,5 +1,5 @@
- /*
--** $Id: lapi.c,v 2.55.1.3 2008/01/03 15:20:39 roberto Exp $
-+** $Id: lapi.c,v 2.55.1.4 2008/02/14 16:46:39 roberto Exp $
- ** Lua API
- ** See Copyright Notice in lua.h
- */
-@@ -93,15 +93,14 @@
-
-
- LUA_API int lua_checkstack (lua_State *L, int size) {
-- int res;
-+ int res = 1;
- lua_lock(L);
-- if ((L->top - L->base + size) > LUAI_MAXCSTACK)
-+ if (size > LUAI_MAXCSTACK || (L->top - L->base + size) > LUAI_MAXCSTACK)
- res = 0; /* stack overflow */
-- else {
-+ else if (size > 0) {
- luaD_checkstack(L, size);
- if (L->ci->top < L->top + size)
- L->ci->top = L->top + size;
-- res = 1;
- }
- lua_unlock(L);
- return res;
---- src/lbaselib.c 2008/01/20 13:53:22 1.191.1.4
-+++ src/lbaselib.c 2008/02/14 16:46:22 1.191.1.6
-@@ -1,5 +1,5 @@
- /*
--** $Id: lbaselib.c,v 1.191.1.4 2008/01/20 13:53:22 roberto Exp $
-+** $Id: lbaselib.c,v 1.191.1.6 2008/02/14 16:46:22 roberto Exp $
- ** Basic library
- ** See Copyright Notice in lua.h
- */
-@@ -344,10 +344,12 @@
- luaL_checktype(L, 1, LUA_TTABLE);
- i = luaL_optint(L, 2, 1);
- e = luaL_opt(L, luaL_checkint, 3, luaL_getn(L, 1));
-+ if (i > e) return 0; /* empty range */
- n = e - i + 1; /* number of elements */
-- if (n <= 0) return 0; /* empty range */
-- luaL_checkstack(L, n, "table too big to unpack");
-- for (; i<=e; i++) /* push arg[i...e] */
-+ if (n <= 0 || !lua_checkstack(L, n)) /* n <= 0 means arith. overflow */
-+ return luaL_error(L, "too many results to unpack");
-+ lua_rawgeti(L, 1, i); /* push arg[i] (avoiding overflow problems) */
-+ while (i++ < e) /* push arg[i + 1...e] */
- lua_rawgeti(L, 1, i);
- return n;
- }
-@@ -526,7 +528,7 @@
- status = lua_resume(co, narg);
- if (status == 0 || status == LUA_YIELD) {
- int nres = lua_gettop(co);
-- if (!lua_checkstack(L, nres))
-+ if (!lua_checkstack(L, nres + 1))
- luaL_error(L, "too many results to resume");
- lua_xmove(co, L, nres); /* move yielded values */
- return nres;
---- src/ldebug.c 2007/12/28 15:32:23 2.29.1.3
-+++ src/ldebug.c 2008/05/08 16:56:26 2.29.1.6
-@@ -1,5 +1,5 @@
- /*
--** $Id: ldebug.c,v 2.29.1.3 2007/12/28 15:32:23 roberto Exp $
-+** $Id: ldebug.c,v 2.29.1.6 2008/05/08 16:56:26 roberto Exp $
- ** Debug Interface
- ** See Copyright Notice in lua.h
- */
-@@ -275,12 +275,12 @@
-
- static int precheck (const Proto *pt) {
- check(pt->maxstacksize <= MAXSTACK);
-- lua_assert(pt->numparams+(pt->is_vararg & VARARG_HASARG) <= pt->maxstacksize);
-- lua_assert(!(pt->is_vararg & VARARG_NEEDSARG) ||
-+ check(pt->numparams+(pt->is_vararg & VARARG_HASARG) <= pt->maxstacksize);
-+ check(!(pt->is_vararg & VARARG_NEEDSARG) ||
- (pt->is_vararg & VARARG_HASARG));
- check(pt->sizeupvalues <= pt->nups);
- check(pt->sizelineinfo == pt->sizecode || pt->sizelineinfo == 0);
-- check(GET_OPCODE(pt->code[pt->sizecode-1]) == OP_RETURN);
-+ check(pt->sizecode > 0 && GET_OPCODE(pt->code[pt->sizecode-1]) == OP_RETURN);
- return 1;
- }
-
-@@ -346,9 +346,18 @@
- int dest = pc+1+b;
- check(0 <= dest && dest < pt->sizecode);
- if (dest > 0) {
-- /* cannot jump to a setlist count */
-- Instruction d = pt->code[dest-1];
-- check(!(GET_OPCODE(d) == OP_SETLIST && GETARG_C(d) == 0));
-+ int j;
-+ /* check that it does not jump to a setlist count; this
-+ is tricky, because the count from a previous setlist may
-+ have the same value of an invalid setlist; so, we must
-+ go all the way back to the first of them (if any) */
-+ for (j = 0; j < dest; j++) {
-+ Instruction d = pt->code[dest-1-j];
-+ if (!(GET_OPCODE(d) == OP_SETLIST && GETARG_C(d) == 0)) break;
-+ }
-+ /* if 'j' is even, previous value is not a setlist (even if
-+ it looks like one) */
-+ check((j&1) == 0);
- }
- }
- break;
-@@ -363,7 +372,11 @@
- }
- switch (op) {
- case OP_LOADBOOL: {
-- check(c == 0 || pc+2 < pt->sizecode); /* check its jump */
-+ if (c == 1) { /* does it jump? */
-+ check(pc+2 < pt->sizecode); /* check its jump */
-+ check(GET_OPCODE(pt->code[pc+1]) != OP_SETLIST ||
-+ GETARG_C(pt->code[pc+1]) != 0);
-+ }
- break;
- }
- case OP_LOADNIL: {
-@@ -428,7 +441,10 @@
- }
- case OP_SETLIST: {
- if (b > 0) checkreg(pt, a + b);
-- if (c == 0) pc++;
-+ if (c == 0) {
-+ pc++;
-+ check(pc < pt->sizecode - 1);
-+ }
- break;
- }
- case OP_CLOSURE: {
---- src/ltablib.c 2007/12/28 15:32:23 1.38.1.2
-+++ src/ltablib.c 2008/02/14 16:46:58 1.38.1.3
-@@ -1,5 +1,5 @@
- /*
--** $Id: ltablib.c,v 1.38.1.2 2007/12/28 15:32:23 roberto Exp $
-+** $Id: ltablib.c,v 1.38.1.3 2008/02/14 16:46:58 roberto Exp $
- ** Library for Table Manipulation
- ** See Copyright Notice in lua.h
- */
-@@ -132,6 +132,15 @@
- }
-
-
-+static void addfield (lua_State *L, luaL_Buffer *b, int i) {
-+ lua_rawgeti(L, 1, i);
-+ if (!lua_isstring(L, -1))
-+ luaL_error(L, "invalid value (%s) at index %d in table for "
-+ LUA_QL("concat"), luaL_typename(L, -1), i);
-+ luaL_addvalue(b);
-+}
-+
-+
- static int tconcat (lua_State *L) {
- luaL_Buffer b;
- size_t lsep;
-@@ -141,13 +150,12 @@
- i = luaL_optint(L, 3, 1);
- last = luaL_opt(L, luaL_checkint, 4, luaL_getn(L, 1));
- luaL_buffinit(L, &b);
-- for (; i <= last; i++) {
-- lua_rawgeti(L, 1, i);
-- luaL_argcheck(L, lua_isstring(L, -1), 1, "table contains non-strings");
-- luaL_addvalue(&b);
-- if (i != last)
-- luaL_addlstring(&b, sep, lsep);
-+ for (; i < last; i++) {
-+ addfield(L, &b, i);
-+ luaL_addlstring(&b, sep, lsep);
- }
-+ if (i == last) /* add last value (if interval was not empty) */
-+ addfield(L, &b, i);
- luaL_pushresult(&b);
- return 1;
- }
---- src/luaconf.h 2008/01/18 17:07:48 1.82.1.6
-+++ src/luaconf.h 2008/02/11 16:25:08 1.82.1.7
-@@ -1,5 +1,5 @@
- /*
--** $Id: luaconf.h,v 1.82.1.6 2008/01/18 17:07:48 roberto Exp $
-+** $Id: luaconf.h,v 1.82.1.7 2008/02/11 16:25:08 roberto Exp $
- ** Configuration file for Lua
- ** See Copyright Notice in lua.h
- */
-@@ -440,10 +440,10 @@
- @* can use.
- ** CHANGE it if you need lots of (Lua) stack space for your C
- ** functions. This limit is arbitrary; its only purpose is to stop C
--** functions to consume unlimited stack space.
-+** functions to consume unlimited stack space. (must be smaller than
-+** -LUA_REGISTRYINDEX)
- */
--#define LUAI_MCS_AUX ((int)(INT_MAX / (4*sizeof(LUA_NUMBER))))
--#define LUAI_MAXCSTACK (LUAI_MCS_AUX > SHRT_MAX ? SHRT_MAX : LUAI_MCS_AUX)
-+#define LUAI_MAXCSTACK 8000
-
-
-
---- src/lundump.c 2008/01/18 16:39:11 2.7.1.2
-+++ src/lundump.c 2008/04/04 19:51:41 2.7.1.4
-@@ -1,5 +1,5 @@
- /*
--** $Id: lundump.c,v 2.7.1.2 2008/01/18 16:39:11 roberto Exp $
-+** $Id: lundump.c,v 2.7.1.4 2008/04/04 19:51:41 roberto Exp $
- ** load precompiled Lua chunks
- ** See Copyright Notice in lua.h
- */
-@@ -48,7 +48,6 @@
- static void LoadBlock(LoadState* S, void* b, size_t size)
- {
- size_t r=luaZ_read(S->Z,b,size);
-- UNUSED(r);
- IF (r!=0, "unexpected end");
- }
-
-@@ -115,7 +114,7 @@
- setnilvalue(o);
- break;
- case LUA_TBOOLEAN:
-- setbvalue(o,LoadChar(S));
-+ setbvalue(o,LoadChar(S)!=0);
- break;
- case LUA_TNUMBER:
- setnvalue(o,LoadNumber(S));
-@@ -161,7 +160,9 @@
-
- static Proto* LoadFunction(LoadState* S, TString* p)
- {
-- Proto* f=luaF_newproto(S->L);
-+ Proto* f;
-+ if (++S->L->nCcalls > LUAI_MAXCCALLS) error(S,"code too deep");
-+ f=luaF_newproto(S->L);
- setptvalue2s(S->L,S->L->top,f); incr_top(S->L);
- f->source=LoadString(S); if (f->source==NULL) f->source=p;
- f->linedefined=LoadInt(S);
-@@ -175,6 +176,7 @@
- LoadDebug(S,f);
- IF (!luaG_checkcode(f), "bad code");
- S->L->top--;
-+ S->L->nCcalls--;
- return f;
- }
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20081011/d977a6a4/attachment.html
More information about the macports-changes
mailing list