diff --git a/protobuf-all-21.7.tar.gz b/protobuf-all-21.7.tar.gz deleted file mode 100644 index aeab399f8cc4c44da94956e126597d1c9e3d4761..0000000000000000000000000000000000000000 Binary files a/protobuf-all-21.7.tar.gz and /dev/null differ diff --git a/spark.spec b/spark.spec index 219d5147f95737ad8fd36fedb2b661c672b84b8f..ecc04972969027abdcf2531f6d7026823c9e19d4 100644 --- a/spark.spec +++ b/spark.spec @@ -3,8 +3,8 @@ Summary: A unified analytics engine for large-scale data processing. Name: spark -Version: 3.5.0 -Release: 5 +Version: 3.5.1 +Release: 1 License: Apache 2.0 URL: http://spark.apache.org/ Source0: https://github.com/apache/spark/archive/v%{version}.tar.gz @@ -12,11 +12,10 @@ Source1: https://github.com/protocolbuffers/protobuf/archive/refs/tags/v3.21.7.t Source2: https://github.com/os72/protoc-jar/archive/refs/tags/v3.11.4.tar.gz Source3: https://github.com/os72/protoc-jar-maven-plugin/archive/refs/tags/v3.11.4.zip Source4: https://services.gradle.org/distributions/gradle-7.6-bin.zip -Source5: https://github.com/google/protobuf/releases/download/v21.7/protobuf-all-21.7.tar.gz Source6: https://github.com/grpc/grpc-java/archive/refs/tags/v1.56.0.tar.gz Patch0001: 0001-change-mvn-scalafmt.patch Patch0002: 0002-Upgrade-os-maven-plugin-to-1.7.1.patch -Patch0003: backport-CVE-2024-23945.patch +# Patch0003: backport-CVE-2024-23945.patch %ifarch riscv64 BuildRequires: protobuf-devel protobuf-compiler @@ -58,10 +57,9 @@ unzip %{SOURCE3} -d ${HOME}/%{name}-prep_dir pushd ${HOME}/%{name}-prep_dir/protoc-jar-maven-plugin-3.11.4 mvn clean install -Dmaven.test.skip=true -Dmaven.javadoc.skip=true popd -# prepare gradle and protobuf for build protoc-gen-grpc-java +# prepare gradle for build protoc-gen-grpc-java mkdir -p %{_tmppath}/source cp %{SOURCE4} %{_tmppath}/source -tar xzf %{SOURCE5} -C %{_tmppath}/source # protoc-gen-grpc-java tar -mxf %{SOURCE6} -C ${HOME}/%{name}-prep_dir pushd ${HOME}/%{name}-prep_dir/grpc-java-1.56.0 @@ -77,7 +75,7 @@ popd %patch0001 -p1 %patch0002 -p1 -%patch0003 -p1 +# %patch0003 -p1 %ifarch riscv64 sed -i -e 's/protoVersion = "3.23.4/protoVersion = "'${PROTOC_VERSION}/'' project/SparkBuild.scala @@ -97,8 +95,10 @@ cp -rf ../%{name}-%{version} %{buildroot}/opt/apache-%{name}-%{version} %files /opt/apache-%{name}-%{version} - %changelog +* Thu Jun 19 2025 openeuler_bot - 3.5.1-1 +- update spark to 3.5.1 + * Thu Dec 26 2024 changtao - 3.5.0-5 - Type: CVE - CVE: CVE-2024-23945 @@ -126,5 +126,4 @@ cp -rf ../%{name}-%{version} %{buildroot}/opt/apache-%{name}-%{version} - Update spark version * Fri Sep 18 2020 Hubble_Zhu - 1.0 -- Init package - +- Init package \ No newline at end of file diff --git a/v3.5.1.tar.gz b/v3.5.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..0578c99fd547e76a453a001e2dd4cec8817e43a8 Binary files /dev/null and b/v3.5.1.tar.gz differ