Compare commits
No commits in common. "c8" and "c9-beta" have entirely different histories.
@ -1,35 +0,0 @@
|
||||
--- raptor2-2.0.15/src/raptor_rfc2396.c.CVE-2024-57823 2014-07-26 23:07:37.000000000 +0200
|
||||
+++ raptor2-2.0.15/src/raptor_rfc2396.c 2025-01-13 12:59:22.175568228 +0100
|
||||
@@ -289,10 +289,8 @@ raptor_uri_normalize_path(unsigned char*
|
||||
}
|
||||
|
||||
|
||||
-#if defined(RAPTOR_DEBUG)
|
||||
if(path_len != strlen((const char*)path_buffer))
|
||||
RAPTOR_FATAL4("Path '%s' length %ld does not match calculated %ld.", (const char*)path_buffer, (long)strlen((const char*)path_buffer), (long)path_len);
|
||||
-#endif
|
||||
|
||||
/* Remove all "<component>/../" path components */
|
||||
|
||||
@@ -327,10 +325,8 @@ raptor_uri_normalize_path(unsigned char*
|
||||
if(!prev || !cur)
|
||||
continue;
|
||||
|
||||
-#if defined(RAPTOR_DEBUG)
|
||||
if(path_len != strlen((const char*)path_buffer))
|
||||
RAPTOR_FATAL3("Path length %ld does not match calculated %ld.", (long)strlen((const char*)path_buffer), (long)path_len);
|
||||
-#endif
|
||||
|
||||
/* If the current one is '..' */
|
||||
if(s == (cur+2) && cur[0] == '.' && cur[1] == '.') {
|
||||
@@ -393,10 +389,8 @@ raptor_uri_normalize_path(unsigned char*
|
||||
}
|
||||
|
||||
|
||||
-#if defined(RAPTOR_DEBUG)
|
||||
if(path_len != strlen((const char*)path_buffer))
|
||||
RAPTOR_FATAL3("Path length %ld does not match calculated %ld.", (long)strlen((const char*)path_buffer), (long)path_len);
|
||||
-#endif
|
||||
|
||||
/* RFC3986 Appendix C.2 / 5.4.2 Abnormal Examples
|
||||
* Remove leading /../ and /./
|
||||
@ -2,7 +2,7 @@
|
||||
Summary: RDF Parser Toolkit for Redland
|
||||
Name: raptor2
|
||||
Version: 2.0.15
|
||||
Release: 17%{?dist}
|
||||
Release: 30%{?dist}
|
||||
|
||||
License: GPLv2+ or LGPLv2+ or ASL 2.0
|
||||
Source: http://download.librdf.org/source/raptor2-%{version}.tar.gz
|
||||
@ -13,15 +13,18 @@ URL: http://librdf.org/raptor/
|
||||
Patch1: 0001-Calcualte-max-nspace-declarations-correctly-for-XML-.patch
|
||||
# https://bugs.librdf.org/mantis/view.php?id=650
|
||||
Patch2: 0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch
|
||||
# no patch yet but https://github.com/dajobe/raptor/issues/70
|
||||
Patch3: CVE-2024-57823.patch
|
||||
|
||||
## upstreamable patches
|
||||
|
||||
BuildRequires: make
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: curl-devel
|
||||
%if ! 0%{?flatpak}
|
||||
BuildRequires: gtk-doc
|
||||
%endif
|
||||
BuildRequires: libicu-devel
|
||||
BuildRequires: pkgconfig(libxslt)
|
||||
%if ! 0%{?rhel}
|
||||
BuildRequires: yajl-devel
|
||||
%endif
|
||||
|
||||
# when /usr/bin/rappor moved here -- rex
|
||||
Conflicts: raptor < 1.4.21-10
|
||||
@ -48,21 +51,24 @@ sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
|
||||
|
||||
|
||||
%build
|
||||
%configure \
|
||||
--disable-static --enable-release \
|
||||
--with-icu-config=/usr/bin/icu-config \
|
||||
%if 0%{?flatpak}
|
||||
--disable-gtk-doc \
|
||||
%endif
|
||||
--with-yajl=no
|
||||
|
||||
make %{?_smp_mflags}
|
||||
%if 0%{?rhel}
|
||||
%define distrooptions --with-yajl=no
|
||||
%else
|
||||
%define distrooptions --with-yajl=yes
|
||||
%endif
|
||||
|
||||
%configure \
|
||||
--disable-static \
|
||||
--enable-release \
|
||||
--with-icu-config=/usr/bin/icu-config \
|
||||
%{distrooptions}
|
||||
|
||||
%make_build
|
||||
|
||||
|
||||
%install
|
||||
rm -rf %{buildroot}
|
||||
|
||||
make DESTDIR=%{buildroot} install
|
||||
%make_install
|
||||
|
||||
## unpackaged files
|
||||
rm -fv %{buildroot}%{_libdir}/lib*.la
|
||||
@ -74,16 +80,11 @@ test "$(pkg-config --modversion raptor2)" = "%{version}"
|
||||
make check
|
||||
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
%postun -p /sbin/ldconfig
|
||||
%ldconfig_scriptlets
|
||||
|
||||
%files
|
||||
%doc AUTHORS ChangeLog NEWS README
|
||||
%doc COPYING* LICENSE.txt LICENSE-2.0.txt
|
||||
%license COPYING* LICENSE.txt LICENSE-2.0.txt
|
||||
%{_libdir}/libraptor2.so.0*
|
||||
%{_bindir}/rapper
|
||||
%{_mandir}/man1/rapper*
|
||||
@ -100,22 +101,62 @@ rm -rf %{buildroot}
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Jan 13 2025 Eike Rathke <erack@redhat.com> - 2.0.15-17
|
||||
- Resolves: CVE-2024-57823 integer underflow when normalizing a URI with the
|
||||
turtle parser
|
||||
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2.0.15-30
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
||||
* Tue Nov 24 2020 Caolán McNamara <caolanm@redhat.com> - 2.0.15-16
|
||||
- Resolves: rhbz#1900904 CVE-2020-25713 raptor2: malformed input file can lead to a segfault
|
||||
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.0.15-29
|
||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||
|
||||
* Tue Nov 17 2020 Caolán McNamara <caolanm@redhat.com> - 2.0.15-15
|
||||
- Resolves: rhbz#1896534 CVE-2017-18926 raptor: heap-based buffer overflow
|
||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.15-28
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Mon Nov 16 2020 Caolán McNamara <caolanm@redhat.com> - 2.0.15-14
|
||||
- Resolves: rhbz#1896340 Suppress documentation in Flatpak builds
|
||||
* Mon Jan 11 2021 Caolán McNamara <caolanm@redhat.com> - 2.0.15-27
|
||||
- Resolves: rhbz#1900686 CVE-2020-25713 malformed input file can lead to a segfault
|
||||
|
||||
* Tue Aug 21 2018 Caolán McNamara <caolanm@redhat.com> - 2.0.15-13
|
||||
* Mon Aug 10 2020 Caolán McNamara <caolanm@redhat.com> - 2.0.15-26
|
||||
- Resolves: rhbz#1560206 drop requirement on yajl
|
||||
|
||||
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.15-25
|
||||
- Second attempt - Rebuilt for
|
||||
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.15-24
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Fri May 15 2020 Pete Walter <pwalter@fedoraproject.org> - 2.0.15-23
|
||||
- Rebuild for ICU 67
|
||||
|
||||
* Mon Feb 17 2020 Rex Dieter <rdieter@fedoraproject.org> - 2.0.15-22
|
||||
- backport crash fix
|
||||
|
||||
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.15-21
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Fri Nov 01 2019 Pete Walter <pwalter@fedoraproject.org> - 2.0.15-20
|
||||
- Rebuild for ICU 65
|
||||
|
||||
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.15-19
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.15-18
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Wed Jan 23 2019 Pete Walter <pwalter@fedoraproject.org> - 2.0.15-17
|
||||
- Rebuild for ICU 63
|
||||
|
||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.15-16
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Tue Jul 10 2018 Pete Walter <pwalter@fedoraproject.org> - 2.0.15-15
|
||||
- Rebuild for ICU 62
|
||||
|
||||
* Mon Apr 30 2018 Pete Walter <pwalter@fedoraproject.org> - 2.0.15-14
|
||||
- Rebuild for ICU 61.1
|
||||
|
||||
* Wed Mar 07 2018 Rex Dieter <rdieter@fedoraproject.org> - 2.0.15-13
|
||||
- BR: gcc-c++, use %%make_build %%make_install %%license %%ldconfig_scriptlets
|
||||
|
||||
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.15-12
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user