image_optim_pack 0.7.0.20211002 → 0.8.0.20220131

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4d4774965d093a7979bd2e40160e816ee89c6be8ea41d07fd6b90d8032bcb38
-  data.tar.gz: c7eaaaeba22c6775529fc54476b683d02da02e9df708e3001cf5f68a7841d874
+  metadata.gz: 42ee74f56e5f6ebc0a7a0f0c91dd84829868bde9b095ce3c8baa5ad8e956581e
+  data.tar.gz: b801ad92d69aa39ae20e4499483cf80a0851d906c07e7009c67332c7f406e7ee
 SHA512:
-  metadata.gz: 2fcf599f3e6759a217e59db2681c2b5d5adb98d50b1aad295bd35dd97ecf354be61f9e7db016094bc3be20c0afda7e71e1463bd0b824b27b5369fff40721744f
-  data.tar.gz: d0b9f3a13cb52fcde2b1d48c53dd42eb1e647edfec9f627b4f1182fcd7a66ae0ea984a6feb0681829dd613e9174192458cb5bf4c48961b14a9525fea7ba76ea3
+  metadata.gz: 72583137f4bf0b13731ab31cb6525617ae74d8f27a244eca15ec3ca28cb832e5bf14103d89a59e54708dfce32328243f7301f6d2eb5537d776542d6d5b1136bb
+  data.tar.gz: 70463b1471db64757ae024b7120269c626ea73d64e56910841f8556b7c9fd6df525d7b50b2049634014adaefbfb3b2e225c5e3751452c451d489fb4a6880925d

data/.dockerignore

