diff --git a/0012-CVE-2023-2976.patch b/0012-CVE-2023-2976.patch new file mode 100644 index 0000000000000000000000000000000000000000..13a9e4bb578a3708b5e249945e3bb29b09e532f2 --- /dev/null +++ b/0012-CVE-2023-2976.patch @@ -0,0 +1,65 @@ +diff --git a/buildtools/pom.xml b/buildtools/pom.xml +index 9dbbba70f9..1c78a05f94 100644 +--- a/buildtools/pom.xml ++++ b/buildtools/pom.xml +@@ -47,7 +47,7 @@ + 8.37 + 3.1.2 + 4.2.3 +- 32.0.0-jre ++ 32.1.1-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 e32d3d9f43..0c11baa362 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-32.0.0-jre.jar ++ - com.google.guava-guava-32.1.1-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 +diff --git a/pom.xml b/pom.xml +index 0cbb930786..272da71732 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 +- 32.0.0-jre ++ 32.1.1-jre + 1.0 + 0.14.0 + 7.0.1 +diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE +index 636fb61db9..47e4fbcfa5 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-32.0.0-jre.jar ++ - guava-32.1.1-jre.jar + - listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar + - failureaccess-1.0.1.jar + * Google Guice +diff --git a/pulsar-sql/presto-distribution/pom.xml b/pulsar-sql/presto-distribution/pom.xml +index 990c806e44..bde34a1616 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 +- 32.0.0-jre ++ 32.1.1-jre + 2.12.1 + 2.5.1 + 4.0.1 diff --git a/pulsar.spec b/pulsar.spec index ee3fbe2858b79e67ed6bef83afde217433639b89..cba60b2485e52fea01fc76b87967506786acac08 100644 --- a/pulsar.spec +++ b/pulsar.spec @@ -1,6 +1,6 @@ %define debug_package %{nil} %define pulsar_ver 2.10.4 -%define pkg_ver 11 +%define pkg_ver 12 %define _prefix /opt/pulsar Summary: Cloud-Native, Distributed Messaging and Streaming Name: pulsar @@ -21,6 +21,7 @@ Patch0008: 0008-CVE-2023-26048.patch Patch0009: 0009-CVE-2022-24329.patch Patch0010: 0010-CVE-2022-22970.patch Patch0011: 0011-CVE-2023-25194.patch +Patch0012: 0012-CVE-2023-2976.patch BuildRoot: /root/rpmbuild/BUILDROOT/ BuildRequires: java-1.8.0-openjdk-devel,maven,systemd Requires: java-1.8.0-openjdk,systemd @@ -44,6 +45,7 @@ Pulsar is a distributed pub-sub messaging platform with a very flexible messagin %patch0009 -p1 %patch0010 -p1 %patch0011 -p1 +%patch0012 -p1 %build mvn clean install -Pcore-modules,-main -DskipTests @@ -69,6 +71,8 @@ getent passwd pulsar >/dev/null || useradd -r -g pulsar -d / -s /sbin/nologin pu exit 0 %changelog +* Thu Dec 7 2023 Dapeng Sun - 2.10.4-12 +- resolve cve-2023-2976 * Wed Dec 6 2023 Dapeng Sun - 2.10.4-11 - resolve cve-2023-25194 * Wed Dec 6 2023 Dapeng Sun - 2.10.4-10