Skip to content

Commit d167cd0

Browse files
Robert MarshallClemens Beckdependencies-bot
committed
Merge branch 'deps/e771939-f80ac85' into 'master'
Update exiftool/exiftool from 12.73 to 12.76 See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7375 Merged-by: Robert Marshall <[email protected]> Approved-by: João Alexandre Cunha <[email protected]> Approved-by: Clemens Beck <[email protected]> Approved-by: Robert Marshall <[email protected]> Co-authored-by: Clemens Beck <[email protected]> Co-authored-by: deps <[email protected]>
2 parents bc0955e + 1dc7992 commit d167cd0

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

config/patches/exiftool/allowlist-types.patch

Lines changed: 7 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 1e4f591a..737599f4 100644
2+
index b5349398..13d064e3 100644
33
--- a/lib/Image/ExifTool.pm
44
+++ b/lib/Image/ExifTool.pm
55
@@ -190,19 +190,10 @@ $defaultLang = 'en'; # default language
@@ -11,9 +11,9 @@ index 1e4f591a..737599f4 100644
1111
- OGG FLAC APE MPC MKV MXF DV PMP IND PGF ICC ITC FLIR FLIF FPF
1212
- LFP HTML VRD RTF FITS XISF XCF DSS QTIF FPX PICT ZIP GZIP PLIST
1313
- RAR 7Z BZ2 CZI TAR EXE EXR HDR CHM LNK WMF AVC DEX DPX RAW Font
14-
- RSRC M2TS MacOS PHP PCX DCX DWF DWG DXF WTV Torrent VCard LRI
15-
- R3D AA PDB PFM2 MRC LIF JXL MOI ISO ALIAS JSON MP3 DICOM PCD ICO
16-
- TXT AAC);
14+
- JUMBF RSRC M2TS MacOS PHP PCX DCX DWF DWG DXF WTV Torrent VCard
15+
- LRI R3D AA PDB PFM2 MRC LIF JXL MOI ISO ALIAS JSON MP3 DICOM PCD
16+
- ICO TXT AAC);
1717
+@fileTypes = qw(JPEG TIFF);
1818

1919
# file types that we can write (edit)
@@ -24,7 +24,7 @@ index 1e4f591a..737599f4 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-
@@ -224,347 +215,9 @@ my %createTypes = map { $_ => 1 } qw(XMP ICC MIE VRD DR4 EXIF EXV);
27+
@@ -224,349 +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 = (
@@ -64,6 +64,7 @@ index 1e4f591a..737599f4 100644
6464
- BPG => ['BPG', 'Better Portable Graphics'],
6565
- BTF => ['BTF', 'Big Tagged Image File Format'], #(unofficial)
6666
- BZ2 => ['BZ2', 'BZIP2 archive'],
67+
- C2PA => ['JUMBF','Coalition for Content Provenance and Authenticity'],
6768
- CHM => ['CHM', 'Microsoft Compiled HTML format'],
6869
- CIFF => ['CRW', 'Camera Image File Format'],
6970
- COS => ['COS', 'Capture One Settings'],
@@ -178,6 +179,7 @@ index 1e4f591a..737599f4 100644
178179
- JPS => ['JPEG', 'JPEG Stereo image'],
179180
- JPX => ['JP2', 'JPEG 2000 with extensions'],
180181
- JSON => ['JSON', 'JavaScript Object Notation'],
182+
- JUMBF=> ['JUMBF','JPEG Universal Metadata Box Format'],
181183
- JXL => ['JXL', 'JPEG XL'],
182184
- JXR => ['TIFF', 'JPEG XR'],
183185
- K25 => ['TIFF', 'Kodak DC25 RAW'],

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.73')
18+
version = Gitlab::Version.new('exiftool', '12.76')
1919
default_version version.print(false)
2020

2121
license 'GPL-1.0 or Artistic'

0 commit comments

Comments
 (0)