diff --git a/hadoop-3.3.3-src.tar.gz b/hadoop-3.3.4-src.tar.gz similarity index 76% rename from hadoop-3.3.3-src.tar.gz rename to hadoop-3.3.4-src.tar.gz index fe1a6bf..d3f7af1 100644 Binary files a/hadoop-3.3.3-src.tar.gz and b/hadoop-3.3.4-src.tar.gz differ diff --git a/hadoop.spec b/hadoop.spec index 8316d3c..00483e1 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.3 +Version: 3.3.4 Release: 1 Summary: A software platform for processing vast amounts of data # The BSD license file is missing @@ -39,7 +39,7 @@ 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 +BuildRequires: npm chrpath Requires: java-1.8.0-openjdk protobuf2-java apache-zookeeper %description @@ -754,10 +754,10 @@ pushd $basedir/share/%{name}/common popd pushd $basedir/share/%{name}/common/lib link_hadoop_jars %{buildroot}%{_datadir}/%{name}/common/lib + \cp -r %{_builddir}/hadoop-%{version}-src/hadoop-dist/target/hadoop-%{version}/share/hadoop/common/lib/* %{buildroot}%{_datadir}/%{name}/common/lib popd # hdfs jar dependencies -echo "----------------hdfs jar dependencies" copy_dep_jars $hdfsdir/share/%{name}/hdfs/lib %{buildroot}%{_datadir}/%{name}/hdfs/lib %{__ln_s} %{_jnidir}/%{name}/%{name}-hdfs-bkjournal.jar %{buildroot}%{_datadir}/%{name}/hdfs/lib cp -f hadoop-hdfs-project/%{name}-hdfs-client/target/hadoop-hdfs-client-%{version}.jar $hdfsdir/share/%{name}/hdfs @@ -767,6 +767,7 @@ cp -f hadoop-hdfs-project/%{name}-hdfs-nfs/target/hadoop-hdfs-nfs-%{version}.jar cp -f hadoop-hdfs-project/%{name}-hdfs-rbf/target/hadoop-hdfs-rbf-%{version}.jar $hdfsdir/share/%{name}/hdfs pushd $hdfsdir/share/%{name}/hdfs link_hadoop_jars %{buildroot}%{_datadir}/%{name}/hdfs + \cp -r %{_builddir}/hadoop-%{version}-src/hadoop-dist/target/hadoop-%{version}/share/hadoop/hdfs/lib %{buildroot}%{_datadir}/%{name}/hdfs/lib popd # httpfs @@ -905,6 +906,9 @@ sed -i "s|{|%{_var}/log/hadoop-hdfs/*.audit\n{|" %{buildroot}%{_sysconfdir}/logr # hdfs init script install -m 755 %{SOURCE8} %{buildroot}%{_sbindir} +chrpath -d %{buildroot}%{_bindir}/container-executor +chrpath -d %{buildroot}%{_bindir}/test-container-executor + %pretrans -p hdfs path = "%{_datadir}/%{name}/hdfs/webapps" st = posix.stat(path) @@ -1124,6 +1128,12 @@ fi %config(noreplace) %{_sysconfdir}/%{name}/container-executor.cfg %changelog +* Tue Sep 20 2022 xiasenlin - 3.3.4-1 +- fix cve CVE-2021-25642 + +* Thu Sep 8 2022 xiasenlin - 3.3.3-2 +- add chrpath to solve check_rpath warning + * Thu Aug 11 2022 xiexing - 3.3.3-1 - update version