rpms
/
lua
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Drop compat-lua-libs package, as there now is a separate compat-lua 

package (including a -devel)
This commit is contained in:
Hans de Goede 2013-08-05 22:10:14 +02:00
parent c7fdd0a771
commit 68422ad970
6 changed files with 7 additions and 43935 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

195
lua-5.1.4-2.patch
View File

@ -1,195 +0,0 @@
# patch-lua-5.1.4-2 created 2010-05-14T21:02:40-0300
# 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-2
# patch < patch-lua-5.1.4-2
# use curl -O -R if you don't have wget
--- lcode.c 2007/12/28 15:32:23 2.25.1.3
+++ lcode.c 2009/06/15 14:12:25 2.25.1.4
@@ -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.4 2009/06/15 14:12:25 roberto Exp $
** Code generator for Lua
** See Copyright Notice in lua.h
*/
@@ -544,15 +544,18 @@
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;
break;
}
+ case VFALSE: {
+ if (!hasjumps(e)) {
+ pc = luaK_jump(fs); /* always jump */
+ break;
+ }
+ /* else go through */
+ }
default: {
pc = jumponcond(fs, e, 0);
break;
@@ -572,14 +575,17 @@
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;
}
+ case VTRUE: {
+ if (!hasjumps(e)) {
+ pc = luaK_jump(fs); /* always jump */
+ break;
+ }
+ /* else go through */
+ }
default: {
pc = jumponcond(fs, e, 1);
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;
}
--- 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]);
--- 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 2009/07/01 21:10:33 2.63.1.4
@@ -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 $
** 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? */
@@ -152,7 +153,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");
}

43660
lua-5.1.4-autotoolize.patch
View File

File diff suppressed because it is too large Load Diff

12
lua-5.1.4-idsize.patch
View File

