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 3adf14147c8087d0336b82b285986002064fd1b2..35dc364c8702021434728e625f497042c552f278 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: 5
+Version: 3.3.6
+Release: 2
 Summary: A software platform for processing vast amounts of data
 # The BSD license file is missing
 # https://issues.apache.org/jira/browse/HADOOP-9849
@@ -75,6 +75,7 @@ Obsoletes: %{name}-javadoc < 2.4.1-22%{?dist}
 
 Requires: leveldb
 Requires: protobuf2-java
+Conflicts: hadoop-3.1-client
 
 %description common
 Apache Hadoop is a framework that allows for the distributed processing of
@@ -88,6 +89,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
@@ -100,6 +102,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
@@ -112,6 +115,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
@@ -135,6 +139,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
@@ -149,6 +154,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
@@ -166,6 +172,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
@@ -179,6 +186,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.
@@ -187,6 +195,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
@@ -198,6 +207,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
@@ -219,6 +229,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
@@ -231,6 +242,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
@@ -262,6 +274,7 @@ tar -xzvf ${HOME}/repository/com/github/eirslett/yarn/1.22.5/yarn-1.22.5.tar.gz
 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 
@@ -1131,6 +1144,12 @@ fi
 %config(noreplace) %{_sysconfdir}/%{name}/container-executor.cfg
 
 %changelog
+* Fri Dec 15 2023 xiexing <xiexing4@hisilicon.com> - 3.3.6-2
+- add conflicts to hadoop spec
+
+* Mon Nov 27 2023 wenweijian wenweijian2@huawei.com - 3.3.6-1
+- fix cve CVE-2023-26031
+
 * Fri Oct 20 2023 wenweijian <wenweijian2@huawei.com> - 3.3.4-5
 - remove zookeeper requires.