diff --git a/0008-modify-sshd-core-version.patch b/0008-modify-sshd-core-version.patch new file mode 100755 index 0000000..cf0e005 --- /dev/null +++ b/0008-modify-sshd-core-version.patch @@ -0,0 +1,25 @@ +From a405d8b048c2e9c9795bb554d75370df1d088d6b Mon Sep 17 00:00:00 2001 +From: jxy_git +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 @@ + 1.0.0.Final + 5.2.0 + 2.2.7 +- 2.5.0 ++ 2.8.0 + 1.5.7 + 1.7.5 + 2.9.0 +-- +2.33.0 + diff --git a/ovirt-engine.spec b/ovirt-engine.spec index 7ade6f3..4bb1fe3 100644 --- a/ovirt-engine.spec +++ b/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: 5 +Release: 6 Summary: Management server for Open Virtualization Group: %{ovirt_product_group} License: Apache 2.0 @@ -197,6 +197,7 @@ 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: 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 @@ -300,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 @@ -362,7 +359,7 @@ Requires: novnc >= 1.0.0 Requires: python3-%{name}-lib >= %{version}-%{release} Requires: openssh >= 8.2p1 Requires: vdsm-jsonrpc-java >= 1.5.4 -Conflicts: vdsm-jsonrpm-java >= 1.6 +Conflicts: vdsm-jsonrpc-java >= 1.6 Requires: java-client-kubevirt >= 0.5.0 Requires: openssl Requires: ovirt-engine-extension-aaa-jdbc >= 1.2.0 @@ -456,11 +453,6 @@ 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} @@ -654,6 +646,7 @@ Setup imageio service. %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 @@ -944,12 +937,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-common-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.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-core.jar/sshd-core-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.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 @@ -969,7 +962,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" @@ -1303,6 +1295,9 @@ fi %{engine_data}/setup/bin/ovirt-engine-health %changelog +* Fri Mar 03 2023 jiangxinyu - 4.4.4.1-6 +- Remove OVN/OVS support + * Fri May 27 2022 yanghuan - 4.4.4.1-5 - Fix CVE-2020-10775