Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=323f29c7336f2811525e601c06ff429c5cb098f0
commit 323f29c7336f2811525e601c06ff429c5cb098f0 Author: crazy <[email protected]> Date: Fri Mar 11 15:56:44 2016 +0100 lua-5.3.2-1-x86_64 * version bump * built with compat_api for 5.1* and 5.2* * ohh man such a ugly package diff --git a/source/devel/lua/CVE-2014-5461.patch b/source/devel/lua/CVE-2014-5461.patch deleted file mode 100644 index 31d3b8b..0000000 --- a/source/devel/lua/CVE-2014-5461.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Enrico Tassi <[email protected]> -Date: Tue, 26 Aug 2014 16:20:55 +0200 -Subject: Fix stack overflow in vararg functions - ---- - src/ldo.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/ldo.c b/src/ldo.c -index d1bf786..30333bf 100644 ---- a/src/ldo.c -+++ b/src/ldo.c -@@ -274,7 +274,7 @@ int luaD_precall (lua_State *L, StkId func, int nresults) { - CallInfo *ci; - StkId st, base; - Proto *p = cl->p; -- luaD_checkstack(L, p->maxstacksize); -+ luaD_checkstack(L, p->maxstacksize + p->numparams); - func = restorestack(L, funcr); - if (!p->is_vararg) { /* no varargs? */ - base = func + 1; diff --git a/source/devel/lua/FrugalBuild b/source/devel/lua/FrugalBuild index 265385d..cb2c1c6 100644 --- a/source/devel/lua/FrugalBuild +++ b/source/devel/lua/FrugalBuild @@ -2,44 +2,36 @@ # Maintainer: crazy <[email protected]> # Contributor: Laszlo Dvornik <[email protected]> +### NOTE: V= and R= in lua.pc has to be changed on relbumps/version bumps!!! pkgname=lua -pkgver=5.1.5 -pkgrel=5 +pkgver=5.3.2 +pkgrel=1 pkgdesc="A powerful light-weight programming language designed for extending applications." url="http://www.lua.org/"; -depends=('readline>=6.3-6' 'ncurses>=6.0-3') +depends=('readline>=6.3-6' 'ncurses>=6.0-3' 'glibc>=2.22-10') groups=('devel' 'devel-core') archs=('i686' 'x86_64' 'arm') up2date="Flasttar 'http://www.lua.org/ftp/'" -source=($url/ftp/$pkgname-$pkgver.tar.gz \ - $pkgname-5.1.1-{cflags,prefix,sharedlibs}.diff) -sha1sums=('b3882111ad02ecc6b972f8c1241647905cb2e3fc' \ - '0d5d6b2aeab1ca8bde5f65d77d40d5a23b79b2c8' \ - 'd076610e3408397f9f5cb10f32ff3ea9af11f803' \ - 'c92bcd9338e2dcf5edc54d2f25af7c029bae6500') - - -# FSA fix *** -source=(${source[@]} CVE-2014-5461.patch) -sha1sums=(${sha1sums[@]} '21a9bc31291b1afc2b5251dcbe75ec4596189149') -# *********** - +source=($url/ftp/$pkgname-$pkgver.tar.gz lua-all.patch lua.pc) +sha1sums=('7a47adef554fdca7d0c5536148de34579134a973' \ + '25733d03319b6e62b5b4a42a8d95967351474293' \ + 'd3037d8161ee48e40fe99fbdc1acde6aa2856ff5') +options+=('static') build() { Fcd - unset MAKEFLAGS Fpatchall if [ "$CARCH" == "x86_64" ]; then - export CFLAGS="$CFLAGS -fPIC" + CFLAGS+=" -fPIC" fi - make linux || Fdie + make MYCFLAGS="$CFLAGS" MYLDFLAGS="$LDFLAGS" || Fdie make INSTALL_TOP=$Fdestdir/usr install || Fdie - Ffilerel etc/lua.pc /usr/lib/pkgconfig/lua.pc - Frm usr/lib/liblua.so - Fln liblua.so.5.1 /usr/lib/liblua.so - chmod 0755 $Fdestdir//usr/lib/liblua.so.5.1 || Fdie + Ffilerel ../lua.pc /usr/lib/pkgconfig/lua.pc + Fln liblua.so.$pkgver /usr/lib/liblua.so + Fln liblua.so.$pkgver /usr/lib/liblua.so.${pkgver%.*} + chmod 0755 $Fdestdir/usr/lib/liblua.so.$pkgver || Fdie } # optimization ok diff --git a/source/devel/lua/lua-5.1.1-cflags.diff b/source/devel/lua/lua-5.1.1-cflags.diff deleted file mode 100644 index db658ae..0000000 --- a/source/devel/lua/lua-5.1.1-cflags.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur lua-5.1.orig/src/Makefile lua-5.1/src/Makefile ---- lua-5.1.orig/src/Makefile 2006-02-16 16:45:09.000000000 +0100 -+++ lua-5.1/src/Makefile 2006-03-01 14:55:29.000000000 +0100 -@@ -8,7 +8,8 @@ - PLAT= none - - CC= gcc --CFLAGS= -O2 -Wall $(MYCFLAGS) -+CFLAGS ?= -O2 -Wall -+CFLAGS += $(MYCFLAGS) - AR= ar rcu - RANLIB= ranlib - RM= rm -f diff --git a/source/devel/lua/lua-5.1.1-prefix.diff b/source/devel/lua/lua-5.1.1-prefix.diff deleted file mode 100644 index debdf0f..0000000 --- a/source/devel/lua/lua-5.1.1-prefix.diff +++ /dev/null @@ -1,36 +0,0 @@ -diff -Naur lua-5.1.4/etc/lua.pc lua-5.1.4-2/etc/lua.pc ---- lua-5.1.4/etc/lua.pc 2008-08-08 07:46:11.000000000 -0500 -+++ lua-5.1.4-2/etc/lua.pc 2010-10-05 02:27:30.379001571 -0500 -@@ -8,7 +8,7 @@ - R= 5.1.4 - - # grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/' --prefix= /usr/local -+prefix= /usr - INSTALL_BIN= ${prefix}/bin - INSTALL_INC= ${prefix}/include - INSTALL_LIB= ${prefix}/lib -diff -Naur lua-5.1.4/Makefile lua-5.1.4-2/Makefile ---- lua-5.1.4/Makefile 2008-08-11 19:40:48.000000000 -0500 -+++ lua-5.1.4-2/Makefile 2010-10-05 02:27:21.284001613 -0500 -@@ -9,7 +9,7 @@ - - # Where to install. The installation starts in the src and doc directories, - # so take care if INSTALL_TOP is not an absolute path. --INSTALL_TOP= /usr/local -+INSTALL_TOP= /usr - INSTALL_BIN= $(INSTALL_TOP)/bin - INSTALL_INC= $(INSTALL_TOP)/include - INSTALL_LIB= $(INSTALL_TOP)/lib -diff -Naur lua-5.1.4/src/luaconf.h lua-5.1.4-2/src/luaconf.h ---- lua-5.1.4/src/luaconf.h 2008-02-11 10:25:08.000000000 -0600 -+++ lua-5.1.4-2/src/luaconf.h 2010-10-05 02:27:44.490001525 -0500 -@@ -94,7 +94,7 @@ - ".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll" - - #else --#define LUA_ROOT "/usr/local/" -+#define LUA_ROOT "/usr/" - #define LUA_LDIR LUA_ROOT "share/lua/5.1/" - #define LUA_CDIR LUA_ROOT "lib/lua/5.1/" - #define LUA_PATH_DEFAULT \ diff --git a/source/devel/lua/lua-5.1.1-sharedlibs.diff b/source/devel/lua/lua-5.1.1-sharedlibs.diff deleted file mode 100644 index bbc6c07..0000000 --- a/source/devel/lua/lua-5.1.1-sharedlibs.diff +++ /dev/null @@ -1,43 +0,0 @@ -diff -Naur lua-5.1.3/Makefile lua-5.1.3-p/Makefile ---- lua-5.1.3/Makefile 2008-01-17 18:53:37.000000000 +0100 -+++ lua-5.1.3-p/Makefile 2008-06-30 00:13:09.000000000 +0200 -@@ -38,7 +38,7 @@ - # What to install. - TO_BIN= lua luac - TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp --TO_LIB= liblua.a -+TO_LIB= liblua.a liblua.so.5.1 liblua.so - TO_MAN= lua.1 luac.1 - - # Lua version and release. -diff -Naur lua-5.1.3/src/Makefile lua-5.1.3-p/src/Makefile ---- lua-5.1.3/src/Makefile 2008-01-19 20:37:58.000000000 +0100 -+++ lua-5.1.3-p/src/Makefile 2008-06-30 00:16:49.000000000 +0200 -@@ -23,6 +23,7 @@ - PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris - - LUA_A= liblua.a -+LUA_SO= liblua.so - CORE_O= lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \ - lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o \ - lundump.o lvm.o lzio.o -@@ -36,7 +37,7 @@ - LUAC_O= luac.o print.o - - ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O) --ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) -+ALL_T= $(LUA_A) $(LUA_SO) $(LUA_T) $(LUAC_T) - ALL_A= $(LUA_A) - - default: $(PLAT) -@@ -51,6 +52,10 @@ - $(AR) $@ $? - $(RANLIB) $@ - -+$(LUA_SO): $(CORE_O) $(LIB_O) -+ $(CC) -shared -Wl,-soname,liblua.so -o [email protected] $? $(MYLDFLAGS) -+ ln -sf [email protected] $@ -+ - $(LUA_T): $(LUA_O) $(LUA_A) - $(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) - diff --git a/source/devel/lua/lua-all.patch b/source/devel/lua/lua-all.patch new file mode 100644 index 0000000..6556488 --- /dev/null +++ b/source/devel/lua/lua-all.patch @@ -0,0 +1,104 @@ +diff -Naur lua-5.3.2/Makefile lua-5.3.2-p/Makefile +--- lua-5.3.2/Makefile 2015-11-18 20:00:04.000000000 +0100 ++++ lua-5.3.2-p/Makefile 2016-03-11 15:14:14.729559377 +0100 +@@ -4,17 +4,18 @@ + # == CHANGE THE SETTINGS BELOW TO SUIT YOUR ENVIRONMENT ======================= + + # Your platform. See PLATS for possible values. +-PLAT= none ++PLAT= linux + + # Where to install. The installation starts in the src and doc directories, + # so take care if INSTALL_TOP is not an absolute path. See the local target. + # You may want to make INSTALL_LMOD and INSTALL_CMOD consistent with + # LUA_ROOT, LUA_LDIR, and LUA_CDIR in luaconf.h. +-INSTALL_TOP= /usr/local ++ ++INSTALL_TOP= /usr + INSTALL_BIN= $(INSTALL_TOP)/bin + INSTALL_INC= $(INSTALL_TOP)/include + INSTALL_LIB= $(INSTALL_TOP)/lib +-INSTALL_MAN= $(INSTALL_TOP)/man/man1 ++INSTALL_MAN= $(INSTALL_TOP)/share/man/man1 + INSTALL_LMOD= $(INSTALL_TOP)/share/lua/$V + INSTALL_CMOD= $(INSTALL_TOP)/lib/lua/$V + +@@ -41,7 +42,7 @@ + # What to install. + TO_BIN= lua luac + TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp +-TO_LIB= liblua.a ++TO_LIB= liblua.a liblua.so.$R + TO_MAN= lua.1 luac.1 + + # Lua version and release. +@@ -52,7 +53,7 @@ + all: $(PLAT) + + $(PLATS) clean: +- cd src && $(MAKE) $@ ++ cd src && $(MAKE) $@ V=$(V) R=$(R) + + test: dummy + src/lua -v +diff -Naur lua-5.3.2/src/luaconf.h lua-5.3.2-p/src/luaconf.h +--- lua-5.3.2/src/luaconf.h 2015-10-21 20:17:40.000000000 +0200 ++++ lua-5.3.2-p/src/luaconf.h 2016-03-11 14:52:55.006943115 +0100 +@@ -188,7 +188,7 @@ + + #else /* }{ */ + +-#define LUA_ROOT "/usr/local/" ++#define LUA_ROOT "/usr/" + #define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR "/" + #define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR "/" + #define LUA_PATH_DEFAULT \ +diff -Naur lua-5.3.2/src/Makefile lua-5.3.2-p/src/Makefile +--- lua-5.3.2/src/Makefile 2015-05-27 13:10:11.000000000 +0200 ++++ lua-5.3.2-p/src/Makefile 2016-03-11 14:56:25.475907615 +0100 +@@ -4,11 +4,11 @@ + # == CHANGE THE SETTINGS BELOW TO SUIT YOUR ENVIRONMENT ======================= + + # Your platform. See PLATS for possible values. +-PLAT= none ++PLAT= linux + +-CC= gcc -std=gnu99 +-CFLAGS= -O2 -Wall -Wextra -DLUA_COMPAT_5_2 $(SYSCFLAGS) $(MYCFLAGS) +-LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS) ++CC = gcc -std=gnu99 ++CFLAGS = $(MYCFLAGS) -Wall -Wextra -DLUA_COMPAT_5_1 -DLUA_COMPAT_5_2 $(SYSCFLAGS) ++LDFLAGS = $(SYSLDFLAGS) $(MYLDFLAGS) + LIBS= -lm $(SYSLIBS) $(MYLIBS) + + AR= ar rcu +@@ -29,6 +29,7 @@ + PLATS= aix bsd c89 freebsd generic linux macosx mingw posix solaris + + LUA_A= liblua.a ++LUA_SO= liblua.so + CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \ + lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \ + ltm.o lundump.o lvm.o lzio.o +@@ -43,7 +44,7 @@ + LUAC_O= luac.o + + ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O) +-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) ++ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO) + ALL_A= $(LUA_A) + + # Targets start here. +@@ -59,6 +60,12 @@ + $(AR) $@ $(BASE_O) + $(RANLIB) $@ + ++$(LUA_SO): $(CORE_O) $(LIB_O) ++ $(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS) ++ ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V) ++ ln -sf $(LUA_SO).$(R) $(LUA_SO) ++ ++ + $(LUA_T): $(LUA_O) $(LUA_A) + $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) + diff --git a/source/devel/lua/lua.pc b/source/devel/lua/lua.pc new file mode 100644 index 0000000..34ad0a8 --- /dev/null +++ b/source/devel/lua/lua.pc @@ -0,0 +1,20 @@ +V=5.3 +R=5.3.2 + +prefix=/usr +INSTALL_BIN=${prefix}/bin +INSTALL_INC=${prefix}/include +INSTALL_LIB=${prefix}/lib +INSTALL_MAN=${prefix}share//man/man1 +INSTALL_LMOD=${prefix}/share/lua/${V} +INSTALL_CMOD=${prefix}/lib/lua/${V} +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: Lua +Description: An Extensible Extension Language +Version: ${R} +Requires: +Libs: -L${libdir} -llua -lm +Cflags: -I${includedir} _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
