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

liblua51: added legacy provides for soname liblua.so.5.1 [release 5.1.5-5mamba;Mon May 13 2024]

Browse Source
This commit is contained in:
Silvan Calarco 2024-05-13 23:29:25 +02:00
parent 4c2b67c7eb
commit aa81f8ffa9
7 changed files with 147 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
lua-5.1.2-dynlib.patch
View File

@ -1,53 +0,0 @@
diff -ru lua-5.1.2/Makefile lua-5.1.2-om/Makefile
--- lua-5.1.2/Makefile 2007-10-24 10:12:17.000000000 +0200
+++ lua-5.1.2-om/Makefile 2007-10-24 10:16:22.000000000 +0200
@@ -53,7 +53,7 @@
all: $(PLAT)
$(PLATS) clean:
- cd src && $(MAKE) $@
+ cd src && $(MAKE) V=$(V) $@
test: dummy
src/lua test/hello.lua
diff -ru lua-5.1.2/src/Makefile lua-5.1.2-om/src/Makefile
--- lua-5.1.2/src/Makefile 2007-03-25 16:49:23.000000000 +0200
+++ lua-5.1.2-om/src/Makefile 2007-10-24 10:15:52.000000000 +0200
@@ -8,7 +8,7 @@
PLAT= none
CC= gcc
-CFLAGS= -O2 -Wall $(MYCFLAGS)
+CFLAGS= -O2 -Wall -fPIC $(MYCFLAGS) $(RPM_OPT_FLAGS)
AR= ar rcu
RANLIB= ranlib
RM= rm -f
@@ -22,6 +22,7 @@
PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
+LUA_SO= liblua.so.$(V)
LUA_A= liblua.a
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 \
@@ -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_T) $(LUAC_T) $(LUA_SO)
ALL_A= $(LUA_A)
default: $(PLAT)
@@ -51,6 +52,11 @@
$(AR) $@ $?
$(RANLIB) $@
+$(LUA_SO): $(CORE_O) $(LIB_O)
+ gcc -Wl,-soname=liblua.so.$(V) -shared -o $@ $(MYLDFLAGS) $? $(LIBS) $(LUA_O)
+ rm -f liblua.so
+ ln -s $@ liblua.so
+
$(LUA_T): $(LUA_O) $(LUA_A)
$(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)

11
lua-5.1.2-luapc.patch
View File

@ -1,11 +0,0 @@
--- lua-5.1.2/etc/lua.pc 2007-03-23 20:58:49.000000000 +0100
+++ lua-5.1.2/etc/lua.pc.prefix 2007-10-25 11:47:35.000000000 +0200
@@ -8,7 +8,7 @@
R= 5.1.2
# 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

12
lua-5.1.4-cross_compile.patch
View File

@ -1,12 +0,0 @@
diff -Nru lua-5.1.4.orig//src/Makefile lua-5.1.4/src/Makefile
--- lua-5.1.4.orig//src/Makefile 2010-06-16 20:13:28.242643022 +0200
+++ lua-5.1.4/src/Makefile 2010-06-16 20:14:12.930892707 +0200
@@ -53,7 +53,7 @@
$(RANLIB) $@
$(LUA_SO): $(CORE_O) $(LIB_O)
- gcc -Wl,-soname=liblua.so.$(V) -shared -o $@ $(MYLDFLAGS) $? $(LIBS) $(LUA_O)
+ $(CC) -Wl,-soname=liblua.so.$(V) -shared -o $@ $(MYLDFLAGS) $? $(LIBS) $(LUA_O)
rm -f liblua.so
ln -s $@ liblua.so

13
lua51-5.1.5-cflags.patch Normal file
View File

@ -0,0 +1,13 @@
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

66
lua51-5.1.5-coinstallability.patch Normal file
View File

