gentoo auto-resync : 13:05:2023 - 05:50:34

3 files changed, 117 insertions, 0 deletions

diff --git a/media-libs/raptor/Manifest b/media-libs/raptor/Manifest
index 29e544bc3d9a..9911fcc2da01 100644
--- a/media-libs/raptor/Manifest
+++ b/media-libs/raptor/Manifest
@@ -3,9 +3,11 @@ AUX raptor-2.0.15-clang-pointer-integer-warning.patch 1389 BLAKE2B 2673d64c4aa1a
 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
 DIST raptor2-2.0.15.tar.gz 1886657 BLAKE2B 0a39c7b5705bfbf2daa0ca633f79693953b4dfe24c144008d1646a9840a36d4d7ce153b527450647127ec2522047dbd0a6e71f307ee5656951f7e4b610adfd22 SHA512 563dd01869eb4df8524ec12e2c0a541653874dcd834bd1eb265bc2943bb616968f624121d4688579cdce11b4f00a8ab53b7099f1a0850e256bb0a2c16ba048ee
 EBUILD raptor-2.0.15-r7.ebuild 2047 BLAKE2B bed4a9943090e3b7f4d46eeeaca4df9c8998f6800b5e3808a291708a088bc627aa48e3de2e7cda49479ffe7b023613692fe9a8be09b732c9f6b2580a5f583df9 SHA512 0a721dd4d512103c809cd054d8b5abe9d02e8748a7bb6f81fcc0e6dcd34faee20f2c18920bf87d1a2f47a0280def4de2efa612fac93bcad1e04f5d03b2f3e8a9
+EBUILD raptor-2.0.15-r8.ebuild 2093 BLAKE2B 212646d9d8a59d2c9b454d3ddabbc6f546536582b03e34aee9e9e50ac5e28e0989958473549f0e552e1cfbb30cf14f290ae53369cba67c1051c35ab60bb97945 SHA512 6376080e49109250aadd8daa081f1ab53562b05a5badbfc7793fc5f5fc4effa02ffc7b26d56505f1338b8eb22ce3bd2b1922d142e6b3ccc66097ae4e2a6daff4
 MISC metadata.xml 406 BLAKE2B 00da42e759d35fc777ebbce9df89b600758104eb240cbecff33df51779ac9f565a3f7ee35a89a7fb91fd234c1a19b89ff96416189a5015e5563cbd4f420f616a SHA512 1855a61f21b684e5abbf35c3276dc8185eb805574c65e84593eed08d1598d213ca99c17bfe86be3db3172dc103b1dd2b8524e22aeeaf912afa097d022ad0c5d2
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
new file mode 100644
index 000000000000..605301ca0fd1
--- /dev/null
+++ b/media-libs/raptor/files/raptor-2.0.15-libxml2-2.11.patch
@@ -0,0 +1,30 @@
+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/raptor-2.0.15-r8.ebuild b/media-libs/raptor/raptor-2.0.15-r8.ebuild
new file mode 100644
index 000000000000..5b4f113ba487
--- /dev/null
+++ b/media-libs/raptor/raptor-2.0.15-r8.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2023 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"
+	"${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
+}