OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 25-Jan-2008 16:47:57
Branch: HEAD Handle: 2008012515475700
Modified files:
openpkg-src/lua lua.patch lua.spec
Log:
upgrading package: lua 5.1.2 -> 5.1.3
Summary:
Revision Changes Path
1.5 +0 -76 openpkg-src/lua/lua.patch
1.24 +2 -2 openpkg-src/lua/lua.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/lua/lua.patch
============================================================================
$ cvs diff -u -r1.4 -r1.5 lua.patch
--- openpkg-src/lua/lua.patch 25 Aug 2007 08:12:27 -0000 1.4
+++ openpkg-src/lua/lua.patch 25 Jan 2008 15:47:57 -0000 1.5
@@ -58,79 +58,3 @@
#endif
#if defined(LUA_USE_MACOSX)
-
------------------------------------------------------------------------------
-
-Lua 5.1.2 patches 1-7
-http://www.lua.org/bugs.html
-
-Index: src/lcode.c
---- src/lcode.c 15 Jul 2007 17:56:10 -0000 1.3
-+++ src/lcode.c 25 Aug 2007 08:09:13 -0000
-@@ -699,7 +699,7 @@
- e2.t = e2.f = NO_JUMP; e2.k = VKNUM; e2.u.nval = 0;
- switch (op) {
- case OPR_MINUS: {
-- if (e->k == VK)
-+ if (!isnumeral(e))
- luaK_exp2anyreg(fs, e); /* cannot operate on non-numeric constants
*/
- codearith(fs, OP_UNM, e, &e2);
- break;
-Index: src/ldebug.c
---- src/ldebug.c 15 Jul 2007 17:56:10 -0000 1.3
-+++ src/ldebug.c 25 Aug 2007 08:09:14 -0000
-@@ -563,8 +563,8 @@
-
-
- void luaG_concaterror (lua_State *L, StkId p1, StkId p2) {
-- if (ttisstring(p1)) p1 = p2;
-- lua_assert(!ttisstring(p1));
-+ if (ttisstring(p1) || ttisnumber(p1)) p1 = p2;
-+ lua_assert(!ttisstring(p1) && !ttisnumber(p1));
- luaG_typeerror(L, p1, "concatenate");
- }
-
-Index: src/lparser.c
---- src/lparser.c 15 Jul 2007 17:56:10 -0000 1.4
-+++ src/lparser.c 25 Aug 2007 08:09:14 -0000
-@@ -938,6 +938,8 @@
- primaryexp(ls, &nv.v);
- if (nv.v.k == VLOCAL)
- check_conflict(ls, lh, &nv.v);
-+ luaY_checklimit(ls->fs, nvars, LUAI_MAXCCALLS - ls->L->nCcalls,
-+ "variable names");
- assignment(ls, &nv, nvars+1);
- }
- else { /* assignment -> `=' explist1 */
-Index: src/ltable.c
---- src/ltable.c 15 Jul 2007 17:56:11 -0000 1.3
-+++ src/ltable.c 25 Aug 2007 08:09:14 -0000
-@@ -84,8 +84,8 @@
- static Node *hashnum (const Table *t, lua_Number n) {
- unsigned int a[numints];
- int i;
-- n += 1; /* normalize number (avoid -0) */
-- lua_assert(sizeof(a) <= sizeof(n));
-+ if (luai_numeq(n, 0)) /* avoid problems with -0 */
-+ return gnode(t, 0);
- memcpy(a, &n, sizeof(a));
- for (i = 1; i < numints; i++) a[0] += a[i];
- return hashmod(t, a[0]);
-Index: src/lvm.c
---- src/lvm.c 15 Jul 2007 17:56:11 -0000 1.4
-+++ src/lvm.c 25 Aug 2007 08:09:14 -0000
-@@ -61,11 +61,9 @@
- lu_byte mask = L->hookmask;
- const Instruction *oldpc = L->savedpc;
- L->savedpc = pc;
-- if (mask > LUA_MASKLINE) { /* instruction-hook set? */
-- if (L->hookcount == 0) {
-- resethookcount(L);
-- luaD_callhook(L, LUA_HOOKCOUNT, -1);
-- }
-+ if ((mask & LUA_MASKCOUNT) && L->hookcount == 0) {
-+ resethookcount(L);
-+ luaD_callhook(L, LUA_HOOKCOUNT, -1);
- }
- if (mask & LUA_MASKLINE) {
- Proto *p = ci_func(L->ci)->l.p;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/lua/lua.spec
============================================================================
$ cvs diff -u -r1.23 -r1.24 lua.spec
--- openpkg-src/lua/lua.spec 1 Jan 2008 14:57:42 -0000 1.23
+++ openpkg-src/lua/lua.spec 25 Jan 2008 15:47:57 -0000 1.24
@@ -31,8 +31,8 @@
Class: PLUS
Group: Language
License: MIT
-Version: 5.1.2
-Release: 20080101
+Version: 5.1.3
+Release: 20080125
# package options
%option with_readline no
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
