lua5.3: backport CVE fix
[openwrt/staging/wigyori.git] / package / utils / lua5.3 / patches / 001-include-version-number.patch
1 From 96576b44a1b368bd6590eb0778ae45cc9ccede3f Mon Sep 17 00:00:00 2001
2 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
3 Date: Fri, 21 Jun 2019 14:08:38 +0200
4 Subject: [PATCH] include version number
5
6 Including it allows multiple lua versions to coexist.
7
8 Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
9 ---
10
11 --- a/Makefile
12 +++ b/Makefile
13 @@ -12,7 +12,7 @@ PLAT= none
14 # LUA_ROOT, LUA_LDIR, and LUA_CDIR in luaconf.h.
15 INSTALL_TOP= /usr/local
16 INSTALL_BIN= $(INSTALL_TOP)/bin
17 -INSTALL_INC= $(INSTALL_TOP)/include
18 +INSTALL_INC= $(INSTALL_TOP)/include/lua$V
19 INSTALL_LIB= $(INSTALL_TOP)/lib
20 INSTALL_MAN= $(INSTALL_TOP)/man/man1
21 INSTALL_LMOD= $(INSTALL_TOP)/share/lua/$V
22 @@ -39,10 +39,10 @@ RM= rm -f
23 PLATS= aix bsd c89 freebsd generic linux macosx mingw posix solaris
24
25 # What to install.
26 -TO_BIN= lua luac
27 +TO_BIN= lua$V luac$V
28 TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp
29 -TO_LIB= liblua.a
30 -TO_MAN= lua.1 luac.1
31 +TO_LIB= liblua$V.a
32 +TO_MAN= lua$V.1 luac$V.1
33
34 # Lua version and release.
35 V= 5.3
36 @@ -52,7 +52,7 @@ R= $V.4
37 all: $(PLAT)
38
39 $(PLATS) clean:
40 - cd src && $(MAKE) $@
41 + cd src && $(MAKE) $@ V=$V
42
43 test: dummy
44 src/lua -v
45 diff --git a/doc/lua.1 b/doc/lua5.3.1
46 rename from doc/lua.1
47 rename to doc/lua5.3.1
48 diff --git a/doc/luac.1 b/doc/luac5.3.1
49 rename from doc/luac.1
50 rename to doc/luac5.3.1
51 diff --git a/src/Makefile b/src/Makefile
52 --- a/src/Makefile
53 +++ b/src/Makefile
54 @@ -28,7 +28,7 @@ MYOBJS=
55
56 PLATS= aix bsd c89 freebsd generic linux macosx mingw posix solaris
57
58 -LUA_A= liblua.a
59 +LUA_A= liblua$V.a
60 CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \
61 lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \
62 ltm.o lundump.o lvm.o lzio.o
63 @@ -36,10 +36,10 @@ LIB_O= lauxlib.o lbaselib.o lbitlib.o lc
64 lmathlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o loadlib.o linit.o
65 BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS)
66
67 -LUA_T= lua
68 +LUA_T= lua$V
69 LUA_O= lua.o
70
71 -LUAC_T= luac
72 +LUAC_T= luac$V
73 LUAC_O= luac.o
74
75 ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)