@ -0,0 +1,66 @@
diff -ur lua-5.1.4/etc/lua.pc lua-5.1.4-new/etc/lua.pc
--- lua-5.1.4/etc/lua.pc 2008-08-08 14:46:11.000000000 +0200
+++ lua-5.1.4-new/etc/lua.pc 2012-02-23 18:25:34.000000000 +0100
@@ -8,6 +8,6 @@
# 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 -ur lua-5.1.4/src/luaconf.h lua-5.1.4-new/src/luaconf.h
--- lua-5.1.4/src/luaconf.h 2008-02-11 17:25:08.000000000 +0100
+++ lua-5.1.4-new/src/luaconf.h 2012-02-23 18:25:34.000000000 +0100
@@ -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 -ur lua-5.1.4/src/Makefile lua-5.1.4-new/src/Makefile
--- lua-5.1.4/src/Makefile 2008-01-19 20:37:58.000000000 +0100
+++ lua-5.1.4-new/src/Makefile 2012-02-23 18:26:43.000000000 +0100
@@ -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,11 @@
$(AR) $@ $?
$(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 $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
--- lua-5.1.4/Makefile 2008-08-12 02:40:48.000000000 +0200
+++ lua-5.1.4-new/Makefile 2012-02-23 19:06:32.000000000 +0100
@@ -53,7 +53,7 @@
all: $(PLAT)
$(PLATS) clean:
- cd src && $(MAKE) $@
+ cd src && $(MAKE) $@ V=$(V) R=$(R)
test: dummy
src/lua test/hello.lua

21
lua51-5.1.5-cve-2014-5461.patch Normal file
View File

@ -0,0 +1,21 @@
From: Enrico Tassi <gareuselesinge@debian.org>
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;

91
lua51.spec
View File

@ -3,24 +3,23 @@
Name: lua51 Name: lua51
Version: 5.1.5 Version: 5.1.5
Release: 3mamba Release: 5mamba
Summary: A powerful light-weight and embeddable programming language Summary: A powerful light-weight and embeddable programming language
Group: Applications/Development Group: Applications/Development
Vendor: openmamba Vendor: openmamba
Distribution: openmamba Distribution: openmamba
Packager: Aleph0 <aleph0@openmamba.org> Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: http://www.lua.org URL: https://lua.org/
Source: http://www.lua.org/ftp/lua-%{version}.tar.gz Source: https://lua.org/ftp/lua-%{version}.tar.gz
Patch0: lua-5.1.2-dynlib.patch Patch1: lua51-5.1.5-cve-2014-5461.patch
Patch1: lua-5.1.2-luapc.patch Patch2: lua51-5.1.5-coinstallability.patch
Patch2: lua-5.1.4-cross_compile.patch Patch3: lua51-5.1.5-cflags.patch
License: MIT License: MIT
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel BuildRequires: glibc-devel
BuildRequires: libncurses-devel BuildRequires: libncurses-devel
BuildRequires: libreadline-devel BuildRequires: libreadline-devel
## AUTOBUILDREQ-END ## AUTOBUILDREQ-END
BuildRoot: %{_tmppath}/%{name}-%{version}-root
%description %description
Lua is a powerful light-weight programming language designed for extending applications. Lua is a powerful light-weight programming language designed for extending applications.
@ -40,12 +39,16 @@ Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release}
%description devel %description devel
Lua is a powerful light-weight programming language designed for extending applications. Lua is a powerful light-weight programming language designed for extending applications.
Lua is also frequently used as a general-purpose, stand-alone language. Lua is also frequently used as a general-purpose, stand-alone language.
This package contains files needed for embedding lua into your application. This package contains files needed for embedding lua into your application.
%package -n %{libname} %package -n %{libname}
Summary: Lua is a powerful, light-weight programming language Summary: Lua is a powerful, light-weight programming language
Group: System/Libraries Group: System/Libraries
%ifarch x86_64 aarch64
Provides: liblua.so.5.1()(64bit)
%else
Provides: liblua.so.5.1
%endif
%description -n %{libname} %description -n %{libname}
Lua is a powerful light-weight programming language designed for extending applications. Lua is a powerful light-weight programming language designed for extending applications.
@ -55,6 +58,7 @@ This package contains the dynamic libraries provided by lua scripting language.
Summary: Static libraries and headers for lua Summary: Static libraries and headers for lua
Group: Development/Libraries Group: Development/Libraries
Requires: %{libname} = %{?epoch:%epoch:}%{version}-%{release} Requires: %{libname} = %{?epoch:%epoch:}%{version}-%{release}
Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release}
%description -n %{libname}-devel %description -n %{libname}-devel
Lua is a powerful light-weight programming language designed for extending applications. Lua is a powerful light-weight programming language designed for extending applications.
@ -64,50 +68,43 @@ This package contains static libraries and header files need for development.
%prep %prep
%setup -q -n lua-%{version} %setup -q -n lua-%{version}
%patch0 -p1 -b .dynlib # Taken from Arch Linux
#%patch1 -p1 -b .luapc %patch 1 -p1 -b .cve-2014-5461
#%patch2 -p1 %patch 2 -p1 -b .coinstallability
%patch 3 -p1 -b .cflags
sed -e 's:llua:llua5.1:' -e 's:/include:/include/lua5.1:' -i etc/lua.pc
sed -r -e '/^LUA_(SO|A|T)=/ s/lua/lua5.1/' -e '/^LUAC_T=/ s/luac/luac5.1/' -i src/Makefile
%build %build
##% make linux ##% make linux
%make -j1 -C src \ %make -j1 \
CC=%{_host}-gcc \ CC=%{_host}-gcc \
MYCFLAGS="$RPM_OPT_FLAGS -fPIC -DLUA_USE_LINUX" \ MYCFLAGS="%{optflags} -fPIC -DLUA_USE_LINUX" \
MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses" V=%{majver} all MYLDFLAGS="-Wl,-E -ldl -lreadline -lhistory -lncurses" \
linux
%install %install
[ "%{buildroot}" != / ] && rm -rf %{buildroot} [ "%{buildroot}" != / ] && rm -rf %{buildroot}
%makeinstall \ %makeinstall \
TO_BIN='lua5.1 luac5.1' \
TO_LIB="liblua5.1.so liblua5.1.so.5.1 liblua5.1.so.%{version}" \
INSTALL_DATA='cp -d' \
INSTALL_TOP=%{buildroot}%{_prefix} \ INSTALL_TOP=%{buildroot}%{_prefix} \
INSTALL_INC=%{buildroot}%{_includedir}/lua%{majver} \ INSTALL_INC=%{buildroot}%{_includedir}/lua%{majver} \
INSTALL_LIB=%{buildroot}%{_libdir} \ INSTALL_LIB=%{buildroot}%{_libdir} \
INSTALL_MAN=%{buildroot}%{_mandir}/man1 INSTALL_MAN=%{buildroot}%{_mandir}/man1
install -d %{buildroot}%{_datadir}/lua install -Dm644 etc/lua.pc %{buildroot}%{_libdir}/pkgconfig/lua51.pc
install -m 644 test/*.lua %{buildroot}%{_datadir}/lua ln -sf lua51.pc %{buildroot}%{_libdir}/pkgconfig/lua5.1.pc
ln -sf lua51.pc %{buildroot}%{_libdir}/pkgconfig/lua-5.1.pc
install -d %{buildroot}%{_libdir} ln -s liblua5.1.so %{buildroot}%{_libdir}/liblua.so.5.1
install -m 755 src/liblua.so.%{majver} %{buildroot}%{_libdir} ln -s liblua5.1.so %{buildroot}%{_libdir}/liblua.so.%{version}
ln -s liblua.so.%{majver} %{buildroot}%{_libdir}/liblua%{majver}.so
ln -s liblua.so.%{majver} %{buildroot}%{_libdir}/liblua%{majver}.so.%{majver}
install -d %{buildroot}%{_libdir}/pkgconfig/ cd %{buildroot}%{_mandir}/man1
cat > %{buildroot}%{_libdir}/pkgconfig/lua%{majver}.pc << _EOF mv %{buildroot}%{_mandir}/man1/{lua.1,lua5.1.1}
prefix=%{_prefix} mv %{buildroot}%{_mandir}/man1/{luac.1,luac5.1.1}
exec_prefix=%{_exec_prefix}
libdir=%{_libdir}
includedir=%{_includedir}/lua%{majver}
Name: Lua
Description: An Extensible Extension Language
Version: 5.1.5
Requires:
Libs: -L%{_libdir} -llua%{majver} -lm -lreadline
Cflags: -I%{_includedir}/lua%{majver}
_EOF
rm -f %{buildroot}%{_libdir}/liblua.a
rm -f %{buildroot}%{_libdir}/liblua.so
%clean %clean
[ "%{buildroot}" != / ] && rm -rf %{buildroot} [ "%{buildroot}" != / ] && rm -rf %{buildroot}
@ -117,12 +114,10 @@ rm -f %{buildroot}%{_libdir}/liblua.so
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%{_bindir}/lua %{_bindir}/lua5.1
%{_bindir}/luac %{_bindir}/luac5.1
%dir %{_datadir}/lua %{_mandir}/man1/lua5.1.*
%{_datadir}/lua/*.lua %{_mandir}/man1/luac5.1.*
%{_mandir}/man1/lua.*
%{_mandir}/man1/luac.*
%files -n %{libname} %files -n %{libname}
%defattr(-,root,root) %defattr(-,root,root)
@ -137,9 +132,17 @@ rm -f %{buildroot}%{_libdir}/liblua.so
%{_includedir}/lua%{majver}/*.hpp %{_includedir}/lua%{majver}/*.hpp
%{_libdir}/liblua%{majver}.so %{_libdir}/liblua%{majver}.so
%{_libdir}/pkgconfig/lua%{majver}.pc %{_libdir}/pkgconfig/lua%{majver}.pc
%{_libdir}/pkgconfig/lua-5.1.pc
%{_libdir}/pkgconfig/lua51.pc
%doc HISTORY README doc/*.html doc/*.css doc/*.gif doc/*.png %doc HISTORY README doc/*.html doc/*.css doc/*.gif doc/*.png
%changelog %changelog
* Mon May 13 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 5.1.5-5mamba
- liblua51: added legacy provides for soname liblua.so.5.1
* Sat May 11 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 5.1.5-4mamba
- rebuilt with coinstallability with more recent versions
* Sat Jul 20 2013 Silvan Calarco <silvan.calarco@mambasoft.it> 5.1.5-3mamba * Sat Jul 20 2013 Silvan Calarco <silvan.calarco@mambasoft.it> 5.1.5-3mamba
- provide liblua5.1.so* using symlinks - provide liblua5.1.so* using symlinks