!62 fix CVE-2024-23945

From: @changtao615 
Reviewed-by: @wenwj0 
Signed-off-by: @wenwj0

0001-change-mvn-scalafmt.patch

@@ -0,0 +1,21 @@
+diff -Naur spark-3.5.0/pom.xml spark-3.5.0-change/pom.xml
+--- spark-3.5.0/pom.xml	2023-09-09 09:24:06.000000000 +0800
++++ spark-3.5.0-change/pom.xml	2023-09-21 16:07:19.952921078 +0800
+@@ -115,7 +115,7 @@
+     <java.version>1.8</java.version>
+     <maven.compiler.source>${java.version}</maven.compiler.source>
+     <maven.compiler.target>${java.version}</maven.compiler.target>
+-    <maven.version>3.8.8</maven.version>
++    <maven.version>3.6.3</maven.version>
+     <exec-maven-plugin.version>3.1.0</exec-maven-plugin.version>
+     <sbt.project.name>spark</sbt.project.name>
+     <asm.version>9.5</asm.version>
+@@ -442,7 +442,7 @@
+       <dependency>
+         <groupId>org.scala-lang.modules</groupId>
+         <artifactId>scala-parallel-collections_${scala.binary.version}</artifactId>
+-        <version>1.0.4</version>
++        <version>1.0.3</version>
+       </dependency>
+       --><!-- #endif scala-2.13 -->
+       <dependency>

0001-modify-maven-version-for-3.6.3-to-3.5.4.patch

@@ -1,28 +0,0 @@
-From b197048d8dcd5c3567fee87330b41b3938356123 Mon Sep 17 00:00:00 2001
-From: hubble_zhu <hubble_zhu@qq.com>
-Date: Wed, 30 Sep 2020 14:53:42 +0800
-Subject: [PATCH] modify maven version for 3.6.3 to 3.5.4
-
----
- pom.xml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pom.xml b/pom.xml
-index 7c60f8f..4b993ee 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -115,7 +115,7 @@
-     <java.version>1.8</java.version>
-     <maven.compiler.source>${java.version}</maven.compiler.source>
-     <maven.compiler.target>${java.version}</maven.compiler.target>
--    <maven.version>3.6.3</maven.version>
-+    <maven.version>3.5.4</maven.version>
-     <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
-     <sbt.project.name>spark</sbt.project.name>
-     <slf4j.version>1.7.30</slf4j.version>
-@@ -3202,1 +3202,1 @@
--        <version>1.0.4</version>
-+        <version>1.0.3</version>
--- 
-2.23.0
-

0002-Upgrade-os-maven-plugin-to-1.7.1.patch

@@ -0,0 +1,22 @@
+From 958468fc5154399f1a256097502b21a8f256b2f3 Mon Sep 17 00:00:00 2001
+From: Dingli Zhang <dingli@iscas.ac.cn>
+Date: Mon, 1 Jul 2024 05:21:50 +0000
+Subject: [PATCH] Upgrade os-maven-plugin to 1.7.1
+
+
+diff --git a/connector/connect/common/pom.xml b/connector/connect/common/pom.xml
+index c78c5445..57515a8f 100644
+--- a/connector/connect/common/pom.xml
++++ b/connector/connect/common/pom.xml
+@@ -116,7 +116,7 @@
+             <extension>
+                 <groupId>kr.motd.maven</groupId>
+                 <artifactId>os-maven-plugin</artifactId>
+-                <version>1.6.2</version>
++                <version>1.7.1</version>
+             </extension>
+         </extensions>
+         <outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory>
+-- 
+2.41.0
+

1000-Added-support-for-building-the-riscv64-protoc-binari.patch

