Update exiftool to support 24

sift/include-server.sls

@@ -3,7 +3,6 @@ include:
   - sift.python3-packages
   - sift.python-packages
   - sift.packages
-  - sift.perl-packages
   - sift.scripts
 
 sift-server-include:
@@ -14,5 +13,4 @@ sift-server-include:
       - sls: sift.python3-packages
       - sls: sift.python-packages
       - sls: sift.packages
-      - sls: sift.perl-packages
       - sls: sift.scripts

sift/perl-packages/cgi.sls

@@ -1,7 +1,7 @@
 include:
   - sift.packages.perl
 
-cgi:
+sift-perl-package-libcgi-pm-perl:
   pkg.installed:
     - name: libcgi-pm-perl
     - require:

sift/perl-packages/datecalc.sls

@@ -1,7 +1,7 @@
 include:
   - sift.packages.perl
 
-datecalc:
+sift-perl-package-libdate-calc-perl:
   pkg.installed:
     - name: libdate-calc-perl
     - require:

sift/perl-packages/dbd-sqlite.sls

@@ -2,7 +2,7 @@ include:
   - sift.packages.perl
   - sift.packages.build-essential
 
-sift-perl-packages-dbd-sqlite:
+sift-perl-package-dbd-sqlite:
   cmd.run:
     - name: cpanm --no-man-pages install DBD::SQLite
     - env:

sift/perl-packages/dbi.sls

@@ -1,7 +1,7 @@
 include:
   - sift.packages.perl
 
-dbi:
+sift-perl-package-libdbi-perl:
   pkg.installed:
     - name: libdbi-perl
     - require:

sift/perl-packages/exiftool.sls

@@ -1,7 +1,7 @@
 include:
   - sift.packages.perl
 
-exiftool:
+sift-perl-package-libimage-exiftool-perl:
   pkg.installed:
     - name: libimage-exiftool-perl
     - require:

sift/perl-packages/json.sls

@@ -1,7 +1,7 @@
 include:
   - sift.packages.perl
 
-json:
+sift-perl-package-libjson-perl:
   pkg.installed:
     - name: libjson-perl
     - require:

sift/perl-packages/quicktable.sls

@@ -2,7 +2,7 @@ include:
   - sift.packages.perl
   - sift.packages.build-essential
 
-sift-perl-packages-quicktable:
+sift-perl-package-quicktable:
   cmd.run:
     - name: cpanm --no-man-pages install HTML::QuickTable 
     - env:

sift/perl-packages/xpath.sls

@@ -1,7 +1,7 @@
 include:
   - sift.packages.perl
 
-xpath:
+sift-perl-package-libxml-xpath-perl:
   pkg.installed:
     - name: libxml-xpath-perl
     - require:

sift/scripts/exiftool.sls

@@ -1,16 +1,21 @@
-# source=https://owl.phy.queensu.ca/~phil/exiftool/
-# license=free
+# Name: exiftool
+# Website: https://exiftool.org
+# Description: Platform-independent tool to read, write, and edit metadata information
+# Category:
+# Author: Phil Harvey
+# License: Free
+# Notes: exiftool
 
-{% set exiftool_version = '10.60' -%}
-{% set exiftool_sha256  = 'df0988f60e1a6c086799e1f2ecd419e8abbad4dfb5dfa66c6080c78a5cb7acfa' -%}
+{% set exiftool_version = '13.16' -%}
+{% set exiftool_sha256  = 'c4d12812ace44caea59173b75c47d97b32fc195dc4c0b561f305d847417839d1' -%}
 
 include:
-  - sift.packages.patch
-  
+  - sift.packages.build-essential
+
 sift-exiftool-source:
   file.managed:
     - name: /var/cache/sift/archives/Image-ExifTool-{{ exiftool_version }}.tar.gz
-    - source: https://owl.phy.queensu.ca/~phil/exiftool/Image-ExifTool-{{ exiftool_version }}.tar.gz
+    - source: https://exiftool.org/Image-ExifTool-{{ exiftool_version }}.tar.gz
     - source_hash: sha256={{ exiftool_sha256 }}
     - makedirs: True
 
@@ -22,44 +27,19 @@ sift-exiftool-extracted:
     - watch:
       - file: sift-exiftool-source
 
-sift-exiftool-patch-file:
-  file.managed:
-    - name: /usr/local/src/exiftool-{{ exiftool_version }}/exiftool.patch
-    - contents: |
-        diff --git 1/exiftool 2/exiftool
-        index eeff10b..a7c1259 100755
-        --- 1/exiftool
-        +++ 2/exiftool
-        @@ -18,7 +18,7 @@ my $version = '10.60';
-         my $exeDir;
-         BEGIN {
-             # get exe directory
-        -    $exeDir = ($0 =~ /(.*)[\\\/]/) ? $1 : '.';
-        +    $exeDir = "/usr/local/share/exiftool-$version/Image-ExifTool-$version";
-             # add lib directory at start of include path
-             unshift @INC, "$exeDir/lib";
-             # load or disable config file if specified
-    - watch:
-      - archive: sift-exiftool-extracted
-
-sift-exiftool-patch:
-  file.patch:
-    - name: /usr/local/src/exiftool-{{ exiftool_version }}/Image-ExifTool-{{ exiftool_version }}/exiftool
-    - source: /usr/local/src/exiftool-{{ exiftool_version }}/exiftool.patch
-    - hash: sha256=8790e165825aa7028d3a71ce656c876f8430d2505c6ca5aa058e74b16faee611
-    - require:
-      - sls: sift.packages.patch
-      - file: sift-exiftool-patch-file
-    - watch:
-      - archive: sift-exiftool-extracted
-
-sift-exiftool-binary:
-  file.managed:
-    - name: /usr/local/bin/exiftool
-    - source: /usr/local/src/exiftool-{{ exiftool_version }}/Image-ExifTool-{{ exiftool_version }}/exiftool
-    - mode: 755
-    - watch:
-      - file: sift-exiftool-patch
+sift-exiftool-makefile:
+  cmd.run:
+    - name: perl Makefile.PL
+    - cwd: /usr/local/src/exiftool-{{ exiftool_version }}/Image-ExifTool-{{ exiftool_version }}/
+    - include:
+      - sls: sift.packages.build-essential
+
+sift-exiftool-install:
+  cmd.run:
+    - name: make install
+    - cwd: /usr/local/src/exiftool-{{ exiftool_version }}/Image-ExifTool-{{ exiftool_version }}/
+    - include:
+      - cmd: sift-exiftool-makefile
 
 
 

sift/scripts/init.sls

@@ -6,6 +6,7 @@ include:
   - sift.scripts.densityscout
   - sift.scripts.dumbpig
   - sift.scripts.dump-mft-entry
+  - sift.scripts.exiftool
   - sift.scripts.image-mounter
   - sift.scripts.java-idx-parser
   - sift.scripts.jobparser
@@ -38,6 +39,7 @@ sift-scripts:
       - sls: sift.scripts.densityscout
       - sls: sift.scripts.dumbpig
       - sls: sift.scripts.dump-mft-entry
+      - sls: sift.scripts.exiftool
       - sls: sift.scripts.image-mounter
       - sls: sift.scripts.java-idx-parser
       - sls: sift.scripts.jobparser