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 00483e1ebcfbcecc5799d90c266e2f3e6ade0c4c..e7b05c38d49e977adc5df5c01431c6abdedcd22a 100644 --- a/hadoop.spec +++ b/hadoop.spec @@ -10,7 +10,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*$ %define _binaries_in_noarch_packages_terminate_build 0 Name: hadoop -Version: 3.3.4 +Version: 3.3.6 Release: 1 Summary: A software platform for processing vast amounts of data # The BSD license file is missing @@ -34,6 +34,7 @@ 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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: java-1.8.0-openjdk-devel maven hostname maven-local tomcat cmake snappy openssl-devel @@ -73,6 +74,7 @@ Obsoletes: %{name}-javadoc < 2.4.1-22%{?dist} Requires: apache-zookeeper Requires: leveldb Requires: protobuf2-java +Conflicts: hadoop-3.1-client %description common Apache Hadoop is a framework that allows for the distributed processing of @@ -86,6 +88,7 @@ Hadoop modules. %package common-native Summary: The native Apache Hadoop library file Requires: %{name}-common = %{version}-%{release} +Conflicts: hadoop-3.1-common %description common-native Apache Hadoop is a framework that allows for the distributed processing of @@ -98,6 +101,7 @@ This package contains the native-hadoop library %package devel Summary: Headers for Apache Hadoop Requires: libhdfs%{?_isa} = %{version}-%{release} +Conflicts: hadoop-3.1-common-native %description devel Header files for Apache Hadoop's hdfs library and other utilities @@ -110,6 +114,7 @@ Requires: %{name}-common = %{version}-%{release} Requires(post): systemd Requires(preun): systemd Requires(postun): systemd +Conflicts: hadoop-3.1-hdfs %description hdfs Apache Hadoop is a framework that allows for the distributed processing of @@ -133,6 +138,7 @@ Requires: tcnative Requires(post): systemd Requires(preun): systemd Requires(postun): systemd +Conflicts: hadoop-3.1-httpfs %description httpfs Apache Hadoop is a framework that allows for the distributed processing of @@ -147,6 +153,7 @@ the complete FileSystem/FileContext interface in HDFS. Summary: The Apache Hadoop Filesystem Library Requires: %{name}-hdfs = %{version}-%{release} Requires: lzo +Conflicts: hadoop-3.1-libhdfs %description -n libhdfs Apache Hadoop is a framework that allows for the distributed processing of @@ -164,6 +171,7 @@ Requires: %{name}-mapreduce-examples = %{version}-%{release} Requires(post): systemd Requires(preun): systemd Requires(postun): systemd +Conflicts: hadoop-3.1-mapreduce %description mapreduce Apache Hadoop is a framework that allows for the distributed processing of @@ -177,6 +185,7 @@ This package provides Apache Hadoop MapReduce (MRv2). Summary: Apache Hadoop MapReduce (MRv2) examples BuildArch: noarch Requires: hsqldb +Conflicts: hadoop-3.1-mapreduce-examples %description mapreduce-examples This package contains mapreduce examples. @@ -185,6 +194,7 @@ This package contains mapreduce examples. Summary: Apache Hadoop maven plugin BuildArch: noarch Requires: maven +Conflicts: hadoop-3.1-maven-plugin %description maven-plugin The Apache Hadoop maven plugin @@ -196,6 +206,7 @@ Requires: %{name}-common = %{version}-%{release} Requires: %{name}-hdfs = %{version}-%{release} Requires: %{name}-mapreduce = %{version}-%{release} Requires: %{name}-yarn = %{version}-%{release} +Conflicts: hadoop-3.1-tests %description tests Apache Hadoop is a framework that allows for the distributed processing of @@ -206,7 +217,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} @@ -218,6 +228,7 @@ Requires: leveldbjni Requires(post): systemd Requires(preun): systemd Requires(postun): systemd +Conflicts: hadoop-3.1-yarn nodejs-yarn %description yarn Apache Hadoop is a framework that allows for the distributed processing of @@ -230,6 +241,7 @@ This package contains Apache Hadoop YARN. %package yarn-security Summary: The ability to run Apache Hadoop YARN in secure mode Requires: %{name}-yarn = %{version}-%{release} +Conflicts: hadoop-3.1-yarn-security %description yarn-security Apache Hadoop is a framework that allows for the distributed processing of @@ -241,24 +253,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 - -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 +${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 @@ -308,7 +323,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,7 +1143,10 @@ fi %config(noreplace) %{_sysconfdir}/%{name}/container-executor.cfg %changelog -* Tue Sep 20 2022 xiasenlin - 3.3.4-1 +* Sun Apr 14 2023 xiexing - 3.3.6-1 +- update version to 3.3.6 + +* Mon Sep 19 2022 xiasenlin - 3.3.4-1 - fix cve CVE-2021-25642 * Thu Sep 8 2022 xiasenlin - 3.3.3-2 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/ + + + + +