@@ -0,0 +1,56 @@
+From 8b626946fcabc659a41de3b15cbe6f5d45bd596e Mon Sep 17 00:00:00 2001
+From: Dingli Zhang <dingli@iscas.ac.cn>
+Date: Tue, 7 May 2024 13:56:04 +0800
+Subject: [PATCH] Added support for building the riscv64 protoc binaries with
+ Kokoro
+
+
+diff --git a/kokoro/release/protoc/linux/build.sh b/kokoro/release/protoc/linux/build.sh
+index 44a95aab3..13be7b2ed 100755
+--- a/kokoro/release/protoc/linux/build.sh
++++ b/kokoro/release/protoc/linux/build.sh
+@@ -22,6 +22,9 @@ protoc-artifacts/build-protoc.sh linux aarch_64 protoc
+ sudo apt install -y g++-powerpc64le-linux-gnu
+ protoc-artifacts/build-protoc.sh linux ppcle_64 protoc
+ 
++sudo apt install -y g++-riscv64-linux-gnu
++protoc-artifacts/build-protoc.sh linux riscv64 protoc
++
+ sudo apt install -y g++-s390x-linux-gnu
+ protoc-artifacts/build-protoc.sh linux s390_64 protoc
+ 
+diff --git a/protoc-artifacts/build-protoc.sh b/protoc-artifacts/build-protoc.sh
+index 460284262..20ca05739 100755
+--- a/protoc-artifacts/build-protoc.sh
++++ b/protoc-artifacts/build-protoc.sh
+@@ -93,6 +93,8 @@ checkArch ()
+         assertEq $format "elf64-x86-64" $LINENO
+       elif [[ "$ARCH" == aarch_64 ]]; then
+         assertEq $format "elf64-little" $LINENO
++      elif [[ "$ARCH" == riscv64 ]]; then
++        assertEq $format "elf64-littleriscv" $LINENO
+       elif [[ "$ARCH" == s390_64 ]]; then
+ 	if [[ $host_machine == s390x ]];then
+ 	  assertEq $format "elf64-s390" $LINENO
+@@ -162,6 +164,9 @@ checkDependencies ()
+     elif [[ "$ARCH" == aarch_64 ]]; then
+       dump_cmd='objdump -p '"$1"' | grep NEEDED'
+       white_list="libpthread\.so\.0\|libm\.so\.6\|libc\.so\.6\|ld-linux-aarch64\.so\.1"
++    elif [[ "$ARCH" == riscv64 ]]; then
++      dump_cmd='objdump -p '"$1"' | grep NEEDED'
++      white_list="libz\.so\.1\|libm\.so\.6\|libc\.so\.6\|ld-linux-riscv64-lp64d\.so\.1"
+     fi
+   elif [[ "$OS" == osx ]]; then
+     dump_cmd='otool -L '"$1"' | fgrep dylib'
+@@ -226,6 +231,8 @@ elif [[ "$(uname)" == Linux* ]]; then
+     elif [[ "$ARCH" == ppcle_64 ]]; then
+       CXXFLAGS="$CXXFLAGS -m64"
+       CONFIGURE_ARGS="$CONFIGURE_ARGS --host=powerpc64le-linux-gnu"
++    elif [[ "$ARCH" == riscv64 ]]; then
++      CONFIGURE_ARGS="$CONFIGURE_ARGS --host=riscv64-linux-gnu"
+     elif [[ "$ARCH" == s390_64 ]]; then
+       CXXFLAGS="$CXXFLAGS -m64"
+       CONFIGURE_ARGS="$CONFIGURE_ARGS --host=s390x-linux-gnu"
+-- 
+2.41.0
+

1001-Add-protoc-java-support-for-riscv64.patch

