Update Gemfile & .lock to drop deleted Tom Hughes fork & pull newer version of ffi-libarchive from their repo

Author: erictheise

Gemfile

@@ -36,7 +36,7 @@ gem "rtlcss"
 gem "autoprefixer-rails"
 
 # Use image_optim to optimise images
-gem "image_optim", :github => "tomhughes/image_optim", :ref => "svgo-config"
+gem "image_optim"
 gem "image_optim_rails"
 
 # Use argon2 for password hashing
@@ -129,7 +129,8 @@ gem "opentelemetry-sdk", :require => false
 
 # Used to generate images for traces
 gem "bzip2-ffi"
-gem "ffi-libarchive"
+# Pull 1.2.5 from chef repo (not yet available at rubygems); may clear noise from CI logs
+gem "ffi-libarchive", github: "chef/ffi-libarchive", tag: "v1.2.5"
 # Use https://github.com/dark-panda/gd2-ffij/pull/28 for Docker/macOS compatibility
 gem "gd2-ffij", :github => "rkoeze/gd2-ffij", :ref => "a203a8d5ef004a4198950e86329228fe3f331d06"
 gem "marcel"

Gemfile.lock

@@ -1,3 +1,11 @@
+GIT
+  remote: https://github.com/chef/ffi-libarchive.git
+  revision: 5467a8d878062c3255dac2352b422b21067a67ed
+  tag: v1.2.5
+  specs:
+    ffi-libarchive (1.2.5)
+      ffi (~> 1.17)
+
 GIT
   remote: https://github.com/commonlit/canonical-rails.git
   revision: 97bcb28b910b08ce4dc0169eae55a8cd3d4f26ff
@@ -14,18 +22,6 @@ GIT
     gd2-ffij (0.4.1.dev)
       ffi (>= 1.0.0)
 
-GIT
-  remote: https://github.com/tomhughes/image_optim.git
-  revision: 745137caf615ab07b29082c291416c8fbe0ac3b9
-  ref: svgo-config
-  specs:
-    image_optim (0.31.4)
-      exifr (~> 1.2, >= 1.2.2)
-      fspath (~> 3.0)
-      image_size (>= 1.5, < 4)
-      in_threads (~> 1.3)
-      progress (~> 3.0, >= 3.0.1)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -330,8 +326,6 @@ GEM
     ffi-compiler (1.3.2)
       ffi (>= 1.15.5)
       rake
-    ffi-libarchive (1.1.14)
-      ffi (~> 1.0)
     frozen_record (0.27.4)
       activemodel
     fspath (3.1.2)
@@ -377,6 +371,12 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.8, >= 1.8.1)
       terminal-table (>= 1.5.1)
+    image_optim (0.31.4)
+      exifr (~> 1.2, >= 1.2.2)
+      fspath (~> 3.0)
+      image_size (>= 1.5, < 4)
+      in_threads (~> 1.3)
+      progress (~> 3.0, >= 3.0.1)
     image_optim_rails (0.5.0)
       image_optim (~> 0.24)
       railties
@@ -1027,15 +1027,15 @@ DEPENDENCIES
   erb_lint
   factory_bot_rails
   faraday
-  ffi-libarchive
+  ffi-libarchive!
   frozen_record
   gd2-ffij!
   herb
   htmlentities
   http_accept_language
   i18n-js
   i18n-tasks
-  image_optim!
+  image_optim
   image_optim_rails
   image_processing
   inline_svg