Compare commits

..

No commits in common. 'i10ce' and 'c9' have entirely different histories.
i10ce ... c9

@ -1 +1 @@
01ca6bfca570ffd4633e6416cc478e247d203367 SOURCES/LibRaw-0.21.3.tar.gz
0b425d9a5ed873adeeb68ea1b4945745f3ec1507 SOURCES/0.20.2.tar.gz

2
.gitignore vendored

@ -1 +1 @@
SOURCES/LibRaw-0.21.3.tar.gz
SOURCES/0.20.2.tar.gz

@ -0,0 +1,40 @@
From fa329f37dca4a2c938f8abb50ee4a7ef93e64fbb Mon Sep 17 00:00:00 2001
From: Alex Tutubalin <lexa@lexa.ru>
Date: Mon, 12 Apr 2021 13:21:52 +0300
Subject: [PATCH] check for input buffer size on datastream::gets
---
src/libraw_datastream.cpp | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/libraw_datastream.cpp b/src/libraw_datastream.cpp
index 606e5de73618..7e95bc749688 100644
--- a/src/libraw_datastream.cpp
+++ b/src/libraw_datastream.cpp
@@ -286,6 +286,7 @@ INT64 LibRaw_file_datastream::tell()
char *LibRaw_file_datastream::gets(char *str, int sz)
{
+ if(sz<1) return NULL;
LR_STREAM_CHK();
std::istream is(f.get());
is.getline(str, sz);
@@ -417,6 +418,7 @@ INT64 LibRaw_buffer_datastream::tell()
char *LibRaw_buffer_datastream::gets(char *s, int sz)
{
+ if(sz<1) return NULL;
unsigned char *psrc, *pdest, *str;
str = (unsigned char *)s;
psrc = buf + streampos;
@@ -609,6 +611,7 @@ INT64 LibRaw_bigfile_datastream::tell()
char *LibRaw_bigfile_datastream::gets(char *str, int sz)
{
+ if(sz<1) return NULL;
LR_BF_CHK();
return fgets(str, sz, f);
}
--
2.39.2

@ -1,25 +1,26 @@
--- LibRaw-0.21.0/libraw.pc.in~ 2022-12-18 01:26:41.000000000 -0600
+++ LibRaw-0.21.0/libraw.pc.in 2022-12-19 10:27:02.793929537 -0600
@@ -6,7 +6,9 @@
--- LibRaw-0.20-Beta1/libraw.pc.in~ 2020-05-13 14:22:12.656424311 +0200
+++ LibRaw-0.20-Beta1/libraw.pc.in 2020-05-13 14:22:27.481441569 +0200
@@ -5,7 +5,8 @@
Name: libraw
Description: Raw image decoder library (non-thread-safe)
Requires: @PACKAGE_REQUIRES@
-Requires: @PACKAGE_REQUIRES@
+Requires.private: @PACKAGE_REQUIRES@
Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lraw -lstdc++@PC_OPENMP@
+Libs: -L${libdir} -lraw@PC_OPENMP@
+Libs.private: -lstdc++
Libs.private: @PACKAGE_LIBS_PRIVATE@
Cflags: -I${includedir}/libraw -I${includedir}
--- LibRaw-0.21.0/libraw_r.pc.in~ 2022-12-18 01:26:41.000000000 -0600
+++ LibRaw-0.21.0/libraw_r.pc.in 2022-12-19 10:28:30.620571338 -0600
@@ -6,7 +6,8 @@
--- LibRaw-0.20-Beta1/libraw_r.pc.in~ 2020-05-13 14:22:18.034430572 +0200
+++ LibRaw-0.20-Beta1/libraw_r.pc.in 2020-05-13 14:22:27.481441569 +0200
@@ -5,7 +5,8 @@
Name: libraw
Description: Raw image decoder library (thread-safe)
Requires: @PACKAGE_REQUIRES@
-Requires: @PACKAGE_REQUIRES@
+Requires.private: @PACKAGE_REQUIRES@
Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lraw_r -lstdc++@PC_OPENMP@
+Libs: -L${libdir} -lraw_r@PC_OPENMP@
Libs.private: @PACKAGE_LIBS_PRIVATE@
+Libs.private: -lstdc++
Cflags: -I${includedir}/libraw -I${includedir}

@ -1,22 +1,30 @@
%global somajor 23
# feature macro to enable samples (or not)
%if 0%{?rhel} != 7
%global samples 1
%endif
Summary: Library for reading RAW files obtained from digital photo cameras
Name: LibRaw
Version: 0.21.3
Release: 1%{?dist}
License: BSD-3-Clause and (CDDL-1.0 or LGPL-2.1-only)
URL: https://www.libraw.org
Source0: %{url}/data/%{name}-%{version}.tar.gz
Patch0: LibRaw-pkgconfig.patch
Version: 0.20.2
Release: 6%{?dist}
License: BSD and LGPLv2
URL: http://www.libraw.org
BuildRequires: gcc-c++
BuildRequires: pkgconfig(lcms2)
BuildRequires: pkgconfig(jasper)
BuildRequires: pkgconfig(libjpeg)
BuildRequires: pkgconfig(zlib)
BuildRequires: autoconf automake libtool
BuildRequires: make
Source0: http://github.com/LibRaw/LibRaw/archive/%{version}.tar.gz
Patch0: LibRaw-pkgconfig.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=2172140
Patch1: LibRaw-check-for-input-buffer-size-on-datastream-gets.patch
Provides: bundled(dcraw) = 9.25
%description
@ -45,7 +53,7 @@ LibRaw static development libraries.
%package samples
Summary: LibRaw sample programs
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description samples
LibRaw sample programs
@ -56,12 +64,11 @@ LibRaw sample programs
%build
autoreconf -if
%configure \
--enable-examples=yes \
--enable-examples=%{?samples:yes}%{!?samples:no} \
--enable-jasper \
--enable-jpeg \
--enable-lcms \
--enable-openmp \
--enable-zlib
--enable-openmp
# https://fedoraproject.org/wiki/Packaging:Guidelines#Beware_of_Rpath
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@ -83,11 +90,13 @@ rm -fv samples/*.o
rm -fv %{buildroot}%{_libdir}/lib*.la
%ldconfig_scriptlets
%files
%doc Changelog.txt
%license LICENSE.CDDL LICENSE.LGPL COPYRIGHT
%{_libdir}/libraw.so.%{somajor}{,.*}
%{_libdir}/libraw_r.so.%{somajor}{,.*}
%{_libdir}/libraw.so.20*
%{_libdir}/libraw_r.so.20*
%files static
%{_libdir}/libraw.a
@ -103,74 +112,27 @@ rm -fv %{buildroot}%{_libdir}/lib*.la
%{_libdir}/pkgconfig/libraw_r.pc
%exclude %{_docdir}/libraw/*
%if 0%{?samples}
%files samples
%{_bindir}/*
%endif
%changelog
* Wed Dec 25 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 0.21.3-1
- Rebuilt for MSVSphere 10
* Fri Sep 20 2024 Gwyn Ciesla <gwync@protonmail.com> - 0.21.3-1
- 0.21.3
* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.21.2-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.21.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.21.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Thu Jan 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.21.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Tue Jan 09 2024 Gwyn Ciesla <gwync@protonmail.com> - 0.21.2-2
- CR3-Qstep table: avoid wrong 64-bit code generation patch
* Thu Dec 21 2023 Gwyn Ciesla <gwync@protonmail.com> - 0.21.2-1
- 0.21.2, enable zlib support.
* Tue Nov 28 2023 Orion Poplawski <orion@nwra.com> - 0.21.1-7
- Rebuild for jasper 4.1
* Tue Oct 10 2023 Neal Gompa <ngompa@fedoraproject.org> - 0.21.1-6
- Clean and simplify spec and drop EL7 stuff
- Use official released tarball
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.21.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Mon May 08 2023 Gwyn Ciesla <gwync@protonmail.com> - 0.21.1-4
- Patch for CVE-2023-1729
* Mon Mar 13 2023 Gwyn Ciesla <gwync@protonmail.com> - 0.21.1-3
- migrate to SPDX license
* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.21.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Thu Jan 05 2023 Gwyn Ciesla <gwync@protonmail.com> - 0.21.1-1
- 0.21.1
* Mon Dec 19 2022 Gwyn Ciesla <gwync@protonmail.com> - 0.21.0-1
- 0.21.0
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.20.2-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sun Feb 13 2022 Josef Ridky <jridky@redhat.com> - 0.20.2-6
- Rebuilt for libjasper.so.6
* Tue Apr 04 2023 Debarshi Ray <rishi@fedoraproject.org> - 0.20.2-6
- Fix CVE-2021-32142
Resolves: #2172140
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.20.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Mon Dec 13 2021 Debarshi Ray <rishi@fedoraproject.org> - 0.20.2-5
- CDDL is not an approved license
Resolves: #2031918
* Mon Dec 13 2021 Debarshi Ray <rishi@fedoraproject.org> - 0.20.2-4
- CDDL is not an approved license, but CDDL-1.0 is
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.20.2-4
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.20.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 0.20.2-3
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.20.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Loading…
Cancel
Save