diff --git a/protobuf-3.19.4-jre17-add-opens.patch b/protobuf-3.19.4-jre17-add-opens.patch deleted file mode 100644 index 2d159fa6771d398d610538a35a1fe19da9c38488..0000000000000000000000000000000000000000 --- a/protobuf-3.19.4-jre17-add-opens.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- protobuf-3.19.4/java/pom.xml.jre17 2022-02-13 11:45:39.367028268 +0900 -+++ protobuf-3.19.4/java/pom.xml 2022-02-13 12:43:18.212542147 +0900 -@@ -37,6 +37,7 @@ - src/test/proto - ${project.build.directory}/generated-sources - ${project.build.directory}/generated-test-sources -+ --add-opens java.base/java.lang=ALL-UNNAMED - - - diff --git a/protobuf.spec b/protobuf.spec index c22ccab77826c05cfd4b1d651b01d3fc5850b572..e49061e84012b0118c64c4be4a6ee1c46f82fbf7 100644 --- a/protobuf.spec +++ b/protobuf.spec @@ -1,4 +1,4 @@ -%define anolis_release 6 +%define anolis_release 1 %define googletest_ver 5ec7f0c4a113e2f18ac2c6cc7df51ad6afc24081 %bcond_without python %bcond_with java @@ -8,7 +8,7 @@ %global gtest_dir googletest-%{gtest_commit} Name: protobuf -Version: 3.19.6 +Version: 3.25.0 Release: %{anolis_release}%{?dist} Summary: Protocol Buffers - Google's data interchange format @@ -26,7 +26,6 @@ Source3: %{gtest_url}/archive/%{gtest_commit}/%{gtest_dir}.tar.gz # --help” output. Source4: protoc.1 -Patch3: protobuf-3.19.4-jre17-add-opens.patch BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: zlib-devel @@ -246,7 +245,6 @@ The %{name}-doc package contains documentation files for %{name} %prep %setup -q -n %{name}-%{version} -a3 -%patch3 -p1 -b .jre17 # Copy in the needed gtest/gmock implementations. %setup -q -T -D -b 3 -n %{name}-%{version} @@ -422,6 +420,10 @@ fail=1 %doc CHANGES.txt CONTRIBUTORS.txt README.md %changelog +* Thu Aug 01 2024 Kaiqiang Wang - 3.25.0-1 +- update to 3.25.0 +- fix CVE-2024-2410 + * Wed Mar 13 2024 Zhao Hang - 3.19.6-6 - Rebuild with python3.11 diff --git a/v3.19.6.tar.gz b/v3.25.0.tar.gz similarity index 41% rename from v3.19.6.tar.gz rename to v3.25.0.tar.gz index 9ed632b2bd5e471942e19a14afcafe693f0e5907..8d65346cef3584fe539aebeee92def734a56885d 100644 Binary files a/v3.19.6.tar.gz and b/v3.25.0.tar.gz differ