From add71569d46672dd0ae26bf470ac377ba6e433b9 Mon Sep 17 00:00:00 2001 From: Pablo Greco Date: Sep 13 2019 18:04:31 +0000 Subject: Fix https://bugs.centos.org/view.php?id=14882 --- diff --git a/SOURCES/exiv2-fix-1305.patch b/SOURCES/exiv2-fix-1305.patch new file mode 100644 index 0000000..c7a50d8 --- /dev/null +++ b/SOURCES/exiv2-fix-1305.patch @@ -0,0 +1,22 @@ +From 5405d61623e82896e498c5c8342dd6f42e689115 Mon Sep 17 00:00:00 2001 +From: clanmills +Date: Tue, 12 Sep 2017 09:14:42 +0100 +Subject: [PATCH] Fix http://dev.exiv2.org/issues/1305 + +--- + src/pentaxmn.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/pentaxmn.cpp b/src/pentaxmn.cpp +index 4fc38be0a..b22cb43b6 100644 +--- a/src/pentaxmn.cpp ++++ b/src/pentaxmn.cpp +@@ -1167,6 +1167,8 @@ namespace Exiv2 { + + std::ostream& PentaxMakerNote::printShutterCount(std::ostream& os, const Value& value, const ExifData* metadata) + { ++ if ( ! metadata ) return os << "undefined" ; ++ + ExifData::const_iterator dateIt = metadata->findKey( + ExifKey("Exif.PentaxDng.Date")); + if (dateIt == metadata->end()) { diff --git a/SPECS/compat-exiv2-026.spec b/SPECS/compat-exiv2-026.spec index 0a85622..43e8deb 100644 --- a/SPECS/compat-exiv2-026.spec +++ b/SPECS/compat-exiv2-026.spec @@ -1,7 +1,7 @@ Name: compat-exiv2-026 Version: 0.26 -Release: 1%{?dist} +Release: 1%{?dist}.0.1 Summary: Compatibility package with the exiv2 library in version 0.26 License: GPLv2+ @@ -15,6 +15,9 @@ Patch10: exiv2-CVE-2017-17723.patch Patch11: exiv2-CVE-2017-17725.patch Patch12: exiv2-CVE-2017-5772.patch +##FastTrack +Patch10001: exiv2-fix-1305.patch + BuildRequires: expat-devel BuildRequires: gettext BuildRequires: pkgconfig @@ -82,6 +85,9 @@ chmod 755 %{buildroot}%{_libdir}/libexiv2.so.* %changelog +* Fri Sep 13 2019 Pablo Greco - 0.26-1.0.1 + - Fix https://bugs.centos.org/view.php?id=14882 http://dev.exiv2.org/issues/1305 + * Tue Jan 29 2019 Jan Grulich - 0.26-1 - Spec file based on exiv2 package to provide old libraries before API change Resolves: bz#1668355