diff --git a/add-sp.patch b/add-sp.patch new file mode 100644 index 0000000000000000000000000000000000000000..bd816f98c6d56299497141b244545b88928cb53c --- /dev/null +++ b/add-sp.patch @@ -0,0 +1,21 @@ +diff -Nur LuaJIT-2.1.0-beta3/src/Makefile LuaJIT-2.1.0-beta3-new/src/Makefile +--- LuaJIT-2.1.0-beta3/src/Makefile 2021-05-24 11:04:55.576367200 +0800 ++++ LuaJIT-2.1.0-beta3-new/src/Makefile 2021-05-24 11:06:07.783398500 +0800 +@@ -217,7 +217,7 @@ + TARGET_DYLIBNAME= libluajit-$(ABIVER).$(MAJVER).dylib + TARGET_DYLIBPATH= $(TARGET_LIBPATH)/$(TARGET_DYLIBNAME) + TARGET_DLLNAME= lua$(NODOTABIVER).dll +-TARGET_XSHLDFLAGS= -shared -fPIC -Wl,-soname,$(TARGET_SONAME) ++TARGET_XSHLDFLAGS= -shared -fstack-protector-strong -fPIC -Wl,-soname,$(TARGET_SONAME) + TARGET_DYNXLDOPTS= + + TARGET_LFSFLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE +@@ -309,7 +309,7 @@ + TARGET_DYNXLDOPTS= + else + ifeq (,$(shell $(TARGET_CC) -o /dev/null -c -x c /dev/null -fno-stack-protector 2>/dev/null || echo 1)) +- TARGET_XCFLAGS+= -fno-stack-protector ++ TARGET_XCFLAGS+= + endif + ifeq (Darwin,$(TARGET_SYS)) + ifeq (,$(MACOSX_DEPLOYMENT_TARGET)) diff --git a/luajit.spec b/luajit.spec index 91c6adeab04b0d53572c17bbac0a4aced653e826..a0b9141d73b19ad4198fc1b9bd6a76f4e7d1a978 100644 --- a/luajit.spec +++ b/luajit.spec @@ -2,7 +2,7 @@ Name: luajit Version: 2.1.0 -Release: 2 +Release: 3 Summary: Just-In-Time Compiler for Lua License: MIT URL: http://luajit.org/ @@ -10,6 +10,7 @@ Source0: http://luajit.org/download/LuaJIT-2.1.0-beta3.tar.gz Patch0: CVE-2020-15890.patch Patch1: CVE-2020-24372-1.patch Patch2: CVE-2020-24372-2.patch +Patch3: add-sp.patch ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 @@ -74,6 +75,9 @@ ln -s luajit-2.1.0-beta3 %{buildroot}%{_bindir}/luajit %{_mandir}/man1/%{name}.1* %changelog +* Mon May 24 zhangyao - 2.1.0-3 +- add sp + * Mon Feb 8 2021 zhanghua - 2.1.0-2 - fix CVE-2020-24372