diff --git a/01-lock-triple-beam-version-to-1.3.0.patch b/01-lock-triple-beam-version-to-1.3.0.patch new file mode 100644 index 0000000000000000000000000000000000000000..64f4d447ba28b4801a805f965156c7ed26ae4ddc --- /dev/null +++ b/01-lock-triple-beam-version-to-1.3.0.patch @@ -0,0 +1,26 @@ +From 2c87b545bf16d9a2433179a56abc17b3efdf1fc4 Mon Sep 17 00:00:00 2001 +From: sunyanan +Date: Thu, 13 Jul 2023 23:26:11 +0800 +Subject: [PATCH] lock triple-beam version to 1.3.0 + +--- + .../hadoop-yarn-applications-catalog-webapp/package.json | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/package.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/package.json +index f09442c..1431303 100644 +--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/package.json ++++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/package.json +@@ -14,6 +14,9 @@ + "bootstrap": "~3.3.7", + "roboto-fontface": "0.10.0" + }, ++ "resolutions": { ++ "triple-beam": "1.3.0" ++ }, + "devDependencies": { + "requirejs": "^2.1.0", + "shelljs": "^0.2.6", +-- +1.8.3.1 + diff --git a/hadoop.spec b/hadoop.spec index 503756777322a5175169d9e2e0889b3e78ce7256..3adf14147c8087d0336b82b285986002064fd1b2 100644 --- a/hadoop.spec +++ b/hadoop.spec @@ -11,7 +11,7 @@ %define _binaries_in_noarch_packages_terminate_build 0 Name: hadoop Version: 3.3.4 -Release: 1 +Release: 5 Summary: A software platform for processing vast amounts of data # The BSD license file is missing # https://issues.apache.org/jira/browse/HADOOP-9849 @@ -34,13 +34,16 @@ Source13: %{name}-yarn-site.xml Source14: yarn-v1.22.5.tar.gz Source15: node-12.22.1-linux-x64.tar.gz Source16: node-v12.22.1-linux-arm64.tar.gz +Source17: settings.xml + +Patch0: 01-lock-triple-beam-version-to-1.3.0.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: java-1.8.0-openjdk-devel maven hostname maven-local tomcat cmake snappy openssl-devel BuildRequires: cyrus-sasl-devel chrpath systemd protobuf2-compiler protobuf2-devel protobuf2-java protobuf2 BuildRequires: leveldbjni leveldb-java hawtjni-runtime gcc-c++ BuildRequires: npm chrpath -Requires: java-1.8.0-openjdk protobuf2-java apache-zookeeper +Requires: java-1.8.0-openjdk protobuf2-java %description Apache Hadoop is a framework that allows for the distributed processing of @@ -70,7 +73,6 @@ BuildArch: noarch Requires(pre): /usr/sbin/useradd Obsoletes: %{name}-javadoc < 2.4.1-22%{?dist} -Requires: apache-zookeeper Requires: leveldb Requires: protobuf2-java @@ -206,7 +208,6 @@ offering local computation and storage. This package contains test related resources for Apache Hadoop. %package yarn -BuildArch: noarch Summary: Apache Hadoop YARN Requires: %{name}-common = %{version}-%{release} Requires: %{name}-mapreduce = %{version}-%{release} @@ -241,24 +242,26 @@ This package contains files needed to run Apache Hadoop YARN in secure mode. %prep %autosetup -p1 -n %{name}-%{version}-src -mvn install:install-file -DgroupId=org.fusesource.leveldbjni -DartifactId=leveldbjni-all -Dversion=1.8 -Dpackaging=jar -Dfile=/usr/lib/java/leveldbjni-all.jar -mvn install:install-file -DgroupId=org.fusesource.leveldbjni -DartifactId=leveldbjni -Dversion=1.8 -Dpackaging=jar -Dfile=/usr/lib/java/leveldbjni/leveldbjni.jar -mvn install:install-file -DgroupId=org.iq80.leveldb -DartifactId=leveldb-api -Dversion=0.7 -Dpackaging=jar -Dfile=/usr/share/java/leveldb-java/leveldb-api.jar -mvn install:install-file -DgroupId=org.iq80.leveldb -DartifactId=leveldb-benchmark -Dversion=0.7 -Dpackaging=jar -Dfile=/usr/share/java/leveldb-java/leveldb-benchmark.jar -mvn install:install-file -DgroupId=org.iq80.leveldb -DartifactId=leveldb -Dversion=0.7 -Dpackaging=jar -Dfile=/usr/share/java/leveldb-java/leveldb.jar -mvn install:install-file -DgroupId=orn.fusesource.hawtjni -DartifactId=hawtjni-runtime -Dversion=1.16 -Dpackaging=jar -Dfile=/usr/lib/java/hawtjni/hawtjni-runtime.jar - -mkdir -p /home/abuild/.m2/repository/com/github/eirslett/node/12.22.1/ -cp %{SOURCE15} /home/abuild/.m2/repository/com/github/eirslett/node/12.22.1/ -cp %{SOURCE16} /home/abuild/.m2/repository/com/github/eirslett/node/12.22.1/ -mv /home/abuild/.m2/repository/com/github/eirslett/node/12.22.1/node-v12.22.1-linux-arm64.tar.gz /home/abuild/.m2/repository/com/github/eirslett/node/12.22.1/node-12.22.1-linux-arm64.tar.gz -mkdir -p /home/abuild/.m2/repository/com/github/eirslett/yarn/1.22.5/ -cp %{SOURCE14} /home/abuild/.m2/repository/com/github/eirslett/yarn/1.22.5/ -mv /home/abuild/.m2/repository/com/github/eirslett/yarn/1.22.5/yarn-v1.22.5.tar.gz /home/abuild/.m2/repository/com/github/eirslett/yarn/1.22.5/yarn-1.22.5.tar.gz -tar -xzvf /home/abuild/.m2/repository/com/github/eirslett/yarn/1.22.5/yarn-1.22.5.tar.gz -C /home/abuild/.m2/repository/com/github/eirslett/yarn/1.22.5/ +cp %{SOURCE17} ./ +sed -i "s,@HOME@,${HOME},g" settings.xml +mvn install:install-file -DgroupId=org.fusesource.leveldbjni -DartifactId=leveldbjni-all -Dversion=1.8 -Dpackaging=jar -Dfile=/usr/lib/java/leveldbjni-all.jar -s settings.xml +mvn install:install-file -DgroupId=org.fusesource.leveldbjni -DartifactId=leveldbjni -Dversion=1.8 -Dpackaging=jar -Dfile=/usr/lib/java/leveldbjni/leveldbjni.jar -s settings.xml +mvn install:install-file -DgroupId=org.iq80.leveldb -DartifactId=leveldb-api -Dversion=0.7 -Dpackaging=jar -Dfile=/usr/share/java/leveldb-java/leveldb-api.jar -s settings.xml +mvn install:install-file -DgroupId=org.iq80.leveldb -DartifactId=leveldb-benchmark -Dversion=0.7 -Dpackaging=jar -Dfile=/usr/share/java/leveldb-java/leveldb-benchmark.jar -s settings.xml +mvn install:install-file -DgroupId=org.iq80.leveldb -DartifactId=leveldb -Dversion=0.7 -Dpackaging=jar -Dfile=/usr/share/java/leveldb-java/leveldb.jar -s settings.xml +mvn install:install-file -DgroupId=orn.fusesource.hawtjni -DartifactId=hawtjni-runtime -Dversion=1.16 -Dpackaging=jar -Dfile=/usr/lib/java/hawtjni/hawtjni-runtime.jar -s settings.xml + +mkdir -p ${HOME}/repository/com/github/eirslett/node/12.22.1/ +cp %{SOURCE15} ${HOME}/repository/com/github/eirslett/node/12.22.1/ +cp %{SOURCE16} ${HOME}/repository/com/github/eirslett/node/12.22.1/ +mv ${HOME}/repository/com/github/eirslett/node/12.22.1/node-v12.22.1-linux-arm64.tar.gz ${HOME}/repository/com/github/eirslett/node/12.22.1/node-12.22.1-linux-arm64.tar.gz +mkdir -p ${HOME}/repository/com/github/eirslett/yarn/1.22.5/ +cp %{SOURCE14} ${HOME}/repository/com/github/eirslett/yarn/1.22.5/ +mv ${HOME}/repository/com/github/eirslett/yarn/1.22.5/yarn-v1.22.5.tar.gz ${HOME}/repository/com/github/eirslett/yarn/1.22.5/yarn-1.22.5.tar.gz +tar -xzvf ${HOME}/repository/com/github/eirslett/yarn/1.22.5/yarn-1.22.5.tar.gz -C ${HOME}/repository/com/github/eirslett/yarn/1.22.5/ npm config set registry https://repo.huaweicloud.com/repository/npm/ npm cache clean -f -/home/abuild/.m2/repository/com/github/eirslett/yarn/1.22.5/yarn-v1.22.5/bin/yarn config set registry https://repo.huaweicloud.com/repository/npm/ -g +${HOME}/repository/com/github/eirslett/yarn/1.22.5/yarn-v1.22.5/bin/yarn config set registry https://repo.huaweicloud.com/repository/npm/ -g %pom_add_dep org.iq80.leveldb:leveldb-api:0.7 hadoop-hdfs-project/hadoop-hdfs %pom_add_dep org.iq80.leveldb:leveldb-api:0.7 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy @@ -308,7 +311,7 @@ npm cache clean -f %mvn_file :%{name}-common::tests: %{name}/%{name}-common %build -mvn clean -Dsnappy.lib=/usr/lib64 -Dbundle.snappy -Dcontainer-executor.conf.dir=%{_sysconfdir}/%{name} -Pdist,native -DskipTests -DskipIT -Dmaven.javadoc.skip=true package +mvn clean -Dsnappy.lib=/usr/lib64 -Dbundle.snappy -Dcontainer-executor.conf.dir=%{_sysconfdir}/%{name} -Pdist,native -DskipTests -DskipIT -Dmaven.javadoc.skip=true package -s settings.xml %install # Copy all jar files except those generated by the build @@ -1128,12 +1131,25 @@ fi %config(noreplace) %{_sysconfdir}/%{name}/container-executor.cfg %changelog +* Fri Oct 20 2023 wenweijian - 3.3.4-5 +- remove zookeeper requires. + +* Wed Aug 16 2023 Jia Chao - 3.3.4-4 +- fix: use $HOME rather than /home/abuild, suit for all buildtools. +- fix: yarn have ELF bin, not noarch at all. + +* Thu Jul 13 2023 sunyanan - 3.3.4-3 +- lock triple-beam version to 1.3.0 + +* Thu Mar 9 2023 xiexing - 3.3.4-2 +- fix EBS install problem + * Mon Sep 19 2022 xiexing - 3.3.4-1 -- fix CVE-2021-25642 +- fix CVE-2021-25642 * Tue Sep 13 2022 xiexing - 3.3.3-1 - update version to fix CVE-2021-37404 CVE-2022-26612 - CVE-2021-33036 CVE-2022-25168 + CVE-2021-33036 CVE-2022-25168 and add chrpath to solve check_rpath warning * Fri Feb 25 2022 wangkai - 3.2.1-12 diff --git a/settings.xml b/settings.xml new file mode 100644 index 0000000000000000000000000000000000000000..a41ffcd5d8b6b65eb24879aaa295a39f12ad8ab2 --- /dev/null +++ b/settings.xml @@ -0,0 +1,22 @@ + + + + @HOME@/repository/ + + + + + + + + + huaweicloud + * + https://repo.huaweicloud.com/repository/maven/ + + + + +