@@ -0,0 +1,10 @@
+/boxes/
+/.git/
+
+/build/
+/.vagrant/
+
+Gemfile.lock
+/*.gem
+/.bundle
+/tmp/

data/.github/workflows/check.yml

@@ -22,7 +22,9 @@ jobs:
         - '2.6'
         - '2.7'
         - '3.0'
+        - '3.1'
         - jruby-9.2
+        - jruby-9.3
       fail-fast: false
     steps:
     - uses: actions/checkout@v2
@@ -33,12 +35,3 @@ jobs:
     - run: make test
     - run: bundle exec image_optim --info
     - run: bundle exec rspec
-  rubocop:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: '3.0'
-        bundler-cache: true
-    - run: bundle exec rubocop

data/.github/workflows/rubocop.yml

@@ -0,0 +1,16 @@
+name: rubocop
+on:
+  push:
+  pull_request:
+  schedule:
+  - cron: 45 4 * * 0
+jobs:
+  rubocop:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: '3.1'
+        bundler-cache: true
+    - run: bundle exec rubocop

data/CHANGELOG.markdown

@@ -2,6 +2,23 @@
 
 ## unreleased
 
+## v0.8.0.20220131 (2022-01-31)
+
+* liblcms 2.13 [@toy](https://github.com/toy)
+
+## v0.8.0.20220117 (2022-01-17)
+
+* libjpeg 9e and pngquant 2.17.0 [@toy](https://github.com/toy)
+
+## v0.8.0.20211116 (2021-11-16)
+
+* oxipng 5.0.1 [@toy](https://github.com/toy)
+
+## v0.8.0 (2021-10-20)
+
+* Add [lcms2](https://littlecms.com) colour management library for pngquant [@toy](https://github.com/toy)
+* Add [oxipng](https://github.com/shssoichiro/oxipng) (v5.0.0), switch to ubuntu/xenial32 for 32 bit [@toy](https://github.com/toy)
+
 ## v0.7.0.20211002 (2021-10-02)
 
 * pngquant 2.16.0 [@toy](https://github.com/toy)

data/Dockerfile

@@ -0,0 +1,167 @@
+FROM alpine:3.12 as base
+ENV LD_LIBRARY_PATH=/usr/local/lib
+WORKDIR /tmp
+
+FROM base as build
+RUN apk add --no-cache build-base cmake nasm bash findutils
+COPY script/extract ./
+ENV CPATH=/usr/local/include
+
+FROM build as libz
+ARG LIBZ_VER
+ARG LIBZ_SHA256
+COPY download/libz-$LIBZ_VER.tar.gz download/
+RUN ./extract libz && \
+    cd build/libz && \
+    ./configure && \
+    make install
+
+FROM libz as libpng
+ARG LIBPNG_VER
+ARG LIBPNG_SHA256
+COPY download/libpng-$LIBPNG_VER.tar.gz download/
+RUN ./extract libpng && \
+    cd build/libpng && \
+    ./configure --with-zlib-prefix=/usr/local && \
+    make install
+
+FROM libpng as liblcms
+ARG LIBLCMS_VER
+ARG LIBLCMS_SHA256
+COPY download/liblcms-$LIBLCMS_VER.tar.gz download/
+RUN ./extract liblcms && \
+    cd build/liblcms && \
+    ./configure && \
+    make install
+
+FROM build as libjpeg
+ARG LIBJPEG_VER
+ARG LIBJPEG_SHA256
+COPY download/libjpeg-$LIBJPEG_VER.tar.gz download/
+RUN ./extract libjpeg && \
+    cd build/libjpeg && \
+    ./configure && \
+    make install
+
+FROM build as libmozjpeg
+ARG LIBMOZJPEG_VER
+ARG LIBMOZJPEG_SHA256
+COPY download/libmozjpeg-$LIBMOZJPEG_VER.tar.gz download/
+RUN ./extract libmozjpeg && \
+    cd build/libmozjpeg && \
+    cmake -DPNG_SUPPORTED=0 . && \
+    make install
+
+FROM libpng as advancecomp
+ARG ADVANCECOMP_VER
+ARG ADVANCECOMP_SHA256
+COPY download/advancecomp-$ADVANCECOMP_VER.tar.gz download/
+RUN ./extract advancecomp && \
+    cd build/advancecomp && \
+    ./configure && \
+    make install
+
+FROM build as gifsicle
+ARG GIFSICLE_VER
+ARG GIFSICLE_SHA256
+COPY download/gifsicle-$GIFSICLE_VER.tar.gz download/
+RUN ./extract gifsicle && \
+    cd build/gifsicle && \
+    ./configure && \
+    make install
+
+FROM build as jhead
+ARG JHEAD_VER
+ARG JHEAD_SHA256
+COPY download/jhead-$JHEAD_VER.tar.gz download/
+RUN ./extract jhead && \
+    cd build/jhead && \
+    make && \
+    install -c jhead /usr/local/bin
+
+FROM libmozjpeg as jpegarchive
+ARG JPEGARCHIVE_VER
+ARG JPEGARCHIVE_SHA256
+COPY download/jpegarchive-$JPEGARCHIVE_VER.tar.gz download/
+RUN ./extract jpegarchive && \
+    cd build/jpegarchive && \
+    make install
+
+FROM libjpeg as jpegoptim
+ARG JPEGOPTIM_VER
+ARG JPEGOPTIM_SHA256
+COPY download/jpegoptim-$JPEGOPTIM_VER.tar.gz download/
+RUN ./extract jpegoptim && \
+    cd build/jpegoptim && \
+    ./configure && \
+    make install
+
+FROM libpng as optipng
+ARG OPTIPNG_VER
+ARG OPTIPNG_SHA256
+COPY download/optipng-$OPTIPNG_VER.tar.gz download/
+RUN ./extract optipng && \
+    cd build/optipng && \
+    ./configure && \
+    make install
+
+FROM rust:1.55-alpine3.13 as oxipng
+RUN apk add --no-cache build-base
+COPY script/extract ./
+ARG OXIPNG_VER
+ARG OXIPNG_SHA256
+COPY download/oxipng-$OXIPNG_VER.tar.gz download/
+RUN ./extract oxipng && \
+    cd build/oxipng && \
+    cargo build --release && \
+    install -c target/release/oxipng /usr/local/bin
+
+FROM libpng as pngcrush
+ARG PNGCRUSH_VER
+ARG PNGCRUSH_SHA256
+COPY download/pngcrush-$PNGCRUSH_VER.tar.gz download/
+RUN ./extract pngcrush && \
+    cd build/pngcrush && \
+    make && \
+    install -c pngcrush /usr/local/bin
+
+FROM liblcms as pngquant
+ARG PNGQUANT_VER
+ARG PNGQUANT_SHA256
+COPY download/pngquant-$PNGQUANT_VER.tar.gz download/
+RUN ./extract pngquant && \
+    cd build/pngquant && \
+    make install
+
+# FROM build as [name]
+# ARG [NAME]_VER
+# ARG [NAME]_SHA256
+# COPY download/[name]-$[NAME]_VER.tar.gz download/
+# RUN ./extract [name] && \
+#     cd build/[name] && \
+#     ./configure && \
+#     make install
+
+FROM base as image_optim
+RUN apk add --no-cache libstdc++ ruby npm perl dumb-init
+
+COPY --from=advancecomp /usr/local/bin/advpng          /usr/local/bin/
+COPY --from=gifsicle    /usr/local/bin/gifsicle        /usr/local/bin/
+COPY --from=jhead       /usr/local/bin/jhead           /usr/local/bin/
+COPY --from=jpegarchive /usr/local/bin/jpeg-recompress /usr/local/bin/
+COPY --from=jpegoptim   /usr/local/bin/jpegoptim       /usr/local/bin/
+COPY --from=libjpeg     /usr/local/bin/jpegtran        /usr/local/bin/
+COPY --from=optipng     /usr/local/bin/optipng         /usr/local/bin/
+COPY --from=oxipng      /usr/local/bin/oxipng          /usr/local/bin/
+COPY --from=pngcrush    /usr/local/bin/pngcrush        /usr/local/bin/
+COPY --from=pngquant    /usr/local/bin/pngquant        /usr/local/bin/
+
+COPY --from=libjpeg     /usr/local/lib/libjpeg.so.9    /usr/local/lib/
+COPY --from=libpng      /usr/local/lib/libpng16.so.16  /usr/local/lib/
+COPY --from=libz        /usr/local/lib/libz.so.1       /usr/local/lib/
+COPY --from=liblcms     /usr/local/lib/liblcms2.so.2   /usr/local/lib/
+
+RUN npm -g install svgo
+RUN gem install --no-document image_optim
+ENTRYPOINT ["dumb-init", "image_optim", "--skip-missing-workers"]
+CMD ["--help"]

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2014-2021 Ivan Kuchin
+Copyright (c) 2014-2022 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

@@ -7,13 +7,15 @@ GIFSICLE_VER := 1.93
 JHEAD_VER := 3.04
 JPEGARCHIVE_VER := 2.2.0
 JPEGOPTIM_VER := 1.4.6
-LIBJPEG_VER := 9d
+LIBJPEG_VER := 9e
+LIBLCMS_VER := 2.13
 LIBMOZJPEG_VER := 4.0.3
 LIBPNG_VER := 1.6.37
 LIBZ_VER := 1.2.11
 OPTIPNG_VER := 0.7.7
+OXIPNG_VER := 5.0.1
 PNGCRUSH_VER := 1.8.13
-PNGQUANT_VER := 2.16.0
+PNGQUANT_VER := 2.17.0
 
 # ====== CHECKSUMS ======
 
@@ -37,7 +39,6 @@ BUILD_ROOT_DIR := $(CURDIR)/build
 BUILD_DIR := $(BUILD_ROOT_DIR)/$(OS)-$(ARCH)
 OUTPUT_ROOT_DIR := $(CURDIR)/vendor
 OUTPUT_DIR := $(OUTPUT_ROOT_DIR)/$(OS)-$(ARCH)
-$(shell mkdir -p $(DL_DIR) $(BUILD_DIR) $(OUTPUT_DIR))
 
 ANSI_RED=\033[31m
 ANSI_GREEN=\033[32m
@@ -48,7 +49,6 @@ ANSI_RESET=\033[0m
 
 downcase = $(shell echo $1 | tr A-Z a-z)
 
-ln_s := ln -sf
 tar := $(shell if command -v bsdtar >/dev/null 2>&1; then echo bsdtar; else echo tar; fi)
 sha256sum := $(shell if command -v sha256sum >/dev/null 2>&1; then echo sha256sum; elif command -v shasum >/dev/null 2>&1; then echo shasum -a 256; else echo sha256; fi)
 
@@ -63,8 +63,9 @@ $1_DIR := $(BUILD_DIR)/$(call downcase,$1)
 $1_TGZ := $(DL_DIR)/$(call downcase,$1)-$($1_VER).tar.gz
 $1_EXTRACTED := $$($1_DIR)/__$$(notdir $$($1_TGZ))__
 $$($1_EXTRACTED) : $$($1_TGZ)
+	mkdir -p $(BUILD_DIR)
 	rm -rf $$(@D)
-	echo "$$($1_SHA256)  $$($1_TGZ)" | $(sha256sum) -c
+	echo "$$($1_SHA256)  $$<" | $(sha256sum) -c
 	mkdir $$(@D)
 	$(tar) -C $$(@D) --strip-components=1 -xzf $$<
 	touch $$(@D)/__$$(notdir $$<)__
@@ -76,6 +77,7 @@ define archive-dl
 $(call archive,$1)
 # download archive from url
 $$($1_TGZ) :
+	mkdir -p $(DL_DIR)
 	while ! mkdir $$@.lock 2> /dev/null; do sleep 1; done
 	wget -q -O $$@.tmp $(subst [VER],$($1_VER),$(strip $2))
 	mv $$@.tmp $$@
@@ -88,10 +90,12 @@ $(eval $(call archive-dl,JHEAD,       https://www.sentex.ca/~mwandel/jhead/jhead
 $(eval $(call archive-dl,JPEGARCHIVE, https://github.com/danielgtaylor/jpeg-archive/archive/v[VER].tar.gz))
 $(eval $(call archive-dl,JPEGOPTIM,   https://www.kokkonen.net/tjko/src/jpegoptim-[VER].tar.gz))
 $(eval $(call archive-dl,LIBJPEG,     https://www.ijg.org/files/jpegsrc.v[VER].tar.gz))
+$(eval $(call archive-dl,LIBLCMS,     https://prdownloads.sourceforge.net/lcms/lcms2-[VER].tar.gz?download))
 $(eval $(call archive-dl,LIBMOZJPEG,  https://github.com/mozilla/mozjpeg/archive/v[VER].tar.gz))
 $(eval $(call archive-dl,LIBPNG,      https://prdownloads.sourceforge.net/libpng/libpng-[VER].tar.gz?download))
 $(eval $(call archive-dl,LIBZ,        https://prdownloads.sourceforge.net/libpng/zlib-[VER].tar.gz?download))
 $(eval $(call archive-dl,OPTIPNG,     https://prdownloads.sourceforge.net/optipng/optipng-[VER].tar.gz?download))
+$(eval $(call archive-dl,OXIPNG,      https://github.com/shssoichiro/oxipng/archive/refs/tags/v[VER].tar.gz))
 $(eval $(call archive-dl,PNGCRUSH,    https://prdownloads.sourceforge.net/pmt/pngcrush-[VER]-nolib.tar.gz?download))
 $(eval $(call archive-dl,PNGQUANT,    https://pngquant.org/pngquant-[VER]-src.tar.gz))
 
@@ -141,6 +145,7 @@ PRODUCTS += $1
 $1_DESTINATION := $$(OUTPUT_DIR)/$$($1_BASENAME)
 # copy product to output dir
 $$($1_DESTINATION) : $$($1_TARGET)
+	mkdir -p $(OUTPUT_DIR)
 	temppath=`mktemp "$(BUILD_DIR)"/tmp.XXXXXXXXXX` && \
 		strip $$< -Sx -o "$$$$temppath" && \
 		chmod 755 "$$$$temppath" && \
@@ -156,10 +161,12 @@ $(eval $(call target,JPEG-RECOMPRESS,JPEGARCHIVE))
 $(eval $(call target,JPEGOPTIM))
 $(eval $(call target,JPEGTRAN,LIBJPEG,.libs/jpegtran))
 $(eval $(call target,LIBJPEG,,libjpeg$(DLEXT)))
+$(eval $(call target,LIBLCMS,,liblcms2$(DLEXT)))
 $(eval $(call target-build,LIBMOZJPEG,,libjpeg.a))
 $(eval $(call target,LIBPNG,,libpng$(DLEXT)))
 $(eval $(call target,LIBZ,,libz$(DLEXT)))
 $(eval $(call target,OPTIPNG,,src/optipng/optipng))
+$(eval $(call target,OXIPNG,,target/release/oxipng))
 $(eval $(call target,PNGCRUSH))
 $(eval $(call target,PNGQUANT))
 
@@ -235,9 +242,11 @@ test :
 	$(call check_bin,jpegoptim,--version,$(JPEGOPTIM_VER))
 	$(call check_bin,jpegtran,-v - 2>&1,$(LIBJPEG_VER))
 	$(call check_lib,libjpeg$(DLEXT))
+	$(call check_lib,liblcms2$(DLEXT))
 	$(call check_lib,libpng$(DLEXT))
 	$(call check_lib,libz$(DLEXT))
 	$(call check_bin,optipng,--version,$(OPTIPNG_VER))
+	$(call check_bin,oxipng,--version,$(OXIPNG_VER))
 	$(call check_bin,pngcrush,-version 2>&1,$(PNGCRUSH_VER))
 	$(call check_bin,pngquant,--help,$(PNGQUANT_VER))
 .PHONY : test
@@ -250,6 +259,24 @@ update-versions :
 	make checksum-update
 .PHONY : update-versions
 
+# ====== DOCKER ======
+
+DOCKER_IMAGE := ghcr.io/toy/image_optim
+DOCKER_TAG := $(shell date +%Y%m%d)
+
+docker-build : download
+	@docker build \
+		$(foreach archive,$(ARCHIVES),--build-arg $(archive)_VER=$($(archive)_VER) --build-arg $(archive)_SHA256=$($(archive)_SHA256)) \
+		-t $(DOCKER_IMAGE):$(DOCKER_TAG) \
+		-t $(DOCKER_IMAGE):latest \
+		.
+.PHONY : docker-build
+
+docker-push : docker-build
+	@docker push $(DOCKER_IMAGE):$(DOCKER_TAG)
+	@docker push $(DOCKER_IMAGE):latest
+.PHONY : docker-push
+
 # ====== CLEAN ======
 
 clean :
@@ -384,7 +411,19 @@ ifdef IS_DARWIN
 else
 	cd $(DIR) && $(MAKE) libjpeg.la
 endif
-	cd $(@D) && $(ln_s) .libs/libjpeg$(DLEXT) .
+	cd $(DIR) && ln -sf .libs/libjpeg$(DLEXT) .
+
+## liblcms
+$(LIBLCMS_TARGET) :
+	cd $(DIR) && ./configure
+	cd $(DIR) && $(libtool_target_soname)
+ifdef IS_DARWIN
+	cd $(DIR)/src && make liblcms2.la LDFLAGS="-Wl,-install_name,@loader_path/$(@F)"
+else
+	cd $(DIR)/src && make liblcms2.la LDFLAGS="$(XORIGIN)"
+endif
+	cd $(DIR) && ln -sf include/lcms2.h .
+	cd $(DIR) && ln -sf src/.libs/liblcms2$(DLEXT) .
 
 ## libmozjpeg
 $(LIBMOZJPEG_TARGET) :
@@ -403,7 +442,7 @@ ifdef IS_DARWIN
 else
 	cd $(DIR) && $(MAKE) libpng16.la LDFLAGS="$(XORIGIN)"
 endif
-	cd $(DIR) && $(ln_s) .libs/libpng16$(DLEXT) libpng$(DLEXT)
+	cd $(DIR) && ln -sf .libs/libpng16$(DLEXT) libpng$(DLEXT)
 	$(call chrpath_origin,$@)
 
 ## libz
@@ -424,6 +463,10 @@ $(OPTIPNG_TARGET) :
 	cd $(DIR) && $(MAKE) all LDFLAGS="$(XORIGIN) $(LDFLAGS)"
 	$(call chrpath_origin,$@)
 
+## oxipng
+$(OXIPNG_TARGET) :
+	cd $(DIR) && cargo build --release
+
 ## pngcrush
 $(eval $(call depend,PNGCRUSH,LIBPNG LIBZ))
 $(PNGCRUSH_TARGET) :
@@ -438,8 +481,8 @@ $(PNGCRUSH_TARGET) :
 	$(call chrpath_origin,$@)
 
 ## pngquant
-$(eval $(call depend,PNGQUANT,LIBPNG LIBZ))
+$(eval $(call depend,PNGQUANT,LIBLCMS LIBPNG LIBZ))
 $(PNGQUANT_TARGET) :
-	cd $(DIR) && ./configure --without-cocoa --without-lcms2 --extra-ldflags="$(XORIGIN) $(STATIC_LIBGCC)"
+	cd $(DIR) && ./configure --without-cocoa --extra-ldflags="$(XORIGIN) $(STATIC_LIBGCC)"
 	cd $(DIR) && $(MAKE) pngquant
 	$(call chrpath_origin,$@)

data/README.markdown

@@ -28,12 +28,14 @@ A test application with latest `image_optim` and `image_optim_pack` is available
 * [libjpeg-turbo](https://www.libjpeg-turbo.org/) by libjpeg-turbo Project ([license](acknowledgements/libjpeg-turbo.txt))
 	* based on libjpeg, see above
 	* includes [x86 SIMD extension for IJG JPEG library](https://cetus.sakura.ne.jp/softlab/jpeg-x86simd/jpegsimd.html) by Miyasaka Masaru ([license](acknowledgements/libjpeg-x86-simd.txt))
+* [liblcms2](https://littlecms.com) by Marti Maria ([license](acknowledgements/liblcms2.txt))
 * [libpng](http://libpng.org/pub/png/) by Guy Eric Schalnat, Andreas Dilger, Glenn Randers-Pehrson and others ([license](acknowledgements/libpng.txt))
 * [mozjpeg](https://github.com/mozilla/mozjpeg) by Mozilla Research ([license](acknowledgements/mozjpeg.txt))
 	* base on libjpeg and libjpeg-turbo, see above
 * [optipng](http://optipng.sourceforge.net/) by Cosmin Truta ([license](acknowledgements/optipng.txt), [authors](acknowledgements/optipng-authors.txt))
 	* contains code based in part on the work of Miyasaka Masaru for BMP support ([license](acknowledgements/bmp2png.txt))
 	* and David Koblas for GIF support ([license](acknowledgements/gifread.txt))
+* [oxipng](https://github.com/shssoichiro/oxipng) by Joshua Holmer ([license](acknowledgements/oxipng.txt))
 * [pngcrush](https://pmt.sourceforge.io/pngcrush/) by Glenn Randers-Pehrson, portions by Greg Roelofs ([license](acknowledgements/pngcrush.txt))
 	* contains [cexcept](http://www.nicemice.net/cexcept/) interface by Adam M. Costello and Cosmin Truta ([license](acknowledgements/cexcept.txt))
 * [pngquant](https://pngquant.org/) by Kornel Lesiński based on code by Greg Roelofs and Jef Poskanzer after an idea by Stefan Schneider ([license](acknowledgements/pngquant.txt))
@@ -90,6 +92,25 @@ make clean-all # Remove build root and output root directories
 make clobber # `clean-all` and remove download directory
 ```
 
+## Docker
+
+This project includes a `Dockerfile` in the root, which builds a minimal image with most binaries included.
+
+#### Running
+
+```bash
+docker run --rm ghcr.io/toy/image_optim --version # image_optim version
+docker run --rm ghcr.io/toy/image_optim --info # image_optim info including bin versions
+docker run --rm -v "$PWD":/here -w /here ghcr.io/toy/image_optim image-in-this-folder.jpg
+```
+
+#### Building
+
+```bash
+make docker-build # will be tagged with latest and current date in format %Y%m%d
+make docker-push # will push tags created by docker-build
+```
+
 ## Copyright
 
-Copyright (c) 2014-2021 Ivan Kuchin. See [LICENSE.txt](LICENSE.txt) for details.
+Copyright (c) 2014-2022 Ivan Kuchin. See [LICENSE.txt](LICENSE.txt) for details.

data/Vagrantfile

@@ -9,6 +9,7 @@ Vagrant.configure('2') do |config|
   config.vm.provider 'virtualbox' do |vb|
     vb.check_guest_additions = false
     vb.customize ['modifyvm', :id, '--groups', '/image_optim']
+    vb.customize ['modifyvm', :id, '--uartmode1', 'disconnected'] # override for ubuntu/xenial32
   end
 
   # handle manually using rsync
@@ -16,30 +17,41 @@ Vagrant.configure('2') do |config|
 
   {
     'linux-x86_64'  => 'boxes/centos-amd64.box',
-    'linux-i686'    => 'boxes/centos-i386.box',
+    'linux-i686'    => 'ubuntu/xenial32',
   }.each do |name, location|
     config.vm.define name do |machine|
       machine.vm.hostname = name.gsub('_', '-')
       machine.vm.box = location
 
-      machine.vm.provision :shell, inline: case name
-      when /^linux/
-        <<-SH
+      machine.vm.provision :shell, inline: <<-SH
+        if command -v apt-get; then
           set -ex
-          if command -v apt-get; then
-            apt-get update
-            apt-get -y install rsync ntpdate make wget gcc g++ chrpath perl pkg-config autoconf automake libtool nasm cmake
-          else
-            yum -y install rsync ntpdate make wget gcc gcc-c++ chrpath perl pkg-config autoconf automake libtool nasm cmake
-          fi
-        SH
-      end
 
-      machine.vm.provision :shell, inline: <<-SH
-        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
+        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
+        fi
+
         mkdir -p /vagrant
         chown vagrant:vagrant /vagrant
       SH
+
+      machine.vm.provision :shell, run: 'always', inline: <<-SH
+        if command -v apt-get; then
+          set -ex
+
+          apt-get update
+          apt-get -y dist-upgrade
+        else
+          set -ex
+
+          yum -y update
+        fi
+      SH
     end
   end
 end

data/acknowledgements/liblcms2.txt

@@ -0,0 +1,21 @@
+Little CMS
+Copyright (c) 1998-2020 Marti Maria Saguer
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject
+to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/acknowledgements/oxipng.txt

@@ -0,0 +1,20 @@
+The MIT License (MIT)
+Copyright (c) 2016 Joshua Holmer
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/checksums.mk

@@ -3,10 +3,12 @@ GIFSICLE_SHA256 := 92f67079732bf4c1da087e6ae0905205846e5ac777ba5caa66d12a73aa943
 JHEAD_SHA256 := ef89bbcf4f6c25ed88088cf242a47a6aedfff4f08cc7dc205bf3e2c0f10a03c9
 JPEGARCHIVE_SHA256 := 3da16a5abbddd925dee0379aa51d9fe0cba33da0b5703be27c13a2dda3d7ed75
 JPEGOPTIM_SHA256 := 88b1eb64c2a33a2f013f068df8b0331f42c019267401ae3fa28e3277403a5ab7
-LIBJPEG_SHA256 := 6c434a3be59f8f62425b2e3c077e785c9ce30ee5874ea1c270e843f273ba71ee
+LIBJPEG_SHA256 := 4077d6a6a75aeb01884f708919d25934c93305e49f7e3f36db9129320e6f4f3d
+LIBLCMS_SHA256 := 0c67a5cc144029cfa34647a52809ec399aae488db4258a6a66fba318474a070f
 LIBMOZJPEG_SHA256 := 4f22731db2afa14531a5bf2633d8af79ca5cb697a550f678bf43f24e5e409ef0
 LIBPNG_SHA256 := daeb2620d829575513e35fecc83f0d3791a620b9b93d800b763542ece9390fb4
 LIBZ_SHA256 := c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
 OPTIPNG_SHA256 := 4f32f233cef870b3f95d3ad6428bfe4224ef34908f1b42b0badf858216654452
+OXIPNG_SHA256 := aff72d2f627617f3f36d9796e65b83eb34f24d2c94f3a55612ade2df8ab8d946
 PNGCRUSH_SHA256 := fed0aaf5c098aa8c7f78c75365cd18d7341417326ecbdba547876b7b4f3df4be
-PNGQUANT_SHA256 := 06c6fdded675753fbdbeacc2b63507fb30f42fae813e48a1684b240bb5b63522
+PNGQUANT_SHA256 := a27cf0e64db499ccb3ddae9b36036e881f78293e46ec27a9e7a86a3802fcda66

data/image_optim_pack.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_optim_pack'
-  s.version     = '0.7.0.20211002'
+  s.version     = '0.8.0.20220131'
   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']
@@ -54,8 +54,8 @@ Gem::Specification.new do |s|
   s.add_dependency 'fspath', '>= 2.1', '< 4'
 
   s.add_development_dependency 'rspec', '~> 3.0'
-  if RUBY_VERSION >= '2.4'
-    s.add_development_dependency 'rubocop', '~> 1.0'
+  if RUBY_VERSION >= '2.5'
+    s.add_development_dependency 'rubocop', '~> 1.22', '!= 1.22.2'
     s.add_development_dependency 'rubocop-rspec', '~> 2.0'
   end
 end

data/script/extract

@@ -0,0 +1,19 @@
+#!/bin/sh
+
+set -e
+
+if [ "$#" -ne 1 ]; then
+  echo "Require name of package as argument" >&2
+  exit 1
+fi
+
+name="$1"
+upcase=$(echo "$name" | tr a-z A-Z)
+version=$(printenv "${upcase}_VER")
+checksum=$(printenv "${upcase}_SHA256")
+archive="download/${name}-${version}.tar.gz"
+build_dir="build/$name"
+
+echo "$checksum  $archive" | sha256sum -c
+mkdir -p "$build_dir"
+tar -C "$build_dir" --strip-components=1 -xzf "$archive"

data/script/livecheck

@@ -179,7 +179,7 @@ jhead:
   url: https://www.sentex.ca/~mwandel/jhead/
   regexp: jhead-(\d+(?:\.\d+)*)
 jpegoptim:
-  url: https://github.com/tjko/jpegoptim/releases.atom
+  url: https://github.com/tjko/jpegoptim/tags.atom
   regexp: <id>tag:github.com,2008:Repository/\d+/\D+?(\d+(?:\.\d+)*)</id>
 jpegarchive:
   url: https://github.com/danielgtaylor/jpeg-archive/releases.atom
@@ -187,6 +187,9 @@ jpegarchive:
 libjpeg:
   url: https://www.ijg.org/files/
   regexp: jpegsrc.v(.*?).tar.gz
+liblcms:
+  url: https://sourceforge.net/projects/lcms/rss?path=/lcms
+  regexp: /lcms/(\d+(?:\.\d+)*)/
 libmozjpeg:
   url: https://github.com/mozilla/mozjpeg/releases.atom
   regexp: <id>tag:github.com,2008:Repository/\d+/\D+?(\d+(?:\.\d+)*)</id>
@@ -199,6 +202,9 @@ libz:
 optipng:
   url: https://sourceforge.net/projects/optipng/rss
   regexp: /OptiPNG/optipng-(\d+(?:\.\d+)*)/
+oxipng:
+  url: https://github.com/shssoichiro/oxipng/releases.atom
+  regexp: <id>tag:github.com,2008:Repository/\d+/v(\d+(?:\.\d+)*)</id>
 pngcrush:
   url: https://sourceforge.net/projects/pmt/rss?path=/pngcrush
   regexp: /pngcrush/(\d+(?:\.\d+)*)/

data/script/platform_downloads

@@ -5,7 +5,26 @@ require 'gems'
 require 'ostruct'
 require 'terminal-table'
 
-versions = Gems.versions('image_optim_pack').map(&OpenStruct.method(:new))
+ATTRIBUTES = %i[
+  authors
+  built_at
+  created_at
+  description
+  downloads_count
+  metadata
+  number
+  summary
+  platform
+  rubygems_version
+  ruby_version
+  prerelease
+  licenses
+  requirements
+  sha
+].freeze
+Version = Struct.new(*ATTRIBUTES, :keyword_init => true)
+
+versions = Gems.versions('image_optim_pack').map(&Version.method(:new))
 
 platforms = versions.map(&:platform).uniq.sort_by do |platform|
   platform.sub('amd64', 'x86_64').split('-').reverse

data/script/run

@@ -38,7 +38,7 @@ for arch in x86_64; do
 
   mkdir -p "vendor/$platform"
 
-  sudo -u _image_optim bash -c "
+  sudo -u _image_optim --set-home bash -c "
     set -e
 
     mkdir -p '$build_dir'
@@ -53,7 +53,7 @@ for arch in x86_64; do
   rsync -aR --del "$build_dir/./vendor/$platform" .
 done
 
-for vm in $(perl -pe "s/.*?'(.+?-.+?)'\s+=>\s+'.+?\/.+?'.*|.*/\$1/" Vagrantfile); do
+for vm in $(perl -pe "s/.*?'(.+?-.+?)'\s+=>\s+'.+?\/.+?'.*|.*/\$1/" Vagrantfile | uniq); do
   passes-filter "$vm" || continue
   header "$vm"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_optim_pack
 version: !ruby/object:Gem::Version
