diff --git a/add-sp.patch b/add-sp.patch new file mode 100644 index 0000000000000000000000000000000000000000..05ec1c00f39a81953191b1561b175e077e4bd1b8 --- /dev/null +++ b/add-sp.patch @@ -0,0 +1,11 @@ +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-01 19:05:00.000000000 +0000 ++++ LuaJIT-2.1.0-beta3_new/src/Makefile 2021-05-18 14:21:52.367253841 +0000 +@@ -186,6 +186,7 @@ + # make HOST_CC="gcc -m32" CROSS=i586-mingw32msvc- TARGET_SYS=Windows + # make HOST_CC="gcc -m32" CROSS=powerpc-linux-gnu- + ++CFLAGS += -fstack-protector-strong + ASOPTIONS= $(CCOPT) $(CCWARN) $(XCFLAGS) $(CFLAGS) + CCOPTIONS= $(CCDEBUG) $(ASOPTIONS) + LDOPTIONS= $(CCDEBUG) $(LDFLAGS) diff --git a/luajit.spec b/luajit.spec index 91c6adeab04b0d53572c17bbac0a4aced653e826..68d10669b5aa5d444b5dbdc756f7a6b9bce09064 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 +* Tue May 18 2021 zhangyao - 2.1.0-3 +- add sp + * Mon Feb 8 2021 zhanghua - 2.1.0-2 - fix CVE-2020-24372