From f2eb8640e19ff73a169257bdd2a323603c52f8f2 Mon Sep 17 00:00:00 2001
From: zhangxianting <zhangxianting@uniontech.com>
Date: Fri, 26 Jul 2024 14:31:34 +0800
Subject: [PATCH] fix build error

---
 ...port-for-avoid-conflict-with-k8s-in-.patch | 39 +++++++++++++++++++
 libreport.spec                                |  7 +++-
 libxml2-encoding.h-remove-tree.h.patch        | 25 ++++++++++++
 3 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 huawei-modify-testcase-port-for-avoid-conflict-with-k8s-in-.patch
 create mode 100644 libxml2-encoding.h-remove-tree.h.patch

diff --git a/huawei-modify-testcase-port-for-avoid-conflict-with-k8s-in-.patch b/huawei-modify-testcase-port-for-avoid-conflict-with-k8s-in-.patch
new file mode 100644
index 0000000..9189498
--- /dev/null
+++ b/huawei-modify-testcase-port-for-avoid-conflict-with-k8s-in-.patch
@@ -0,0 +1,39 @@
+From 90a2c95e52ca8c38cab5a28b969e93262c3642dd Mon Sep 17 00:00:00 2001
+From: caixiaomeng 00662745 <caixiaomeng2@huawei.com>
+Date: Tue, 28 May 2024 19:35:40 +0800
+Subject: [PATCH] modify testcase port for avoid conflict with k8s in 8080
+
+---
+ tests/bugzilla_plugin.at.in                        | 2 +-
+ tests/mock_bugzilla_server/mock_bugzilla_server.py | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/bugzilla_plugin.at.in b/tests/bugzilla_plugin.at.in
+index 22f7fe2..eaf837b 100644
+--- a/tests/bugzilla_plugin.at.in
++++ b/tests/bugzilla_plugin.at.in
+@@ -183,7 +183,7 @@ TS_MAIN
+         sleep(3);
+ 
+         struct bugzilla_struct rhbz = { 0 };
+-        rhbz.b_bugzilla_url = "http://localhost:8080/";
++        rhbz.b_bugzilla_url = "http://localhost:9137/";
+         rhbz.b_bugzilla_xmlrpc = g_build_filename(rhbz.b_bugzilla_url, "xmlrpc.cgi", NULL);
+         rhbz.b_ssl_verify = FALSE;
+ 
+diff --git a/tests/mock_bugzilla_server/mock_bugzilla_server.py b/tests/mock_bugzilla_server/mock_bugzilla_server.py
+index 14d1582..5e84e9c 100755
+--- a/tests/mock_bugzilla_server/mock_bugzilla_server.py
++++ b/tests/mock_bugzilla_server/mock_bugzilla_server.py
+@@ -75,7 +75,7 @@ def populate_struct(dest: dict, src: dict, keys: List[str]):
+         except KeyError:
+             pass
+ 
+-with MyXMLRPCServer(('', 8080), requestHandler=RequestHandler) as server:
++with MyXMLRPCServer(('', 9137), requestHandler=RequestHandler) as server:
+     class Bug:
+         @staticmethod
+         @server.register_function(name='Bug.create')
+-- 
+2.44.0
+
diff --git a/libreport.spec b/libreport.spec
index f4ee31d..7ce496b 100644
--- a/libreport.spec
+++ b/libreport.spec
@@ -2,13 +2,15 @@
 
 Name:    libreport
 Version: 2.17.10
-Release: 1
+Release: 2
 License: GPLv2+
 Summary: Generic library for reporting various problems
 URL:     https://abrt.readthedocs.org/
 Source:  https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
 
 Patch9000: fix-bug-delete-gtk-deprecation-warnings.patch
+Patch9001: libxml2-encoding.h-remove-tree.h.patch
+Patch9002: huawei-modify-testcase-port-for-avoid-conflict-with-k8s-in-.patch
 
 BuildRequires: dbus-devel gtk3-devel curl-devel desktop-file-utils python3-devel
 BuildRequires: gettext libxml2-devel libtar-devel intltool libtool texinfo asciidoc xmlto
@@ -334,6 +336,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_mandir}/man5/bugzilla_formatdup_anaconda.conf.5.*
 
 %changelog
+* Fri Jul 26 2024 zhangxianting <zhangxianting@uniontech.com> - 2.17.10-2
+- fix build error
+
 * Thu Jun 29 2023 dillon chen<dillon.chen@gmail.com> - 2.17.10-1
 - update version to 2.17.10
 
diff --git a/libxml2-encoding.h-remove-tree.h.patch b/libxml2-encoding.h-remove-tree.h.patch
new file mode 100644
index 0000000..ec66e3d
--- /dev/null
+++ b/libxml2-encoding.h-remove-tree.h.patch
@@ -0,0 +1,25 @@
+From 292e392b3dd85580b1e9f1fa1cb1504849188759 Mon Sep 17 00:00:00 2001
+From: zhangxianting <zhangxianting@uniontech.com>
+Date: Fri, 26 Jul 2024 14:29:14 +0800
+Subject: [PATCH] libxml2: encoding.h remove tree.h
+
+---
+ src/plugins/mantisbt.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/plugins/mantisbt.h b/src/plugins/mantisbt.h
+index 1feaf8f..af51ba9 100644
+--- a/src/plugins/mantisbt.h
++++ b/src/plugins/mantisbt.h
+@@ -24,7 +24,7 @@
+ extern "C" {
+ #endif
+ 
+-#include <libxml/encoding.h>
++#include <libxml/tree.h>
+ #include "problem_report.h"
+ 
+ #define SOAP_STRING "ns2:string"
+-- 
+2.33.0
+
-- 
Gitee