-  version: 0.7.0.20211002
+  version: 0.8.0.20220131
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-02 00:00:00.000000000 Z
+date: 2022-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: image_optim
@@ -64,14 +64,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.22'
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 1.22.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.22'
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 1.22.2
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -92,10 +98,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".dockerignore"
 - ".github/workflows/check.yml"
+- ".github/workflows/rubocop.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - CHANGELOG.markdown
+- Dockerfile
 - Gemfile
 - LICENSE.txt
 - Makefile
@@ -114,10 +123,12 @@ files:
 - acknowledgements/libjpeg-turbo.txt
 - acknowledgements/libjpeg-x86-simd.txt
 - acknowledgements/libjpeg.txt
+- acknowledgements/liblcms2.txt
 - acknowledgements/libpng.txt
 - acknowledgements/mozjpeg.txt
 - acknowledgements/optipng-authors.txt
 - acknowledgements/optipng.txt
+- acknowledgements/oxipng.txt
 - acknowledgements/pngcrush.txt
 - acknowledgements/pngquant.txt
 - acknowledgements/smallfry.txt
@@ -130,8 +141,6 @@ files:
 - boxes/Rakefile
 - boxes/definitions/centos-amd64/definition.rb
 - boxes/definitions/centos-amd64/ks.cfg
