diff options
Diffstat (limited to 'media-libs/raptor')
12 files changed, 2 insertions, 524 deletions
diff --git a/media-libs/raptor/Manifest b/media-libs/raptor/Manifest index 7c4f31460455..50efb2dea3e0 100644 --- a/media-libs/raptor/Manifest +++ b/media-libs/raptor/Manifest @@ -1,16 +1,5 @@ -AUX 0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch 1197 BLAKE2B f570a9a479e9d73f506c16dc7c3a75badf5da2e2407173b1ddd6ed8374f269ca628ea1b84adf94ac3b055db9a1d74f812db9557b96c92300f53c60a5048728a6 SHA512 1d392b6fc41d59349b75e9ab5adcf95a545c02709ec2a71b1855f98a444c9e753ca44464264c624fcaf6e49404f8f92d7aa7b85dfacecb1c7c28f3960e9c4fb9 -AUX raptor-2.0.15-clang-pointer-integer-warning.patch 1389 BLAKE2B 2673d64c4aa1ab6802a77c8f0196d17ac0b948aaa1fd18d120c566a0f453eb28e2478df5bdd3766daeebc079c61dbd1fc0eb13dcf0a89021cf2a9922151885be SHA512 774c4aa61d0184a76e8d23935c20e99e5b7be90dd3945ce071f89bbb8cc623b40037e2efcaeaa8019a2e8068e2e9b2bb0e74174a5c8e37c8603937c47c0301ab -AUX raptor-2.0.15-configure-clang16.patch 1215 BLAKE2B 6778c055bda00e769458745be34ad079a5ac1ca67e9756caef5a54f8a05ec634484b45573232c967d1d22ee91dcd3c96d63ccf5352e34d1931b23029c9b506ea SHA512 253d65d6958df061aeedfbf354db01a2f8770483c355ea26469c742de97ce690efb18e452a5fcecda06440f35bd68353cbefdadcf82fa8dea175de7b3a5eca57 -AUX raptor-2.0.15-dont_use_curl-config.patch 1681 BLAKE2B 5c3b241836e04dabbcd6fd9db6e89225fcd8cf4c1eed24dff7bb5348d7a0985633a7f9173a5279b04ec277ad0f775a18c52ae33af86b6522a21a3e63123d162d SHA512 28e3137592c14dcf9fc1d8401e6bc58af7f1abcab4886acde42a03dd7b61aa9b176672300951f7b4fcdf5128ce445f12594f7a09444331d1d6c34aaa7a4b9cfc -AUX raptor-2.0.15-heap-overflow.patch 1708 BLAKE2B cea8df63861760fe55f1320cbc0833d814c38148b3d5f2b7163348de48bd95a37ee3000d312ce76879c798182f74d60f49fcef89f5f051bd40febc0c1da68099 SHA512 f7df0ec3123ac8ec9f2852dfb54e380d210446a36ab2f74aa9d2dcb8346162046d239b4db9a0747b18e3d19f4dc1ce41d194557c5e53027a3618e81b7b251d3d -AUX raptor-2.0.15-libxml2-2.11.patch 1114 BLAKE2B 0e3462817a77917eb82066f7d9efb1a28fa27221596c18fb140dadb4c0fd074b0936ed5cbd9fc620548796f548ad75890b00a3f73300af7d754cea695dc7f993 SHA512 6d6c6ab0be9136ccf3e5b0c1140e88a49cbf94d4c36d27e3bb672ef13c83cdc7c8048c7ef883f9302fb3924ed78db1b059a983b9e1f8bce4522d5ef33a811ba7 -AUX raptor-2.0.15-use-pkg-config-icu.patch 1575 BLAKE2B 7dfc19ecd246a049663c7e1ad6853fc9b8540a5a26ae24e3479c8fc7da4e519fd3ab4d5c8003962aed1b744701d8294cf0f08a298f854c0e58ecef6e1b42b7e9 SHA512 5848ca19d016aa46991c54de4f3d2f80cbc17c922f75fac49b5d7a9e33be07f6102f9c929107a2ed193d95a1333c64b436fa25639cf1803d0d60c40185d617f3 -AUX raptor-2.0.15-use-pkg-config-libxml2.patch 1479 BLAKE2B 8b2f1d1a10b04d6c67b807af14c2e78444234c0202414fa172a34436e3c39399a02a7ebd7439f985dfc564b5899d2ffbf2c9a55b399b2db6cdc5b76118276055 SHA512 6d146068f386346af6e745791fb6adedb98fa7f9fe54838578c0a2261f9efadfca72e36eb5a9fd2e24a36264c780a7869482c16667a7bd067604b5cb62959c05 -AUX raptor-2.0.15-use-pkg-config-libxslt.patch 3514 BLAKE2B 5bcdb3fecf1149ad60387bc4c485d42fd9f764556ebf383201baa3d18426a85ca76a3f29723a8f74be71a58fcfba9f5263a1b1681d012ea4cc0167260702d111 SHA512 0eef2e55e8f77ceb8ac1dc639eea7cb7ee53e53d0ad8058af8b52d44d9f5a5a4e027c7c90360b950469f0c632721c8be068fde7f7fdb8e93aab06b56d3845150 AUX raptor-2.0.16-dont_use_curl-config.patch 2079 BLAKE2B 6e0df04d318e189613912d33e17b46ece25d7bc04f351dada3d2cf94f4bc8ef51d9da75bbeb2a4b94f4bf9168de0a3d6f7713f0537d83d4a8dc8c31dbe170f66 SHA512 82f857bace0048b393460ef03ec532cb884b45aafd799fba6b33bce02b1799cc34a0ccdc38b8d5fdc4d6e75ebe8c9380004dacadea18f25e17f5322fb608ae3f AUX raptor-2.0.16-libxml2-2.11-compatibility.patch 1079 BLAKE2B 044c7288b72d9d99154ab4b26a1709bc769eb737f2dffa7a3689e499981af54ec80cb3021218f437754feceedc20fea1db0d22a3f8ce0912afb101ec55d3cebc SHA512 2e00218a4c6ce3e214e5b1ea378310497cc95983a6fac8301534a59e722af5d2f3fd8ffc24ab0918ed8fc430b7127626aeaf844df8a9b3aefd3f40c1c1909e50 -DIST raptor2-2.0.15.tar.gz 1886657 BLAKE2B 0a39c7b5705bfbf2daa0ca633f79693953b4dfe24c144008d1646a9840a36d4d7ce153b527450647127ec2522047dbd0a6e71f307ee5656951f7e4b610adfd22 SHA512 563dd01869eb4df8524ec12e2c0a541653874dcd834bd1eb265bc2943bb616968f624121d4688579cdce11b4f00a8ab53b7099f1a0850e256bb0a2c16ba048ee DIST raptor2-2.0.16.tar.gz 1750726 BLAKE2B 1e5e5742ba4cdaacb98a9ba77a9352589df0da60869e7721ee140c81ed4886bf909b37b247bd925c82a4ac44b3c11a909c913f0851d49a1d9d91c9293189266d SHA512 9bd5cff36390e1e0ef15ac56e5413ecfceb4018cb531a4da8850d3623615f12a93690a78be61f9d9ae7a24e16f6446e356bc2b7f34051ddc077761d85a9b7c44 -EBUILD raptor-2.0.15-r8.ebuild 2038 BLAKE2B b6c6e9d5fe16b9be682a427a3ca447f8667c9dd065a8bcf1a055e3217b535a185857bb2ac150dc453ebc443accff1c852a624e9aafd2e9c7503be31a36cceac4 SHA512 11e730facf8eaf61a1f98dd53634ed387a2386b62afcfc3d3043819d2fe107c5d0f5701809bd11aa540fd8eae4281e7b341e61fcbbaeea7019021815f8db3c3d -EBUILD raptor-2.0.16.ebuild 1664 BLAKE2B 76f0e7c1ee53bf6c363367d0e4cb0cfc761929704f4857c52ebc140ec2caed3a6c121349e3075dbea7a479614a6d347f230d20c0128d50eb97f99baaaa8478b8 SHA512 aeccc704a2e80353d4ccbd3c206f1663d3184cc7dd44d7d1b158a95f033dc514cae6a4df88a638505a85555fcdc5aac6d88dac0b51a62078d1616e8bdb81c0b3 +EBUILD raptor-2.0.16.ebuild 1657 BLAKE2B db99a5796193505fb0374d1ddf5527ad997ee4dcaba6719e321ba571ea00e75f98c4e4b2265bc11902f5bf42985e85d9c87af082bbd858194ba1e5561504b82c SHA512 6144c9425f5e97a83398acf433e1a62c2b86e15eda2baac4592c35c9d7f12516d57c9450038b65a6a188dccb024baea4d4cffd5e0e403ae9aed05f13be18bf11 MISC metadata.xml 406 BLAKE2B 00da42e759d35fc777ebbce9df89b600758104eb240cbecff33df51779ac9f565a3f7ee35a89a7fb91fd234c1a19b89ff96416189a5015e5563cbd4f420f616a SHA512 1855a61f21b684e5abbf35c3276dc8185eb805574c65e84593eed08d1598d213ca99c17bfe86be3db3172dc103b1dd2b8524e22aeeaf912afa097d022ad0c5d2 diff --git a/media-libs/raptor/files/0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch b/media-libs/raptor/files/0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch deleted file mode 100644 index dc693dfec222..000000000000 --- a/media-libs/raptor/files/0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a549457461874157c8c8e8e8a6e0eec06da4fbd0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com> -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/media-libs/raptor/files/raptor-2.0.15-clang-pointer-integer-warning.patch b/media-libs/raptor/files/raptor-2.0.15-clang-pointer-integer-warning.patch deleted file mode 100644 index badb450456e4..000000000000 --- a/media-libs/raptor/files/raptor-2.0.15-clang-pointer-integer-warning.patch +++ /dev/null @@ -1,44 +0,0 @@ -https://bugs.gentoo.org/869380 -https://github.com/dajobe/raptor/commit/567d4d1ab639d924e8d5af459476f331b9af0ce5 - -From: Dave Beckett <dave@dajobe.org> -Date: Tue, 4 Nov 2014 15:25:20 -0800 -Subject: [PATCH] Fix error returns in new world methods - -(raptor_world_get_parser_factory, -raptor_world_get_serializers_count): Fix return value in assertions ---- 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); - ---- 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/media-libs/raptor/files/raptor-2.0.15-configure-clang16.patch b/media-libs/raptor/files/raptor-2.0.15-configure-clang16.patch deleted file mode 100644 index ab62fd9bff0c..000000000000 --- a/media-libs/raptor/files/raptor-2.0.15-configure-clang16.patch +++ /dev/null @@ -1,28 +0,0 @@ -https://github.com/dajobe/raptor/pull/55 - -From b7c252e1d5601321a5a6f6627745753b5c704762 Mon Sep 17 00:00:00 2001 -From: Sam James <sam@gentoo.org> -Date: Fri, 4 Nov 2022 01:53:32 +0000 -Subject: [PATCH] configure.ac: fix -Wimplicit-function-declaration in - HAVE___FUNCTION__ test - -This breaks with Clang 16 which makes such errors fatal: -``` -error: call to undeclared library function 'printf' with type 'int (const char *, ...)'; ISO C99 and later do not support implicit function declarations [-Werror,-Wimplicit-function-declaration] -error: call to undeclared library function 'printf' with type 'int (const char *, ...)'; ISO C99 and later do not support implicit function declarations [-Werror,-Wimplicit-function-declaration] -``` - -Signed-off-by: Sam James <sam@gentoo.org> ---- a/configure.ac -+++ b/configure.ac -@@ -335,7 +335,8 @@ 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 <stdio.h> -+int main() { printf(__FUNCTION__); }])], - [AC_DEFINE([HAVE___FUNCTION__], [1], [Is __FUNCTION__ available]) - AC_MSG_RESULT(yes)], - [AC_MSG_RESULT(no)]) - diff --git a/media-libs/raptor/files/raptor-2.0.15-dont_use_curl-config.patch b/media-libs/raptor/files/raptor-2.0.15-dont_use_curl-config.patch deleted file mode 100644 index bab174176cbe..000000000000 --- a/media-libs/raptor/files/raptor-2.0.15-dont_use_curl-config.patch +++ /dev/null @@ -1,59 +0,0 @@ -https://bugs.gentoo.org/552474 - ---- raptor2-2.0.15/configure.ac -+++ raptor2-2.0.15/configure.ac -@@ -524,49 +524,12 @@ - fi - fi - --dnl curl --AC_ARG_WITH(curl-config, [ --with-curl-config=PATH Location of libcurl curl-config []], curl_config="$withval", curl_config="") -- --if test "X$curl_config" != "Xno" ; then -- if test "X$curl_config" != "X" ; then -- AC_MSG_CHECKING(for $curl_config) -- -- if test -f $curl_config ; then -- CURL_CONFIG=$curl_config -- AC_MSG_RESULT(yes) -- else -- AC_MSG_RESULT(no - searching PATH) -- fi -- fi -- if test "X$CURL_CONFIG" = "X" ; then -- AC_CHECK_PROGS(CURL_CONFIG, curl-config) -- fi --fi -- - libcurl_source=no --if test "X$CURL_CONFIG" != "X"; then -- LIBCURL_CFLAGS=`$CURL_CONFIG --cflags` -- LIBCURL_LIBS=`$CURL_CONFIG --libs` -- -- CPPFLAGS="$LIBCURL_CFLAGS $CPPFLAGS" -- LIBS="$LIBS $LIBCURL_LIBS" -- AC_CHECK_HEADER(curl/curl.h) -- AC_CHECK_FUNC(curl_easy_init, have_curl_easy_init=yes, have_curl_easy_init=no) -- -- AC_MSG_CHECKING(for libcurl via curl-config) -- if test $have_curl_easy_init = yes; then -- libcurl_source="curl-config" -- LIBCURL_VERSION=`$CURL_CONFIG --version | sed -e 's/^libcurl *//'` -- fi -- CPPFLAGS="$oCPPFLAGS" -- LIBS="$oLIBS" --else -- PKG_CHECK_MODULES([LIBCURL],[libcurl],[ -- LIBCURL_VERSION=`$PKG_CONFIG libcurl --modversion` -- libcurl_source="pkg-config" -- ], [:]) -- AC_MSG_CHECKING(for libcurl via pkg-config) --fi -+PKG_CHECK_MODULES([LIBCURL],[libcurl],[ -+ LIBCURL_VERSION=`$PKG_CONFIG libcurl --modversion` -+ libcurl_source="pkg-config" -+], [:]) -+AC_MSG_CHECKING(for libcurl via pkg-config) - - if test "$libcurl_source" = "no"; then - AC_MSG_RESULT(no - not found) diff --git a/media-libs/raptor/files/raptor-2.0.15-heap-overflow.patch b/media-libs/raptor/files/raptor-2.0.15-heap-overflow.patch deleted file mode 100644 index 3418d4bfd261..000000000000 --- a/media-libs/raptor/files/raptor-2.0.15-heap-overflow.patch +++ /dev/null @@ -1,42 +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 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/media-libs/raptor/files/raptor-2.0.15-libxml2-2.11.patch b/media-libs/raptor/files/raptor-2.0.15-libxml2-2.11.patch deleted file mode 100644 index 605301ca0fd1..000000000000 --- a/media-libs/raptor/files/raptor-2.0.15-libxml2-2.11.patch +++ /dev/null @@ -1,30 +0,0 @@ -https://bugs.gentoo.org/906227 -https://github.com/dajobe/raptor/issues/59 -https://github.com/dajobe/raptor/pull/58 - -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. ---- 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/media-libs/raptor/files/raptor-2.0.15-use-pkg-config-icu.patch b/media-libs/raptor/files/raptor-2.0.15-use-pkg-config-icu.patch deleted file mode 100644 index 60fffcd804ee..000000000000 --- a/media-libs/raptor/files/raptor-2.0.15-use-pkg-config-icu.patch +++ /dev/null @@ -1,48 +0,0 @@ -https://github.com/dajobe/raptor/commit/3af116d61babd7042b42018c67a63baebf486df7 - -Fixes build with e.g. lld. - -From 3af116d61babd7042b42018c67a63baebf486df7 Mon Sep 17 00:00:00 2001 -From: Hugh McMaster <hugh.mcmaster@outlook.com> -Date: Fri, 21 Aug 2020 20:48:17 +1000 -Subject: [PATCH] configure.ac: Use PKG_CHECK_MODULES to detect the ICU library - ---- a/configure.ac -+++ b/configure.ac -@@ -621,21 +621,10 @@ else - AC_MSG_RESULT(yes - $LIBCURL_VERSION) - fi - -- --AC_ARG_WITH(icu-config, [ --with-icu-config=PATH Location of ICU icu-config []], icu_config="$withval", icu_config="") -- --have_icu=no --AC_MSG_CHECKING(for ICU) --if test "X$icu_config" != "Xno" -a "X$icu_config" != "X" ; then -- ICU_CONFIG=$icu_config -- ICU_VERSION=`$ICU_CONFIG --version` -+PKG_CHECK_MODULES([ICU], [icu-uc], [ - have_icu=yes -- AC_MSG_RESULT(yes - version $ICU_VERSION) --else -- AC_MSG_RESULT(no) --fi --dnl Note there is NO automated searching for icu-config -- -+ ICU_VERSION=`$PKG_CONFIG icu-uc --modversion` -+], [have_icu=no]) - - AC_ARG_WITH(www-config, [ --with-libwww-config=PATH Location of W3C libwww libwww-config []], libwww_config="$withval", libwww_config="") - -@@ -1183,8 +1172,8 @@ dnl ICU for NFC check - AC_MSG_CHECKING(NFC library to use) - nfc_library=none - if test $need_icu = yes; then -- CPPFLAGS="$CPPFLAGS `$ICU_CONFIG --cppflags-searchpath`" -- RAPTOR_LDFLAGS="$RAPTOR_LDFLAGS `$ICU_CONFIG --ldflags-searchpath` -licuuc" -+ CPPFLAGS="$CPPFLAGS $ICU_CFLAGS" -+ RAPTOR_LDFLAGS="$RAPTOR_LDFLAGS $ICU_LIBS" - AC_LIBOBJ(raptor_nfc_icu) - nfc_library="ICU $ICU_VERSION" - fi - diff --git a/media-libs/raptor/files/raptor-2.0.15-use-pkg-config-libxml2.patch b/media-libs/raptor/files/raptor-2.0.15-use-pkg-config-libxml2.patch deleted file mode 100644 index e53111b857fa..000000000000 --- a/media-libs/raptor/files/raptor-2.0.15-use-pkg-config-libxml2.patch +++ /dev/null @@ -1,41 +0,0 @@ -https://github.com/dajobe/raptor/commit/3f9335b3cfd945a8d5f6f75f87cab04c53cc2b6d - -From 3f9335b3cfd945a8d5f6f75f87cab04c53cc2b6d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Tue, 27 Oct 2015 10:35:35 +0100 -Subject: [PATCH] configure.ac: do additional checks on libxml2 when library is - found -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -In yocto cross environments we must use pkg-config. Configuring with - - --without-xml2-config - --without-curl-config - -causes - -| checking for LIBXML... yes -| checking for libxml via pkg-config... yes - 2.9.2 -| checking for LIBCURL... yes -| checking for libcurl via pkg-config... yes - 7.44.0 -| checking for ICU... no -| checking for yajl installation... not found. Get it from http://lloyd.github.com/yajl/ and use --with-yajl=DIR if necessary to configure the installation directory. -| checking GRDDL parser requirements... no - libxml2 and libxslt are both not available - -Applying this patch fixes configuration. - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- a/configure.ac -+++ b/configure.ac -@@ -599,7 +599,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) - diff --git a/media-libs/raptor/files/raptor-2.0.15-use-pkg-config-libxslt.patch b/media-libs/raptor/files/raptor-2.0.15-use-pkg-config-libxslt.patch deleted file mode 100644 index 5ef9ac1b6ffa..000000000000 --- a/media-libs/raptor/files/raptor-2.0.15-use-pkg-config-libxslt.patch +++ /dev/null @@ -1,102 +0,0 @@ -Rebased version of https://github.com/dajobe/raptor/commit/abfdfb44cc00dfafbad4e594618621fce21590e1 - ---- a/configure.ac -+++ b/configure.ac -@@ -524,6 +524,44 @@ if test "X$xslt_config" != "Xno" ; then - fi - fi - -+if test "X$XSLT_CONFIG" != "X"; then -+ XSLT_CFLAGS=`$XSLT_CONFIG --cflags` -+ XSLT_LIBS=`$XSLT_CONFIG --libs` -+ -+ CPPFLAGS="$XSLT_CFLAGS $CPPFLAGS" -+ LIBS="$LIBS $XSLT_LIBS" -+ -+ AC_CHECK_FUNC(xsltSaveResultToString, have_xsltSaveResultToString=yes, have_xsltSaveResultToString=no) -+ AC_MSG_CHECKING(for libxslt via xslt-config) -+ if test $have_xsltSaveResultToString = yes; then -+ have_libxslt=1 -+ LIBXSLT_VERSION=`$XSLT_CONFIG --version` -+ libxslt_version_dec=`echo $LIBXSLT_VERSION | $AWK -F. '{printf("%d\n", 10000*$1 + 100*$2 + $3)};'` -+ libxslt_min_version_dec=`echo $libxslt_min_version | $AWK -F. '{printf("%d\n", 10000*$1 + 100*$2 + 3)};'` -+ AC_MSG_RESULT(yes - version $LIBXSLT_VERSION) -+ if test $libxslt_version_dec -lt $libxslt_min_version_dec; then -+ AC_MSG_WARN(Using libxslt $LIBXSLT_VERSION is unsupported - $libxslt_min_version or newer required.) -+ have_libxslt=0 -+ fi -+ fi -+ -+ AC_CHECK_FUNC(xsltInit) -+ -+ AC_CHECK_HEADERS(libxslt/xslt.h) -+ if test "$ac_cv_header_libxslt_xslt_h" = no ; then -+ AC_MSG_WARN(libxslt library found but not headers - disabling) -+ have_libxslt_lib=0 -+ have_libxslt=0 -+ fi -+ CPPFLAGS="$oCPPFLAGS" -+ LIBS="$oLIBS" -+else -+ PKG_CHECK_MODULES([XSLT], [libxslt > $libxslt_min_version], [ -+ LIBXSLT_VERSION=`$PKG_CONFIG libxslt --modversion` -+ have_libxslt=1 -+ ], [have_libxslt=0]) -+fi -+ - libcurl_source=no - PKG_CHECK_MODULES([LIBCURL],[libcurl],[ - LIBCURL_VERSION=`$PKG_CONFIG libcurl --modversion` -@@ -650,41 +688,6 @@ fi - CPPFLAGS="$oCPPFLAGS" - LIBS="$oLIBS" - -- --have_libxslt=0 -- --if test "X$XSLT_CONFIG" != X; then -- CPPFLAGS="`$XSLT_CONFIG --cflags` $CPPFLAGS" -- LIBS="$LIBS `$XSLT_CONFIG --libs`" -- AC_CHECK_FUNC(xsltSaveResultToString, have_xsltSaveResultToString=yes, have_xsltSaveResultToString=no) -- AC_MSG_CHECKING(for system libxslt library) -- if test $have_xsltSaveResultToString = yes; then -- have_libxslt=1 -- LIBXSLT_VERSION=`$XSLT_CONFIG --version` -- libxslt_version_dec=`echo $LIBXSLT_VERSION | $AWK -F. '{printf("%d\n", 10000*$1 + 100*$2 + $3)};'` -- libxslt_min_version_dec=`echo $libxslt_min_version | $AWK -F. '{printf("%d\n", 10000*$1 + 100*$2 + $3)};'` -- AC_MSG_RESULT(yes - version $LIBXSLT_VERSION) -- if test $libxslt_version_dec -lt $libxslt_min_version_dec; then -- AC_MSG_WARN(Using libxslt $LIBXSLT_VERSION is unsupported - $libxslt_min_version or newer required.) -- have_libxslt=0 -- fi -- else -- AC_MSG_RESULT(no) -- fi -- -- AC_CHECK_FUNC(xsltInit) -- -- AC_CHECK_HEADERS(libxslt/xslt.h) -- if test "$ac_cv_header_libxslt_xslt_h" = no ; then -- AC_MSG_WARN(libxslt library found but not headers - disabling) -- have_libxslt_lib=0 -- have_libxslt=0 -- fi --fi --CPPFLAGS="$oCPPFLAGS" --LIBS="$oLIBS" -- -- - dnl Check for JSON library - - AC_ARG_WITH(yajl, [ --with-yajl=DIR YAJL installation directory or 'no' to disable (default=auto)], yajl_prefix="$withval", yajl_prefix="none") -@@ -1184,8 +1187,8 @@ AM_CONDITIONAL(RAPTOR_XML_LIBXML, test $need_libxml = 1) - - - if test $need_libxslt = 1; then -- RAPTOR_LDFLAGS="$RAPTOR_LDFLAGS `$XSLT_CONFIG --libs`" -- CPPFLAGS="`$XSLT_CONFIG --cflags` $CPPFLAGS" -+ RAPTOR_LDFLAGS="$RAPTOR_LDFLAGS $XSLT_LIBS" -+ CPPFLAGS="$CPPFLAGS $XSLT_CFLAGS" - fi - - if test $need_libyajl = 1; then diff --git a/media-libs/raptor/raptor-2.0.15-r8.ebuild b/media-libs/raptor/raptor-2.0.15-r8.ebuild deleted file mode 100644 index 76527c9ee736..000000000000 --- a/media-libs/raptor/raptor-2.0.15-r8.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools multilib-minimal - -MY_PN=${PN}2 -MY_P=${MY_PN}-${PV} - -DESCRIPTION="The RDF Parser Toolkit" -HOMEPAGE="https://librdf.org/raptor/" -SRC_URI="https://download.librdf.org/source/${MY_P}.tar.gz" - -LICENSE="Apache-2.0 GPL-2 LGPL-2.1" -SLOT="2" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="+curl debug json static-libs" - -DEPEND=" - dev-libs/libxml2[${MULTILIB_USEDEP}] - dev-libs/libxslt[${MULTILIB_USEDEP}] - dev-libs/icu:=[${MULTILIB_USEDEP}] - sys-libs/zlib[${MULTILIB_USEDEP}] - curl? ( net-misc/curl[${MULTILIB_USEDEP}] ) - json? ( dev-libs/yajl[${MULTILIB_USEDEP}] ) -" -RDEPEND="${DEPEND} - !media-libs/raptor:0 -" -BDEPEND=" - >=sys-devel/bison-3 - app-alternatives/lex - virtual/pkgconfig -" - -S="${WORKDIR}/${MY_P}" - -DOCS=( AUTHORS ChangeLog NEWS NOTICE README ) -HTML_DOCS=( {NEWS,README,RELEASE,UPGRADING}.html ) - -PATCHES=( - "${FILESDIR}/${P}-heap-overflow.patch" - "${FILESDIR}/${P}-dont_use_curl-config.patch" #552474 - "${FILESDIR}/0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch" - "${FILESDIR}/${P}-use-pkg-config-libxml2.patch" - "${FILESDIR}/${P}-use-pkg-config-icu.patch" - "${FILESDIR}/${P}-use-pkg-config-libxslt.patch" - "${FILESDIR}/${P}-clang-pointer-integer-warning.patch" - "${FILESDIR}/${P}-configure-clang16.patch" - "${FILESDIR}/${P}-libxml2-2.11.patch" -) - -src_prepare() { - default - - # bug #552474 - eautoreconf - - multilib_copy_sources -} - -multilib_src_configure() { - # FIXME: It should be possible to use net-nntp/inn for libinn.h and -linn! - - local myeconfargs=( - --with-html-dir="${EPREFIX}"/usr/share/gtk-doc/html - $(usex curl --with-www=curl --with-www=xml) - $(use_enable debug) - $(use_with json yajl) - $(use_enable static-libs static) - ) - - econf "${myeconfargs[@]}" -} - -multilib_src_test() { - emake -j1 test -} - -multilib_src_install() { - default - - find "${ED}" -name '*.la' -delete || die -} diff --git a/media-libs/raptor/raptor-2.0.16.ebuild b/media-libs/raptor/raptor-2.0.16.ebuild index a0ebad7f0680..3d3903f710b5 100644 --- a/media-libs/raptor/raptor-2.0.16.ebuild +++ b/media-libs/raptor/raptor-2.0.16.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="Apache-2.0 GPL-2 LGPL-2.1" SLOT="2" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="debug json static-libs" DEPEND=" |