RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: rse@rpm5.org
Module: rpm lua Date: 23-Aug-2008 09:42:01
Branch: rpm-5_1 Handle: 2008082307420001
Modified files: (Branch: rpm-5_1)
lua lapi.c loadlib.c lobject.h lstrlib.c lua.h
lualib.h
rpm CHANGES INSTALL devtool.conf
Log:
upgrade to Lua 5.1.4
Summary:
Revision Changes Path
1.4.2.2 +7 -4 lua/lapi.c
1.2.2.1 +5 -3 lua/loadlib.c
1.4.2.1 +2 -2 lua/lobject.h
1.2.2.1 +3 -2 lua/lstrlib.c
1.2.2.1 +2 -2 lua/lua.h
1.2.2.2 +1 -0 lua/lualib.h
1.2288.2.102+1 -0 rpm/CHANGES
2.93.2.4 +1 -1 rpm/INSTALL
2.205.2.16 +1 -1 rpm/devtool.conf
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: lua/lapi.c
============================================================================
$ cvs diff -u -r1.4.2.1 -r1.4.2.2 lapi.c
--- lua/lapi.c 8 Jun 2008 09:25:21 -0000 1.4.2.1
+++ lua/lapi.c 23 Aug 2008 07:42:01 -0000 1.4.2.2
@@ -1,5 +1,5 @@
/*
-** $Id: lapi.c,v 2.55.1.4 2008/02/14 16:46:39 roberto Exp $
+** $Id: lapi.c,v 2.55.1.5 2008/07/04 18:41:18 roberto Exp $
** Lua API
** See Copyright Notice in lua.h
*/
@@ -929,10 +929,13 @@
g->GCthreshold = g->totalbytes - a;
else
g->GCthreshold = 0;
- while (g->GCthreshold <= g->totalbytes)
+ while (g->GCthreshold <= g->totalbytes) {
luaC_step(L);
- if (g->gcstate == GCSpause) /* end of cycle? */
- res = 1; /* signal it */
+ if (g->gcstate == GCSpause) { /* end of cycle? */
+ res = 1; /* signal it */
+ break;
+ }
+ }
break;
}
case LUA_GCSETPAUSE: {
@@ .
patch -p0 <<'@@ .'
Index: lua/loadlib.c
============================================================================
$ cvs diff -u -r1.2 -r1.2.2.1 loadlib.c
--- lua/loadlib.c 25 Jan 2008 16:54:30 -0000 1.2
+++ lua/loadlib.c 23 Aug 2008 07:42:01 -0000 1.2.2.1
@@ -1,5 +1,5 @@
/*
-** $Id: loadlib.c,v 1.52.1.2 2007/12/28 14:58:43 roberto Exp $
+** $Id: loadlib.c,v 1.52.1.3 2008/08/06 13:29:28 roberto Exp $
** Dynamic library loader for Lua
** See Copyright Notice in lua.h
**
@@ -506,8 +506,10 @@
static void setfenv (lua_State *L) {
lua_Debug ar;
- lua_getstack(L, 1, &ar);
- lua_getinfo(L, "f", &ar);
+ if (lua_getstack(L, 1, &ar) == 0 ||
+ lua_getinfo(L, "f", &ar) == 0 || /* get calling function */
+ lua_iscfunction(L, -1))
+ luaL_error(L, LUA_QL("module") " not called from a Lua function");
lua_pushvalue(L, -2);
lua_setfenv(L, -2);
lua_pop(L, 1);
@@ .
patch -p0 <<'@@ .'
Index: lua/lobject.h
============================================================================
$ cvs diff -u -r1.4 -r1.4.2.1 lobject.h
--- lua/lobject.h 25 Jan 2008 16:54:30 -0000 1.4
+++ lua/lobject.h 23 Aug 2008 07:42:01 -0000 1.4.2.1
@@ -1,5 +1,5 @@
/*
-** $Id: lobject.h,v 2.20.1.1 2007/12/27 13:02:25 roberto Exp $
+** $Id: lobject.h,v 2.20.1.2 2008/08/06 13:29:48 roberto Exp $
** Type definitions for Lua objects
** See Copyright Notice in lua.h
*/
@@ -208,7 +208,7 @@
#define getstr(ts) cast(const char *, (ts) + 1)
-#define svalue(o) getstr(tsvalue(o))
+#define svalue(o) getstr(rawtsvalue(o))
@@ .
patch -p0 <<'@@ .'
Index: lua/lstrlib.c
============================================================================
$ cvs diff -u -r1.2 -r1.2.2.1 lstrlib.c
--- lua/lstrlib.c 25 Jan 2008 16:54:30 -0000 1.2
+++ lua/lstrlib.c 23 Aug 2008 07:42:01 -0000 1.2.2.1
@@ -1,5 +1,5 @@
/*
-** $Id: lstrlib.c,v 1.132.1.3 2007/12/28 15:32:23 roberto Exp $
+** $Id: lstrlib.c,v 1.132.1.4 2008/07/11 17:27:21 roberto Exp $
** Standard library for string operations and pattern-matching
** See Copyright Notice in lua.h
*/
@@ -35,7 +35,8 @@
static ptrdiff_t posrelat (ptrdiff_t pos, size_t len) {
/* relative string position: negative means back from end */
- return (pos>=0) ? pos : (ptrdiff_t)len+pos+1;
+ if (pos < 0) pos += (ptrdiff_t)len + 1;
+ return (pos >= 0) ? pos : 0;
}
@@ .
patch -p0 <<'@@ .'
Index: lua/lua.h
============================================================================
$ cvs diff -u -r1.2 -r1.2.2.1 lua.h
--- lua/lua.h 25 Jan 2008 16:54:30 -0000 1.2
+++ lua/lua.h 23 Aug 2008 07:42:01 -0000 1.2.2.1
@@ -1,5 +1,5 @@
/*
-** $Id: lua.h,v 1.218.1.4 2008/01/03 15:41:15 roberto Exp $
+** $Id: lua.h,v 1.218.1.5 2008/08/06 13:30:12 roberto Exp $
** Lua - An Extensible Extension Language
** Lua.org, PUC-Rio, Brazil (http://www.lua.org)
** See Copyright Notice at the end of this file
@@ -17,7 +17,7 @@
#define LUA_VERSION "Lua 5.1"
-#define LUA_RELEASE "Lua 5.1.3"
+#define LUA_RELEASE "Lua 5.1.4"
#define LUA_VERSION_NUM 501
#define LUA_COPYRIGHT "Copyright (C) 1994-2008 Lua.org, PUC-Rio"
#define LUA_AUTHORS "R. Ierusalimschy, L. H. de Figueiredo & W. Celes"
@@ .
patch -p0 <<'@@ .'
Index: lua/lualib.h
============================================================================
$ cvs diff -u -r1.2.2.1 -r1.2.2.2 lualib.h
--- lua/lualib.h 18 Aug 2008 19:47:16 -0000 1.2.2.1
+++ lua/lualib.h 23 Aug 2008 07:42:01 -0000 1.2.2.2
@@ -39,6 +39,7 @@
#define LUA_LOADLIBNAME "package"
LUALIB_API int (luaopen_package) (lua_State *L);
+
/* open all previous libraries */
LUALIB_API void (luaL_openlibs) (lua_State *L);
@@ .
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2288.2.101 -r1.2288.2.102 CHANGES
--- rpm/CHANGES 22 Aug 2008 04:58:59 -0000 1.2288.2.101
+++ rpm/CHANGES 23 Aug 2008 07:42:00 -0000 1.2288.2.102
@@ -1,4 +1,5 @@
5.1.4 -> 5.1.5:
+ - rse: upgrade embedded Lua from version 5.1.3 to 5.1.4
- jbj: WR: remove --with-path-versioned in devtool targets.
- jbj: WR: remove $(VERION) from macros paths in devtool targets.
- jbj: WR: fix: cleanup patch integration thinkos.
@@ .
patch -p0 <<'@@ .'
Index: rpm/INSTALL
============================================================================
$ cvs diff -u -r2.93.2.3 -r2.93.2.4 INSTALL
--- rpm/INSTALL 15 Jun 2008 07:10:52 -0000 2.93.2.3
+++ rpm/INSTALL 23 Aug 2008 07:42:00 -0000 2.93.2.4
@@ -35,7 +35,7 @@
Neon optional 0.26.0 0.28.1 http://www.webdav.org/neon/
Berkeley-DB [1] optional 4.5 4.7.25 http://www.oracle.com/database/berkeley-db.html
SQLite [1] optional 3.3 3.5.9 http://www.sqlite.org/
-Lua [2] optional 5.1 5.1.3 http://www.lua.org/
+Lua [2] optional 5.1 5.1.4 http://www.lua.org/
ZLib [3] optional 1.2 1.2.3 http://www.zlib.net/
Bzip2 optional 1.0 1.0.5 http://www.bzip.org/
LZMA Utils optional 4.42.2 4.999.3 http://tukaani.org/lzma/
@@ .
patch -p0 <<'@@ .'
Index: rpm/devtool.conf
============================================================================
$ cvs diff -u -r2.205.2.15 -r2.205.2.16 devtool.conf
--- rpm/devtool.conf 22 Aug 2008 04:58:59 -0000 2.205.2.15
+++ rpm/devtool.conf 23 Aug 2008 07:42:00 -0000 2.205.2.16
@@ -302,7 +302,7 @@
v_beecrypt="4.1.2"
v_db="4.7.25"
v_sqlite="3.5.9"
- v_lua="5.1.3"
+ v_lua="5.1.4"
v_file="4.24"
v_popt="1.14"
v_libxml2="2.6.32"
@@ .
Received on Sat Aug 23 09:42:01 2008