raptor2: upgrade 2.0.15 -> 2.0.16

0001-Match-reutrn-type-from-RAPTOR_ASSERT_OBJECT_POINTER_.patch
0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch
removed since they're included in 2.0.16

License-Update:
 Copyright year updatd to 2023.
 "David Beckett" changed to "Dave Beckett"
 URL from http changed to https

Changelog:
==========
-  Fixes CVE-2017-18926 and CVE-2020-25713
-  Multiple Appveyor Windows and CMake build fixes by 0u812. (Note: the
   resulting binaries and libraries were not tested on Windows)
-  Turtle parser now reads input in chunks so can handle huge files. Patch
-  Added a serializer for the mKR language.
-  Rapper utility now counts triples using longs
-  Several smaller portability fixes for OpenBSD and cross building

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Wang Mingyu 2023-03-10 14:15:35 +08:00 committed by Khem Raj
parent 1e48109bc5
commit 1928bc1741
3 changed files with 2 additions and 84 deletions

View File

@ -1,47 +0,0 @@
From 97b5dcaa6b221eb403cc92e953225d38aee18f70 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 1 Sep 2022 14:48:39 -0700
Subject: [PATCH] Match reutrn type from
RAPTOR_ASSERT_OBJECT_POINTER_RETURN_VALUE
This ensures that integer type 0 is returned and not NULL
Fixes
raptor_serialize.c:243:66: error: incompatible pointer to integer conversion returning 'void *' from a function with result type 'int' [-Wint-conversion]
RAPTOR_ASSERT_OBJECT_POINTER_RETURN_VALUE(world, raptor_world, NULL);
^~~~
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
src/raptor_parse.c | 2 +-
src/raptor_serialize.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/raptor_parse.c b/src/raptor_parse.c
index 26911f4..0091e1e 100644
--- a/src/raptor_parse.c
+++ b/src/raptor_parse.c
@@ -257,7 +257,7 @@ raptor_world_get_parser_factory(raptor_world *world, const char *name)
int
raptor_world_get_parsers_count(raptor_world* world)
{
- RAPTOR_ASSERT_OBJECT_POINTER_RETURN_VALUE(world, raptor_world, NULL);
+ RAPTOR_ASSERT_OBJECT_POINTER_RETURN_VALUE(world, raptor_world, 0);
raptor_world_open(world);
diff --git a/src/raptor_serialize.c b/src/raptor_serialize.c
index a1f29d7..2bf4ab2 100644
--- a/src/raptor_serialize.c
+++ b/src/raptor_serialize.c
@@ -240,7 +240,7 @@ raptor_get_serializer_factory(raptor_world* world, const char *name)
int
raptor_world_get_serializers_count(raptor_world* world)
{
- RAPTOR_ASSERT_OBJECT_POINTER_RETURN_VALUE(world, raptor_world, NULL);
+ RAPTOR_ASSERT_OBJECT_POINTER_RETURN_VALUE(world, raptor_world, 0);
raptor_world_open(world);
--
2.37.3

View File

@ -1,32 +0,0 @@
From 3f97aac5a1f43ef57b02fb9ccdcadd41a6b69fa9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Tue, 27 Oct 2015 10:21:24 +0100
Subject: [PATCH] configure.ac: do additional checks on libxml2 also when
detected by pkg-config
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Backport [https://github.com/dajobe/raptor/commit/e75b1dbb7f2a6514b8d391b200c45a2bec6268bf]
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 10ff870..35fa08e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -601,7 +601,7 @@ have_libxml=0
need_libxml=0
oCPPFLAGS="$CPPFLAGS"
-if test "X$XML_CONFIG" != X; then
+if test "X$libxml_source" != X; then
CPPFLAGS="$LIBXML_CFLAGS $CPPFLAGS"
LIBS="$LIBS $LIBXML_LIBS"
AC_CHECK_FUNC(xmlCreatePushParserCtxt, have_xmlCreatePushParserCtxt=yes, have_xmlCreatePushParserCtxt=no)
--
2.1.0

View File

@ -1,7 +1,7 @@
SUMMARY = "Library for parsing and serializing RDF syntaxes"
LICENSE = "GPL-2.0-only | LGPL-2.1-only | Apache-2.0"
LIC_FILES_CHKSUM = " \
file://LICENSE.txt;md5=b840e5ae3aeb897f45b473341348cd9c \
file://LICENSE.txt;md5=f7fed8b6ab9289b77f5c14f3f79572cc \
file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
file://LICENSE-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \
@ -11,11 +11,8 @@ DEPENDS = "libxml2 libxslt curl yajl"
SRC_URI = " \
http://download.librdf.org/source/${BPN}-${PV}.tar.gz \
file://0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch \
file://0001-Match-reutrn-type-from-RAPTOR_ASSERT_OBJECT_POINTER_.patch \
"
SRC_URI[md5sum] = "a39f6c07ddb20d7dd2ff1f95fa21e2cd"
SRC_URI[sha256sum] = "ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed"
SRC_URI[sha256sum] = "089db78d7ac982354bdbf39d973baf09581e6904ac4c92a98c5caadb3de44680"
inherit autotools pkgconfig