packages/netty
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!25 fix build error

Browse Source 
From: @wang_yue111
Reviewed-by: @wangchong1995924,@wangchong1995924
Signed-off-by: @wangchong1995924,@wangchong1995924
This commit is contained in:
openeuler-ci-bot 2021-08-16 10:44:34 +00:00 committed by Gitee
commit dcca06c0c3
2 changed files with 57 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
fix-build-error.patch Normal file
View File

@ -0,0 +1,52 @@
From c4659b32ae737903c7e5a28c1a2fd706f43e6640 Mon Sep 17 00:00:00 2001
From: wang_yue111 <648774160@qq.com>
Date: Mon, 16 Aug 2021 11:15:47 +0800
Subject: [PATCH] fix build error
---
transport-native-unix-common/pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/transport-native-unix-common/pom.xml b/transport-native-unix-common/pom.xml
index 72f02c0..04430e9 100644
--- a/transport-native-unix-common/pom.xml
+++ b/transport-native-unix-common/pom.xml
@@ -99,7 +99,7 @@
<env key="LIB_DIR" value="${nativeLibOnlyDir}" />
<env key="OBJ_DIR" value="${nativeObjsOnlyDir}" />
<env key="JNI_PLATFORM" value="${jni.platform}" />
- <env key="CFLAGS" value="-O3 -Werror -Wno-attributes -fPIC -fno-omit-frame-pointer -Wunused-variable" />
+ <env key="CFLAGS" value="-O3 -Werror -Wno-error=stringop-overflow -Wno-attributes -fPIC -fno-omit-frame-pointer -Wunused-variable" />
<env key="LDFLAGS" value="-Wl,--no-as-needed -lrt" />
<env key="LIB_NAME" value="${nativeLibName}" />
<!-- support for __attribute__((weak_import)) by the linker was added in 10.2 so ensure we
@@ -170,7 +170,7 @@
<env key="LIB_DIR" value="${nativeLibOnlyDir}" />
<env key="OBJ_DIR" value="${nativeObjsOnlyDir}" />
<env key="JNI_PLATFORM" value="${jni.platform}" />
- <env key="CFLAGS" value="-O3 -Werror -Wno-attributes -fPIC -fno-omit-frame-pointer -Wunused-variable" />
+ <env key="CFLAGS" value="-O3 -Werror -Wno-error=stringop-overflow -Wno-attributes -fPIC -fno-omit-frame-pointer -Wunused-variable" />
<env key="LDFLAGS" value="-Wl,--no-as-needed -lrt" />
<env key="LIB_NAME" value="${nativeLibName}" />
</exec>
@@ -240,7 +240,7 @@
<env key="LIB_DIR" value="${nativeLibOnlyDir}" />
<env key="OBJ_DIR" value="${nativeObjsOnlyDir}" />
<env key="JNI_PLATFORM" value="${jni.platform}" />
- <env key="CFLAGS" value="-O3 -Werror -Wno-attributes -fPIC -fno-omit-frame-pointer -Wunused-variable" />
+ <env key="CFLAGS" value="-O3 -Werror -Wno-error=stringop-overflow -Wno-attributes -fPIC -fno-omit-frame-pointer -Wunused-variable" />
<env key="LDFLAGS" value="-Wl,--no-as-needed -lrt" />
<env key="LIB_NAME" value="${nativeLibName}" />
</exec>
@@ -310,7 +310,7 @@
<env key="LIB_DIR" value="${nativeLibOnlyDir}" />
<env key="OBJ_DIR" value="${nativeObjsOnlyDir}" />
<env key="JNI_PLATFORM" value="${jni.platform}" />
- <env key="CFLAGS" value="-O3 -Werror -Wno-attributes -fPIC -fno-omit-frame-pointer -Wunused-variable" />
+ <env key="CFLAGS" value="-O3 -Werror -Wno-error=stringop-overflow -Wno-attributes -fPIC -fno-omit-frame-pointer -Wunused-variable" />
<env key="LDFLAGS" value="-Wl,--no-as-needed -lrt" />
<env key="LIB_NAME" value="${nativeLibName}" />
</exec>
--
2.23.0

6
netty.spec
View File

@ -2,7 +2,7 @@
Name: netty
Version: 4.1.13
Release: 12
Release: 13
Summary: Asynchronous event-driven network application Java framework
License: ASL 2.0
URL: https://netty.io/
@ -24,6 +24,7 @@ Patch0012: CVE-2021-21295-pre3.patch
Patch0013: CVE-2021-21295-pre4.patch
Patch0014: CVE-2021-21295.patch
Patch0015: CVE-2021-21409.patch
Patch0016: fix-build-error.patch
BuildRequires: maven-local mvn(ant-contrib:ant-contrib)
BuildRequires: mvn(com.jcraft:jzlib) mvn(commons-logging:commons-logging)
@ -145,6 +146,9 @@ export CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS"
%changelog
* Mon Aug 16 2021 wangyue <wangyue92@qq.com> - 4.1.13-13
- fix build error
* Tue Apr 06 2021 wangxiao <wangxiao65@huawei.com> - 4.1.13-12
- Fix CVE-2021-21295 CVE-2021-21409