backport-xml-Don-t-crash-parsing-empty-XML-string.patch

@@ -1,50 +0,0 @@
-From a217a9fea1a1cfb2bee3263b0ea08b860535af8d Mon Sep 17 00:00:00 2001
-From: Christophe Fergeau <cfergeau@redhat.com>
-Date: Mon, 16 Oct 2017 10:48:33 +0200
-Subject: [PATCH] xml: Don't crash parsing empty XML string
-
-Calling rest_xml_parser_parse_from_data() with an empty string ("")
-currently causes a crash as xmlReaderForMemory() returns NULL in that
-case, and we then try to dereference this pointer without checking it's
-non-NULL.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=789053
----
- rest/rest-xml-parser.c | 3 +++
- tests/xml.c            | 6 ++++++
- 2 files changed, 9 insertions(+)
-
-diff --git a/rest/rest-xml-parser.c b/rest/rest-xml-parser.c
-index ffa6ff3..796052e 100644
---- a/rest/rest-xml-parser.c
-+++ b/rest/rest-xml-parser.c
-@@ -103,6 +103,9 @@ rest_xml_parser_parse_from_data (RestXmlParser *parser,
-                                NULL, /* URL? */
-                                NULL, /* encoding */
-                                XML_PARSE_RECOVER | XML_PARSE_NOCDATA);
-+  if (reader == NULL) {
-+      return NULL;
-+  }
-   xmlTextReaderSetErrorHandler(reader, rest_xml_parser_xml_reader_error, NULL);
- 
-   while (xmlTextReaderRead (reader) == 1)
-diff --git a/tests/xml.c b/tests/xml.c
-index 4b7718b..9d03e29 100644
---- a/tests/xml.c
-+++ b/tests/xml.c
-@@ -34,6 +34,12 @@ main (int argc, char **argv)
- 
-   parser = rest_xml_parser_new ();
- 
-+  root = rest_xml_parser_parse_from_data (parser, "", -1);
-+  g_assert (root == NULL);
-+
-+  root = rest_xml_parser_parse_from_data (parser, "<invalid", -1);
-+  g_assert (root == NULL);
-+
-   root = rest_xml_parser_parse_from_data (parser, TEST_XML, strlen (TEST_XML));
-   g_assert (root);
- 
--- 
-2.33.0
-

rest.spec

@@ -1,14 +1,12 @@
 Name:		rest
 Version:	0.8.1
-Release:	9
+Release:	7
 Summary:	A library for access to RESTful web services
 License:	LGPLv2
 URL:		https://www.gnome.org
 Source0:	https://download.gnome.org/sources/%{name}/0.8/%{name}-%{version}.tar.xz
 
 Patch0:		rest-0.8.0-fix-the-XML-test.patch
-Patch1:		backport-xml-Don-t-crash-parsing-empty-XML-string.patch
-Patch2:		skip-some-failed-tests.patch
 
 BuildRequires:	glib2-devel libsoup-devel libxml2-devel gobject-introspection-devel
 BuildRequires:  gtk-doc autoconf automake libtool libxslt
@@ -43,9 +41,6 @@ autoreconf -fiv
 
 %ldconfig_scriptlets
 
-%check
-make check
-
 %files
 %defattr(-,root,root)
 %doc AUTHORS
@@ -71,18 +66,6 @@ make check
 %{_datadir}/gtk-doc/html/rest-0.7
 
 %changelog
-* Tue Sep 26 2023 zhouyihang <zhouyihang3@h-partners.com> - 0.8.1-9
-- Type:requirements
-- Id:NA
-- SUG:NA
-- DESC:enable test
-
-* Wed Nov 09 2022 zhouyihang <zhouyihang3@h-partners.com> - 0.8.1-8
-- Type:bugfix
-- Id:NA
-- SUG:NA
-- DESC:xml do not crash parsing empty XML string
-
 * Sat Nov 23 2019 openEuler Buildteam <buildteam@openeuler.org> - 0.8.1-7
 - Type:bugfix
 - Id:NA

rest.yaml

@@ -1,4 +0,0 @@
-version_control: gitlab.gnome
-src_repo: librest
-tag_prefix: librest-
-seperator: .

skip-some-failed-tests.patch

@@ -1,63 +0,0 @@
-From e11bab03ede4c05743b01f7c8f00556847447843 Mon Sep 17 00:00:00 2001
-From: zhouyihang <zhouyihang3@h-partners.com>
-Date: Tue, 26 Sep 2023 14:55:19 +0800
-Subject: [PATCH] skip some failed tests
-
----
- tests/flickr.c      | 1 +
- tests/lastfm.c      | 1 +
- tests/oauth-async.c | 1 +
- tests/oauth.c       | 1 +
- 4 files changed, 4 insertions(+)
-
-diff --git a/tests/flickr.c b/tests/flickr.c
-index 1befe72..8e97de2 100644
---- a/tests/flickr.c
-+++ b/tests/flickr.c
-@@ -30,6 +30,7 @@
- int
- main (int argc, char **argv)
- {
-+  exit(77);
-   RestProxy *proxy;
-   RestProxyCall *call;
-   GError *error = NULL;
-diff --git a/tests/lastfm.c b/tests/lastfm.c
-index b6af16e..f650e8f 100644
---- a/tests/lastfm.c
-+++ b/tests/lastfm.c
-@@ -31,6 +31,7 @@
- int
- main (int argc, char **argv)
- {
-+  exit(77);
-   RestProxy *proxy;
-   RestProxyCall *call;
-   GError *error = NULL;
-diff --git a/tests/oauth-async.c b/tests/oauth-async.c
-index f23f985..31a8ceb 100644
---- a/tests/oauth-async.c
-+++ b/tests/oauth-async.c
-@@ -115,6 +115,7 @@ on_timeout (gpointer data)
- int
- main (int argc, char **argv)
- {
-+  exit(77);
-   RestProxy *proxy;
-   OAuthProxy *oproxy;
-   GError *error = NULL;
-diff --git a/tests/oauth.c b/tests/oauth.c
-index f8eca46..5d8a390 100644
---- a/tests/oauth.c
-+++ b/tests/oauth.c
-@@ -27,6 +27,7 @@
- int
- main (int argc, char **argv)
- {
-+  exit(77);
-   RestProxy *proxy;
-   OAuthProxy *oproxy;
-   OAuthProxyPrivate *priv;
--- 
-2.33.0
-