From a54bc7d7c6e7df255f2a21aa5d77a415f81c0d0b Mon Sep 17 00:00:00 2001 From: wk333 <13474090681@163.com> Date: Tue, 22 Jul 2025 14:22:14 +0800 Subject: [PATCH] sync release and fix CVE-2024-57822 --- backport-0003-CVE-2024-57822.patch | 14 ++++++++++++++ raptor2.spec | 13 ++++++++++--- 2 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 backport-0003-CVE-2024-57822.patch diff --git a/backport-0003-CVE-2024-57822.patch b/backport-0003-CVE-2024-57822.patch new file mode 100644 index 0000000..df20467 --- /dev/null +++ b/backport-0003-CVE-2024-57822.patch @@ -0,0 +1,14 @@ +#backport from upstream https://github.com/dajobe/raptor/commit/ece2c79df43091686a538b8231cf387d84bfa60e +diff --git a/src/raptor_ntriples.c b/src/raptor_ntriples.c +index 60fd3aa..c44f8c4 100644 +--- a/src/raptor_ntriples.c ++++ b/src/raptor_ntriples.c +@@ -208,7 +208,7 @@ raptor_ntriples_parse_term_internal(raptor_world* world, + locator->column--; + locator->byte--; + } +- if(term_class == RAPTOR_TERM_CLASS_BNODEID && dest[-1] == '.') { ++ if(term_class == RAPTOR_TERM_CLASS_BNODEID && position > 0 && dest[-1] == '.') { + /* If bnode id ended on '.' move back one */ + dest--; + diff --git a/raptor2.spec b/raptor2.spec index 7470305..2b55e02 100644 --- a/raptor2.spec +++ b/raptor2.spec @@ -1,6 +1,6 @@ Name: raptor2 Version: 2.0.15 -Release: 19 +Release: 21 Summary: Raptor RDF parsing and serializing utility License: GPLv2+ or LGPLv2+ or ASL 2.0 URL: http://librdf.org/raptor/ @@ -8,6 +8,7 @@ Source: http://download.librdf.org/source/raptor2-%{version}.tar.gz Patch0: CVE-2020-25713.patch Patch1: backport-0001-CVE-2024-57823.patch Patch2: backport-0002-CVE-2024-57823.patch +Patch3: backport-0003-CVE-2024-57822.patch BuildRequires: gcc-c++ curl-devel gtk-doc libicu-devel pkgconfig(libxslt) yajl-devel Conflicts: raptor < 1.4.21-10 @@ -70,11 +71,17 @@ make check %{_mandir}/man3/libraptor2* %changelog -* Fri Apr 18 2025 zhangliangpengkun - 2.0.15-19 +* Mon July 21 2025 shaojiansong - 2.0.15-21 +- fix CVE-2024-57822 + +* Fri Apr 18 2025 zhangliangpengkun - 2.0.15-20 - fix CVE-2024-57823 -* Wed Jul 20 2022 liangqifeng - 2.0.15-18 +* Wed Jul 20 2022 liangqifeng - 2.0.15-19 - Fix CVE-2020-25713 +* Mon May 18 2020 wangchen - 2.0.15-18 +- rebuild for raptor2 + * Fri Dec 20 2019 shijian - 2.0.15-17 - Package init -- Gitee