diff --git a/.raptor2.metadata b/.raptor2.metadata index a06cb48..030e90a 100644 --- a/.raptor2.metadata +++ b/.raptor2.metadata @@ -1 +1 @@ -504231f87024df9aceb90eb957196b557b4b8e38 SOURCES/raptor2-2.0.15.tar.gz +504231f87024df9aceb90eb957196b557b4b8e38 SOURCES/raptor2-2.0.15.tar.gz diff --git a/SOURCES/raptor2-c99.patch b/SOURCES/raptor2-c99.patch new file mode 100644 index 0000000..dbc0719 --- /dev/null +++ b/SOURCES/raptor2-c99.patch @@ -0,0 +1,47 @@ +commit 567d4d1ab639d924e8d5af459476f331b9af0ce5 +Author: Dave Beckett +Date: Tue Nov 4 15:25:20 2014 -0800 + + Fix error returns in new world methods + + (raptor_world_get_parser_factory, + raptor_world_get_serializers_count): Fix return value in assertions + +diff --git a/src/raptor_parse.c b/src/raptor_parse.c +index 26911f47752119c6..6caa7f1c231cc0c3 100644 +--- a/src/raptor_parse.c ++++ b/src/raptor_parse.c +@@ -252,12 +252,12 @@ raptor_world_get_parser_factory(raptor_world *world, const char *name) + * + * Get number of parsers + * +- * Return value: number of parsers ++ * Return value: number of parsers or <0 on failure + **/ + 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, -1); + + raptor_world_open(world); + +diff --git a/src/raptor_serialize.c b/src/raptor_serialize.c +index a1f29d78d33f82ee..a0344418441a2295 100644 +--- a/src/raptor_serialize.c ++++ b/src/raptor_serialize.c +@@ -235,12 +235,12 @@ raptor_get_serializer_factory(raptor_world* world, const char *name) + * + * Get number of serializers + * +- * Return value: number of serializers ++ * Return value: number of serializers or <0 on failure + **/ + 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, -1); + + raptor_world_open(world); + diff --git a/SOURCES/raptor2-configure-c99.patch b/SOURCES/raptor2-configure-c99.patch new file mode 100644 index 0000000..23d9472 --- /dev/null +++ b/SOURCES/raptor2-configure-c99.patch @@ -0,0 +1,35 @@ +Include for printf in __FUNCTION__ check. Otherwise, the +check will fail with compilers which do not implement implicit +function declarations (a C feature that was removed in 1999 from the +language), no matter if the compiler supports FUNCTION or not. + +Submitted upstream: + +diff --git a/configure b/configure +index b0091892a210361d..08501ac8ed5e4fe1 100755 +--- a/configure ++++ b/configure +@@ -13747,6 +13747,8 @@ esac + $as_echo_n "checking whether __FUNCTION__ is available... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ ++ ++#include + int main() { printf(__FUNCTION__); } + _ACEOF + if ac_fn_c_try_compile "$LINENO"; then : +diff --git a/configure.ac b/configure.ac +index 10ff870805b82e65..40a8548b6406866a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -312,7 +312,9 @@ AC_C_BIGENDIAN + AC_C_INLINE + + AC_MSG_CHECKING(whether __FUNCTION__ is available) +-AC_COMPILE_IFELSE([AC_LANG_SOURCE([int main() { printf(__FUNCTION__); }])], ++AC_COMPILE_IFELSE([AC_LANG_SOURCE([ ++#include ++int main() { printf(__FUNCTION__); }])], + [AC_DEFINE([HAVE___FUNCTION__], [1], [Is __FUNCTION__ available]) + AC_MSG_RESULT(yes)], + [AC_MSG_RESULT(no)]) diff --git a/SOURCES/raptor2-libxml2.patch b/SOURCES/raptor2-libxml2.patch new file mode 100644 index 0000000..393bbea --- /dev/null +++ b/SOURCES/raptor2-libxml2.patch @@ -0,0 +1,28 @@ +commit 4dbc4c1da2a033c497d84a1291c46f416a9cac51 +Author: David Anes +Date: Thu May 4 11:54:02 2023 +0200 + + 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. + +diff --git a/src/raptor_libxml.c b/src/raptor_libxml.c +index cee87a58e02c7e97..ecf76327d212c73a 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/SPECS/raptor2.spec b/SPECS/raptor2.spec index 91611ff..b83306b 100644 --- a/SPECS/raptor2.spec +++ b/SPECS/raptor2.spec @@ -2,7 +2,7 @@ Summary: RDF Parser Toolkit for Redland Name: raptor2 Version: 2.0.15 -Release: 30%{?dist} +Release: 44%{?dist} License: GPLv2+ or LGPLv2+ or ASL 2.0 Source: http://download.librdf.org/source/raptor2-%{version}.tar.gz @@ -15,6 +15,9 @@ Patch1: 0001-Calcualte-max-nspace-declarations-correctly-for-XML-.patch Patch2: 0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch ## upstreamable patches +Patch3: raptor2-configure-c99.patch +Patch4: raptor2-c99.patch +Patch5: raptor2-libxml2.patch BuildRequires: make BuildRequires: gcc-c++ @@ -101,12 +104,57 @@ make check %changelog -* Tue Aug 10 2021 Mohan Boddu - 2.0.15-30 -- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Related: rhbz#1991688 +* Mon Dec 23 2024 Arkady L. Shane - 2.0.15-44 +- Rebuilt for MSVSphere 10 -* Fri Apr 16 2021 Mohan Boddu - 2.0.15-29 -- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 +* Fri Jul 19 2024 Fedora Release Engineering - 2.0.15-44 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Wed Jan 31 2024 Pete Walter - 2.0.15-43 +- Rebuild for ICU 74 + +* Fri Jan 26 2024 Fedora Release Engineering - 2.0.15-42 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 2.0.15-41 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 08 2024 Florian Weimer - 2.0.15-40 +- Backport upstream patch to fix C compatibility issues +- Backport another upstream patch to fix build issue with current libxml2 + +* Fri Jul 21 2023 Fedora Release Engineering - 2.0.15-39 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jul 11 2023 FrantiĊĦek Zatloukal - 2.0.15-38 +- Rebuilt for ICU 73.2 + +* Fri Jan 20 2023 Fedora Release Engineering - 2.0.15-37 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Dec 31 2022 Pete Walter - 2.0.15-36 +- Rebuild for ICU 72 + +* Thu Dec 8 2022 Florian Weimer - 2.0.15-35 +- Port configure script to C99 + +* Mon Aug 01 2022 Frantisek Zatloukal - 2.0.15-34 +- Rebuilt for ICU 71.1 + +* Sat Jul 23 2022 Fedora Release Engineering - 2.0.15-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Fri Jan 21 2022 Fedora Release Engineering - 2.0.15-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 2.0.15-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Thu May 20 2021 Pete Walter - 2.0.15-30 +- Rebuild for ICU 69 + +* Wed May 19 2021 Pete Walter - 2.0.15-29 +- Rebuild for ICU 69 * Wed Jan 27 2021 Fedora Release Engineering - 2.0.15-28 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild