开源软件构建与测试

Changes of Revision 2

_service:tar_scm:netty.spec Changed

@@ -2,7 +2,7 @@
 
 Name:             netty
 Version:          4.1.13
-Release:          15
+Release:          19
 Summary:          Asynchronous event-driven network application Java framework
 License:          ASL 2.0
 URL:              https://netty.io/
@@ -29,6 +29,7 @@
 Patch0018:        CVE-2021-37137.patch
 Patch0019:        CVE-2021-43797-pre.patch
 Patch0020:        CVE-2021-43797.patch
+Patch0021:        fix-strip.patch
 
 BuildRequires:    maven-local mvn(ant-contrib:ant-contrib)
 BuildRequires:    mvn(com.jcraft:jzlib) mvn(commons-logging:commons-logging)
@@ -153,13 +154,25 @@
 
 
 %changelog
-* Fri Apr 22 2022 wangkai <wangkai385@h-partners.com> - 4.1.13-15
-- Remove lz4-java dependency and fix CVE-2021-43797
+* Sun Mar 05 2023 wulei <wulei80@h-partners.com> - 4.1.13-19
+- Add strip
 
-* Wed Oct 27 2021 wangkai <wangkai385@huawei.com> - 4.1.13-14
+* Mon Mar 07 2022 wangkai <wangkai385@huawei.com> - 4.1.13-18
+- Remove lz4-java dependency
+
+* Fri Dec 24 2021 wangkai <wangkai385@huawei.com> - 4.1.13-17
+- This package depends on log4j.After the log4j vulnerability CVE-2021-45105 is fixed,the version needs to be rebuild.
+
+* Fri Dec 17 2021 yaoxin <yaoxin30@huawei.com> - 4.1.13-16
+- Fix CVE-2021-43797
+
+* Wed Oct 27 2021 wangkai <wangkai385@huawei.com> - 4.1.13-15
 - fix CVE-2021-37136 CVE-2021-37137
 
-* Mon Aug 16 2021 wangyue <wangyue92@qq.com> - 4.1.13-13
+* 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
 
 * Tue Apr 06 2021 wangxiao <wangxiao65@huawei.com> - 4.1.13-12

_service:tar_scm:fix-strip.patch Added

@@ -0,0 +1,30 @@
+diff -Nur a/transport-native-epoll/pom.xml b/transport-native-epoll/pom.xml
+--- a/transport-native-epoll/pom.xml	2023-03-05 15:42:40.947323733 +0800
++++ b/transport-native-epoll/pom.xml	2023-03-05 15:45:43.877975494 +0800
+@@ -32,7 +32,7 @@
+     <unix.common.lib.dir>${project.build.directory}/unix-common-lib</unix.common.lib.dir>
+     <unix.common.lib.unpacked.dir>${unix.common.lib.dir}/META-INF/native/lib</unix.common.lib.unpacked.dir>
+     <unix.common.include.unpacked.dir>${unix.common.lib.dir}/META-INF/native/include</unix.common.include.unpacked.dir>
+-    <jni.compiler.args.ldflags>LDFLAGS=-L${unix.common.lib.unpacked.dir} -Wl,--no-as-needed -lrt -Wl,--whole-archive -l${unix.common.lib.name} -Wl,--no-whole-archive</jni.compiler.args.ldflags>
++    <jni.compiler.args.ldflags>LDFLAGS=-L${unix.common.lib.unpacked.dir} -Wl,--no-as-needed -lrt -Wl,--whole-archive -Wl,-s -l${unix.common.lib.name} -Wl,--no-whole-archive</jni.compiler.args.ldflags>
+     <skipTests>true</skipTests>
+   </properties>
+ 
+@@ -221,7 +221,7 @@
+                   <value>${linux.sendmmsg.support}${glibc.sendmmsg.support}</value>
+                   
+                   <regex>.*IO_NETTY_SENDMSSG_NOT_FOUND.*</regex>
+-                  <replacement>CFLAGS=-O3 -DIO_NETTY_SENDMMSG_NOT_FOUND -Werror -fno-omit-frame-pointer -Wunused-variable -I${unix.common.include.unpacked.dir}</replacement>
++                  <replacement>CFLAGS=-O3 -DIO_NETTY_SENDMMSG_NOT_FOUND -Werror -fno-omit-frame-pointer -Wunused-variable -Wl,-s -I${unix.common.include.unpacked.dir}</replacement>
+                   <failIfNoMatch>false</failIfNoMatch>
+                 </configuration>
+               </execution>
+@@ -237,7 +237,7 @@
+                   <value>${jni.compiler.args.cflags}</value>
+                   
+                   <regex>^((?!CFLAGS=).)*$</regex>
+-                  <replacement>CFLAGS=-O3 -Werror -fno-omit-frame-pointer -Wunused-variable -I${unix.common.include.unpacked.dir}</replacement>
++                  <replacement>CFLAGS=-O3 -Werror -fno-omit-frame-pointer -Wunused-variable -Wl,-s -I${unix.common.include.unpacked.dir}</replacement>
+                   <failIfNoMatch>false</failIfNoMatch>
+                 </configuration>
+               </execution>

_service Changed