View | Details | Raw Unified | Return to bug 255803 | Differences between
and this patch

Collapse All | Expand All

(-)./distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1592880859
1
TIMESTAMP = 1621512261
2
SHA256 (Image-ExifTool-12.00.tar.gz) = d0792cc94ab58a8b3d81b18ccdb8b43848c8fb901b5b7caecdcb68689c6c855a
2
SHA256 (Image-ExifTool-12.16.tar.gz) = c140797d72acdaf04f7ce0629867353510b56fbe99ceaac0742bbc379610756a
3
SIZE (Image-ExifTool-12.00.tar.gz) = 4817545
3
SIZE (Image-ExifTool-12.16.tar.gz) = 4888506
(-)./files/patch-exiftool (+14 lines)
Line 0 Link Here
1
--- exiftool.orig	2021-01-21 16:24:14 UTC
2
+++ exiftool
3
@@ -4242,7 +4242,10 @@ sub FilterArgfileLine($)
4
         # escaped by an odd number of backslashes, and escape a single backslash
5
         # if it occurs at the end of the string
6
         $arg =~ s{\\(.)|(["\$\@]|\\$)}{'\\'.($2 || $1)}sge;
7
-        $arg = eval qq{"$arg"};     # un-escape characters in C string
8
+        # un-escape characters in C string
9
+        my %esc = ( a => "\a", b => "\b", f => "\f", n => "\n",
10
+                    r => "\r", t => "\t", '"' => '"', '\\' => '\\' );
11
+        $arg =~ s/\\(.)/$esc{$1}||'\\'.$1/egs;
12
     } else {
13
         $arg =~ s/^\s+//;           # remove leading white space
14
         $arg =~ s/[\x0d\x0a]+$//s;  # remove trailing newline
(-)./files/patch-lib_Image_ExifTool_DjVu.pm (+27 lines)
Line 0 Link Here
1
--- lib/Image/ExifTool/DjVu.pm	2020-12-26 13:10:16 UTC
2
+++ lib/Image/ExifTool/DjVu.pm	2021-04-13 14:30:35 UTC
3
@@ -18,7 +18,7 @@ use strict;
4
 use vars qw($VERSION);
5
 use Image::ExifTool qw(:DataAccess :Utils);
6
 
7
-$VERSION = '1.06';
8
+$VERSION = '1.07';
9
 
10
 sub ParseAnt($);
11
 sub ProcessAnt($$$);
12
@@ -227,10 +227,11 @@ Tok: for (;;) {
13
                 last unless $tok =~ /(\\+)$/ and length($1) & 0x01;
14
                 $tok .= '"';    # quote is part of the string
15
             }
16
-            # must protect unescaped "$" and "@" symbols, and "\" at end of string
17
-            $tok =~ s{\\(.)|([\$\@]|\\$)}{'\\'.($2 || $1)}sge;
18
-            # convert C escape sequences (allowed in quoted text)
19
-            $tok = eval qq{"$tok"};
20
+            # convert C escape sequences, allowed in quoted text
21
+            # (note: this only converts a few of them!)
22
+            my %esc = ( a => "\a", b => "\b", f => "\f", n => "\n",
23
+                        r => "\r", t => "\t", '"' => '"', '\\' => '\\' );
24
+            $tok =~ s/\\(.)/$esc{$1}||'\\'.$1/egs;
25
         } else {                # key name
26
             pos($$dataPt) = pos($$dataPt) - 1;
27
             # allow anything in key but whitespace, braces and double quotes
(-)./Makefile (-4 / +2 lines)
Lines 1-9 Link Here
1
# Created by: Tod McQuillin <devin@spamcop.net>
1
# Created by: Tod McQuillin <devin@spamcop.net>
2
2
3
PORTNAME=	Image-ExifTool
3
PORTNAME=	Image-ExifTool
4
PORTVERSION=	12.00
4
PORTVERSION=	12.16
5
CATEGORIES=	graphics perl5
5
CATEGORIES=	graphics perl5
6
MASTER_SITES=	https://sno.phy.queensu.ca/~phil/exiftool/ \
6
MASTER_SITES=	https://exiftool.org/ \
7
		CPAN
7
		CPAN
8
MASTER_SITE_SUBDIR=	CPAN:EXIFTOOL
8
MASTER_SITE_SUBDIR=	CPAN:EXIFTOOL
9
PKGNAMEPREFIX=	p5-
9
PKGNAMEPREFIX=	p5-
Lines 20-28 USE_PERL5= configure Link Here
20
CONFLICTS_INSTALL=	p5-Image-ExifTool-devel
20
CONFLICTS_INSTALL=	p5-Image-ExifTool-devel
21
21
22
NO_ARCH=	yes
22
NO_ARCH=	yes
23
24
PORTDOCS=	*
23
PORTDOCS=	*
25
26
OPTIONS_DEFINE=	DOCS
24
OPTIONS_DEFINE=	DOCS
27
25
28
post-install-DOCS-on:
26
post-install-DOCS-on:
(-)./pkg-descr (-1 / +1 lines)
Lines 14-17 Panasonic/Leica, Pentax/Asahi, Ricoh, Sa Link Here
14
ExifTool writes EXIF, GPS, IPTC, XMP and MakerNotes meta information to
14
ExifTool writes EXIF, GPS, IPTC, XMP and MakerNotes meta information to
15
JPEG, TIFF, GIF, CRW, THM, CR2, NEF, PEF and DNG images.
15
JPEG, TIFF, GIF, CRW, THM, CR2, NEF, PEF and DNG images.
16
16
17
WWW: https://sno.phy.queensu.ca/~phil/exiftool/
17
WWW: https://exiftool.org/
(-)./pkg-plist (+4 lines)
Lines 141-146 bin/exiftool Link Here
141
%%SITE_PERL%%/Image/ExifTool/Nikon.pm
141
%%SITE_PERL%%/Image/ExifTool/Nikon.pm
142
%%SITE_PERL%%/Image/ExifTool/NikonCapture.pm
142
%%SITE_PERL%%/Image/ExifTool/NikonCapture.pm
143
%%SITE_PERL%%/Image/ExifTool/NikonCustom.pm
143
%%SITE_PERL%%/Image/ExifTool/NikonCustom.pm
144
%%SITE_PERL%%/Image/ExifTool/NikonSettings.pm
144
%%SITE_PERL%%/Image/ExifTool/Nintendo.pm
145
%%SITE_PERL%%/Image/ExifTool/Nintendo.pm
145
%%SITE_PERL%%/Image/ExifTool/OOXML.pm
146
%%SITE_PERL%%/Image/ExifTool/OOXML.pm
146
%%SITE_PERL%%/Image/ExifTool/Ogg.pm
147
%%SITE_PERL%%/Image/ExifTool/Ogg.pm
Lines 215-220 bin/exiftool Link Here
215
%%SITE_PERL%%/Image/ExifTool/XMP2.pl
216
%%SITE_PERL%%/Image/ExifTool/XMP2.pl
216
%%SITE_PERL%%/Image/ExifTool/XMPStruct.pl
217
%%SITE_PERL%%/Image/ExifTool/XMPStruct.pl
217
%%SITE_PERL%%/Image/ExifTool/ZIP.pm
218
%%SITE_PERL%%/Image/ExifTool/ZIP.pm
219
%%SITE_PERL%%/Image/ExifTool/ZISRAW.pm
218
%%SITE_PERL%%/Image/ExifTool/iWork.pm
220
%%SITE_PERL%%/Image/ExifTool/iWork.pm
219
%%PERL5_MAN1%%/exiftool.1.gz
221
%%PERL5_MAN1%%/exiftool.1.gz
220
%%PERL5_MAN3%%/File::RandomAccess.3.gz
222
%%PERL5_MAN3%%/File::RandomAccess.3.gz
Lines 324-329 bin/exiftool Link Here
324
%%PERL5_MAN3%%/Image::ExifTool::Nikon.3.gz
326
%%PERL5_MAN3%%/Image::ExifTool::Nikon.3.gz
325
%%PERL5_MAN3%%/Image::ExifTool::NikonCapture.3.gz
327
%%PERL5_MAN3%%/Image::ExifTool::NikonCapture.3.gz
326
%%PERL5_MAN3%%/Image::ExifTool::NikonCustom.3.gz
328
%%PERL5_MAN3%%/Image::ExifTool::NikonCustom.3.gz
329
%%PERL5_MAN3%%/Image::ExifTool::NikonSettings.3.gz
327
%%PERL5_MAN3%%/Image::ExifTool::Nintendo.3.gz
330
%%PERL5_MAN3%%/Image::ExifTool::Nintendo.3.gz
328
%%PERL5_MAN3%%/Image::ExifTool::OOXML.3.gz
331
%%PERL5_MAN3%%/Image::ExifTool::OOXML.3.gz
329
%%PERL5_MAN3%%/Image::ExifTool::Ogg.3.gz
332
%%PERL5_MAN3%%/Image::ExifTool::Ogg.3.gz
Lines 397-400 bin/exiftool Link Here
397
%%PERL5_MAN3%%/Image::ExifTool::XMP2.3.gz
400
%%PERL5_MAN3%%/Image::ExifTool::XMP2.3.gz
398
%%PERL5_MAN3%%/Image::ExifTool::XMPStruct.3.gz
401
%%PERL5_MAN3%%/Image::ExifTool::XMPStruct.3.gz
399
%%PERL5_MAN3%%/Image::ExifTool::ZIP.3.gz
402
%%PERL5_MAN3%%/Image::ExifTool::ZIP.3.gz
403
%%PERL5_MAN3%%/Image::ExifTool::ZISRAW.3.gz
400
%%PERL5_MAN3%%/Image::ExifTool::iWork.3.gz
404
%%PERL5_MAN3%%/Image::ExifTool::iWork.3.gz

Return to bug 255803