!45 Fix warning of failing to delete files when uninstall

From: @jxy_git 
Reviewed-by: @wm-wm-wm 
Signed-off-by: @wm-wm-wm

0007-add-config-item-for-openeuler.patch

@@ -0,0 +1,38 @@
+From f7411c6c0795c0936ae59a4fab6c04d74da2d2bc Mon Sep 17 00:00:00 2001
+From: wang--ge <wang__ge@126.com>
+Date: Tue, 16 Nov 2021 09:19:20 +0800
+Subject: [PATCH] add config item for openeuler
+
+---
+ .../roles/ovirt-host-deploy-facts/tasks/host-os.yml      | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-facts/tasks/host-os.yml b/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-facts/tasks/host-os.yml
+index 7e42653..ef92743 100644
+--- a/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-facts/tasks/host-os.yml
++++ b/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-facts/tasks/host-os.yml
+@@ -5,9 +5,15 @@
+         if ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS'
+         else 0 }}"
+     fc_ver: "{{ ansible_distribution_major_version|int
+-        if ansible_distribution == 'Fedora'
++        if (ansible_distribution == 'Fedora' or ansible_distribution == 'openEuler')
+         else 0 }}"
+ 
++- name: Check if system is OpenEuler
++  set_fact:
++    ansible_python_interpreter: "{{ 'usr/bin/python3' }}"
++  when:
++    ansible_distribution == 'openEuler'
++
+ - name: Fetch installed packages
+   package_facts:
+     manager: auto
+@@ -26,3 +32,4 @@
+ - name: Detect if host is a prebuilt image
+   set_fact:
+     node_host: "{{ not node_presence.changed }}"
++
+-- 
+2.27.0
+

0008-modify-sshd-core-version.patch

@@ -0,0 +1,25 @@
+From a405d8b048c2e9c9795bb554d75370df1d088d6b Mon Sep 17 00:00:00 2001
+From: jxy_git <jiangxinyu@kylinos.cn>
+Date: Fri, 21 Oct 2022 10:35:44 +0800
+Subject: [PATCH] modify sshd-core version
+
+---
+ pom.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pom.xml b/pom.xml
+index 19d1cf0..bc389d3 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -63,7 +63,7 @@
+     <javax.interceptor.api.version>1.0.0.Final</javax.interceptor.api.version>
+     <dozer.version>5.2.0</dozer.version>
+     <cxf.version>2.2.7</cxf.version>
+-    <sshd-core.version>2.5.0</sshd-core.version>
++    <sshd-core.version>2.8.0</sshd-core.version>
+     <vdsm-jsonrpc-java.version>1.5.7</vdsm-jsonrpc-java.version>
+     <slf4j.version>1.7.5</slf4j.version>
+     <gwt.version>2.9.0</gwt.version>
+-- 
+2.33.0
+

ovirt-engine.spec

@@ -176,7 +176,7 @@ getent passwd %1 >/dev/null || useradd -r -u %2 -g %3 -c %5 -s /sbin/nologin -d
 
 Name:		ovirt-engine
 Version:	4.4.4.1
-Release:	3
+Release:	5
 Summary:	Management server for Open Virtualization
 Group:		%{ovirt_product_group}
 License:	Apache 2.0
@@ -195,7 +195,9 @@ Patch2:         0002-add-support-running-on-kunpeng-platform.patch
 Patch3:         0003-add-virt-chipset-support.patch
 Patch4:         0004-fit-cluster-can-not-find-error-under-aarch64-platform.patch
 Patch5:         0005-fix-interface-report-an-error-when-emulatedMachine-is-null.patch
-Patch6:         CVE-2020-10775.patch
+Patch6:         0007-add-config-item-for-openeuler.patch
+Patch7:         CVE-2020-10775.patch
+Patch8:         0008-modify-sshd-core-version.patch
 BuildArch:	noarch
 
 BuildRequires:	assertj-core >= 2.2.0
@@ -212,8 +214,9 @@ BuildRequires:	javapackages-local
 
 Requires(pre):	shadow-utils
 
-Requires:	ovirt-engine-wildfly-overlay >= 18
+Requires:	ovirt-engine-wildfly-overlay = 19.1.0
 Requires:	ansible-2.9 
