diff --git a/CVE-2020-25713.patch b/CVE-2020-25713.patch deleted file mode 100644 index 1fb279df3e4df9d1ebc33e917da6f34a50b97b35..0000000000000000000000000000000000000000 --- a/CVE-2020-25713.patch +++ /dev/null @@ -1,33 +0,0 @@ -From a549457461874157c8c8e8e8a6e0eec06da4fbd0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Tue, 24 Nov 2020 10:30:20 +0000 -Subject: [PATCH] CVE-2020-25713 raptor2: malformed input file can lead to a - segfault - -due to an out of bounds array access in -raptor_xml_writer_start_element_common - -See: -https://bugs.mageia.org/show_bug.cgi?id=27605 -https://www.openwall.com/lists/oss-security/2020/11/13/1 -https://gerrit.libreoffice.org/c/core/+/106249 ---- - src/raptor_xml_writer.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/raptor_xml_writer.c b/src/raptor_xml_writer.c -index 56993dc3..4426d38c 100644 ---- a/src/raptor_xml_writer.c -+++ b/src/raptor_xml_writer.c -@@ -227,7 +227,7 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer, - - /* check it wasn't an earlier declaration too */ - for(j = 0; j < nspace_declarations_count; j++) -- if(nspace_declarations[j].nspace == element->attributes[j]->nspace) { -+ if(nspace_declarations[j].nspace == element->attributes[i]->nspace) { - declare_me = 0; - break; - } --- -2.28.0 - diff --git a/raptor2-2.0.15.tar.gz b/raptor2-2.0.15.tar.gz deleted file mode 100644 index a6d94ee80c2524f62fc202086dc51fa6d1314eb2..0000000000000000000000000000000000000000 Binary files a/raptor2-2.0.15.tar.gz and /dev/null differ diff --git a/raptor2-2.0.16.tar.gz b/raptor2-2.0.16.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..b874687ba46b8d1712842ca5f91c249c2cbc4a28 Binary files /dev/null and b/raptor2-2.0.16.tar.gz differ diff --git a/raptor2.spec b/raptor2.spec index ae858587ddb45cc296b32ccdd094129a1ea87f4a..d3ef1c031a107485d2e3a0fe888926500b8faa22 100644 --- a/raptor2.spec +++ b/raptor2.spec @@ -1,12 +1,11 @@ Name: raptor2 -Version: 2.0.15 -Release: 19 +Version: 2.0.16 +Release: 1 Summary: Raptor RDF parsing and serializing utility License: GPLv2+ or LGPLv2+ or ASL 2.0 URL: http://librdf.org/raptor/ Source: http://download.librdf.org/source/raptor2-%{version}.tar.gz -Patch0: CVE-2020-25713.patch #upstream https://github.com/dajobe/raptor/commit/4dbc4c1da2a033c497d84a1291c46f416a9cac51 Patch1: Remove-the-access-to-entities-checked-private-symbol-for-libxml2-2.11.0.patch @@ -72,6 +71,9 @@ make check %{_mandir}/man3/libraptor2* %changelog +* Tue Jun 25 2024 xu_ping <707078654@qq.com> - 2.0.16-1 +- Upgrade version to 2.0.16 + * Thu Aug 10 2023 xu_ping <707078654@qq.com> - 2.0.15-19 - fix build error due to libxml2 upgrade