diff --git a/0001-bugfix-invalid-variable-name.patch b/0001-bugfix-invalid-variable-name.patch new file mode 100644 index 0000000000000000000000000000000000000000..1aecf47ee6cbe1384917129cd894535d01a18251 --- /dev/null +++ b/0001-bugfix-invalid-variable-name.patch @@ -0,0 +1,36 @@ +diff --git a/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh b/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh +index bcb8158..e207519 100755 +--- a/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh ++++ b/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh +@@ -2355,6 +2355,9 @@ function hadoop_verify_user_perm + declare command=$2 + declare uvar + ++ if [[ $command =~ \. ]];then ++ return 1 ++ fi + uvar=$(hadoop_build_custom_subcmd_var "${program}" "${command}" USER) + + if [[ -n ${!uvar} ]]; then +@@ -2381,7 +2384,9 @@ function hadoop_need_reexec + declare uvar + + # we've already been re-execed, bail +- ++ if [[ $command =~ \. ]];then ++ return 1 ++ fi + if [[ "${HADOOP_REEXECED_CMD}" = true ]]; then + return 1 + fi +@@ -2421,7 +2426,9 @@ function hadoop_subcommand_opts + if [[ -z "${program}" || -z "${command}" ]]; then + return 1 + fi +- ++ if [[ $command =~ \. ]];then ++ return 1 ++ fi + # bash 4 and up have built-in ways to upper and lower + # case the contents of vars. This is faster than + # calling tr. diff --git a/hadoop-3.1.spec b/hadoop-3.1.spec index 82576bd2d560c7a7f225da54c7a9ddcf90611ee3..671edef712e9f27e4dcbca37d4b6054193580e84 100644 --- a/hadoop-3.1.spec +++ b/hadoop-3.1.spec @@ -12,7 +12,7 @@ %define _binaries_in_noarch_packages_terminate_build 0 Name: hadoop-3.1 Version: 3.1.4 -Release: 6 +Release: 7 Summary: A software platform for processing vast amounts of data # The BSD license file is missing # https://issues.apache.org/jira/browse/HADOOP-9849 @@ -33,6 +33,8 @@ Source11: %{real_name}-hdfs-site.xml Source12: %{real_name}-mapred-site.xml Source13: %{real_name}-yarn-site.xml +Patch1: 0001-bugfix-invalid-variable-name.patch + BuildRoot: %{_tmppath}/%{real_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 @@ -1135,7 +1137,10 @@ fi %config(noreplace) %{_sysconfdir}/%{real_name}/container-executor.cfg %changelog -* Fri Apr 16 2021 Ge Wang -3.2.1-6 +* Wed Jun 16 2021 zhangtao - 3.1.4-7 +- bugfix invalid variable name + +* Fri Apr 16 2021 Ge Wang -3.1.4-6 - Build with local leveldbjni package instead of package in remote repository * Thu Apr 08 2021 Ge Wang - 3.1.4-5