diff --git a/.gitignore b/.gitignore index 6e3e988..15ca8b2 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ Image-ExifTool-8.25.tar.gz /Image-ExifTool-11.85.tar.gz /Image-ExifTool-12.00.tar.gz /Image-ExifTool-12.16.tar.gz +/Image-ExifTool-12.26.tar.gz diff --git a/Image-ExifTool-12.16-CVE-2021-22204.patch b/Image-ExifTool-12.16-CVE-2021-22204.patch deleted file mode 100644 index 6a200f0..0000000 --- a/Image-ExifTool-12.16-CVE-2021-22204.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -up Image-ExifTool-12.16/lib/Image/ExifTool/DjVu.pm.CVE-2021-22204 Image-ExifTool-12.16/lib/Image/ExifTool/DjVu.pm ---- Image-ExifTool-12.16/lib/Image/ExifTool/DjVu.pm.CVE-2021-22204 2021-04-26 11:06:57.868813858 -0400 -+++ Image-ExifTool-12.16/lib/Image/ExifTool/DjVu.pm 2021-04-26 11:07:46.734614214 -0400 -@@ -18,7 +18,7 @@ use strict; - use vars qw($VERSION); - use Image::ExifTool qw(:DataAccess :Utils); - --$VERSION = '1.06'; -+$VERSION = '1.07'; - - sub ParseAnt($); - sub ProcessAnt($$$); -@@ -227,10 +227,11 @@ Tok: for (;;) { - last unless $tok =~ /(\\+)$/ and length($1) & 0x01; - $tok .= '"'; # quote is part of the string - } -- # must protect unescaped "$" and "@" symbols, and "\" at end of string -- $tok =~ s{\\(.)|([\$\@]|\\$)}{'\\'.($2 || $1)}sge; -- # convert C escape sequences (allowed in quoted text) -- $tok = eval qq{"$tok"}; -+ # convert C escape sequences, allowed in quoted text -+ # (note: this only converts a few of them!) -+ my %esc = ( a => "\a", b => "\b", f => "\f", n => "\n", -+ r => "\r", t => "\t", '"' => '"', '\\' => '\\' ); -+ $tok =~ s/\\(.)/$esc{$1}||'\\'.$1/egs; - } else { # key name - pos($$dataPt) = pos($$dataPt) - 1; - # allow anything in key but whitespace, braces and double quotes diff --git a/perl-Image-ExifTool.spec b/perl-Image-ExifTool.spec index 4cedda1..b56aa5b 100644 --- a/perl-Image-ExifTool.spec +++ b/perl-Image-ExifTool.spec @@ -1,12 +1,10 @@ Name: perl-Image-ExifTool -Version: 12.16 -Release: 3%{?dist} +Version: 12.26 +Release: 1%{?dist} License: GPL+ or Artistic Summary: Utility for reading and writing image meta info URL: http://www.sno.phy.queensu.ca/%7Ephil/exiftool/ Source0: http://www.sno.phy.queensu.ca/%7Ephil/exiftool/Image-ExifTool-%{version}.tar.gz -# https://github.com/exiftool/exiftool/commit/cf0f4e7dcd024ca99615bfd1102a841a25dde031#diff-fa0d652d10dbcd246e6b1df16c1e992931d3bb717a7e36157596b76bdadb3800 -Patch0: Image-ExifTool-12.16-CVE-2021-22204.patch BuildArch: noarch BuildRequires: coreutils BuildRequires: findutils @@ -56,7 +54,6 @@ Sigma/Foveon, and Sony. %prep %setup -q -n Image-ExifTool-%{version} -%patch0 -p1 %build %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -84,6 +81,9 @@ make test %{_mandir}/man3/*.3* %changelog +* Wed Jun 23 2021 Tom Callaway - 12.26-1 +- update to latest stable (12.26) + * Mon Apr 26 2021 Tom Callaway - 12.16-3 - apply upstream fix for CVE-2021-22204 diff --git a/sources b/sources index b4b0150..a5c65ba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Image-ExifTool-12.16.tar.gz) = adfd21834ccf06277903712b3c5e328b29c56f3b30ee68f6802dca0820823b627622e55f53238690525d1d19df2a59cb57f9d80a1bb2e99da37fb7d963ee16ee +SHA512 (Image-ExifTool-12.26.tar.gz) = 15bbff738e151d3ed5c77a17c99ded6cc3da2050fe7df94c42aea544aa31d7f539d70d07fd5336ae018af05b7f168712f1367046d8004861fce58442c03f82bd