From aea7df6dec58bc85911351d7198f4803b626be14 Mon Sep 17 00:00:00 2001
From: wang_yue111 <648774160@qq.com>
Date: Mon, 16 Aug 2021 11:40:21 +0800
Subject: [PATCH] fix build error

---
 fix-build-error.patch | 52 +++++++++++++++++++++++++++++++++++++++++++
 netty.spec            | 11 +++++----
 2 files changed, 57 insertions(+), 6 deletions(-)
 create mode 100644 fix-build-error.patch

diff --git a/fix-build-error.patch b/fix-build-error.patch
new file mode 100644
index 0000000..5b2d8a3
--- /dev/null
+++ b/fix-build-error.patch
@@ -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
+
diff --git a/netty.spec b/netty.spec
index 253385f..43023ad 100644
--- a/netty.spec
+++ b/netty.spec
@@ -2,7 +2,7 @@
 
 Name:             netty
 Version:          4.1.13
-Release:          13
+Release:          14
 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)
@@ -66,11 +67,6 @@ Man pages and other related documents for %{name}.
 %pom_disable_module "testsuite-osgi"
 %pom_disable_module "tarball"
 %pom_disable_module "microbench"
-%pom_disable_module transport-native-unix-common
-%pom_disable_module transport-native-unix-common-tests
-%pom_disable_module transport-native-epoll
-%pom_disable_module transport-native-kqueue
-%pom_disable_module all
 
 %pom_xpath_inject 'pom:plugin[pom:artifactId="maven-remote-resources-plugin"]' '
 <dependencies>
@@ -150,6 +146,9 @@ export CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS"
 
 
 %changelog
+* Mon Aug 16 2021 wangyue <wangyue92@qq.com> - 4.1.13-14
+- fix build error
+
 * Sat Aug 14 2021 wangyue <wangyue92@qq.com> - 4.1.13-13
 - fix build error
 
-- 
Gitee