Compare commits

..

No commits in common. "3a317b585a00a385223bb5c6f1b03b8712c59d70" and "1ea68d2c5830df6006b93c991653bf9e2c9fae2c" have entirely different histories.

3 changed files with 2 additions and 40759 deletions

View File

@ -1,21 +0,0 @@
diff -Nur LuaJIT-2.1.0-beta3/src/Makefile LuaJIT-2.1.0-beta3_bak/src/Makefile
--- LuaJIT-2.1.0-beta3/src/Makefile 2023-03-24 16:37:56.684754051 +0800
+++ LuaJIT-2.1.0-beta3_bak/src/Makefile 2023-03-24 16:43:09.421826030 +0800
@@ -220,7 +220,7 @@
TARGET_DYLIBPATH= $(TARGET_LIBPATH)/$(TARGET_DYLIBNAME)
TARGET_DLLNAME= lua$(NODOTABIVER).dll
TARGET_DLLDOTANAME= libluajit-$(ABIVER).dll.a
-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
@@ -313,7 +313,7 @@
else
TARGET_AR+= 2>/dev/null
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))

File diff suppressed because it is too large Load Diff

View File

@ -2,19 +2,14 @@
Name: luajit
Version: 2.1.0
Release: 5
Release: 0.9beta3
Summary: Just-In-Time Compiler for Lua
License: MIT
URL: http://luajit.org/
Source0: http://luajit.org/download/LuaJIT-2.1.0-beta3.tar.gz
# Patches from https://github.com/LuaJit/LuaJIT.git
# Generated from v2.1 branch against the 2.1.0-beta3 tag using
# git diff v2.1.0-beta3..v2.1 > luajit-2.1-update.patch
Patch0001: luajit-2.1-update.patch
Patch0002: 0002-luajit-add-secure-compile-option-fstack.patch
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
BuildRequires: gcc
BuildRequires: make
%description
@ -76,20 +71,5 @@ ln -s luajit-2.1.0-beta3 %{buildroot}%{_bindir}/luajit
%{_mandir}/man1/%{name}.1*
%changelog
* Fri Mar 24 2023 liyanan <liyanan32@h-partners.com> - 2.1.0-5
- Round upstream commit
* Sat Aug 20 2022 wangkai <wangkai385@h-partners.com> - 2.1.0-4
- add secure compile option -fstack-protector-strong
* Wed Jun 30 2021 liuyumeng <liuyumeng5@huawei.com> - 2.1.0-3
- add BuildRequires: gcc
* Mon Feb 8 2021 zhanghua <zhanghua40@huawei.com> - 2.1.0-2
- fix CVE-2020-24372
* Mon Jan 11 2021 zhangatao <zhangtao221@huawei.com> - 2.1.0-1
- fix CVE-2020-15890
* Sun Mar 15 2020 zhangatao <zhangtao221@huawei.com> - 2.1.0-0.8beta3
- package init