diff --git a/0003-CVE-2023-2976.patch b/0003-CVE-2023-2976.patch new file mode 100644 index 0000000000000000000000000000000000000000..e5170d283c9810e197dc2be5a78d672d7e308672 --- /dev/null +++ b/0003-CVE-2023-2976.patch @@ -0,0 +1,83 @@ +diff --git a/buildtools/pom.xml b/buildtools/pom.xml +index 0197f03326..5115700da7 100644 +--- a/buildtools/pom.xml ++++ b/buildtools/pom.xml +@@ -47,7 +47,7 @@ + 8.37 + 3.1.2 + 4.2.3 +- 31.0.1-jre ++ 32.0.0-jre + 1.10.12 + 1.32 + +diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt +index 1ce81c7344..7d2433a2db 100644 +--- a/distribution/server/src/assemble/LICENSE.bin.txt ++++ b/distribution/server/src/assemble/LICENSE.bin.txt +@@ -328,7 +328,7 @@ The Apache Software License, Version 2.0 + - com.google.code.gson-gson-2.8.9.jar + - io.gsonfire-gson-fire-1.8.5.jar + * Guava +- - com.google.guava-guava-31.0.1-jre.jar ++ - com.google.guava-guava-32.0.0-jre.jar + - com.google.guava-failureaccess-1.0.1.jar + - com.google.guava-listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar + * J2ObjC Annotations -- com.google.j2objc-j2objc-annotations-1.3.jar +@@ -559,7 +559,7 @@ MIT License + - org.slf4j-slf4j-api-1.7.32.jar + - org.slf4j-jcl-over-slf4j-1.7.32.jar + * The Checker Framework +- - org.checkerframework-checker-qual-3.12.0.jar ++ - org.checkerframework-checker-qual-3.33.0.jar + + Protocol Buffers License + * Protocol Buffers +diff --git a/pom.xml b/pom.xml +index 69adebd4df..904bd5ac28 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -168,7 +168,7 @@ flexible messaging model and an intuitive client API. + 0.11.1 + 0.28.0 + 2.4.9 +- 31.0.1-jre ++ 32.0.0-jre + 1.0 + 0.14.0 + 7.0.1 +diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE +index 4087b9e83e..a5923972ee 100644 +--- a/pulsar-sql/presto-distribution/LICENSE ++++ b/pulsar-sql/presto-distribution/LICENSE +@@ -221,7 +221,7 @@ The Apache Software License, Version 2.0 + - jackson-module-jaxb-annotations-2.13.4.jar + - jackson-module-jsonSchema-2.13.4.jar + * Guava +- - guava-31.0.1-jre.jar ++ - guava-32.0.0-jre.jar + - listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar + - failureaccess-1.0.1.jar + * Google Guice +@@ -515,7 +515,7 @@ MIT License + * JUL to SLF4J Bridge + - jul-to-slf4j-1.7.32.jar + * Checker Qual +- - checker-qual-3.12.0.jar ++ - checker-qual-3.33.0.jar + * Annotations + - animal-sniffer-annotations-1.19.jar + - annotations-4.1.1.4.jar +diff --git a/pulsar-sql/presto-distribution/pom.xml b/pulsar-sql/presto-distribution/pom.xml +index cbeb5b7096..990c806e44 100644 +--- a/pulsar-sql/presto-distribution/pom.xml ++++ b/pulsar-sql/presto-distribution/pom.xml +@@ -39,7 +39,7 @@ + 2.6 + 0.0.12 + 3.0.5 +- 31.0.1-jre ++ 32.0.0-jre + 2.12.1 + 2.5.1 + 4.0.1 diff --git a/pulsar.spec b/pulsar.spec index e4b21abbf48d8649ff6d98381fde7f92e1c98182..bcd9d4d5ed5af7387bab4ad0f001d45592131855 100644 --- a/pulsar.spec +++ b/pulsar.spec @@ -1,6 +1,6 @@ %define debug_package %{nil} %define pulsar_ver 2.10.4 -%define pkg_ver 1 +%define pkg_ver 3 %define _prefix /opt/pulsar Summary: Cloud-Native, Distributed Messaging and Streaming Name: pulsar @@ -12,6 +12,7 @@ URL: https://pulsar.apache.org Source0: https://archive.apache.org/dist/pulsar/pulsar-2.10.4/apache-pulsar-2.10.4-src.tar.gz Patch0001: 0001-use-huawei-repository.patch Patch0002: 0002-resolve-cve-2023-32697.patch +Patch0003: 0003-CVE-2023-2976.patch BuildRoot: /root/rpmbuild/BUILDROOT/ BuildRequires: java-1.8.0-openjdk-devel,maven,systemd Requires: java-1.8.0-openjdk,systemd @@ -26,6 +27,7 @@ Pulsar is a distributed pub-sub messaging platform with a very flexible messagin %patch0001 -p1 %patch0002 -p1 +%patch0003 -p1 %build mvn clean install -Pcore-modules,-main -DskipTests @@ -51,7 +53,9 @@ getent passwd pulsar >/dev/null || useradd -r -g pulsar -d / -s /sbin/nologin pu exit 0 %changelog +* Mon Nov 27 2023 Dapeng Sun - 2.10.4-3 +- resolve CVE-2023-2976 +* Thu Aug 24 2023 Jialing Wang - 2.10.4-2 +- resovle Cve-2023-32697 * Fri Aug 11 2023 Jialing Wang - 2.10.4-1 - init puslar spec -* Fri Aug 24 2023 Jialing Wang - 2.10.4-2 -- resovle Cve-2023-32697 \ No newline at end of file