diff --git a/0001-Calcualte-max-nspace-declarations-correctly-for-XML-.patch.1 b/0001-Calcualte-max-nspace-declarations-correctly-for-XML-.patch.1 deleted file mode 100644 index b6f0765..0000000 --- a/0001-Calcualte-max-nspace-declarations-correctly-for-XML-.patch.1 +++ /dev/null @@ -1,43 +0,0 @@ -From 590681e546cd9aa18d57dc2ea1858cb734a3863f Mon Sep 17 00:00:00 2001 -From: Dave Beckett -Date: Sun, 16 Apr 2017 23:15:12 +0100 -Subject: [PATCH] Calcualte max nspace declarations correctly for XML writer - -(raptor_xml_writer_start_element_common): Calculate max including for -each attribute a potential name and value. - -Fixes Issues #0000617 http://bugs.librdf.org/mantis/view.php?id=617 -and #0000618 http://bugs.librdf.org/mantis/view.php?id=618 ---- - src/raptor_xml_writer.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/src/raptor_xml_writer.c b/src/raptor_xml_writer.c -index 693b946..0d3a36a 100644 ---- a/src/raptor_xml_writer.c -+++ b/src/raptor_xml_writer.c -@@ -181,9 +181,10 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer, - size_t nspace_declarations_count = 0; - unsigned int i; - -- /* max is 1 per element and 1 for each attribute + size of declared */ - if(nstack) { -- int nspace_max_count = element->attribute_count+1; -+ int nspace_max_count = element->attribute_count * 2; /* attr and value */ -+ if(element->name->nspace) -+ nspace_max_count++; - if(element->declared_nspaces) - nspace_max_count += raptor_sequence_size(element->declared_nspaces); - if(element->xml_language) -@@ -237,7 +238,7 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer, - } - } - -- /* Add the attribute + value */ -+ /* Add the attribute's value */ - nspace_declarations[nspace_declarations_count].declaration= - raptor_qname_format_as_xml(element->attributes[i], - &nspace_declarations[nspace_declarations_count].length); --- -2.9.3 - diff --git a/raptor-libxml2-2.11-support.patch b/raptor-libxml2-2.11-support.patch new file mode 100644 index 0000000..7e7920a --- /dev/null +++ b/raptor-libxml2-2.11-support.patch @@ -0,0 +1,31 @@ +From 4dbc4c1da2a033c497d84a1291c46f416a9cac51 Mon Sep 17 00:00:00 2001 +From: David Anes +Date: Thu, 4 May 2023 11:54:02 +0200 +Subject: [PATCH] Remove the access to entities 'checked' private symbol for + libxml2 2.11.0 + +Since version 2.11.0, some private symbols that were never intended +as public API/ABI have been removed from libxml2, therefore the field +'checked' is no longer present and raptor fails to build in this +scenario. +--- + src/raptor_libxml.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/raptor_libxml.c b/src/raptor_libxml.c +index 538c2c8e..8bcee139 100644 +--- a/src/raptor_libxml.c ++++ b/src/raptor_libxml.c +@@ -246,10 +246,11 @@ raptor_libxml_getEntity(void* user_data, const xmlChar *name) + + ret->owner = 1; + +-#if LIBXML_VERSION >= 20627 ++#if LIBXML_VERSION >= 20627 && LIBXML_VERSION < 21100 + /* Checked field was released in 2.6.27 on 2006-10-25 + * http://git.gnome.org/browse/libxml2/commit/?id=a37a6ad91a61d168ecc4b29263def3363fff4da6 + * ++ * and was later removed in version 2.11.0 + */ + + /* Mark this entity as having been checked - never do this again */ diff --git a/raptor.changes b/raptor.changes index ab3abbc..33cd5ce 100644 --- a/raptor.changes +++ b/raptor.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Thu May 4 09:59:20 UTC 2023 - David Anes + +- Add support for libxml 2.11.0+ + * Added patch raptor-libxml2-2.11-support.patch + +------------------------------------------------------------------- +Tue Mar 7 12:23:30 UTC 2023 - Dirk Müller + +- update to 2.0.16: + * long list of accumulated bug, security and portability fixes + * see https://librdf.org/raptor/RELEASE.html#rel2_0_16 +- drop + 0001-Calcualte-max-nspace-declarations-correctly-for-XML-.patch.1: + obsolete/upstream +- ubsan.patch: refresh + ------------------------------------------------------------------- Tue Nov 10 08:59:36 UTC 2020 - Dirk Mueller diff --git a/raptor.spec b/raptor.spec index 84540c3..21692e4 100644 --- a/raptor.spec +++ b/raptor.spec @@ -1,7 +1,7 @@ # # spec file for package raptor # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,18 +17,19 @@ Name: raptor -Version: 2.0.15 +Version: 2.0.16 Release: 0 Summary: RDF Parser Toolkit -License: LGPL-2.1-or-later OR GPL-2.0-or-later OR Apache-2.0 +License: Apache-2.0 OR GPL-2.0-or-later OR LGPL-2.1-or-later Group: System/Libraries -URL: http://librdf.org/raptor/ -Source0: http://download.librdf.org/source/%{name}2-%{version}.tar.gz -Source1: http://download.librdf.org/source/raptor2-%{version}.tar.gz.asc +URL: https://librdf.org/raptor/ +Source0: https://download.librdf.org/source/%{name}2-%{version}.tar.gz +Source1: https://download.librdf.org/source/raptor2-%{version}.tar.gz.asc Source2: %{name}.keyring Source3: baselibs.conf -Patch1: https://raw.githubusercontent.com/LibreOffice/core/master/external/redland/raptor/0001-Calcualte-max-nspace-declarations-correctly-for-XML-.patch.1 -Patch2: https://raw.githubusercontent.com/LibreOffice/core/master/external/redland/raptor/ubsan.patch +Patch2: ubsan.patch +# Patch sent upstream: https://github.com/dajobe/raptor/pull/58 +Patch3: raptor-libxml2-2.11-support.patch BuildRequires: bison BuildRequires: curl-devel BuildRequires: libicu-devel @@ -67,8 +68,8 @@ raptor library. %prep %setup -q -n %{name}2-%{version} -%patch1 -p1 %patch2 +%patch3 -p1 %build %configure \ diff --git a/raptor2-2.0.15.tar.gz b/raptor2-2.0.15.tar.gz deleted file mode 100644 index 680defe..0000000 --- a/raptor2-2.0.15.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed -size 1886657 diff --git a/raptor2-2.0.15.tar.gz.asc b/raptor2-2.0.15.tar.gz.asc deleted file mode 100644 index cdfc94e..0000000 --- a/raptor2-2.0.15.tar.gz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.12 (GNU/Linux) - -iD8DBQBUVc6+Q+ySUE9xlVoRAnxqAKCRqSzc78OIh8orUDjdKhVQEcur6ACgpum4 -OQfk2Dv5Vj5nn2JNrHa3loE= -=rKa+ ------END PGP SIGNATURE----- diff --git a/raptor2-2.0.16.tar.gz b/raptor2-2.0.16.tar.gz new file mode 100644 index 0000000..41f9238 --- /dev/null +++ b/raptor2-2.0.16.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:089db78d7ac982354bdbf39d973baf09581e6904ac4c92a98c5caadb3de44680 +size 1750726 diff --git a/raptor2-2.0.16.tar.gz.asc b/raptor2-2.0.16.tar.gz.asc new file mode 100644 index 0000000..f656bfb --- /dev/null +++ b/raptor2-2.0.16.tar.gz.asc @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iF0EABECAB0WIQT4efDe2ngBmN0I3GRD7JJQT3GVWgUCY/+plgAKCRBD7JJQT3GV +WqVvAJ9KqFljL1WQAKgWo+KamkDo9sHLPgCdH+3MgyyJf8BcbcMim8EQQuPqsH0= +=OAOH +-----END PGP SIGNATURE----- diff --git a/ubsan.patch b/ubsan.patch index 71cfda1..9d1a8e5 100644 --- a/ubsan.patch +++ b/ubsan.patch @@ -1,6 +1,8 @@ ---- src/raptor_rfc2396.c +Index: src/raptor_rfc2396.c +=================================================================== +--- src/raptor_rfc2396.c.orig +++ src/raptor_rfc2396.c -@@ -386,7 +386,7 @@ +@@ -386,7 +386,7 @@ raptor_uri_normalize_path(unsigned char* } @@ -9,17 +11,3 @@ /* Remove /.. at the end of the path */ *prev = '\0'; path_len -= (s-prev); ---- src/raptor_uri.c -+++ src/raptor_uri.c -@@ -1336,9 +1336,9 @@ - !strncmp((const char*)base_detail->scheme, - (const char*)reference_detail->scheme, - base_detail->scheme_len) && -- !strncmp((const char*)base_detail->authority, -+ (base_detail->authority_len == 0 || !strncmp((const char*)base_detail->authority, - (const char*)reference_detail->authority, -- base_detail->authority_len)) { -+ base_detail->authority_len))) { - - if(!base_detail->path) { - if(reference_detail->path) {