[PR PATCH] raptor: update to 2.0.16.

[PR PATCH] raptor: update to 2.0.16.

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 321 bytes --]

There is a new pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages raptor
https://github.com/void-linux/void-packages/pull/44709

raptor: update to 2.0.16.
None

A patch file from https://github.com/void-linux/void-packages/pull/44709.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-raptor-44709.patch --]
[-- Type: text/x-diff, Size: 5910 bytes --]

From 464218a36ef1cfd2a2c68349560ce0ac1f5ffdba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jun 2023 11:44:06 +0200
Subject: [PATCH] raptor: update to 2.0.16.

---
 ...4c1da2a033c497d84a1291c46f416a9cac51.patch | 31 ++++++++++++++
 srcpkgs/raptor/patches/CVE-2017-18926.patch   | 40 -------------------
 srcpkgs/raptor/patches/out-of-bounds.patch    | 16 --------
 srcpkgs/raptor/template                       |  6 +--
 4 files changed, 34 insertions(+), 59 deletions(-)
 create mode 100644 srcpkgs/raptor/patches/4dbc4c1da2a033c497d84a1291c46f416a9cac51.patch
 delete mode 100644 srcpkgs/raptor/patches/CVE-2017-18926.patch
 delete mode 100644 srcpkgs/raptor/patches/out-of-bounds.patch

diff --git a/srcpkgs/raptor/patches/4dbc4c1da2a033c497d84a1291c46f416a9cac51.patch b/srcpkgs/raptor/patches/4dbc4c1da2a033c497d84a1291c46f416a9cac51.patch
new file mode 100644
index 000000000000..1c718872499e
--- /dev/null
+++ b/srcpkgs/raptor/patches/4dbc4c1da2a033c497d84a1291c46f416a9cac51.patch
@@ -0,0 +1,31 @@
+From 4dbc4c1da2a033c497d84a1291c46f416a9cac51 Mon Sep 17 00:00:00 2001
+From: David Anes <david.anes@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 */
diff --git a/srcpkgs/raptor/patches/CVE-2017-18926.patch b/srcpkgs/raptor/patches/CVE-2017-18926.patch
deleted file mode 100644
index 6f31e508ffc1..000000000000
--- a/srcpkgs/raptor/patches/CVE-2017-18926.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 590681e546cd9aa18d57dc2ea1858cb734a3863f Mon Sep 17 00:00:00 2001
-From: Dave Beckett <dave@dajobe.org>
-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 693b9468..0d3a36a5 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);
diff --git a/srcpkgs/raptor/patches/out-of-bounds.patch b/srcpkgs/raptor/patches/out-of-bounds.patch
deleted file mode 100644
index 54801e5b6590..000000000000
--- a/srcpkgs/raptor/patches/out-of-bounds.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Patch from https://bugs.librdf.org/mantis/view.php?id=650
-
-diff --git a/src/raptor_xml_writer.c b/src/raptor_xml_writer.c
-index 56993dc3..163f34d5 100644
---- a/src/raptor_xml_writer.c
-+++ b/src/raptor_xml_writer.c
-@@ -216,6 +216,9 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer,
- 
-   if(nstack && element->attributes) {
-     for(i = 0; i < element->attribute_count; i++) {
-+      if (nspace_declarations_count > element->attribute_count)
-+        goto error;
-+
-       /* qname */
-       if(element->attributes[i]->nspace) {
-         /* Check if we need a namespace declaration attribute */
diff --git a/srcpkgs/raptor/template b/srcpkgs/raptor/template
index 8c880dfd6939..51f93973c9ae 100644
--- a/srcpkgs/raptor/template
+++ b/srcpkgs/raptor/template
@@ -1,7 +1,7 @@
 # Template file for 'raptor'
 pkgname=raptor
-version=2.0.15
-revision=4
+version=2.0.16
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static --with-yajl=no"
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later, Apache-2.0"
 homepage="https://librdf.org/raptor"
 distfiles="https://librdf.org/dist/source/raptor2-${version}.tar.gz"
-checksum=ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed
+checksum=089db78d7ac982354bdbf39d973baf09581e6904ac4c92a98c5caadb3de44680
 
 libraptor_package() {
 	short_desc+=" - Runtime libraries"

Re: [PR PATCH] [Merged]: raptor: update to 2.0.16.

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 163 bytes --]

There's a merged pull request on the void-packages repository

raptor: update to 2.0.16.
https://github.com/void-linux/void-packages/pull/44709

Description:
None