Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
3a317b585a
!32 [sync] PR-31: Round upstream commit
From: @openeuler-sync-bot 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
2023-03-27 01:25:45 +00:00
lyn1001
b4426b1642 Round upstream commit
(cherry picked from commit 7607ccda4f01a54f32eb9ca3539a5224f59f7ea9)
2023-03-24 17:30:34 +08:00
openeuler-ci-bot
a118583898
!30 [sync] PR-27: 增加SP安全编译选项
From: @openeuler-sync-bot 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
2022-12-03 09:28:39 +00:00
wk333
75e47ae4a2 add secure compile option -fstack-protector-strong
(cherry picked from commit 64503078c531631613acace543aef3ce48c0c681)
2022-12-03 17:10:29 +08:00
openeuler-ci-bot
96943c8ff3 !22 Add a BuildRquires about gcc
From: @liuyumeng1
Reviewed-by: @shirely16,@yanan-rock
Signed-off-by: @yanan-rock
2021-06-30 12:53:51 +00:00
Zhiqiang Liu
a337dc435a 1 2021-06-30 14:11:23 +08:00
openeuler-ci-bot
d9ca0d85bf !7 fix CVE-2020-24372
From: @zhanghua1831
Reviewed-by: @wang_yue111,@small_leek,@overweight
Signed-off-by: @small_leek,@overweight
2021-02-09 16:34:10 +08:00
zhanghua1831
275fc18be5 fix CVE-2020-24372 2021-02-08 15:23:46 +08:00
openeuler-ci-bot
3d69cdd157 !2 fix CVE-2020-15890
From: @angela7
Reviewed-by: @overweight
Signed-off-by: @overweight
2021-01-12 14:21:15 +08:00
guoxiaoqi
3a986fad79 fix CVE-2020-15890 2021-01-11 20:07:36 +08:00
3 changed files with 40759 additions and 2 deletions

View File

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

40716
luajit-2.1-update.patch Normal file

File diff suppressed because it is too large Load Diff

View File

@ -2,14 +2,19 @@
Name: luajit
Version: 2.1.0
Release: 0.9beta3
Release: 5
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
@ -71,5 +76,20 @@ 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