janneke pushed a commit to branch core-packages-team
in repository guix.
commit 6bf623695e73b1348f3fe4adf10dc47d6cf4310b
Author: Janneke Nieuwenhuizen <jann...@gnu.org>
AuthorDate: Tue Dec 31 22:10:21 2024 +0100
gnu: raptor2: Update to 2.0.16; fixes build with gcc-14.
* gnu/packages/patches/raptor2-heap-overflow.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Unregister it.
* gnu/packages/rdf.scm (raptor2): Update to 2.0.16 and drop it.
Change-Id: I6a007ac9728d8ed16ddeef425cc544e7f0d861c1
---
gnu/local.mk | 1 -
gnu/packages/patches/raptor2-heap-overflow.patch | 51 ------------------------
gnu/packages/rdf.scm | 7 ++--
3 files changed, 3 insertions(+), 56 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 42bc360918..2e70993008 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2163,7 +2163,6 @@ dist_patch_DATA =
\
%D%/packages/patches/ragel-char-signedness.patch \
%D%/packages/patches/randomjungle-disable-static-build.patch \
%D%/packages/patches/rapidcheck-fix-libs.patch \
- %D%/packages/patches/raptor2-heap-overflow.patch \
%D%/packages/patches/ratpoison-shell.patch \
%D%/packages/patches/retroarch-unbundle-spirv-cross.patch \
%D%/packages/patches/rct-add-missing-headers.patch \
diff --git a/gnu/packages/patches/raptor2-heap-overflow.patch
b/gnu/packages/patches/raptor2-heap-overflow.patch
deleted file mode 100644
index ce2a4516f8..0000000000
--- a/gnu/packages/patches/raptor2-heap-overflow.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-This patch addresses two heap overflow bugs in raptor2:
-
-http://seclists.org/oss-sec/2017/q2/424
-
-Patch copied from libreoffice:
-
-https://github.com/LibreOffice/core/blob/master/external/redland/raptor/0001-Calcualte-max-nspace-declarations-correctly-for-XML-.patch.1
-
-From 590681e546cd9aa18d57dc2ea1858cb734a3863f Mon Sep 17 00:00:00 2001
-From: Dave Beckett <d...@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 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/gnu/packages/rdf.scm b/gnu/packages/rdf.scm
index 58a485553e..481f848a6b 100644
--- a/gnu/packages/rdf.scm
+++ b/gnu/packages/rdf.scm
@@ -10,6 +10,7 @@
;;; Copyright © 2022 Marius Bakke <mar...@gnu.org>
;;; Copyright © 2022 Maxim Cournoyer <maxim.courno...@gmail.com>
;;; Copyright © 2023 Brendan Tildesley <m...@brendan.scot>
+;;; Copyright © 2024 Janneke Nieuwenhuizen <jann...@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -68,16 +69,14 @@
(define-public raptor2
(package
(name "raptor2")
- (version "2.0.15")
+ (version "2.0.16")
(source (origin
(method url-fetch)
(uri (string-append "https://download.librdf.org/source/"; name
"-" version ".tar.gz"))
- (patches
- (search-patches "raptor2-heap-overflow.patch"))
(sha256
(base32
- "1vc02im4mpc28zxzgli68k6j0dakh0k3s389bm436yvqajxg19xd"))))
+ "1026whyxpajwijlr4k5c0iliwn09mwxrg7gkvd5kb0n9ga6vg788"))))
(build-system gnu-build-system)
(inputs
(list curl libxml2 libxslt zlib))