@@ -0,0 +1,23 @@
+From 2c52801962444baa444401b8fafd09bd6cfab92b Mon Sep 17 00:00:00 2001
+From: Dingli Zhang <dingli@iscas.ac.cn>
+Date: Thu, 9 May 2024 00:02:35 +0800
+Subject: [PATCH] Add support for riscv64
+
+---
+ src/main/java/com/github/os72/protocjar/PlatformDetector.java | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/main/java/com/github/os72/protocjar/PlatformDetector.java b/src/main/java/com/github/os72/protocjar/PlatformDetector.java
+index 7a99348..b8f08e5 100644
+--- a/src/main/java/com/github/os72/protocjar/PlatformDetector.java
++++ b/src/main/java/com/github/os72/protocjar/PlatformDetector.java
+@@ -211,6 +211,9 @@ private static String normalizeArch(String value) {
+         if ("ppc64le".equals(value)) {
+             return "ppcle_64";
+         }
++        if ("riscv64".equals(value)) {
++            return "riscv64";
++        }
+         if ("s390".equals(value)) {
+             return "s390_32";
+         }

1002-Added-support-for-building-the-riscv64-protoc-gen-gr.patch

@@ -0,0 +1,147 @@
+From 11c8f77c101385119e34d0961e4203c6eb27c52d Mon Sep 17 00:00:00 2001
+From: Dingli Zhang <dingli@iscas.ac.cn>
+Date: Fri, 5 Jul 2024 03:48:20 +0000
+Subject: [PATCH] Added support for building the riscv64 protoc-gen-grpc-java
+ binaries with Kokoro
+
+
+diff --git a/build.gradle b/build.gradle
+index ed4baab82..c5bed1026 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -23,6 +23,8 @@ subprojects {
+     version = "1.56.0" // CURRENT_GRPC_VERSION
+ 
+     repositories {
++        maven { url 'file://@HOME@/.m2/repository'}
++        maven { url "https://mirrors.huaweicloud.com/repository/maven/"}
+         maven { // The google mirror is less flaky than mavenCentral()
+             url "https://maven-central.storage-download.googleapis.com/maven2/" }
+         mavenCentral()
+diff --git a/buildscripts/kokoro/linux_artifacts.sh b/buildscripts/kokoro/linux_artifacts.sh
+index c80d3436f..49a15a457 100755
+--- a/buildscripts/kokoro/linux_artifacts.sh
++++ b/buildscripts/kokoro/linux_artifacts.sh
+@@ -56,6 +56,8 @@ cp -r "$LOCAL_MVN_TEMP"/* "$MVN_ARTIFACT_DIR"/
+   SKIP_TESTS=true ARCH=aarch_64 /grpc-java/buildscripts/kokoro/unix.sh
+ "$GRPC_JAVA_DIR"/buildscripts/run_in_docker.sh grpc-java-artifacts-multiarch env \
+   SKIP_TESTS=true ARCH=ppcle_64 /grpc-java/buildscripts/kokoro/unix.sh
++"$GRPC_JAVA_DIR"/buildscripts/run_in_docker.sh grpc-java-artifacts-multiarch env \
++  SKIP_TESTS=true ARCH=risv64 /grpc-java/buildscripts/kokoro/unix.sh
+ # Use a newer GCC version. GCC 7 in multiarch has a bug:
+ #   internal compiler error: output_operand: invalid %-code
+ "$GRPC_JAVA_DIR"/buildscripts/run_in_docker.sh grpc-java-artifacts-ubuntu2004 env \
+diff --git a/buildscripts/kokoro/unix.sh b/buildscripts/kokoro/unix.sh
+index 1e6af6cfc..048aef9e8 100755
+--- a/buildscripts/kokoro/unix.sh
++++ b/buildscripts/kokoro/unix.sh
+@@ -48,7 +48,7 @@ GRADLE_FLAGS+=" -Pcheckstyle.ignoreFailures=false"
+ GRADLE_FLAGS+=" -PfailOnWarnings=true"
+ GRADLE_FLAGS+=" -PerrorProne=true"
+ GRADLE_FLAGS+=" -PskipAndroid=true"
+-GRADLE_FLAGS+=" -Dorg.gradle.parallel=true"
++GRADLE_FLAGS+=" -Dorg.gradle.parallel=false"
+ export GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xmx1g'"
+ 
+ # Make protobuf discoverable by :grpc-compiler
+@@ -90,7 +90,7 @@ fi
+ LOCAL_MVN_TEMP=$(mktemp -d)
+ # Note that this disables parallel=true from GRADLE_FLAGS
+ if [[ -z "${ALL_ARTIFACTS:-}" ]]; then
+-  if [[ "$ARCH" = "aarch_64" || "$ARCH" = "ppcle_64" || "$ARCH" = "s390_64" ]]; then
++  if [[ $ARCH == "aarch_64" || $ARCH == "riscv64" ]]; then
+     GRADLE_FLAGS+=" -x grpc-compiler:generateTestProto -x grpc-compiler:generateTestLiteProto"
+     GRADLE_FLAGS+=" -x grpc-compiler:testGolden -x grpc-compiler:testLiteGolden"
+     GRADLE_FLAGS+=" -x grpc-compiler:testDeprecatedGolden -x grpc-compiler:testDeprecatedLiteGolden"
+diff --git a/buildscripts/kokoro/upload_artifacts.sh b/buildscripts/kokoro/upload_artifacts.sh
+index 39e27eff5..bc47d4b50 100644
+--- a/buildscripts/kokoro/upload_artifacts.sh
++++ b/buildscripts/kokoro/upload_artifacts.sh
+@@ -34,6 +34,9 @@ LOCAL_OTHER_ARTIFACTS="$KOKORO_GFILE_DIR"/github/grpc-java/artifacts/
+ # for linux aarch64 platform
+ [[ "$(find "$LOCAL_MVN_ARTIFACTS" -type f -iname 'protoc-gen-grpc-java-*-linux-aarch_64.exe' | wc -l)" != '0' ]]
+ 
++# for linux riscv64 platform
++[[ "$(find "$LOCAL_MVN_ARTIFACTS" -type f -iname 'protoc-gen-grpc-java-*-linux-riscv64.exe' | wc -l)" != '0' ]]
++
+ # for linux ppc64le platform
+ [[ "$(find "$LOCAL_MVN_ARTIFACTS" -type f -iname 'protoc-gen-grpc-java-*-linux-ppcle_64.exe' | wc -l)" != '0' ]]
+ 
+diff --git a/buildscripts/make_dependencies.sh b/buildscripts/make_dependencies.sh
+index 3d02a72f4..0427d47e1 100755
+--- a/buildscripts/make_dependencies.sh
++++ b/buildscripts/make_dependencies.sh
+@@ -7,8 +7,8 @@ PROTOBUF_VERSION=21.7
+ 
+ # ARCH is x86_64 bit unless otherwise specified.
+ ARCH="${ARCH:-x86_64}"
+-DOWNLOAD_DIR=/tmp/source
+-INSTALL_DIR="/tmp/protobuf-cache/$PROTOBUF_VERSION/$(uname -s)-$ARCH"
++DOWNLOAD_DIR=/var/tmp/source
++INSTALL_DIR="/var/tmp/protobuf-cache/$PROTOBUF_VERSION/$(uname -s)-$ARCH"
+ mkdir -p $DOWNLOAD_DIR
+ 
+ # Start with a sane default
+@@ -36,6 +36,8 @@ else
+       --prefix="$INSTALL_DIR"
+   elif [[ "$ARCH" == aarch* ]]; then
+     ./configure --disable-shared --host=aarch64-linux-gnu --prefix="$INSTALL_DIR"
++  elif [[ "$ARCH" == riscv* ]]; then
++    ./configure --disable-shared --host=riscv64-linux-gnu --prefix="$INSTALL_DIR"
+   elif [[ "$ARCH" == ppc* ]]; then
+     ./configure --disable-shared --host=powerpc64le-linux-gnu --prefix="$INSTALL_DIR"
+   elif [[ "$ARCH" == s390* ]]; then
+diff --git a/compiler/build.gradle b/compiler/build.gradle
+index 12798208c..7960642cd 100644
+--- a/compiler/build.gradle
++++ b/compiler/build.gradle
+@@ -58,6 +58,7 @@ model {
+                 cppCompiler.executable = 'aarch64-linux-gnu-g++'
+                 linker.executable = 'aarch64-linux-gnu-g++'
+             }
++            target("riscv64")
+             target("s390_64") {
+                 cppCompiler.executable = 's390x-linux-gnu-g++'
+                 linker.executable = 's390x-linux-gnu-g++'
+@@ -73,6 +74,7 @@ model {
+         x86_64 { architecture "x86_64" }
+         ppcle_64 { architecture "ppcle_64" }
+         aarch_64 { architecture "aarch_64" }
++        riscv64 { architecture "riscv64" }
+         s390_64 { architecture "s390_64" }
+         loongarch_64 { architecture "loongarch_64" }
+     }
+@@ -84,6 +86,7 @@ model {
+                 'x86_64',
+                 'ppcle_64',
+                 'aarch_64',
++                'riscv64',
+                 's390_64',
+                 'loongarch_64'
+             ]) {
+diff --git a/compiler/check-artifact.sh b/compiler/check-artifact.sh
+index a5f33a35b..ebe9dc4a1 100755
+--- a/compiler/check-artifact.sh
++++ b/compiler/check-artifact.sh
+@@ -61,6 +61,8 @@ checkArch ()
+         assertEq "$format" "elf64-x86-64" $LINENO
+       elif [[ "$ARCH" == aarch_64 ]]; then
+         assertEq "$format" "elf64-little" $LINENO
++      elif [[ "$ARCH" == riscv64 ]]; then
++        assertEq $format "elf64-littleriscv" $LINENO
+       elif [[ "$ARCH" == loongarch_64 ]]; then
+         echo $format
+ 	assertEq "$format" "elf64-loongarch" $LINENO
+@@ -119,6 +121,9 @@ checkDependencies ()
+     elif [[ "$ARCH" == aarch_64 ]]; then
+       dump_cmd='aarch64-linux-gnu-objdump -x '"$1"' |grep "NEEDED"'
+       white_list="linux-vdso\.so\.1\|libpthread\.so\.0\|libm\.so\.6\|libc\.so\.6\|ld-linux-aarch64\.so\.1"
++    elif [[ "$ARCH" == riscv64 ]]; then
++      dump_cmd='objdump -p '"$1"' | grep NEEDED'
++      white_list="libm\.so\.6\|libc\.so\.6\|ld-linux-riscv64-lp64d\.so\.1"
+     elif [[ "$ARCH" == loongarch_64 ]]; then
+       dump_cmd='objdump -x '"$1"' | grep NEEDED'
+       white_list="linux-vdso\.so\.1\|libpthread\.so\.0\|libm\.so\.6\|libc\.so\.6\|ld\.so\.1"
+-- 
+2.41.0
+

README.md

@@ -0,0 +1,44 @@
+# spark
+
+#### 介绍
+Apache Spark是一个围绕速度、易用性和复杂分析构建的大数据处理框架，最初在2009年由加州大学伯克利分校的AMPLab开发，并于2010年成为Apache的开源项目之一，
+与Hadoop和Storm等其他大数据和MapReduce技术相比，Spark有如下优势：
+Spark提供了一个全面、统一的框架用于管理各种有着不同性质（文本数据、图表数据等）的数据集和数据源（批量数据或实时的流数据）的大数据处理的需求。
+
+
+#### 软件架构
+软件架构说明
+- 这里是列表文本Spark Core：包含Spark的基本功能；尤其是定义RDD的API、操作以及这两者上的动作。其他Spark的库都是构建在RDD和Spark Core之上的
+- 这里是列表文本Spark SQL：提供通过Apache Hive的SQL变体Hive查询语言（HiveQL）与Spark进行交互的API。每个数据库表被当做一个RDD，Spark SQL查询被转换为Spark操作。
+- 这里是列表文本Spark Streaming：对实时数据流进行处理和控制。Spark Streaming允许程序能够像普通RDD一样处理实时数据
+- 这里是列表文本MLlib：一个常用机器学习算法库，算法被实现为对RDD的Spark操作。这个库包含可扩展的学习算法，比如分类、回归等需要对大量数据集进行迭代的操作。
+- 这里是列表文本GraphX：控制图、并行图操作和计算的一组算法和工具的集合。GraphX扩展了RDD API，包含控制图、创建子图、访问路径上所有顶点的操作
+
+#### 安装教程
+
+1.  xxxx
+2.  xxxx
+3.  xxxx
+
+#### 使用说明
+
+1.  xxxx
+2.  xxxx
+3.  xxxx
+
+#### 参与贡献
+
+1.  Fork 本仓库
+2.  新建 Feat_xxx 分支
+3.  提交代码
+4.  新建 Pull Request
+
+
+#### 特技
+
+1.  使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md
+2.  Gitee 官方博客 [blog.gitee.com](https://blog.gitee.com)
+3.  你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解 Gitee 上的优秀开源项目
+4.  [GVP](https://gitee.com/gvp) 全称是 Gitee 最有价值开源项目，是综合评定出的优秀开源项目
+5.  Gitee 官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
+6.  Gitee 封面人物是一档用来展示 Gitee 会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)

backport-CVE-2024-23945.patch

@@ -0,0 +1,51 @@
+From cf59b1f51c16301f689b4e0f17ba4dbd140e1b19 Mon Sep 17 00:00:00 2001
+From: Sean Owen <srowen@gmail.com>
+Date: Tue, 17 Oct 2023 16:10:56 -0700
+Subject: [PATCH] [MINOR][SQL] Remove signature from Hive thriftserver
+ exception
+
+### What changes were proposed in this pull request?
+
+Don't return expected signature to caller in Hive thriftserver exception
+
+### Why are the changes needed?
+
+Please see private discussion
+
+### Does this PR introduce _any_ user-facing change?
+
+No
+
+### How was this patch tested?
+
+Existing tests
+
+### Was this patch authored or co-authored using generative AI tooling?
+
+No
+
+Closes #43402 from srowen/HiveCookieSigner.
+
+Authored-by: Sean Owen <srowen@gmail.com>
+Signed-off-by: Dongjoon Hyun <dhyun@apple.com>
+---
+ .../src/main/java/org/apache/hive/service/CookieSigner.java    | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/sql/hive-thriftserver/src/main/java/org/apache/hive/service/CookieSigner.java b/sql/hive-thriftserver/src/main/java/org/apache/hive/service/CookieSigner.java
+index 782e47a6..4b8d2cb1 100644
+--- a/sql/hive-thriftserver/src/main/java/org/apache/hive/service/CookieSigner.java
++++ b/sql/hive-thriftserver/src/main/java/org/apache/hive/service/CookieSigner.java
+@@ -81,8 +81,7 @@ public class CookieSigner {
+       LOG.debug("Signature generated for " + rawValue + " inside verify is " + currentSignature);
+     }
+     if (!MessageDigest.isEqual(originalSignature.getBytes(), currentSignature.getBytes())) {
+-      throw new IllegalArgumentException("Invalid sign, original = " + originalSignature +
+-        " current = " + currentSignature);
++      throw new IllegalArgumentException("Invalid sign");
+     }
+     return rawValue;
+   }
+-- 
+2.43.0
+

settings.xml

@@ -1,264 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<!--
- | This is the configuration file for Maven. It can be specified at two levels:
- |
- |  1. User Level. This settings.xml file provides configuration for a single user,
- |                 and is normally provided in ${user.home}/.m2/settings.xml.
- |
- |                 NOTE: This location can be overridden with the CLI option:
- |
- |                 -s /path/to/user/settings.xml
- |
- |  2. Global Level. This settings.xml file provides configuration for all Maven
- |                 users on a machine (assuming they're all using the same Maven
- |                 installation). It's normally provided in
- |                 ${maven.conf}/settings.xml.
- |
- |                 NOTE: This location can be overridden with the CLI option:
- |
- |                 -gs /path/to/global/settings.xml
- |
- | The sections in this sample file are intended to give you a running start at
- | getting the most out of your Maven installation. Where appropriate, the default
- | values (values used when the setting is not specified) are provided.
- |
- |-->
-<settings xmlns="http://maven.apache.org/SETTINGS/1.2.0"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.2.0 https://maven.apache.org/xsd/settings-1.2.0.xsd">
-  <!-- localRepository
-   | The path to the local repository maven will use to store artifacts.
-   |
-   | Default: ${user.home}/.m2/repository
-  <localRepository>/path/to/local/repo</localRepository>
-  -->
-
-  <!-- interactiveMode
-   | This will determine whether maven prompts you when it needs input. If set to false,
-   | maven will use a sensible default value, perhaps based on some other setting, for
-   | the parameter in question.
-   |
-   | Default: true
-  <interactiveMode>true</interactiveMode>
-  -->
-
-  <!-- offline
-   | Determines whether maven should attempt to connect to the network when executing a build.
-   | This will have an effect on artifact downloads, artifact deployment, and others.
-   |
-   | Default: false
-  <offline>false</offline>
-  -->
-
-  <!-- pluginGroups
-   | This is a list of additional group identifiers that will be searched when resolving plugins by their prefix, i.e.
-   | when invoking a command line like "mvn prefix:goal". Maven will automatically add the group identifiers
-   | "org.apache.maven.plugins" and "org.codehaus.mojo" if these are not already contained in the list.
-   |-->
-  <pluginGroups>
-    <!-- pluginGroup
-     | Specifies a further group identifier to use for plugin lookup.
-    <pluginGroup>com.your.plugins</pluginGroup>
-    -->
-  </pluginGroups>
-
-  <!-- proxies
-   | This is a list of proxies which can be used on this machine to connect to the network.
-   | Unless otherwise specified (by system property or command-line switch), the first proxy
-   | specification in this list marked as active will be used.
-   |-->
-  <proxies>
-    <!-- proxy
-     | Specification for one proxy, to be used in connecting to the network.
-     |
-    <proxy>
-      <id>optional</id>
-      <active>true</active>
-      <protocol>http</protocol>
-      <username>proxyuser</username>
-      <password>proxypass</password>
-      <host>proxy.host.net</host>
-      <port>80</port>
-      <nonProxyHosts>local.net|some.host.com</nonProxyHosts>
-    </proxy>
-    -->
-  </proxies>
-
-  <!-- servers
-   | This is a list of authentication profiles, keyed by the server-id used within the system.
-   | Authentication profiles can be used whenever maven must make a connection to a remote server.
-   |-->
-  <servers>
-    <!-- server
-     | Specifies the authentication information to use when connecting to a particular server, identified by
-     | a unique name within the system (referred to by the 'id' attribute below).
-     |
-     | NOTE: You should either specify username/password OR privateKey/passphrase, since these pairings are
-     |       used together.
-     |
-    <server>
-      <id>deploymentRepo</id>
-      <username>repouser</username>
-      <password>repopwd</password>
-    </server>
-    -->
-
-    <!-- Another sample, using keys to authenticate.
-    <server>
-      <id>siteServer</id>
-      <privateKey>/path/to/private/key</privateKey>
-      <passphrase>optional; leave empty if not used.</passphrase>
-    </server>
-    -->
-  </servers>
-
-  <!-- mirrors
-   | This is a list of mirrors to be used in downloading artifacts from remote repositories.
-   |
-   | It works like this: a POM may declare a repository to use in resolving certain artifacts.
-   | However, this repository may have problems with heavy traffic at times, so people have mirrored
-   | it to several places.
-   |
-   | That repository definition will have a unique id, so we can create a mirror reference for that
-   | repository, to be used as an alternate download site. The mirror site will be the preferred
-   | server for that repository.
-   |-->
-  <mirrors>
-    <!-- mirror
-     | Specifies a repository mirror site to use instead of a given repository. The repository that
-     | this mirror serves has an ID that matches the mirrorOf element of this mirror. IDs are used
-     | for inheritance and direct lookup purposes, and must be unique across the set of mirrors.
-     |
-    <mirror>
-      <id>mirrorId</id>
-      <mirrorOf>repositoryId</mirrorOf>
-      <name>Human Readable Name for this Mirror.</name>
-      <url>http://my.repository.com/repo/path</url>
-    </mirror>
-     -->
-    <mirror>
-      <id>big</id>
-      <mirrorOf>*</mirrorOf>
-      <name>huaweicloud</name>
-      <url>https://mirrors.huaweicloud.com/repository/maven/</url>
-      <blocked>true</blocked>
-    </mirror>
-  </mirrors>
-
-  <!-- profiles
-   | This is a list of profiles which can be activated in a variety of ways, and which can modify
-   | the build process. Profiles provided in the settings.xml are intended to provide local machine-
-   | specific paths and repository locations which allow the build to work in the local environment.
-   |
-   | For example, if you have an integration testing plugin - like cactus - that needs to know where
-   | your Tomcat instance is installed, you can provide a variable here such that the variable is
-   | dereferenced during the build process to configure the cactus plugin.
-   |
-   | As noted above, profiles can be activated in a variety of ways. One way - the activeProfiles
-   | section of this document (settings.xml) - will be discussed later. Another way essentially
-   | relies on the detection of a system property, either matching a particular value for the property,
-   | or merely testing its existence. Profiles can also be activated by JDK version prefix, where a
-   | value of '1.4' might activate a profile when the build is executed on a JDK version of '1.4.2_07'.
-   | Finally, the list of active profiles can be specified directly from the command line.
-   |
-   | NOTE: For profiles defined in the settings.xml, you are restricted to specifying only artifact
-   |       repositories, plugin repositories, and free-form properties to be used as configuration
-   |       variables for plugins in the POM.
-   |
-   |-->
-  <profiles>
-    <!-- profile
-     | Specifies a set of introductions to the build process, to be activated using one or more of the
-     | mechanisms described above. For inheritance purposes, and to activate profiles via <activatedProfiles/>
-     | or the command line, profiles have to have an ID that is unique.
-     |
-     | An encouraged best practice for profile identification is to use a consistent naming convention
-     | for profiles, such as 'env-dev', 'env-test', 'env-production', 'user-jdcasey', 'user-brett', etc.
-     | This will make it more intuitive to understand what the set of introduced profiles is attempting
-     | to accomplish, particularly when you only have a list of profile id's for debug.
-     |
-     | This profile example uses the JDK version to trigger activation, and provides a JDK-specific repo.
-    <profile>
-      <id>jdk-1.4</id>
-
-      <activation>
-        <jdk>1.4</jdk>
-      </activation>
-
-      <repositories>
-        <repository>
-          <id>jdk14</id>
-          <name>Repository for JDK 1.4 builds</name>
-          <url>http://www.myhost.com/maven/jdk14</url>
-          <layout>default</layout>
-          <snapshotPolicy>always</snapshotPolicy>
-        </repository>
-      </repositories>
-    </profile>
-    -->
-
-    <!--
-     | Here is another profile, activated by the system property 'target-env' with a value of 'dev',
-     | which provides a specific path to the Tomcat instance. To use this, your plugin configuration
-     | might hypothetically look like:
-     |
-     | ...
-     | <plugin>
-     |   <groupId>org.myco.myplugins</groupId>
-     |   <artifactId>myplugin</artifactId>
-     |
-     |   <configuration>
-     |     <tomcatLocation>${tomcatPath}</tomcatLocation>
-     |   </configuration>
-     | </plugin>
-     | ...
-     |
-     | NOTE: If you just wanted to inject this configuration whenever someone set 'target-env' to
-     |       anything, you could just leave off the <value/> inside the activation-property.
-     |
-    <profile>
-      <id>env-dev</id>
-
-      <activation>
-        <property>
-          <name>target-env</name>
-          <value>dev</value>
-        </property>
-      </activation>
-
-      <properties>
-        <tomcatPath>/path/to/tomcat/instance</tomcatPath>
-      </properties>
-    </profile>
-    -->
-  </profiles>
-
-  <!-- activeProfiles
-   | List of profiles that are active for all builds.
-   |
-  <activeProfiles>
-    <activeProfile>alwaysActiveProfile</activeProfile>
-    <activeProfile>anotherAlwaysActiveProfile</activeProfile>
-  </activeProfiles>
-  -->
-</settings>

spark.spec

@@ -3,33 +3,92 @@
 
 Summary: A unified analytics engine for large-scale data processing.
 Name: spark
-Version: 3.2.0
+Version: 3.5.0
-Release: 2
+Release: 4
-License: Apache License v2.0
+License: Apache 2.0
 URL: http://spark.apache.org/
 Source0: https://github.com/apache/spark/archive/v%{version}.tar.gz
-Source1: settings.xml
+Source1: https://github.com/protocolbuffers/protobuf/archive/refs/tags/v3.21.7.tar.gz
+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
 
-Patch0001: 0001-modify-maven-version-for-3.6.3-to-3.5.4.patch
+%ifarch riscv64
-
+BuildRequires:  protobuf-devel protobuf-compiler
-BuildRequires: java-1.8.0-openjdk-devel
+BuildRequires:  autoconf automake libtool pkgconfig zlib-devel libstdc++-static gcc-c++
-BuildRequires: maven
+Patch1000:      1000-Added-support-for-building-the-riscv64-protoc-binari.patch
+Patch1001:      1001-Add-protoc-java-support-for-riscv64.patch
+Patch1002:      1002-Added-support-for-building-the-riscv64-protoc-gen-gr.patch
+%endif
+BuildRequires: java-1.8.0-openjdk-devel git maven
 
 Requires: java-1.8.0-openjdk
 
-ExclusiveArch: x86_64 aarch64
+ExclusiveArch: x86_64 aarch64 loongarch64 riscv64
 
 %description
 Apache Spark achieves high performance for both batch and streaming data, using a state-of-the-art DAG scheduler, a query optimizer, and a physical execution engine.
 
 %prep
+%ifarch riscv64
+mkdir -p ${HOME}/%{name}-prep_dir
+export PROTOC_VERSION="3."$(protoc --version | awk '{print $NF}')
+mvn install:install-file -DgroupId=com.google.protobuf -DartifactId=protoc -Dversion=${PROTOC_VERSION} -Dclassifier=linux-riscv64 -Dpackaging=exe -Dfile=/usr/bin/protoc
+# protoc
+tar -mxf %{SOURCE1} -C ${HOME}/%{name}-prep_dir
+pushd ${HOME}/%{name}-prep_dir/protobuf-3.21.7
+%patch1000 -p1
+./autogen.sh
+./protoc-artifacts/build-protoc.sh linux riscv64 protoc
+mvn install:install-file -DgroupId=com.google.protobuf -DartifactId=protoc -Dversion=3.21.7 -Dclassifier=linux-riscv64 -Dpackaging=exe -Dfile=protoc-artifacts/target/linux/riscv64/protoc.exe
+popd
+# protoc-jar
+tar -mxf %{SOURCE2} -C ${HOME}/%{name}-prep_dir
+pushd ${HOME}/%{name}-prep_dir/protoc-jar-3.11.4
+%patch1001 -p1
+mvn clean install -Dmaven.test.skip=true -Dmaven.javadoc.skip=true
+popd
+# protoc-jar-maven-plugin
+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
+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
+%patch1002 -p1
+sed -i "s,@HOME@,${HOME},g" build.gradle
+sed -i 's|https\\://services.gradle.org/distributions|file://%{_tmppath}/source|g' gradle/wrapper/gradle-wrapper.properties
+SKIP_TESTS=true ARCH=riscv64 ./buildscripts/kokoro/unix.sh
+mvn install:install-file -DgroupId=io.grpc -DartifactId=protoc-gen-grpc-java -Dversion=1.56.0 -Dclassifier=linux-riscv64 -Dpackaging=exe -Dfile=mvn-artifacts/io/grpc/protoc-gen-grpc-java/1.56.0/protoc-gen-grpc-java-1.56.0-linux-riscv64.exe
+popd
+%endif
+
 %setup -q
 
 %patch0001 -p1
+%patch0002 -p1
+%patch0003 -p1
+
+%ifarch riscv64
+sed -i -e 's/protoVersion = "3.23.4/protoVersion = "'${PROTOC_VERSION}/'' project/SparkBuild.scala
+sed -i -e 's/<protobuf.version>3.23.4/<protobuf.version>'${PROTOC_VERSION}/'' pom.xml
+%endif
 
 %build
-cp %{SOURCE1} ./settings.xml
+%ifarch riscv64
-mvn -DskipTests  -Dmaven.test.skip=true clean package -s settings.xml
+export MAVEN_OPTS="-Xms2048M -Xmx8000M"
+%endif
+./dev/make-distribution.sh --mvn mvn --name spark-3.5.0 --tgz -DskipTests -Dmaven.test.skip=true
 
 %install
 mkdir -p %{buildroot}/opt/
@@ -40,8 +99,25 @@ cp -rf ../%{name}-%{version} %{buildroot}/opt/apache-%{name}-%{version}
 
 
 %changelog
-* Fri Mar 25 2022 xiexing <xiexing4@hisilicon.com> - 3.2.0-2
+* Thu Dec 26 2024 changtao <changtao@kylinos.cn> - 3.5.0-4
-- fix install problem
+- Type: CVE
+- CVE: CVE-2024-23945
+- SUG: NA
+- DESC: fix CVE-2024-23945
+
+* Mon Jul 1 2024 Dingli Zhang <dingli@iscas.ac.cn> - 3.5.0-3
+- Add riscv64 to ExclusiveArch
+- Fix build on riscv64
+- Upgrade os-maven-plugin to 1.7.1
+
+* Tue May 21 2024 Pengda Dou <doupengda@loongson.cn> - 3.5.0-2
+- add loongarch64 to ExclusiveArch
+
+* Mon Sep 25 2023 xiexing <xiexing4@hisilicon.com> - 3.5.0-1
+- update spark version 3.5.0
+
+* Wed Aug 10 2022 xiexing <xiexing4@hisilicon.com> - 3.2.2-1
+- update spark version
 
 * Fri Nov 12 2021 Wuzeyiii<wuzeyi1@huawei.com> - 1.2
 - Update spark version