diff --git a/hadoop-3.3.4-src.tar.gz b/hadoop-3.3.6-src.tar.gz similarity index 74% rename from hadoop-3.3.4-src.tar.gz rename to hadoop-3.3.6-src.tar.gz index d3f7af17aca7392f842547690492d4422894ed6c..520bf79dcccb7bed2d21fadd6023e4eaa46f59d6 100644 Binary files a/hadoop-3.3.4-src.tar.gz and b/hadoop-3.3.6-src.tar.gz differ diff --git a/hadoop.spec b/hadoop.spec index 70f2bc2144caeb2327dee9733b7680e797981f78..495c2b279979da9a12f92eea300f5db2fc77d710 100644 --- a/hadoop.spec +++ b/hadoop.spec @@ -10,8 +10,8 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*$ %define _binaries_in_noarch_packages_terminate_build 0 Name: hadoop -Version: 3.3.4 -Release: 2 +Version: 3.3.6 +Release: 1 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,6 +34,9 @@ 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 @@ -206,7 +209,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,34 +243,27 @@ 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 - -if ("echo `groups`" = "root"); then - mkdir -p /root/.m2/repository/com/github/eirslett/yarn/1.22.5/ - cp %{SOURCE14} /root/.m2/repository/com/github/eirslett/yarn/1.22.5/ - mv /root/.m2/repository/com/github/eirslett/yarn/1.22.5/yarn-v1.22.5.tar.gz /root/.m2/repository/com/github/eirslett/yarn/1.22.5/yarn-1.22.5.tar.gz - tar -xzvf /root/.m2/repository/com/github/eirslett/yarn/1.22.5/yarn-1.22.5.tar.gz -C /root/.m2/repository/com/github/eirslett/yarn/1.22.5/ - npm config set registry https://repo.huaweicloud.com/repository/npm/ - npm cache clean -f - /root/.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 -else - 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/ - 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 -fi +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}/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 ignore-engines true %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 @@ -318,7 +313,7 @@ fi %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 @@ -1138,10 +1133,20 @@ fi %config(noreplace) %{_sysconfdir}/%{name}/container-executor.cfg %changelog -* Thu Dec 1 2022 MacChen1 - 3.3.4-2 -- fix the EBS compile failure +* Mon Nov 27 2023 wenweijian wenweijian2@huawei.com - 3.3.6-1 +- fix cve CVE-2023-26031 + +* 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 -* Tue Sep 20 2022 xiasenlin - 3.3.4-1 +* Mon Sep 19 2022 xiasenlin - 3.3.4-1 - fix cve CVE-2021-25642 * Thu Sep 8 2022 xiasenlin - 3.3.3-2