@ -1,12 +0,0 @@
diff -urN lua-5.1.4/src/luaconf.h.template.in lua-5.1.4.idsize/src/luaconf.h.template.in
--- lua-5.1.4/src/luaconf.h.template.in 2011-01-28 19:18:03.176584291 +0100
+++ lua-5.1.4.idsize/src/luaconf.h.template.in 2011-01-28 19:19:26.581213131 +0100
@@ -216,7 +216,7 @@
@* of a function in debug information.
** CHANGE it if you want a different size.
*/
-#define LUA_IDSIZE 60
+#define LUA_IDSIZE 512
/*

11
lua-5.1.4-lunatic.patch
View File

@ -1,11 +0,0 @@
--- src/loadlib.c.orig 2010-02-09 16:58:47.000000000 -0600
+++ src/loadlib.c 2010-02-09 16:59:12.000000000 -0600
@@ -66,7 +66,7 @@
static void *ll_load (lua_State *L, const char *path) {
- void *lib = dlopen(path, RTLD_NOW);
+ void *lib = dlopen(path, RTLD_NOW|RTLD_GLOBAL);
if (lib == NULL) lua_pushstring(L, dlerror());
return lib;
}

63
lua.spec
View File

@ -10,18 +10,11 @@ Group: Development/Languages
License: MIT
URL: http://www.lua.org/
Source0: http://www.lua.org/ftp/lua-%{version}.tar.gz
Source1: http://www.lua.org/ftp/lua-%{legacy_version}.tar.gz
Patch0: %{name}-%{version}-autotoolize.patch
Patch1: %{name}-%{version}-idsize.patch
Patch2: %{name}-%{version}-luac-shared-link-fix.patch
Patch3: %{name}-%{version}-configure-compat-module.patch
Patch4: %{name}-%{version}-configure-linux.patch
# Legacy patches for compat-lua-libs
Patch10: lua-5.1.4-autotoolize.patch
Patch11: lua-5.1.4-lunatic.patch
Patch12: lua-5.1.4-idsize.patch
Patch13: lua-5.1.4-2.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: automake autoconf libtool readline-devel ncurses-devel
Provides: lua(abi) = %{major_version}
@ -52,17 +45,9 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%description static
This package contains the static version of liblua for %{name}.
%package -n compat-lua-libs
Version: %{legacy_version}
Summary: Powerful light-weight programming language (compat version)
Provides: lua(abi) = %{legacy_version}
Provides: lua = %{legacy_version}
%description -n compat-lua-libs
This package contains a compatibility version of lua (%{legacy_version}).
%prep
%setup -q -a 1
%setup -q
mv src/luaconf.h src/luaconf.h.template.in
%patch0 -p1 -E -z .autoxxx
%patch1 -p1 -z .idsize
@ -71,15 +56,6 @@ mv src/luaconf.h src/luaconf.h.template.in
%patch4 -p1 -z .configure-linux
autoreconf -i
# legacy
pushd lua-%{legacy_version}
%patch10 -p1 -E -z .legacy-autoxxx
%patch11 -p0 -z .legacy-lunatic
%patch12 -p1 -z .legacy-idsize
%patch13 -p0 -d src -z .legacy-bugfix2
# fix perms on auto files
chmod u+x autogen.sh config.guess config.sub configure depcomp install-sh missing
popd
%build
%configure --with-readline --with-compat-module
@ -92,35 +68,15 @@ sed -i 's|@pkgdatadir@|%{_datadir}|g' src/luaconf.h.template
# only one which needs this and otherwise we get License troubles
make %{?_smp_mflags} LIBS="-lm -ldl" luac_LDADD="liblua.la -lm -ldl"
# legacy
pushd lua-%{legacy_version}
%configure --with-readline
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
# hack so that only /usr/bin/lua gets linked with readline as it is the
# only one which needs this and otherwise we get License troubles
make %{?_smp_mflags} LIBS="-lm -ldl" luac_LDADD="liblua.la -lm -ldl"
popd
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm $RPM_BUILD_ROOT%{_libdir}/*.la
mkdir -p $RPM_BUILD_ROOT%{_libdir}/lua/%{major_version}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/lua/%{major_version}
# legacy
pushd lua-%{legacy_version}
cp -a ./src/.libs/liblua-%{legacy_major_version}.so $RPM_BUILD_ROOT%{_libdir}/
mkdir -p $RPM_BUILD_ROOT%{_libdir}/lua/%{legacy_major_version}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/lua/%{legacy_major_version}
popd
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc README doc/*.html doc/*.css doc/*.gif doc/*.png
%{_bindir}/lua
%{_bindir}/luac
@ -132,25 +88,20 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_datadir}/lua/%{major_version}
%files devel
%defattr(-,root,root,-)
%{_includedir}/l*.h
%{_includedir}/l*.hpp
%{_libdir}/liblua.so
%{_libdir}/pkgconfig/*.pc
%files static
%defattr(-,root,root,-)
%{_libdir}/*.a
%files -n compat-lua-libs
%doc lua-%{legacy_version}/README
%{_libdir}/liblua-5.1.so
%dir %{_libdir}/lua
%dir %{_libdir}/lua/%{legacy_major_version}
%dir %{_datadir}/lua
%dir %{_datadir}/lua/%{legacy_major_version}
%changelog
* Mon Aug 05 2013 Hans de Goede <hdegoede@redhat.com> - 5.2.2-3
- Drop compat-lua-libs package, as there now is a separate compat-lua
package (including a -devel)
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.2.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
@ -243,7 +194,7 @@ rm -rf $RPM_BUILD_ROOT
- New upstream release 5.1.1
- Fix detection of readline during compile (iow add readline support back)
* Mon Aug 27 2006 Michael J. Knox <michael[AT]knox.net.nz> - 5.1-7
* Sun Aug 27 2006 Michael J. Knox <michael[AT]knox.net.nz> - 5.1-7
- Rebuild for FC6
* Thu Jun 08 2006 Michael J. Knox <michael[AT]knox.net.nz> - 5.1-6
@ -271,7 +222,7 @@ rm -rf $RPM_BUILD_ROOT
* Sun May 22 2005 Jeremy Katz <katzj@redhat.com> - 5.0.2-4
- rebuild on all arches
* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 5.0.2-3
* Thu Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 5.0.2-3
- rebuilt
* Sat Feb 12 2005 David Woodhouse <dwmw2@infradead.org> - 5.0.2-2

1
sources
View File

@ -1,2 +1 @@
d0870f2de55d59c1c8419f36e8fac150 lua-5.1.4.tar.gz
efbb645e897eae37cad4344ce8b0a614 lua-5.2.2.tar.gz