Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package raptor for openSUSE:Factory checked in at 2023-11-02 20:20:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/raptor (Old) and /work/SRC/openSUSE:Factory/.raptor.new.17445 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "raptor" Thu Nov 2 20:20:35 2023 rev:42 rq:1121386 version:2.0.16 Changes: -------- --- /work/SRC/openSUSE:Factory/raptor/raptor.changes 2020-11-17 21:21:12.925079561 +0100 +++ /work/SRC/openSUSE:Factory/.raptor.new.17445/raptor.changes 2023-11-02 20:20:36.997951850 +0100 @@ -1,0 +2,17 @@ +Thu May 4 09:59:20 UTC 2023 - David Anes <david.a...@suse.com> + +- 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 <dmuel...@suse.com> + +- 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 + +------------------------------------------------------------------- Old: ---- 0001-Calcualte-max-nspace-declarations-correctly-for-XML-.patch.1 raptor2-2.0.15.tar.gz raptor2-2.0.15.tar.gz.asc New: ---- raptor-libxml2-2.11-support.patch raptor2-2.0.16.tar.gz raptor2-2.0.16.tar.gz.asc BETA DEBUG BEGIN: New:- Add support for libxml 2.11.0+ * Added patch raptor-libxml2-2.11-support.patch BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ raptor.spec ++++++ --- /var/tmp/diff_new_pack.olA5BV/_old 2023-11-02 20:20:38.354001747 +0100 +++ /var/tmp/diff_new_pack.olA5BV/_new 2023-11-02 20:20:38.358001894 +0100 @@ -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 @@ %prep %setup -q -n %{name}2-%{version} -%patch1 -p1 %patch2 +%patch3 -p1 %build %configure \ ++++++ raptor-libxml2-2.11-support.patch ++++++ >From 4dbc4c1da2a033c497d84a1291c46f416a9cac51 Mon Sep 17 00:00:00 2001 From: David Anes <david.a...@suse.com> 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 */ ++++++ raptor2-2.0.15.tar.gz -> raptor2-2.0.16.tar.gz ++++++ ++++ 151693 lines of diff (skipped) ++++++ ubsan.patch ++++++ --- /var/tmp/diff_new_pack.olA5BV/_old 2023-11-02 20:20:39.034026769 +0100 +++ /var/tmp/diff_new_pack.olA5BV/_new 2023-11-02 20:20:39.038026916 +0100 @@ -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,18 +11,4 @@ /* Remove <component>/.. 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) {
