From 5a03a40cacefbe015c2c7f6c2fbe4b988ba64c97 Mon Sep 17 00:00:00 2001 From: Boris Date: Mon, 24 May 2021 10:53:18 +0800 Subject: [PATCH 1/3] add sp --- add-sp.patch | 12 ++++++++++++ luajit.spec | 3 +++ 2 files changed, 15 insertions(+) create mode 100644 add-sp.patch diff --git a/add-sp.patch b/add-sp.patch new file mode 100644 index 0000000..385203a --- /dev/null +++ b/add-sp.patch @@ -0,0 +1,12 @@ +diff -Nur LuaJIT-2.1.0-beta3/src/Makefile LuaJIT-2.1.0-beta3-new/src/Makefile +--- LuaJIT-2.1.0-beta3/src/Makefile 2017-05-02 03:05:00.000000000 +0800 ++++ LuaJIT-2.1.0-beta3-new/src/Makefile 2021-05-24 10:50:59.498242200 +0800 +@@ -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 91c6ade..d659d38 100644 --- a/luajit.spec +++ b/luajit.spec @@ -74,6 +74,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 -- Gitee From 12e4b5eef2236d8cb1965e8b315768bffbcc0e7a Mon Sep 17 00:00:00 2001 From: Boris Date: Mon, 24 May 2021 10:55:58 +0800 Subject: [PATCH 2/3] add sp --- luajit.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/luajit.spec b/luajit.spec index d659d38..a0b9141 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 -- Gitee From 7cca60bd980041c4ed0e721db44128312b7d67bf Mon Sep 17 00:00:00 2001 From: Boris Date: Mon, 24 May 2021 11:07:04 +0800 Subject: [PATCH 3/3] add sp --- add-sp.patch | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/add-sp.patch b/add-sp.patch index 385203a..bd816f9 100644 --- a/add-sp.patch +++ b/add-sp.patch @@ -1,6 +1,15 @@ diff -Nur LuaJIT-2.1.0-beta3/src/Makefile LuaJIT-2.1.0-beta3-new/src/Makefile ---- LuaJIT-2.1.0-beta3/src/Makefile 2017-05-02 03:05:00.000000000 +0800 -+++ LuaJIT-2.1.0-beta3-new/src/Makefile 2021-05-24 10:50:59.498242200 +0800 +--- 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 -- Gitee