- updated to 2.0.16 (fixes CVE-2017-18926, CVE-2020-25713)

- added libxml2 patch to fix build with libxml2 2.11.x

diff --git a/libraptor2.spec b/libraptor2.spec
index a2b5e5a3be825cca19004022948d2fd6ae0e8aac..e629c308e26f9191a6768561b7d1c0c514b840d8 100644 (file)
--- a/libraptor2.spec
+++ b/libraptor2.spec
@@ -3,13 +3,14 @@ Summary(pl.UTF-8):    Raptor - zestaw narzędzi do analizy RDF
 Name:          libraptor2
 # the real name is raptor2, but it follows libraptor (named as such because raptor was already occupied)
 %define        rname   raptor2
-Version:       2.0.15
-Release:       2
+Version:       2.0.16
+Release:       1
 License:       LGPL v2.1+ or GPL v2+ or Apache v2.0+
 Group:         Libraries
-Source0:       http://download.librdf.org/source/%{rname}-%{version}.tar.gz
-# Source0-md5: a39f6c07ddb20d7dd2ff1f95fa21e2cd
-URL:           http://librdf.org/raptor/
+Source0:       https://download.librdf.org/source/%{rname}-%{version}.tar.gz
+# Source0-md5: 0a71f13b6eaa0a04bf411083d89d7bc2
+Patch0:                %{rname}-libxml2.patch
+URL:           https://librdf.org/raptor/
 BuildRequires: autoconf >= 2.62
 BuildRequires: automake >= 1:1.11
 # WWW library can be one of: curl(default),xml,libfetch,none
@@ -85,7 +86,7 @@ Summary(pl.UTF-8):    Testowy program parsera Raptor RDF
 Group:         Applications
 Requires:      %{name} = %{version}-%{release}
 Obsoletes:     libraptor-rapper < 2.0.0
-Obsoletes:     redland-rapper
+Obsoletes:     redland-rapper < 0.9.18
 
 %description rapper
 Raptor RDF parser test program.
@@ -95,6 +96,7 @@ Testowy program parsera Raptor RDF.
 
 %prep
 %setup -q -n %{rname}-%{version}
+%patch0 -p1
 
 %build
 %{__libtoolize}

diff --git a/raptor2-libxml2.patch b/raptor2-libxml2.patch
new file mode 100644 (file)
index 0000000..384d493
--- /dev/null
+++ b/raptor2-libxml2.patch
@@ -0,0 +1,11 @@
+--- raptor2-2.0.16/src/raptor_libxml.c.orig    2020-09-08 07:39:33.000000000 +0200
++++ raptor2-2.0.16/src/raptor_libxml.c 2023-06-02 23:07:42.746605669 +0200
+@@ -246,7 +246,7 @@ raptor_libxml_getEntity(void* user_data,
+     
+     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
+      *