From 6b8acd98f17e5c6983c7c1f636b5dee296034c58 Mon Sep 17 00:00:00 2001 From: jxy_git Date: Fri, 3 Mar 2023 18:11:22 +0800 Subject: [PATCH 1/4] Remove OVN/OVS support --- 0008-modify-sshd-core-version.patch | 25 +++++++++++++++++++++++++ ovirt-engine.spec | 27 +++++++++++---------------- 2 files changed, 36 insertions(+), 16 deletions(-) create mode 100755 0008-modify-sshd-core-version.patch 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 -- Gitee From db93d6086aaf37c58e2fac0f6348788d0aa1dd05 Mon Sep 17 00:00:00 2001 From: yanjianqing Date: Wed, 8 Mar 2023 12:49:51 +0800 Subject: [PATCH 2/4] fix engine-setup problem --- 0009-fix-engine-setup-problem.patch | 228 ++++++++++++++++++++++++++++ ovirt-engine.spec | 6 +- 2 files changed, 233 insertions(+), 1 deletion(-) create mode 100644 0009-fix-engine-setup-problem.patch diff --git a/0009-fix-engine-setup-problem.patch b/0009-fix-engine-setup-problem.patch new file mode 100644 index 0000000..a15228d --- /dev/null +++ b/0009-fix-engine-setup-problem.patch @@ -0,0 +1,228 @@ +From ed6bf930fc3177f920908e2421adf980710ec57f Mon Sep 17 00:00:00 2001 +From: Super User +Date: Wed, 8 Mar 2023 11:36:07 +0800 +Subject: [PATCH] fix engine-setup problem + +--- + packaging/bin/engine-backup.sh.in | 3 ++- + packaging/setup/bin/ovirt-engine-upgrade-check.in | 6 ++---- + .../setup/ovirt_engine_setup/engine_common/postgres.py | 6 ++---- + .../ovirt-engine-common/base/core/offlinepackager.py | 6 ++---- + .../ovirt-engine-common/core/offlinepackager.py | 6 ++---- + .../ovirt-engine-common/dialog/titles.py | 6 ++---- + .../ovirt-engine-common/distro-rpm/packages.py | 6 ++---- + .../ovirt-engine-common/distro-rpm/versionlock_config.py | 7 ++++--- + .../plugins/ovirt-engine-setup/ovirt-engine/system/nfs.py | 6 ++---- + 9 files changed, 20 insertions(+), 32 deletions(-) + +diff --git a/packaging/bin/engine-backup.sh.in b/packaging/bin/engine-backup.sh.in +index fd3151b..25120e8 100755 +--- a/packaging/bin/engine-backup.sh.in ++++ b/packaging/bin/engine-backup.sh.in +@@ -994,7 +994,8 @@ dobackup() { + } + + getOSVersion() { +- python@PY_VERSION@ -c 'import platform; d = platform.linux_distribution(full_distribution_name=0); print("%s%s" % (d[0], d[1].split(".")[0]))' ++# python@PY_VERSION@ -c 'import platform; d = platform.linux_distribution(full_distribution_name=0); print("%s%s" % (d[0], d[1].split(".")[0]))' ++ python@PY_VERSION@ -c 'import distro; print("%s%s" % (distro.id(), distrio.version().split(".")[0]))' + } + + createtar() { +diff --git a/packaging/setup/bin/ovirt-engine-upgrade-check.in b/packaging/setup/bin/ovirt-engine-upgrade-check.in +index f357f01..2bae272 100755 +--- a/packaging/setup/bin/ovirt-engine-upgrade-check.in ++++ b/packaging/setup/bin/ovirt-engine-upgrade-check.in +@@ -15,7 +15,7 @@ import platform + import optparse + import gettext + import glob +- ++import distro + + from otopi import common + from otopi import constants as otopicons +@@ -118,9 +118,7 @@ def main(): + setup_packages = get_setup_packages() + + try: +- if platform.linux_distribution( +- full_distribution_name=0 +- )[0] not in ('redhat', 'fedora', 'centos'): ++ if distro.id() not in ('redhat', 'fedora', 'centos','openeuler'): + raise RuntimeError(_('Unsupported distribution')) + + exit = 1 +diff --git a/packaging/setup/ovirt_engine_setup/engine_common/postgres.py b/packaging/setup/ovirt_engine_setup/engine_common/postgres.py +index 51c9c4b..bd8ba4b 100644 +--- a/packaging/setup/ovirt_engine_setup/engine_common/postgres.py ++++ b/packaging/setup/ovirt_engine_setup/engine_common/postgres.py +@@ -15,7 +15,7 @@ import random + import re + import shutil + import time +- ++import distro + from otopi import base + from otopi import constants as otopicons + from otopi import filetransaction +@@ -449,9 +449,7 @@ class Provisioning(base.Base): + self.command.detect('psql') + + def supported(self): +- return platform.linux_distribution( +- full_distribution_name=0 +- )[0] in ('redhat', 'fedora', 'centos') ++ return distro.id() in ('redhat', 'fedora', 'centos','openeuler') + + def validate(self): + if not self.services.exists( +diff --git a/packaging/setup/plugins/ovirt-engine-common/base/core/offlinepackager.py b/packaging/setup/plugins/ovirt-engine-common/base/core/offlinepackager.py +index 7108668..629930a 100644 +--- a/packaging/setup/plugins/ovirt-engine-common/base/core/offlinepackager.py ++++ b/packaging/setup/plugins/ovirt-engine-common/base/core/offlinepackager.py +@@ -12,7 +12,7 @@ + + import gettext + import platform +- ++import distro + from otopi import constants as otopicons + from otopi import packager + from otopi import plugin +@@ -52,9 +52,7 @@ class Plugin(plugin.PluginBase, packager.PackagerBase): + + def __init__(self, context): + super(Plugin, self).__init__(context=context) +- self._distribution = platform.linux_distribution( +- full_distribution_name=0 +- )[0] ++ self._distribution = distro.id() + + @plugin.event( + stage=plugin.Stages.STAGE_INIT, +diff --git a/packaging/setup/plugins/ovirt-engine-provisiondb/ovirt-engine-common/core/offlinepackager.py b/packaging/setup/plugins/ovirt-engine-provisiondb/ovirt-engine-common/core/offlinepackager.py +index 911357c..fbdfc98 100644 +--- a/packaging/setup/plugins/ovirt-engine-provisiondb/ovirt-engine-common/core/offlinepackager.py ++++ b/packaging/setup/plugins/ovirt-engine-provisiondb/ovirt-engine-common/core/offlinepackager.py +@@ -14,7 +14,7 @@ + + import gettext + import platform +- ++import distro + from otopi import constants as otopicons + from otopi import packager + from otopi import plugin +@@ -54,9 +54,7 @@ class Plugin(plugin.PluginBase, packager.PackagerBase): + + def __init__(self, context): + super(Plugin, self).__init__(context=context) +- self._distribution = platform.linux_distribution( +- full_distribution_name=0 +- )[0] ++ self._distribution = distro.id() + + @plugin.event( + stage=plugin.Stages.STAGE_INIT, +diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/dialog/titles.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/dialog/titles.py +index 5f8d02f..9cc2958 100644 +--- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/dialog/titles.py ++++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/dialog/titles.py +@@ -12,7 +12,7 @@ + + import gettext + import platform +- ++import distro + from otopi import plugin + from otopi import util + +@@ -35,9 +35,7 @@ class Plugin(plugin.PluginBase): + + def __init__(self, context): + super(Plugin, self).__init__(context=context) +- self._distribution = platform.linux_distribution( +- full_distribution_name=0 +- )[0] ++ self._distribution = distro.id() + + @plugin.event( + stage=plugin.Stages.STAGE_CUSTOMIZATION, +diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/distro-rpm/packages.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/distro-rpm/packages.py +index 2987052..e7a29ef 100644 +--- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/distro-rpm/packages.py ++++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/distro-rpm/packages.py +@@ -15,7 +15,7 @@ import datetime + import gettext + import os + import platform +- ++import distro + from otopi import constants as otopicons + from otopi import plugin + from otopi import transaction +@@ -266,9 +266,7 @@ class Plugin(plugin.PluginBase): + super(Plugin, self).__init__(context=context) + self._shouldResultVersionLock = False + self._enabled = False +- self._distribution = platform.linux_distribution( +- full_distribution_name=0 +- )[0] ++ self._distribution = distro.id() + + @plugin.event( + stage=plugin.Stages.STAGE_INIT, +diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/distro-rpm/versionlock_config.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/distro-rpm/versionlock_config.py +index 7e9fd9b..47b1f09 100644 +--- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/distro-rpm/versionlock_config.py ++++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/distro-rpm/versionlock_config.py +@@ -12,7 +12,7 @@ + + import os + import platform +- ++import distro + from otopi import constants as otopicons + from otopi import filetransaction + from otopi import plugin +@@ -40,9 +40,10 @@ class Plugin(plugin.PluginBase): + os.path.exists(YUM_VERSIONLOCK_CONF) and + not self.environment[osetupcons.CoreEnv.DEVELOPER_MODE] and + not self.environment[osetupcons.CoreEnv.OFFLINE_PACKAGER] and +- platform.linux_distribution(full_distribution_name=0)[0] in ( ++ distro.id() in ( + 'redhat', +- 'centos' ++ 'centos', ++ 'openeuler' + ) + ) + ) +diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/nfs.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/nfs.py +index a09934d..e43a771 100644 +--- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/nfs.py ++++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/nfs.py +@@ -15,7 +15,7 @@ NFS and RPCbind services configuration plugin. + import gettext + import os + import platform +- ++import distro + from otopi import constants as otopicons + from otopi import filetransaction + from otopi import plugin +@@ -47,9 +47,7 @@ class Plugin(plugin.PluginBase): + + def __init__(self, context): + super(Plugin, self).__init__(context=context) +- self._distribution = platform.linux_distribution( +- full_distribution_name=0 +- )[0] ++ self._distribution = distro.id() + + @plugin.event( + stage=plugin.Stages.STAGE_INIT, +-- +2.39.1 + diff --git a/ovirt-engine.spec b/ovirt-engine.spec index 4bb1fe3..22225df 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: 6 +Release: 7 Summary: Management server for Open Virtualization Group: %{ovirt_product_group} License: Apache 2.0 @@ -198,6 +198,7 @@ Patch5: 0005-fix-interface-report-an-error-when-emulatedMachine-is-null. Patch6: 0007-add-config-item-for-openeuler.patch Patch7: CVE-2020-10775.patch Patch8: 0008-modify-sshd-core-version.patch +Patch9: 0009-fix-engine-setup-problem.patch BuildArch: noarch BuildRequires: assertj-core >= 2.2.0 @@ -1295,6 +1296,9 @@ fi %{engine_data}/setup/bin/ovirt-engine-health %changelog +* Wed Mar 03 2023 yanjianqign -4.4.4.1-7 +- Fix-engine-setup-problem + * Fri Mar 03 2023 jiangxinyu - 4.4.4.1-6 - Remove OVN/OVS support -- Gitee From 68f4808b32a8177dbe0d7d0c5ecd7e495e7fb527 Mon Sep 17 00:00:00 2001 From: yanjianqing Date: Wed, 8 Mar 2023 05:37:36 +0000 Subject: [PATCH 3/4] =?UTF-8?q?update=20ovirt-engine.spec.=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9changlog=E7=9A=84=E9=82=AE=E7=AE=B1=E5=90=8D=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yanjianqing --- ovirt-engine.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ovirt-engine.spec b/ovirt-engine.spec index 22225df..82e8988 100644 --- a/ovirt-engine.spec +++ b/ovirt-engine.spec @@ -1296,7 +1296,7 @@ fi %{engine_data}/setup/bin/ovirt-engine-health %changelog -* Wed Mar 03 2023 yanjianqign -4.4.4.1-7 +* Wed Mar 03 2023 yanjianqing -4.4.4.1-7 - Fix-engine-setup-problem * Fri Mar 03 2023 jiangxinyu - 4.4.4.1-6 -- Gitee From a259acaad417cc8ba0f2f7136c6462ba9558951f Mon Sep 17 00:00:00 2001 From: yanjianqing Date: Wed, 8 Mar 2023 05:42:51 +0000 Subject: [PATCH 4/4] update ovirt-engine.spec. Signed-off-by: yanjianqing --- ovirt-engine.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/ovirt-engine.spec b/ovirt-engine.spec index 82e8988..cd310fe 100644 --- a/ovirt-engine.spec +++ b/ovirt-engine.spec @@ -648,6 +648,7 @@ Setup imageio service. %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -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 -- Gitee