summaryrefslogtreecommitdiff
path: root/user
diff options
context:
space:
mode:
authorZach van Rijn <me@zv.io>2024-12-08 14:19:24 +0000
committerZach van Rijn <me@zv.io>2024-12-08 14:19:24 +0000
commit427cc7412cb82662be84cee98f1e1ed051d4bb72 (patch)
treec6cfc3e0fe165ecf9c7d058c135c11a44d76db13 /user
parentc7624ad5acd98b06f78efdaf78a844e50b607ef4 (diff)
downloadpackages-427cc7412cb82662be84cee98f1e1ed051d4bb72.tar.gz
packages-427cc7412cb82662be84cee98f1e1ed051d4bb72.tar.bz2
packages-427cc7412cb82662be84cee98f1e1ed051d4bb72.tar.xz
packages-427cc7412cb82662be84cee98f1e1ed051d4bb72.zip
user/raptor2: support libxml2 >= 2.11. fixes #1276.
Diffstat (limited to 'user')
-rw-r--r--user/raptor2/APKBUILD6
-rw-r--r--user/raptor2/fix-checked-field-issue.patch19
2 files changed, 23 insertions, 2 deletions
diff --git a/user/raptor2/APKBUILD b/user/raptor2/APKBUILD
index 2b7d49af2..2f10958cd 100644
--- a/user/raptor2/APKBUILD
+++ b/user/raptor2/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Max Rees <maxcrees@me.com>
pkgname=raptor2
pkgver=2.0.15
-pkgrel=2
+pkgrel=3
pkgdesc="RDF parser/serializer toolkit for Redland"
url="https://www.librdf.org/raptor"
arch="all"
@@ -15,6 +15,7 @@ subpackages="$pkgname-dev $pkgname-doc"
source="https://download.librdf.org/source/$pkgname-$pkgver.tar.gz
CVE-2017-18926.patch
CVE-2020-25713.patch
+ fix-checked-field-issue.patch
"
prepare() {
@@ -48,4 +49,5 @@ package() {
sha512sums="563dd01869eb4df8524ec12e2c0a541653874dcd834bd1eb265bc2943bb616968f624121d4688579cdce11b4f00a8ab53b7099f1a0850e256bb0a2c16ba048ee raptor2-2.0.15.tar.gz
82f2f7ea4b72aa2bf444013a81db3cb17fcce2ae650bdb22eaab00d6d5cf7f950f7a550ffff49348db878f90f2753b407e6026d08d543cd0757c1687c6dad159 CVE-2017-18926.patch
-6e7297bb786dd490202f9790e148b298380c1e47faa4970cb7efcd85fcea99eaa5f53e1c66627be9f7f42f6f27a3b1df94357c9db51abf8ed14727343d584f08 CVE-2020-25713.patch"
+6e7297bb786dd490202f9790e148b298380c1e47faa4970cb7efcd85fcea99eaa5f53e1c66627be9f7f42f6f27a3b1df94357c9db51abf8ed14727343d584f08 CVE-2020-25713.patch
+97ab7b8be0471d2b123603a2cf60a07508dcdacc0a14965dcf4dfe42a1b57e8baecd3488471aac7cd39d203cefbbc966c8ec492cfaafda62ebf2c80bf6c85f34 fix-checked-field-issue.patch"
diff --git a/user/raptor2/fix-checked-field-issue.patch b/user/raptor2/fix-checked-field-issue.patch
new file mode 100644
index 000000000..23f7fb1a7
--- /dev/null
+++ b/user/raptor2/fix-checked-field-issue.patch
@@ -0,0 +1,19 @@
+diff --git a/src/raptor_libxml.c b/src/raptor_libxml.c
+index 538c2c8e..8bcee139 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 */
+--
+2.41.0