-- boxes/definitions/centos-i386/definition.rb
-- boxes/definitions/centos-i386/ks.cfg
 - boxes/definitions/centos-postinstall.sh
 - checksums.mk
 - image_optim_pack-darwin-x86_64.gemspec
@@ -140,6 +149,7 @@ files:
 - image_optim_pack.gemspec
 - lib/image_optim/pack.rb
 - lib/image_optim_pack.rb
+- script/extract
 - script/livecheck
 - script/platform_downloads
 - script/run
@@ -153,9 +163,11 @@ files:
 - vendor/darwin-x86_64/jpegoptim
 - vendor/darwin-x86_64/jpegtran
 - vendor/darwin-x86_64/libjpeg.dylib
+- vendor/darwin-x86_64/liblcms2.dylib
 - vendor/darwin-x86_64/libpng.dylib
 - vendor/darwin-x86_64/libz.dylib
 - vendor/darwin-x86_64/optipng
+- vendor/darwin-x86_64/oxipng
 - vendor/darwin-x86_64/pngcrush
 - vendor/darwin-x86_64/pngquant
 - vendor/linux-i686/advpng
@@ -165,9 +177,11 @@ files:
 - vendor/linux-i686/jpegoptim
 - vendor/linux-i686/jpegtran
 - vendor/linux-i686/libjpeg.so
