From 644bac2fa692ba7757c7c77cc70a82195341cf96 Mon Sep 17 00:00:00 2001 From: wangdi Date: Wed, 8 Mar 2023 17:34:52 +0800 Subject: [PATCH] update apache-sshd and postgresql-jdbc version --- ...-apache-sshd-postgresql-jdbc-version.patch | 34 +++++++++++++++++++ ovirt-engine.spec | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 0009-update-apache-sshd-postgresql-jdbc-version.patch diff --git a/0009-update-apache-sshd-postgresql-jdbc-version.patch b/0009-update-apache-sshd-postgresql-jdbc-version.patch new file mode 100644 index 0000000..74b856a --- /dev/null +++ b/0009-update-apache-sshd-postgresql-jdbc-version.patch @@ -0,0 +1,34 @@ +From 88a9c5357954a87fcad43a17e61760093b80eca2 Mon Sep 17 00:00:00 2001 +From: wangdi +Date: Wed, 8 Mar 2023 17:31:50 +0800 +Subject: [PATCH] update apache-sshd postgresql-jdbc version + +--- + pom.xml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pom.xml b/pom.xml +index bc389d3..79c3073 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -51,7 +51,7 @@ + 5.3.1 + 2.6 + 1.5 +- 42.2.3 ++ 42.4.1 + 1.1 + 1.1 + 3.1.3 +@@ -63,7 +63,7 @@ + 1.0.0.Final + 5.2.0 + 2.2.7 +- 2.8.0 ++ 2.9.2 + 1.5.7 + 1.7.5 + 2.9.0 +-- +2.39.1 + diff --git a/ovirt-engine.spec b/ovirt-engine.spec index 4bb1fe3..32c724d 100644 --- a/ovirt-engine.spec +++ b/ovirt-engine.spec @@ -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-update-apache-sshd-postgresql-jdbc-version.patch BuildArch: noarch BuildRequires: assertj-core >= 2.2.0 @@ -647,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