image_optim_pack 0.10.0.20231105 → 0.10.1.20240317

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77146413c46cc1b665900e666564f3e7cd6c77817ff6de9a08109b8508ea024c
-  data.tar.gz: 1240c164a7e935e585d1115a19886ebf7c3c654f1e5daa621484a7eac16e2fd1
+  metadata.gz: 8d10018e951d34abf893b655ecb2bdb1eb546607922bfd8d3ec89a1f7bb94c17
+  data.tar.gz: 7556874b1f9470416aa0bea53a0c0776398fa9ff276e6a498fb0444f17d1da9b
 SHA512:
-  metadata.gz: 0c2f769c5d283e1d3a7cc753b7f037a4be7f9970333f3c6b76adaba1be57c44da66a4d71f8555f088c97454f66b35806f86ed125a99729b3ed03bbf971796716
-  data.tar.gz: 73221d01d11a712cb4d15449348ff3823412719c0119e12f8b2d92a3ec48ce8f5397b400d5184ba7349f3c7cd9f722c1ed9ecab7fc9c44e4a3e771029e46adf7
+  metadata.gz: 63a90f8e34e5d7a0bf533fc6f63cda80e4797886faa6d5c4ddf17134a77434b021ed83071f5c3d7aa283b80dca380f09ddbf0dd1d5745c0a8850a0a61e2f958d
+  data.tar.gz: ad40e4dd0d141331ae423679abb1288d030ec467222751f61ca109191e28d6f003a57a0e498f9cb07368f313b19f7efa31bc268d6e4ad55c4bfa673d91746415

data/.github/workflows/check.yml

@@ -13,19 +13,17 @@ jobs:
         - ubuntu-latest
         - macos-latest
         ruby:
-        - '2.3'
-        - '2.4'
-        - '2.5'
         - '2.6'
         - '2.7'
         - '3.0'
         - '3.1'
         - '3.2'
+        - '3.3'
         - jruby-9.3
         - jruby-9.4
       fail-fast: false
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: "${{ matrix.ruby }}"

data/.github/workflows/docker-build.yml

@@ -14,7 +14,7 @@ jobs:
         - DOCKER_FILE=Dockerfile.debian DOCKER_TAG_SUFFIX=-debian
       fail-fast: false
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
       with:
         registry: ghcr.io

data/.github/workflows/livecheck.yml

@@ -14,7 +14,7 @@ jobs:
   livecheck:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: '3'

data/.github/workflows/rubocop.yml

@@ -8,7 +8,7 @@ jobs:
   rubocop:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: '3'

data/.rubocop.yml

@@ -63,11 +63,6 @@ Style/HashConversion:
 Style/HashEachMethods:
   Enabled: true
 
-Style/HashSyntax:
-  Exclude:
-    - script/livecheck
-  EnforcedStyle: hash_rockets
-
 Style/HashTransformKeys:
   Enabled: false
 

data/CHANGELOG.markdown

@@ -2,6 +2,16 @@
 
 ## unreleased
 
+## v0.10.1.20240317 (2024-03-17)
+
+* gifsicle 1.95 [@toy](https://github.com/toy)
+* libpng 1.6.43, patching pngcrush to be compatible [@toy](https://github.com/toy)
+* libjpeg 9f [@toy](https://github.com/toy)
+
+## v0.10.1 (2023-12-05)
+
+* liblcms 2.16 [@toy](https://github.com/toy)
+
 ## v0.10.0.20231105 (2023-11-05)
 
 * optipng 0.7.8 [@toy](https://github.com/toy)

data/Gemfile

@@ -2,7 +2,7 @@
 
 source 'https://rubygems.org'
 
-gemspec :name => 'image_optim_pack'
+gemspec name: 'image_optim_pack'
 
 if RUBY_VERSION >= '2.1.9'
   gem 'gems', '~> 1.0'

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2014-2023 Ivan Kuchin
+Copyright (c) 2014-2024 Ivan Kuchin
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Makefile

@@ -3,14 +3,14 @@ all :
 # ====== VERSIONS ======
 
 ADVANCECOMP_VER := 2.6
-GIFSICLE_VER := 1.94
+GIFSICLE_VER := 1.95
 JHEAD_VER := 3.04
 JPEGARCHIVE_VER := 2.2.0
 JPEGOPTIM_VER := 1.5.5
-LIBJPEG_VER := 9e
-LIBLCMS_VER := 2.15
+LIBJPEG_VER := 9f
+LIBLCMS_VER := 2.16
 LIBMOZJPEG_VER := 4.1.5
-LIBPNG_VER := 1.6.40
+LIBPNG_VER := 1.6.43
 LIBZ_VER := 1.2.11
 OPTIPNG_VER := 0.7.8
 OXIPNG_VER := 9.0.0
@@ -43,6 +43,7 @@ BUILD_ROOT_DIR := $(CURDIR)/build
 BUILD_DIR := $(BUILD_ROOT_DIR)/$(OS)-$(ARCH)
 OUTPUT_ROOT_DIR := $(CURDIR)/vendor
 OUTPUT_DIR := $(OUTPUT_ROOT_DIR)/$(OS)-$(ARCH)
+PATCHES_DIR := $(CURDIR)/patches
 
 ANSI_RED=\033[31m
 ANSI_GREEN=\033[32m
@@ -495,6 +496,7 @@ $(OXIPNG_TARGET) :
 $(eval $(call depend,PNGCRUSH,LIBPNG LIBZ))
 $(PNGCRUSH_TARGET) :
 	cd $(DIR) && rm -f png.h pngconf.h
+	cd $(DIR) && patch < $(PATCHES_DIR)/pngcrush.patch
 	cd $(DIR) && $(MAKE) pngcrush \
 		CC="$(CC)" \
 		LD="$(CC)" \

data/README.markdown

@@ -119,4 +119,4 @@ make docker-push # will push tags created by docker-build
 
 ## Copyright
 
-Copyright (c) 2014-2023 Ivan Kuchin. See [LICENSE.txt](LICENSE.txt) for details.
+Copyright (c) 2014-2024 Ivan Kuchin. See [LICENSE.txt](LICENSE.txt) for details.

data/Vagrantfile

@@ -27,13 +27,13 @@ Vagrant.configure('2') do |config|
           set -ex
 
           apt-get update
-          apt-get -y install rsync ntpdate make wget gcc g++ chrpath perl pkg-config autoconf automake libtool nasm cmake cargo
+          apt-get -y install rsync ntpdate make wget gcc g++ chrpath perl pkg-config autoconf automake libtool nasm cmake cargo patch
           apt-get -y remove unattended-upgrades
         else
           set -ex
 
           yum -y install epel-release
-          yum -y install rsync ntpdate make wget gcc gcc-c++ chrpath perl pkg-config autoconf automake libtool nasm cmake cargo
+          yum -y install rsync ntpdate make wget gcc gcc-c++ chrpath perl pkg-config autoconf automake libtool nasm cmake cargo patch
         fi
 
         mkdir -p /vagrant

data/boxes/Rakefile

@@ -73,10 +73,10 @@ Dir['definitions/*/definition.rb'].each do |definition_path|
   end
 
   desc 'build all boxes'
-  task :build => box.path
+  task build: box.path
 
   desc 'add all boxes to vagrant'
-  task :add => "add:#{box.name}"
+  task add: "add:#{box.name}"
 end
 
 desc 'remove *.box and iso dir'
@@ -85,4 +85,4 @@ task :clean do
   sh 'rm -r iso || true'
 end
 
-task :default => :build
+task default: :build

data/boxes/definitions/centos-amd64/definition.rb

@@ -1,32 +1,32 @@
 # frozen_string_literal: true
 
 Veewee::Session.declare({
-  :cpu_count => '1',
-  :memory_size => '512',
-  :disk_size => '8192',
-  :disk_format => 'VDI',
-  :hostiocache => 'off',
-  :os_type_id => 'RedHat6_64',
-  :iso_file => 'CentOS-7-x86_64-Minimal-2009.iso',
-  :iso_src => 'http://linux.darkpenguin.net/distros/CentOS/7.9.2009/isos/x86_64/CentOS-7-x86_64-Minimal-2009.iso',
-  :iso_sha256 => '07b94e6b1a0b0260b94c83d6bb76b26bf7a310dc78d7a9c7432809fb9bc6194a',
-  :iso_download_timeout => '1000',
-  :boot_wait => '10',
-  :boot_cmd_sequence => [
+  cpu_count: '1',
+  memory_size: '512',
+  disk_size: '8192',
+  disk_format: 'VDI',
+  hostiocache: 'off',
+  os_type_id: 'RedHat6_64',
+  iso_file: 'CentOS-7-x86_64-Minimal-2009.iso',
+  iso_src: 'http://linux.darkpenguin.net/distros/CentOS/7.9.2009/isos/x86_64/CentOS-7-x86_64-Minimal-2009.iso',
+  iso_sha256: '07b94e6b1a0b0260b94c83d6bb76b26bf7a310dc78d7a9c7432809fb9bc6194a',
+  iso_download_timeout: '1000',
+  boot_wait: '10',
+  boot_cmd_sequence: [
     '<Tab> text ks=http://%IP%:%PORT%/ks.cfg<Enter>',
   ],
-  :kickstart_port => '7122',
-  :kickstart_timeout => '300',
-  :kickstart_file => 'ks.cfg',
-  :ssh_login_timeout => '10000',
-  :ssh_user => 'veewee',
-  :ssh_password => 'veewee',
-  :ssh_key => '',
-  :ssh_host_port => '7222',
-  :ssh_guest_port => '22',
-  :sudo_cmd => "echo '%p'|sudo -S sh '%f'",
-  :shutdown_cmd => '/sbin/halt -h -p',
-  :postinstall_files => %w[../centos-postinstall.sh],
-  :postinstall_timeout => '10000',
-  :skip_iso_transfer => true,
+  kickstart_port: '7122',
+  kickstart_timeout: '300',
+  kickstart_file: 'ks.cfg',
+  ssh_login_timeout: '10000',
+  ssh_user: 'veewee',
+  ssh_password: 'veewee',
+  ssh_key: '',
+  ssh_host_port: '7222',
+  ssh_guest_port: '22',
+  sudo_cmd: "echo '%p'|sudo -S sh '%f'",
+  shutdown_cmd: '/sbin/halt -h -p',
+  postinstall_files: %w[../centos-postinstall.sh],
+  postinstall_timeout: '10000',
+  skip_iso_transfer: true,
 })

data/checksums.mk

@@ -1,12 +1,12 @@
 ADVANCECOMP_SHA256 := b07d77735540409771cbe1b6df165b5151c11bb9c3d8f01290be0ec88ec3498f
-GIFSICLE_SHA256 := 4bc97005c0789620de75f89997d3c2f70758c72c61aa0a2ef04f7a671a2ff89b
+GIFSICLE_SHA256 := b2711647009fd2a13130f3be160532ed46538e762bfc0f020dea50618a7dc950
 JHEAD_SHA256 := ef89bbcf4f6c25ed88088cf242a47a6aedfff4f08cc7dc205bf3e2c0f10a03c9
 JPEGARCHIVE_SHA256 := 3da16a5abbddd925dee0379aa51d9fe0cba33da0b5703be27c13a2dda3d7ed75
 JPEGOPTIM_SHA256 := 90a309d1c092de358bb411d702281ac3039b489d03adb0bc3c4ef04cf0067d38
-LIBJPEG_SHA256 := 4077d6a6a75aeb01884f708919d25934c93305e49f7e3f36db9129320e6f4f3d
-LIBLCMS_SHA256 := b20cbcbd0f503433be2a4e81462106fa61050a35074dc24a4e356792d971ab39
+LIBJPEG_SHA256 := 04705c110cb2469caa79fb71fba3d7bf834914706e9641a4589485c1f832565b
+LIBLCMS_SHA256 := d873d34ad8b9b4cea010631f1a6228d2087475e4dc5e763eb81acc23d9d45a51
 LIBMOZJPEG_SHA256 := 9fcbb7171f6ac383f5b391175d6fb3acde5e64c4c4727274eade84ed0998fcc1
-LIBPNG_SHA256 := 8f720b363aa08683c9bf2a563236f45313af2c55d542b5481ae17dd8d183bb42
+LIBPNG_SHA256 := e804e465d4b109b5ad285a8fb71f0dd3f74f0068f91ce3cdfde618180c174925
 LIBZ_SHA256 := c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
 OPTIPNG_SHA256 := 25a3bd68481f21502ccaa0f4c13f84dcf6b20338e4c4e8c51f2cefbd8513398c
 OXIPNG_SHA256 := 534fa8f349f52b01c2ee4332cef25ce1311edca04209ac6d972e38b171550a1b

data/image_optim_pack.gemspec

@@ -2,12 +2,14 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_optim_pack'
-  s.version     = '0.10.0.20231105'
+  s.version     = '0.10.1.20240317'
   s.summary     = %q{Precompiled binaries for image_optim: advpng, gifsicle, jhead, jpeg-recompress, jpegoptim, jpegtran, optipng, pngcrush, pngquant}
   s.homepage    = "https://github.com/toy/#{s.name}"
   s.authors     = ['Ivan Kuchin']
   s.license     = 'MIT'
 
+  s.required_ruby_version = '>= 1.9.3'
+
   s.metadata = {
     'bug_tracker_uri'   => "https://github.com/toy/#{s.name}/issues",
     'changelog_uri'     => "https://github.com/toy/#{s.name}/blob/master/CHANGELOG.markdown",

data/patches/pngcrush.patch

@@ -0,0 +1,15 @@
+diff --git a/pngcrush.c b/pngcrush.c
+index d0c387e..ed27eff 100644
+--- a/pngcrush.c
++++ b/pngcrush.c
+@@ -5520,8 +5520,10 @@ int main(int argc, char *argv[])
+                      * they were already checked in the pngcrush_measure_idat
+                      * function
+                      */
++# ifdef PNG_IGNORE_ADLER32
+                     png_set_option(read_ptr, PNG_IGNORE_ADLER32,
+                         PNG_OPTION_ON);
++# endif
+                     png_set_crc_action(read_ptr, PNG_CRC_QUIET_USE,
+                                        PNG_CRC_QUIET_USE);
+                 }

data/script/run

@@ -44,7 +44,7 @@ for arch in x86_64; do
     mkdir -p '$build_dir'
     cd '$build_dir'
 
-    ln -nsf '$PWD/Makefile' '$PWD/checksums.mk' '$PWD/download' .
+    ln -nsf '$PWD/Makefile' '$PWD/checksums.mk' '$PWD/download' '$PWD/patches' .
     rsync -aR --del '$PWD/./vendor/$platform' .
 
     make $MAKE_TASK ARCH=$arch
@@ -67,7 +67,7 @@ for vm in $(perl -pe "s/.*?'(.+?-.+?)'\s+=>\s+'.+?\/.+?'.*|.*/\$1/" Vagrantfile
 
   # rsync needed files to the box
   mkdir -p "vendor/$vm"
-  rsync -e "ssh -F $ssh_config" -aR --del Makefile checksums.mk download "vendor/$vm" "$vm:/vagrant"
+  rsync -e "ssh -F $ssh_config" -aR --del Makefile checksums.mk download patches "vendor/$vm" "$vm:/vagrant"
 
   # sync time and run make
   ssh -F "$ssh_config" "$vm" "

data/spec/image_optim/pack_spec.rb

@@ -64,7 +64,7 @@ describe ImageOptim::Pack do
 
       it{ should all(be_an(ImageOptim::BinResolver::Bin)) }
 
-      it{ should all(have_attributes(:version => be)) }
+      it{ should all(have_attributes(version: be)) }
 
       it{ should all(be_non_libraries) }
     end
@@ -72,7 +72,7 @@ describe ImageOptim::Pack do
     describe 'bin helpers' do
       def bins_with_versions(*versions)
         versions.map do |version|
-          double(:version => version, :inspect => version ? 'good' : 'bad')
+          double(version: version, inspect: version ? 'good' : 'bad')
         end
       end
 
@@ -88,8 +88,8 @@ describe ImageOptim::Pack do
 
         it{ should be_all_bins_working }
         it{ should_not be_all_bins_failing }
-        it{ should have_attributes(:working_bins => eq(bins)) }
-        it{ should have_attributes(:failing_bins => be_empty) }
+        it{ should have_attributes(working_bins: eq(bins)) }
+        it{ should have_attributes(failing_bins: be_empty) }
       end
 
       describe 'mixed good/bad bins' do
@@ -98,8 +98,8 @@ describe ImageOptim::Pack do
 
         it{ should_not be_all_bins_working }
         it{ should_not be_all_bins_failing }
-        it{ should have_attributes(:working_bins => bins.select(&:version)) }
-        it{ should have_attributes(:failing_bins => bins.reject(&:version)) }
+        it{ should have_attributes(working_bins: bins.select(&:version)) }
+        it{ should have_attributes(failing_bins: bins.reject(&:version)) }
       end
 
       describe 'all bad bins' do
@@ -108,8 +108,8 @@ describe ImageOptim::Pack do
 
         it{ should_not be_all_bins_working }
         it{ should be_all_bins_failing }
-        it{ should have_attributes(:working_bins => be_empty) }
-        it{ should have_attributes(:failing_bins => eq(bins)) }
+        it{ should have_attributes(working_bins: be_empty) }
+        it{ should have_attributes(failing_bins: eq(bins)) }
       end
     end
   end

data/spec/image_optim_spec.rb

@@ -19,7 +19,7 @@ describe ImageOptim do
     ImageOptim::Worker.klasses.map do |klass|
       [klass.bin_sym, false]
     end
-  ].merge(:skip_missing_workers => false)
+  ].merge(skip_missing_workers: false)
 
   ImageOptim::Worker.klasses.each do |worker_klass|
     next if [:pngout, :svgo].include?(worker_klass.bin_sym)
@@ -30,7 +30,7 @@ describe ImageOptim do
 
         image_optim = ImageOptim.new(options)
         if Array(worker_klass.init(image_optim)).empty?
-          image_optim = ImageOptim.new(options.merge(:allow_lossy => true))
+          image_optim = ImageOptim.new(options.merge(allow_lossy: true))
         end
 
         expect(test_images.any? do |original|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_optim_pack
 version: !ruby/object:Gem::Version
-  version: 0.10.0.20231105
+  version: 0.10.1.20240317
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-05 00:00:00.000000000 Z
+date: 2024-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: image_optim
@@ -152,6 +152,7 @@ files:
 - image_optim_pack.gemspec
 - lib/image_optim/pack.rb
 - lib/image_optim_pack.rb
+- patches/pngcrush.patch
 - script/extract
 - script/livecheck
 - script/platform_downloads
@@ -195,7 +196,7 @@ licenses:
 metadata:
   bug_tracker_uri: https://github.com/toy/image_optim_pack/issues
   changelog_uri: https://github.com/toy/image_optim_pack/blob/master/CHANGELOG.markdown
-  documentation_uri: https://www.rubydoc.info/gems/image_optim_pack/0.10.0.20231105
+  documentation_uri: https://www.rubydoc.info/gems/image_optim_pack/0.10.1.20240317
   source_code_uri: https://github.com/toy/image_optim_pack
 post_install_message:
 rdoc_options: []
@@ -205,14 +206,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.20
+rubygems_version: 3.5.5
 signing_key:
 specification_version: 4
 summary: 'Precompiled binaries for image_optim: advpng, gifsicle, jhead, jpeg-recompress,