+- vendor/linux-i686/liblcms2.so
 - vendor/linux-i686/libpng.so
 - vendor/linux-i686/libz.so
 - vendor/linux-i686/optipng
+- vendor/linux-i686/oxipng
 - vendor/linux-i686/pngcrush
 - vendor/linux-i686/pngquant
 - vendor/linux-x86_64/advpng
@@ -177,9 +191,11 @@ files:
 - vendor/linux-x86_64/jpegoptim
 - vendor/linux-x86_64/jpegtran
 - vendor/linux-x86_64/libjpeg.so
+- vendor/linux-x86_64/liblcms2.so
 - vendor/linux-x86_64/libpng.so
 - vendor/linux-x86_64/libz.so
 - vendor/linux-x86_64/optipng
+- vendor/linux-x86_64/oxipng
 - vendor/linux-x86_64/pngcrush
 - vendor/linux-x86_64/pngquant
 homepage: https://github.com/toy/image_optim_pack
@@ -188,7 +204,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.7.0.20211002
+  documentation_uri: https://www.rubydoc.info/gems/image_optim_pack/0.8.0.20220131
   source_code_uri: https://github.com/toy/image_optim_pack
 post_install_message:
 rdoc_options: []
@@ -205,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.5
 signing_key:
 specification_version: 4
 summary: 'Precompiled binaries for image_optim: advpng, gifsicle, jhead, jpeg-recompress,

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

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-Veewee::Session.declare({
-  :cpu_count => '1',
-  :memory_size => '512',
-  :disk_size => '8192',
-  :disk_format => 'VDI',
-  :hostiocache => 'off',
-  :os_type_id => 'RedHat',
-  :iso_file => 'CentOS-7-i386-Minimal-2009.iso',
-  :iso_src => 'http://linux.darkpenguin.net/distros/CentOS-AltArch/7.9.2009/isos/i386/CentOS-7-i386-Minimal-2009.iso',
-  :iso_sha256 => 'bcbde5d345c5013fa618c38380765547be01a354883b3055f32d7067dd7b5bca',
-  :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,
-})

data/boxes/definitions/centos-i386/ks.cfg

@@ -1,37 +0,0 @@
-install
-cdrom
-lang en_US.UTF-8
-keyboard us
-network --bootproto=dhcp
-rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/
-firewall --enabled --service=ssh
-authconfig --enableshadow --passalgo=sha512
-selinux --disabled
-timezone UTC
-bootloader --location=mbr
-
-text
-skipx
-zerombr
-
-clearpart --all --initlabel
-autopart
-
-auth  --useshadow  --enablemd5
-firstboot --disabled
-reboot
-
-%packages --nobase
-@core
-openssh-clients
-%end
-
-%post
-/usr/bin/yum -y install sudo
-/usr/sbin/groupadd veewee
-/usr/sbin/useradd veewee -g veewee -G wheel
-echo "veewee"|passwd --stdin veewee
-echo "veewee        ALL=(ALL)       NOPASSWD: ALL" >> /etc/sudoers.d/veewee
-chmod 0440 /etc/sudoers.d/veewee
-%end
-