* [gentoo-commits] repo/gentoo:master commit in: media-libs/raptor/files/, media-libs/raptor/
@ 2021-04-29 7:55 Miroslav Šulc
0 siblings, 0 replies; 7+ messages in thread
From: Miroslav Šulc @ 2021-04-29 7:55 UTC (permalink / raw
To: gentoo-commits
commit: 302b7d40ecbd4d456c0f39046a9c078c96e672d8
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 29 07:55:33 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Apr 29 07:55:49 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=302b7d40
media-libs/raptor: fixed CVE-2020-25713
Bug: https://bugs.gentoo.org/754264
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
...713-raptor2-malformed-input-file-can-lead.patch | 32 ++++++++++++++++++++++
...or-2.0.15-r2.ebuild => raptor-2.0.15-r3.ebuild} | 1 +
2 files changed, 33 insertions(+)
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
new file mode 100644
index 00000000000..dc693dfec22
--- /dev/null
+++ b/media-libs/raptor/files/0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch
@@ -0,0 +1,32 @@
+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/raptor-2.0.15-r2.ebuild b/media-libs/raptor/raptor-2.0.15-r3.ebuild
similarity index 95%
rename from media-libs/raptor/raptor-2.0.15-r2.ebuild
rename to media-libs/raptor/raptor-2.0.15-r3.ebuild
index e2a831c9984..1f3f7e84c66 100644
--- a/media-libs/raptor/raptor-2.0.15-r2.ebuild
+++ b/media-libs/raptor/raptor-2.0.15-r3.ebuild
@@ -41,6 +41,7 @@ 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"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/raptor/files/, media-libs/raptor/
@ 2024-08-11 12:20 Miroslav Šulc
0 siblings, 0 replies; 7+ messages in thread
From: Miroslav Šulc @ 2024-08-11 12:20 UTC (permalink / raw
To: gentoo-commits
commit: cdbcf983a9c044561d6ebcb8e583335e22d3f144
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 11 12:20:00 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Aug 11 12:20:00 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdbcf983
media-libs/raptor: dropped obsolete 2.0.15-r8
Bug: https://bugs.gentoo.org/937305
Closes: https://bugs.gentoo.org/935487
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-libs/raptor/Manifest | 1 -
...713-raptor2-malformed-input-file-can-lead.patch | 32 -------
...ptor-2.0.15-clang-pointer-integer-warning.patch | 44 ---------
.../files/raptor-2.0.15-configure-clang16.patch | 28 ------
.../files/raptor-2.0.15-dont_use_curl-config.patch | 59 ------------
.../raptor/files/raptor-2.0.15-heap-overflow.patch | 42 ---------
.../raptor/files/raptor-2.0.15-libxml2-2.11.patch | 30 ------
.../files/raptor-2.0.15-use-pkg-config-icu.patch | 48 ----------
.../raptor-2.0.15-use-pkg-config-libxml2.patch | 41 ---------
.../raptor-2.0.15-use-pkg-config-libxslt.patch | 102 ---------------------
media-libs/raptor/raptor-2.0.15-r8.ebuild | 85 -----------------
11 files changed, 512 deletions(-)
diff --git a/media-libs/raptor/Manifest b/media-libs/raptor/Manifest
index 3c5ab4ee0c47..1711447e5913 100644
--- a/media-libs/raptor/Manifest
+++ b/media-libs/raptor/Manifest
@@ -1,2 +1 @@
-DIST raptor2-2.0.15.tar.gz 1886657 BLAKE2B 0a39c7b5705bfbf2daa0ca633f79693953b4dfe24c144008d1646a9840a36d4d7ce153b527450647127ec2522047dbd0a6e71f307ee5656951f7e4b610adfd22 SHA512 563dd01869eb4df8524ec12e2c0a541653874dcd834bd1eb265bc2943bb616968f624121d4688579cdce11b4f00a8ab53b7099f1a0850e256bb0a2c16ba048ee
DIST raptor2-2.0.16.tar.gz 1750726 BLAKE2B 1e5e5742ba4cdaacb98a9ba77a9352589df0da60869e7721ee140c81ed4886bf909b37b247bd925c82a4ac44b3c11a909c913f0851d49a1d9d91c9293189266d SHA512 9bd5cff36390e1e0ef15ac56e5413ecfceb4018cb531a4da8850d3623615f12a93690a78be61f9d9ae7a24e16f6446e356bc2b7f34051ddc077761d85a9b7c44
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
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/raptor/files/, media-libs/raptor/
@ 2022-11-04 2:24 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2022-11-04 2:24 UTC (permalink / raw
To: gentoo-commits
commit: 69cddc64a2c8fba7b5023097d4160035b012b4cc
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 4 01:56:17 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Nov 4 02:22:16 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69cddc64
media-libs/raptor: fix configure w/ clang 16
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/raptor-2.0.15-configure-clang16.patch | 28 ++++++++++++++++++++++
...or-2.0.15-r6.ebuild => raptor-2.0.15-r7.ebuild} | 1 +
2 files changed, 29 insertions(+)
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
new file mode 100644
index 000000000000..ab62fd9bff0c
--- /dev/null
+++ b/media-libs/raptor/files/raptor-2.0.15-configure-clang16.patch
@@ -0,0 +1,28 @@
+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/raptor-2.0.15-r6.ebuild b/media-libs/raptor/raptor-2.0.15-r7.ebuild
similarity index 97%
rename from media-libs/raptor/raptor-2.0.15-r6.ebuild
rename to media-libs/raptor/raptor-2.0.15-r7.ebuild
index c13617839b54..6cc547d09459 100644
--- a/media-libs/raptor/raptor-2.0.15-r6.ebuild
+++ b/media-libs/raptor/raptor-2.0.15-r7.ebuild
@@ -47,6 +47,7 @@ PATCHES=(
"${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"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/raptor/files/, media-libs/raptor/
@ 2022-09-10 1:57 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2022-09-10 1:57 UTC (permalink / raw
To: gentoo-commits
commit: c2f2b8beda5a58db82808d5e8de0bcde63266d61
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 10 01:44:37 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 10 01:57:07 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2f2b8be
media-libs/raptor: fix build w/ Clang 15
Closes: https://bugs.gentoo.org/869380
Signed-off-by: Sam James <sam <AT> gentoo.org>
...ptor-2.0.15-clang-pointer-integer-warning.patch | 44 ++++++++++++
media-libs/raptor/raptor-2.0.15-r6.ebuild | 83 ++++++++++++++++++++++
2 files changed, 127 insertions(+)
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
new file mode 100644
index 000000000000..badb450456e4
--- /dev/null
+++ b/media-libs/raptor/files/raptor-2.0.15-clang-pointer-integer-warning.patch
@@ -0,0 +1,44 @@
+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/raptor-2.0.15-r6.ebuild b/media-libs/raptor/raptor-2.0.15-r6.ebuild
new file mode 100644
index 000000000000..61763d7ebb69
--- /dev/null
+++ b/media-libs/raptor/raptor-2.0.15-r6.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2022 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-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
+ >=sys-devel/flex-2.5.36
+ 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"
+)
+
+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
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/raptor/files/, media-libs/raptor/
@ 2022-07-17 14:23 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2022-07-17 14:23 UTC (permalink / raw
To: gentoo-commits
commit: d5a6ece3ba0373b986b1952b3297b897f9140055
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 17 14:16:09 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 17 14:16:44 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5a6ece3
media-libs/raptor: use pkg-config for ICU/libxml2/libxslt (fix LLD)
Prompted by discussion with Jannik2099 and Naib in #gentoo-chat.
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/raptor-2.0.15-use-pkg-config-icu.patch | 48 ++++++++++
.../raptor-2.0.15-use-pkg-config-libxml2.patch | 41 +++++++++
.../raptor-2.0.15-use-pkg-config-libxslt.patch | 102 +++++++++++++++++++++
media-libs/raptor/raptor-2.0.15-r5.ebuild | 82 +++++++++++++++++
4 files changed, 273 insertions(+)
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
new file mode 100644
index 000000000000..60fffcd804ee
--- /dev/null
+++ b/media-libs/raptor/files/raptor-2.0.15-use-pkg-config-icu.patch
@@ -0,0 +1,48 @@
+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
new file mode 100644
index 000000000000..e53111b857fa
--- /dev/null
+++ b/media-libs/raptor/files/raptor-2.0.15-use-pkg-config-libxml2.patch
@@ -0,0 +1,41 @@
+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
new file mode 100644
index 000000000000..5ef9ac1b6ffa
--- /dev/null
+++ b/media-libs/raptor/files/raptor-2.0.15-use-pkg-config-libxslt.patch
@@ -0,0 +1,102 @@
+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-r5.ebuild b/media-libs/raptor/raptor-2.0.15-r5.ebuild
new file mode 100644
index 000000000000..bc6bb24ae8c0
--- /dev/null
+++ b/media-libs/raptor/raptor-2.0.15-r5.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2022 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="http://librdf.org/raptor/"
+SRC_URI="http://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 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-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
+ >=sys-devel/flex-2.5.36
+ 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"
+)
+
+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
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/raptor/files/, media-libs/raptor/
@ 2019-02-09 12:59 Lars Wendler
0 siblings, 0 replies; 7+ messages in thread
From: Lars Wendler @ 2019-02-09 12:59 UTC (permalink / raw
To: gentoo-commits
commit: fbd38277371e11131cea7b96d42d62f61d72cb29
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 9 12:57:03 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat Feb 9 12:57:59 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbd38277
media-libs/raptor: Don't use curl-config
Closes: https://bugs.gentoo.org/552474
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
.../files/raptor-2.0.15-dont_use_curl-config.patch | 59 +++++++++++++++++
media-libs/raptor/raptor-2.0.15-r2.ebuild | 74 ++++++++++++++++++++++
2 files changed, 133 insertions(+)
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
new file mode 100644
index 00000000000..bab174176cb
--- /dev/null
+++ b/media-libs/raptor/files/raptor-2.0.15-dont_use_curl-config.patch
@@ -0,0 +1,59 @@
+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/raptor-2.0.15-r2.ebuild b/media-libs/raptor/raptor-2.0.15-r2.ebuild
new file mode 100644
index 00000000000..4f20b71f815
--- /dev/null
+++ b/media-libs/raptor/raptor-2.0.15-r2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools libtool
+
+MY_PN=${PN}2
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="The RDF Parser Toolkit"
+HOMEPAGE="http://librdf.org/raptor/"
+SRC_URI="http://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 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+curl debug json static-libs unicode"
+
+DEPEND="
+ dev-libs/libxml2
+ dev-libs/libxslt
+ curl? ( net-misc/curl )
+ json? ( dev-libs/yajl )
+ unicode? ( dev-libs/icu:= )
+"
+RDEPEND="${DEPEND}
+ !media-libs/raptor:0
+"
+BDEPEND="
+ >=sys-devel/bison-3
+ >=sys-devel/flex-2.5.36
+ 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
+)
+
+src_prepare() {
+ default
+ eautoreconf #552474
+ elibtoolize # Keep this for ~*-fbsd
+}
+
+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)
+ $(usex unicode --with-icu-config="${EPREFIX}"/usr/bin/icu-config '')
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_test() {
+ emake -j1 test
+}
+
+src_install() {
+ default
+ find "${ED}" -name '*.la' -delete || die
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/raptor/files/, media-libs/raptor/
@ 2018-10-03 14:51 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2018-10-03 14:51 UTC (permalink / raw
To: gentoo-commits
commit: 2b4cd933be0aa6b6e224415e17a22c9ea4b49a81
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 3 14:39:57 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Oct 3 14:50:34 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b4cd933
media-libs/raptor: Fix heap overflows, gtk-doc location, EAPI-7
Bug: https://bugs.gentoo.org/621186
Closes: https://bugs.gentoo.org/604290
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11
.../raptor/files/raptor-2.0.15-heap-overflow.patch | 42 +++++++++++++
media-libs/raptor/raptor-2.0.15-r1.ebuild | 71 ++++++++++++++++++++++
2 files changed, 113 insertions(+)
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
new file mode 100644
index 00000000000..3418d4bfd26
--- /dev/null
+++ b/media-libs/raptor/files/raptor-2.0.15-heap-overflow.patch
@@ -0,0 +1,42 @@
+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/raptor-2.0.15-r1.ebuild b/media-libs/raptor/raptor-2.0.15-r1.ebuild
new file mode 100644
index 00000000000..55dca5e226b
--- /dev/null
+++ b/media-libs/raptor/raptor-2.0.15-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit libtool
+
+MY_PN=${PN}2
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="The RDF Parser Toolkit"
+HOMEPAGE="http://librdf.org/raptor/"
+SRC_URI="http://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 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+curl debug json static-libs unicode"
+
+DEPEND="
+ dev-libs/libxml2
+ dev-libs/libxslt
+ curl? ( net-misc/curl )
+ json? ( dev-libs/yajl )
+ unicode? ( dev-libs/icu:= )
+"
+RDEPEND="${DEPEND}
+ !media-libs/raptor:0
+"
+BDEPEND="
+ >=sys-devel/bison-3
+ >=sys-devel/flex-2.5.36
+ 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" )
+
+src_prepare() {
+ default
+ elibtoolize # Keep this for ~*-fbsd
+}
+
+src_configure() {
+ # FIXME: It should be possible to use net-nntp/inn for libinn.h and -linn!
+
+ local myeconfargs=(
+ --with-www=xml
+ --with-html-dir="${EPREFIX}"/usr/share/gtk-doc/html
+ $(use_enable debug)
+ $(use_with json yajl)
+ $(use_enable static-libs static)
+ $(usex unicode "--with-icu-config="${EPREFIX}"/usr/bin/icu-config" '')
+ )
+ use curl && myeconfargs+=( --with-www=curl )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_test() {
+ emake -j1 test
+}
+
+src_install() {
+ default
+ find "${D}" -name '*.la' -delete || die
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-08-11 12:20 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-29 7:55 [gentoo-commits] repo/gentoo:master commit in: media-libs/raptor/files/, media-libs/raptor/ Miroslav Šulc
-- strict thread matches above, loose matches on Subject: below --
2024-08-11 12:20 Miroslav Šulc
2022-11-04 2:24 Sam James
2022-09-10 1:57 Sam James
2022-07-17 14:23 Sam James
2019-02-09 12:59 Lars Wendler
2018-10-03 14:51 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox