From b9cff005ee3d687d6880730c3de33760a489f9d1 Mon Sep 17 00:00:00 2001 From: starlet-dx <15929766099@163.com> Date: Thu, 14 Nov 2024 17:29:10 +0800 Subject: [PATCH] Change dependency on netty-tcnative to tomcat-jni due to netty-tcnative update to 2.0.67 --- netty3.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/netty3.spec b/netty3.spec index eb931f5..188eeae 100644 --- a/netty3.spec +++ b/netty3.spec @@ -5,7 +5,7 @@ Name: netty3 Version: 3.10.6 -Release: 9 +Release: 10 Summary: An asynchronous event-driven network application framework and tools for Java License: ASL 2.0 and BSD and CC0 URL: http://netty.io/ @@ -36,7 +36,7 @@ BuildRequires: mvn(org.apache.ant:ant-launcher) BuildRequires: mvn(org.apache.ant:ant) BuildRequires: mvn(log4j:log4j:12) BuildRequires: mvn(javax.servlet:javax.servlet-api) -BuildRequires: mvn(io.netty:netty-tcnative) +BuildRequires: mvn(org.apache.tomcat:tomcat-jni) BuildRequires: mvn(commons-logging:commons-logging) BuildRequires: mvn(com.jcraft:jzlib) BuildRequires: mvn(com.google.protobuf:protobuf-java) @@ -44,8 +44,6 @@ BuildRequires: mvn(ant-contrib:ant-contrib) BuildArch: noarch -Requires: netty-tcnative - Provides: bundled(java-base64) Provides: netty3-javadoc Obsoletes: netty3-javadoc @@ -79,6 +77,7 @@ rm -rf jar doc license %pom_remove_dep :npn-api %pom_xpath_remove "pom:dependency[pom:artifactId[text()='netty-tcnative']]/pom:classifier" +%pom_change_dep :netty-tcnative org.apache.tomcat:tomcat-jni %pom_xpath_remove "pom:extension[pom:artifactId[text()='os-maven-plugin']]" %pom_xpath_remove "pom:execution[pom:id[text()='remove-examples']]" %pom_xpath_remove "pom:plugin[pom:artifactId[text()='maven-javadoc-plugin']]/pom:configuration" @@ -121,6 +120,9 @@ rm -v %{netty_handler_dir}/ssl/JettyNpnSslEngine.java %changelog +* Fri Nov 15 2024 yaoxin - 3.10.6-10 +- Change dependency on netty-tcnative to tomcat-jni due to netty-tcnative update to 2.0.67 + * Tue Nov 12 2024 yaoxin - 3.10.6-9 - Fix CVE-2024-29025 -- Gitee