diff --git a/.LibRaw.metadata b/.LibRaw.metadata index 9848054..5557586 100644 --- a/.LibRaw.metadata +++ b/.LibRaw.metadata @@ -1 +1 @@ -6434fe5ec5674930bd118b134da577fa3abecd9b SOURCES/LibRaw-0.19.1.tar.gz +c151995b6f17a0ccef7fbc1dcb982f0ccb04d934 SOURCES/LibRaw-0.19.5.tar.gz diff --git a/.gitignore b/.gitignore index 497f24d..0fb894b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/LibRaw-0.19.1.tar.gz +SOURCES/LibRaw-0.19.5.tar.gz diff --git a/SOURCES/LibRaw-0.17.1-CVE-2015-8366-8367.patch b/SOURCES/LibRaw-0.17.1-CVE-2015-8366-8367.patch deleted file mode 100644 index b8848de..0000000 --- a/SOURCES/LibRaw-0.17.1-CVE-2015-8366-8367.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -r -U3 LibRaw-0.17.1.orig/dcraw/dcraw.c LibRaw-0.17.1/dcraw/dcraw.c ---- LibRaw-0.17.1.orig/dcraw/dcraw.c 2015-05-24 21:30:26.000000000 -0500 -+++ LibRaw-0.17.1/dcraw/dcraw.c 2015-12-01 07:47:00.086513959 -0600 -@@ -2901,6 +2901,10 @@ - diff = diff ? -diff : 0x80; - if (ftell(ifp) + 12 >= seg[1][1]) - diff = 0; -+#ifdef LIBRAW_LIBRARY_BUILD -+ if(pix>=raw_width*raw_height) -+ throw LIBRAW_EXCEPTION_IO_CORRUPT; -+#endif - raw_image[pix] = pred[pix & 1] += diff; - if (!(pix & 1) && HOLE(pix / raw_width)) pix += 2; - } diff --git a/SPECS/LibRaw.spec b/SPECS/LibRaw.spec index 3134e3d..d464a8b 100644 --- a/SPECS/LibRaw.spec +++ b/SPECS/LibRaw.spec @@ -1,6 +1,6 @@ Summary: Library for reading RAW files obtained from digital photo cameras Name: LibRaw -Version: 0.19.1 +Version: 0.19.5 Release: 1%{?dist} License: BSD and (CDDL or LGPLv2) URL: http://www.libraw.org @@ -9,10 +9,10 @@ BuildRequires: gcc-c++ BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(jasper) BuildRequires: pkgconfig(libjpeg) +BuildRequires: autoconf automake libtool Source0: http://www.libraw.org/data/%{name}-%{version}.tar.gz Patch0: LibRaw-0.6.0-pkgconfig.patch -Patch1: LibRaw-0.17.1-CVE-2015-8366-8367.patch Provides: bundled(dcraw) = 9.25 %description @@ -39,22 +39,28 @@ Requires: %{name}-devel%{?_isa} = %{version}-%{release} %description static LibRaw static development libraries. +%if 0%{?rhel} != 7 %package samples Summary: LibRaw sample programs Requires: %{name} = %{version}-%{release} %description samples LibRaw sample programs +%endif %prep %setup -q %patch0 -p0 -b .pkgconfig -%patch1 -p1 -b .CVE-2015-8366 %build +autoreconf -if %configure \ +%if 0%{?rhel} == 7 + --enable-examples=no \ +%else --enable-examples=yes \ +%endif --enable-jasper \ --enable-jpeg \ --enable-lcms \ @@ -102,11 +108,17 @@ rm -fv %{buildroot}%{_libdir}/lib*.la %{_libdir}/pkgconfig/libraw_r.pc %exclude %{_docdir}/libraw/* +%if 0%{?rhel} != 7 %files samples %{_bindir}/* +%endif %changelog +* Wed Oct 30 2019 Debarshi Ray - 0.19.5-1 +- 0.19.5 +Resolves: #1671744 + * Fri Dec 14 2018 Debarshi Ray - 0.19.1-1 - 0.19.1 Resolves: #1654688