Skip to content

Commit 3c3957a

Browse files
Robert MarshallClemens Beckdependencies-bot
committed
Merge branch 'deps/e771939-45560e1' into 'master'
Update exiftool/exiftool from 12.71 to 12.73 See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7321 Merged-by: Robert Marshall <[email protected]> Approved-by: Hossein Pursultani <[email protected]> Approved-by: Robert Marshall <[email protected]> Co-authored-by: Clemens Beck <[email protected]> Co-authored-by: deps <[email protected]>
2 parents dc5703c + a859639 commit 3c3957a

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

config/patches/exiftool/allowlist-types.patch

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/lib/Image/ExifTool.pm b/lib/Image/ExifTool.pm
2-
index 6c3a6292..90b57c2e 100644
2+
index 1e4f591a..737599f4 100644
33
--- a/lib/Image/ExifTool.pm
44
+++ b/lib/Image/ExifTool.pm
55
@@ -190,19 +190,10 @@ $defaultLang = 'en'; # default language
@@ -13,7 +13,7 @@ index 6c3a6292..90b57c2e 100644
1313
- RAR 7Z BZ2 CZI TAR EXE EXR HDR CHM LNK WMF AVC DEX DPX RAW Font
1414
- RSRC M2TS MacOS PHP PCX DCX DWF DWG DXF WTV Torrent VCard LRI
1515
- R3D AA PDB PFM2 MRC LIF JXL MOI ISO ALIAS JSON MP3 DICOM PCD ICO
16-
- TXT);
16+
- TXT AAC);
1717
+@fileTypes = qw(JPEG TIFF);
1818

1919
# file types that we can write (edit)
@@ -24,7 +24,7 @@ index 6c3a6292..90b57c2e 100644
2424
my %writeTypes; # lookup for writable file types (hash filled if required)
2525

2626
# file extensions that we can't write for various base types
27-
@@ -223,346 +214,9 @@ my %createTypes = map { $_ => 1 } qw(XMP ICC MIE VRD DR4 EXIF EXV);
27+
@@ -224,347 +215,9 @@ my %createTypes = map { $_ => 1 } qw(XMP ICC MIE VRD DR4 EXIF EXV);
2828
# (if extension may be more than one type, the type is a list where
2929
# the writable type should come first if it exists)
3030
%fileTypeLookup = (
@@ -37,6 +37,7 @@ index 6c3a6292..90b57c2e 100644
3737
- '7Z' => ['7Z', '7z archive'],
3838
- A => ['EXE', 'Static library'],
3939
- AA => ['AA', 'Audible Audiobook'],
40+
- AAC => ['AAC', 'Advanced Audio Coding'],
4041
- AAE => ['PLIST','Apple edit information'],
4142
- AAX => ['MOV', 'Audible Enhanced Audiobook'],
4243
- ACR => ['DICOM','American College of Radiology ACR-NEMA'],
@@ -373,7 +374,7 @@ index 6c3a6292..90b57c2e 100644
373374
# typical extension for each file type (if different than FileType)
374375
diff --git a/lib/Image/ExifTool/AIFF.pm b/lib/Image/ExifTool/AIFF.pm
375376
deleted file mode 100644
376-
index a862a0de..00000000
377+
index f2c7a68d..00000000
377378
--- a/lib/Image/ExifTool/AIFF.pm
378379
+++ /dev/null
379380
@@ -1,312 +0,0 @@
@@ -666,7 +667,7 @@ index a862a0de..00000000
666667
-
667668
-=head1 AUTHOR
668669
-
669-
-Copyright 2003-2023, Phil Harvey (philharvey66 at gmail.com)
670+
-Copyright 2003-2024, Phil Harvey (philharvey66 at gmail.com)
670671
-
671672
-This library is free software; you can redistribute it and/or modify it
672673
-under the same terms as Perl itself.

config/software/exiftool.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#
1616

1717
name 'exiftool'
18-
version = Gitlab::Version.new('exiftool', '12.71')
18+
version = Gitlab::Version.new('exiftool', '12.73')
1919
default_version version.print(false)
2020

2121
license 'GPL-1.0 or Artistic'

0 commit comments

Comments
 (0)