+Requires:       sudo >= 1.9.2
 
 Requires:	%{name}-backend = %{version}-%{release}
 Requires:	%{name}-dbscripts = %{version}-%{release}
@@ -298,10 +301,6 @@ Conflicts:	python3-ipaserver
 # Userportal is retired
 Obsoletes:	%{name}-userportal
 
-# OVS/OVN stuff
-Requires:	python3-pyOpenSSL
-Requires:	ovirt-provider-ovn >= 1.2.1
-
 #JavaScript and CSS libraries are currently bundled
 Provides:	bundled(js-jquery) = 3.4.1
 Provides:	bundled(js-jquery-ui) = 1.12.1
@@ -358,8 +357,9 @@ Requires:	mailcap
 Requires:	mod_ssl
 Requires:	novnc >= 1.0.0
 Requires:	python3-%{name}-lib >= %{version}-%{release}
-Requires:	openssh
+Requires:	openssh >= 8.2p1
 Requires:	vdsm-jsonrpc-java >= 1.5.4
+Conflicts:  vdsm-jsonrpc-java >= 1.6
 Requires:	java-client-kubevirt >= 0.5.0
 Requires:	openssl
 Requires:	ovirt-engine-extension-aaa-jdbc >= 1.2.0
@@ -446,18 +446,13 @@ Requires:	%{name}-setup-plugin-cinderlib = %{version}-%{release}
 Requires:	%{name}-setup-plugin-imageio = %{version}-%{release}
 Requires:	%{name}-dwh-setup >= 4.4.1.2
 Requires:	ovirt-engine-extension-aaa-jdbc >= 1.2.0
-Requires:	openssh
+Requires:	openssh >= 8.2p1
 Requires:       postgresql-13-server
 Requires:       postgresql-13-contrib
 Conflicts:	%{name} < 4.4.0
 # See rhbz# 1676461
 Requires:	ovirt-vmconsole >= 1.0.7
 
-# OVS/OVN stuff, for firewalld service files
-Requires:	openvswitch-ovn-central >= 0:2.7
-Conflicts:	openvswitch-ovn-central = 1:2.6.1
-Requires:	ovirt-provider-ovn >= 1.2.1
-
 %description setup-plugin-ovirt-engine
 Setup and upgrade specific plugins for %{ovirt_product_name_short}
 
@@ -609,7 +604,7 @@ with ovirt-vmconsole-proxy package
 Summary:	Setup and upgrade specific plugins for vmconsole-proxy-helper
 Requires:	%{name}-setup-plugin-ovirt-engine = %{version}-%{release}
 Requires:	%{name}-setup-plugin-ovirt-engine-common = %{version}-%{release}
-Requires:	openssh
+Requires:	openssh >= 8.2p1
 
 %description setup-plugin-vmconsole-proxy-helper
 Setup and upgrade specific plugins for vmconsole-proxy-helper
@@ -628,7 +623,7 @@ A utility for creating a bundle script that runs a health check.
 Summary:	Setup and upgrade specific plugins for cinderlib integration database
 Requires:	%{name}-setup-plugin-ovirt-engine = %{version}-%{release}
 Requires:	%{name}-setup-plugin-ovirt-engine-common = %{version}-%{release}
-Requires:	openssh
+Requires:	openssh >= 8.2p1
 
 %description setup-plugin-cinderlib
 Setup and upgrade specific plugins for cinderlib integration database
@@ -651,6 +646,8 @@ Setup imageio service.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
+%patch8 -p1
 sed -i '87s/@Test/\/\/@Test/g' backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/builder/vminfo/LibvirtVmXmlBuilderTest.java
 sed -i '88s/@MockedConfig/\/\/@MockedConfig/g' backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/builder/vminfo/LibvirtVmXmlBuilderTest.java
 sed -i '121s/@Test/\/\/@Test/g' backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddClusterCommandTest.java
@@ -683,7 +680,9 @@ sed -i 's/require=\"10240\";/require=\"1024\";/g' Makefile
 sed -i 's/MAVEN_OPTS=\"/MAVEN_OPTS=\"-Xmx16384m -Xms16384m /g' Makefile
 sed -i 's/$(BUILD_FLAGS) \\/-Dgwt.compiler.localWorkers=2 $(BUILD_FLAGS) \\/g' Makefile
 sed -i 's/BUILD_ALL_USER_AGENTS=0/BUILD_ALL_USER_AGENTS=1/g' Makefile
