Import from AlmaLinux stable repository

This commit is contained in:
eabdullin 2024-05-14 14:15:06 +03:00
parent f030fb2e1c
commit 6d71cd9a8e
6 changed files with 50 additions and 17 deletions

View File

@ -1 +0,0 @@
0b425d9a5ed873adeeb68ea1b4945745f3ec1507 SOURCES/0.20.2.tar.gz

1
.gitignore vendored
View File

@ -1 +0,0 @@
SOURCES/0.20.2.tar.gz

BIN
SOURCES/0.21.1.tar.gz Normal file

Binary file not shown.

View File

@ -0,0 +1,22 @@
From 9ab70f6dca19229cb5caad7cc31af4e7501bac93 Mon Sep 17 00:00:00 2001
From: Alex Tutubalin <lexa@lexa.ru>
Date: Sat, 14 Jan 2023 18:32:59 +0300
Subject: [PATCH] do not set shrink flag for 3/4 component images
---
src/preprocessing/raw2image.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/preprocessing/raw2image.cpp b/src/preprocessing/raw2image.cpp
index e65e2ad7..702cf290 100644
--- a/src/preprocessing/raw2image.cpp
+++ b/src/preprocessing/raw2image.cpp
@@ -43,6 +43,8 @@ void LibRaw::raw2image_start()
// adjust for half mode!
IO.shrink =
+ !imgdata.rawdata.color4_image && !imgdata.rawdata.color3_image &&
+ !imgdata.rawdata.float4_image && !imgdata.rawdata.float3_image &&
P1.filters &&
(O.half_size || ((O.threshold || O.aber[0] != 1 || O.aber[2] != 1)));

View File

@ -1,26 +1,25 @@
--- 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 @@
--- 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 @@
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.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 @@
--- 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 @@
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: -lstdc++
Libs.private: @PACKAGE_LIBS_PRIVATE@
Cflags: -I${includedir}/libraw -I${includedir}

View File

@ -6,8 +6,8 @@
Summary: Library for reading RAW files obtained from digital photo cameras
Name: LibRaw
Version: 0.20.2
Release: 5%{?dist}
Version: 0.21.1
Release: 1%{?dist}
License: BSD and LGPLv2
URL: http://www.libraw.org
@ -19,7 +19,12 @@ BuildRequires: autoconf automake libtool
BuildRequires: make
Source0: http://github.com/LibRaw/LibRaw/archive/%{version}.tar.gz
Patch0: LibRaw-pkgconfig.patch
# CVE-2023-1729
Patch1: 9ab70f6dca19229cb5caad7cc31af4e7501bac93.patch
Provides: bundled(dcraw) = 9.25
%description
@ -90,8 +95,8 @@ rm -fv %{buildroot}%{_libdir}/lib*.la
%files
%doc Changelog.txt
%license LICENSE.CDDL LICENSE.LGPL COPYRIGHT
%{_libdir}/libraw.so.20*
%{_libdir}/libraw_r.so.20*
%{_libdir}/libraw.so.23*
%{_libdir}/libraw_r.so.23*
%files static
%{_libdir}/libraw.a
@ -114,6 +119,15 @@ rm -fv %{buildroot}%{_libdir}/lib*.la
%changelog
* Mon Oct 02 2023 Debarshi Ray <rishi@fedoraproject.org> - 0.21.1-1
- 0.21.1
- Include the fix for CVE-2023-1729 from Fedora
Resolves: RHEL-768
* Tue Apr 04 2023 Debarshi Ray <rishi@fedoraproject.org> - 0.20.2-6
- Fix CVE-2021-32142
Resolves: #2172140
* Mon Dec 13 2021 Debarshi Ray <rishi@fedoraproject.org> - 0.20.2-5
- CDDL is not an approved license
Resolves: #2031918