-sed -i "s/'centos'/'centos', 'openEuler'/g" packaging/setup/ovirt_engine_setup/engine_common/postgres.py
+sed -i "s/import platform/import distro/g" packaging/setup/ovirt_engine_setup/engine_common/postgres.py
+sed -i "s/platform.linux_distribution/distro.linux_distribution/g" packaging/setup/ovirt_engine_setup/engine_common/postgres.py
+sed -i "s/'centos'/'centos', 'openeuler'/g" packaging/setup/ovirt_engine_setup/engine_common/postgres.py
 sed -i "s/BUILD_LOCALES=0/BUILD_LOCALES=1/g" automation/build-artifacts.sh
 sed -i "s/BUILD_LOCALES=0/BUILD_LOCALES=1/g" Makefile
 sed -i '/slf4j/a\    <module name="com.fasterxml.jackson.core.jackson-databind"/>' backend/manager/modules/utils/src/main/modules/org/ovirt/engine/core/utils/main/module.xml
@@ -939,12 +938,12 @@ perl -i -pe 's/^SHA1-Digest: [^\n]+\n//g' "%{buildroot}%{engine_ear}/META-INF/MA
 %endif
 
 install -dm 755 "%{buildroot}%{engine_data}/modules/common/org/apache/sshd/main"
-cp backend/target/lib/sshd-core-2.5.0.jar %{buildroot}%{engine_data}/modules/common/org/apache/sshd/main
+cp backend/target/lib/sshd-core-2.8.0.jar %{buildroot}%{engine_data}/modules/common/org/apache/sshd/main
-cp backend/target/lib/sshd-common-2.5.0.jar %{buildroot}%{engine_data}/modules/common/org/apache/sshd/main
+cp backend/target/lib/sshd-common-2.8.0.jar %{buildroot}%{engine_data}/modules/common/org/apache/sshd/main
 rm -rf %{buildroot}%{engine_data}/modules/common/org/apache/sshd/main/sshd-core.jar
 rm -rf %{buildroot}%{engine_data}/modules/common/org/apache/sshd/main/sshd-common.jar
-sed -i 's/sshd-common.jar/sshd-common-2.5.0.jar/g' %{buildroot}%{engine_data}/modules/common/org/apache/sshd/main/module.xml
+sed -i 's/sshd-common.jar/sshd-common-2.8.0.jar/g' %{buildroot}%{engine_data}/modules/common/org/apache/sshd/main/module.xml
-sed -i 's/sshd-core.jar/sshd-core-2.5.0.jar/g' %{buildroot}%{engine_data}/modules/common/org/apache/sshd/main/module.xml
+sed -i 's/sshd-core.jar/sshd-core-2.8.0.jar/g' %{buildroot}%{engine_data}/modules/common/org/apache/sshd/main/module.xml
 
 install -dm 755 "%{buildroot}%{_datadir}/java/ebay-cors-filter"
 cp backend/manager/modules/utils/target/lib/cors-filter-1.0.1.jar %{buildroot}%{_datadir}/java/ebay-cors-filter/cors-filter.jar
@@ -964,7 +963,6 @@ fi
 %postun
 if [ "$1" -eq 0 ]; then
 	rm -rf "%{engine_cache}"
-	rm -rf "%{engine_pki}"
 
 	if [ -f "%{_sysconfdir}/yum/pluginconf.d/versionlock.list" ]; then
 		sed -i '/%{name}/d' "%{_sysconfdir}/yum/pluginconf.d/versionlock.list"
@@ -1298,6 +1296,9 @@ fi
 %{engine_data}/setup/bin/ovirt-engine-health
 
 %changelog
+* Mon Aug 01 2022 jiangxinyu <jiangxinyu@kylinos.cn> - 4.4.4.1-4
+- Fix warning of failing to delete files when uninstall
+
 * Fri May 27 2022 yanghuan <huan.yang@epro.com.cn> - 4.4.4.1-3
 - Fix CVE-2020-10775