image_optim_pack 0.13.0 → 0.13.1.20260418

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a61d4808d7c57038edadd1f8fcb7985f4f8739f47c625595f48a016483bdc67e
-  data.tar.gz: 21e28d8500925517caa71ca5ee3de37701a7e745c5a6d6506f57bc654eba8399
+  metadata.gz: e16756c0ef6b7711b0e39587a69fa25580afe84ee1bdf42025c31d6c975a58ac
+  data.tar.gz: c430c7c7c44c0fa80ee84b76ec6250575f960aef42793792d087eec3f685b55d
 SHA512:
-  metadata.gz: 5adea1b45237b93c23642a29fed4d7dd6cde1343278d62587f78d0f7c045ed7547056fa66b1fed90bc31cbe406250a3d7fa8c5ab2bbc8797afd0d5f4557bc7ef
-  data.tar.gz: 170a3237331e8801290737ed7b6238bf717a75b0d96cdc934fa3ffa0da8db2923646346a669a6016480f4fa8541cc42ce4c0b155a32b074847e90cfd3f3bde91
+  metadata.gz: 0c8d9df9bfaadb6aaf0a5009f7a724a62349d28b991816c682a93ad18937365cafb894d1fe885f244d87cb8019b7513255466552d6194936d3ce06b86ea51aeb
+  data.tar.gz: 0b79ddb594329a18fdb1f8e575cece74c85f01339308c81a38d816663d8cf045845ba18b26b144b4482bff544d4c94d93d43e656463c89d375f21505d2ecc993

data/.github/dependabot.yml

@@ -1,6 +1,8 @@
 version: 2
 updates:
-  - package-ecosystem: github-actions
-    directory: /
-    schedule:
-      interval: weekly
+- package-ecosystem: github-actions
+  directory: /
+  schedule:
+    interval: daily
+  cooldown:
+    default-days: 7

data/.github/workflows/build.yml

@@ -11,11 +11,15 @@ jobs:
     runs-on: ${{ case(matrix.arch == 'x86_64', 'ubuntu-latest', 'ubuntu-22.04-arm') }}
     steps:
     - uses: actions/checkout@v6
+    - uses: actions/cache/restore@v5
+      with:
+        path: download
+        key: download-${{ hashFiles('checksums.mk') }}
+        fail-on-cache-miss: true
     - run: uname -m && test "$(uname -m)" = "${{ matrix.arch }}"
     - run: make test
     - run: rm -r vendor
     - run: sudo apt-get install -y chrpath
-    - run: make download download-dependencies
     - run: make all -j
     - uses: actions/upload-artifact@v7
       with:
@@ -30,13 +34,17 @@ jobs:
     runs-on: ${{ case(matrix.arch == 'x86_64', 'ubuntu-latest', 'ubuntu-22.04-arm') }}
     steps:
     - uses: actions/checkout@v6
+    - uses: actions/cache/restore@v5
+      with:
+        path: download
+        key: download-${{ hashFiles('checksums.mk') }}
+        fail-on-cache-miss: true
     - run: docker run -di --rm --name build -v ${{ github.workspace }}:/work -w /work rust:alpine
     - run: docker exec build sh -c 'uname -m && test "$(uname -m)" = "${{ matrix.arch }}"'
     - run: docker exec build apk add --no-cache make file perl
     - run: docker exec build make test
     - run: docker exec build rm -r vendor
-    - run: docker exec build apk add --no-cache gcc g++ chrpath pkgconf autoconf automake libtool nasm cmake patch wget
-    - run: docker exec build make download download-dependencies
+    - run: docker exec build apk add --no-cache gcc g++ chrpath pkgconf autoconf automake libtool nasm cmake patch
     - run: docker exec build make all -j
     - run: docker stop build
       if: always()
@@ -54,10 +62,14 @@ jobs:
     runs-on: ${{ case(matrix.arch == 'x86_64', 'macos-15-intel', 'macos-14') }}
     steps:
     - uses: actions/checkout@v6
+    - uses: actions/cache/restore@v5
+      with:
+        path: download
+        key: download-${{ hashFiles('checksums.mk') }}
+        fail-on-cache-miss: true
     - run: uname -m && test "$(uname -m)" = "${{ matrix.arch }}"
     - run: make test ARCH="${{ matrix.build }}"
     - run: rm -r vendor
-    - run: make download download-dependencies
     - run: rustup target add "${{ case(matrix.build == 'arm64', 'aarch64', matrix.build) }}-apple-darwin"
       if: ${{ matrix.build != matrix.arch }}
     - run: make all -j ARCH="${{ matrix.build }}"

data/.github/workflows/cache-downloads.yml

@@ -0,0 +1,53 @@
+name: cache-downloads
+on:
+  schedule:
+  - cron: 7 10 */3 * *
+  workflow_dispatch:
+    inputs:
+      retry:
+        description: 'Retry attempt'
+        required: true
+        type: number
+jobs:
+  cache-downloads:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v6
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: '4'
+        bundler-cache: true
+    - id: cache-restore
+      uses: actions/cache/restore@v5
+      with:
+        path: download
+        key: download-${{ hashFiles('checksums.mk') }}
+        restore-keys: download-
+    - run: make download-tidy-up
+    - run: make download
+    - run: make download-dependencies
+    - uses: actions/cache/save@v5
+      with:
+        path: download
+        key: download-${{ hashFiles('checksums.mk') }}
+      if: steps.cache-restore.outputs.cache-hit != 'true'
+    - run: make purge-dependencies
+    - env:
+        RETRY: ${{ inputs.retry }}
+        RETRIES: 3
+        GITHUB_TOKEN: ${{ secrets.RETRY_TOKEN }}
+      run: |
+        make update-versions || {
+          exit_code=$?
+          if (( ${RETRY:-0} < $RETRIES )); then
+            sleep $(( ($RETRY + 0) * 30 ))
+            gh workflow run "$GITHUB_WORKFLOW" --repo "$GITHUB_REPOSITORY" --ref "$GITHUB_REF_NAME" -f retry=$(( $RETRY + 1 ))
+          else
+            exit $exit_code
+          fi
+        }
+    - uses: actions/cache@v5
+      with:
+        path: download
+        key: download-${{ hashFiles('checksums.mk') }}
+        lookup-only: true

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

@@ -14,6 +14,11 @@ jobs:
       fail-fast: false
     steps:
     - uses: actions/checkout@v6
+    - uses: actions/cache/restore@v5
+      with:
+        path: download
+        key: download-${{ hashFiles('checksums.mk') }}
+        fail-on-cache-miss: true
     - uses: docker/login-action@v4
       with:
         registry: ghcr.io

data/.github/workflows/livecheck.yml

@@ -21,15 +21,18 @@ jobs:
         bundler-cache: true
     - env:
         RETRY: ${{ inputs.retry }}
-        RETRIES: 10
+        RETRIES: 3
         GITHUB_TOKEN: ${{ secrets.RETRY_TOKEN }}
       run: |
-        bundle exec script/livecheck || {
+        script/livecheck || {
           exit_code=$?
           if (( $exit_code == 2 )) && (( ${RETRY:-0} < $RETRIES )); then
             sleep 300
-            gh workflow run livecheck --repo $GITHUB_REPOSITORY --ref $GITHUB_REF_NAME -f retry=$(( $RETRY + 1 ))
+            gh workflow run "$GITHUB_WORKFLOW" --repo "$GITHUB_REPOSITORY" --ref "$GITHUB_REF_NAME" -f retry=$(( $RETRY + 1 ))
           else
+            if (( $exit_code == 1 )); then
+              gh workflow run cache-downloads --repo "$GITHUB_REPOSITORY" --ref "$GITHUB_REF_NAME" -f retry=0
+            fi
             exit $exit_code
           fi
         }

data/CHANGELOG.markdown

@@ -2,6 +2,16 @@
 
 ## unreleased
 
+## v0.13.1.20260418 (2026-04-18)
+
+* libpng 1.6.58 [@toy](https://github.com/toy)
+
+## v0.13.1 (2026-04-12)
+
+* Add linux-x86_64 and linux-aarch64 platforms including two vendor dirs each [@toy](https://github.com/toy)
+* libpng 1.6.57 [@toy](https://github.com/toy)
+* Don't require presence of `git` in gemspec [@toy](https://github.com/toy)
+
 ## v0.13.0 (2026-04-04)
 
 * Add linux-x86_64-musl and linux-aarch64-musl builds [@toy](https://github.com/toy)

data/Dockerfile

@@ -15,145 +15,145 @@ FROM cargo 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
+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
+RUN ./extract libpng \
+ && cd build/libpng \
+ && ./configure --with-zlib-prefix=/usr/local \
+ && make install
 
 FROM libpng AS liblcms2
 ARG LIBLCMS2_VER
 ARG LIBLCMS2_SHA256
 COPY download/liblcms2-$LIBLCMS2_VER.tar.gz download/
-RUN ./extract liblcms2 && \
-    cd build/liblcms2 && \
-    ./configure && \
-    make install
+RUN ./extract liblcms2 \
+ && cd build/liblcms2 \
+ && ./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
+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 -DCMAKE_POLICY_VERSION_MINIMUM=3.5 . && \
-    make install
+RUN ./extract libmozjpeg \
+ && cd build/libmozjpeg \
+ && cmake -DPNG_SUPPORTED=0 -DCMAKE_POLICY_VERSION_MINIMUM=3.5 . \
+ && 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
+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
+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
+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 && \
-    CFLAGS=-fcommon make install
+RUN ./extract jpegarchive \
+ && cd build/jpegarchive \
+ && CFLAGS=-fcommon 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
+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
+RUN ./extract optipng \
+ && cd build/optipng \
+ && ./configure \
+ && make install
 
 FROM cargo AS oxipng
 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
+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/
 COPY patches/pngcrush.patch patches/
-RUN ./extract pngcrush && \
-    cd build/pngcrush && \
-    patch < ../../patches/pngcrush.patch && \
-    make && \
-    install -c pngcrush /usr/local/bin
+RUN ./extract pngcrush \
+ && cd build/pngcrush \
+ && patch < ../../patches/pngcrush.patch \
+ && make \
+ && install -c pngcrush /usr/local/bin
 
 FROM build AS pngout
 ARG PNGOUT_LINUX_STATIC_VER
 ARG PNGOUT_LINUX_STATIC_SHA256
 COPY download/pngout_linux_static-$PNGOUT_LINUX_STATIC_VER.tar.gz download/
-RUN ./extract pngout_linux_static && \
-    cd build/pngout_linux_static && \
-    cp amd64/pngout-static /usr/local/bin/pngout
+RUN ./extract pngout_linux_static \
+ && cd build/pngout_linux_static \
+ && cp amd64/pngout-static /usr/local/bin/pngout
 
 FROM liblcms2 AS pngquant
 ARG PNGQUANT_VER
 ARG PNGQUANT_SHA256
 COPY download/pngquant-$PNGQUANT_VER.tar.gz download/
-RUN ./extract pngquant && \
-    cd build/pngquant && \
-    cargo build --release && \
-    install -c target/release/pngquant /usr/local/bin
+RUN ./extract pngquant \
+ && cd build/pngquant \
+ && cargo build --release \
+ && install -c target/release/pngquant /usr/local/bin
 
 # 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
+# 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

data/Dockerfile.debian

@@ -3,160 +3,166 @@ ENV LD_LIBRARY_PATH=/usr/local/lib
 WORKDIR /tmp
 
 FROM base AS build
-RUN apt-get update && apt-get install -y build-essential cmake nasm bash findutils
+RUN apt-get update \
+ && apt-get install -y --no-install-recommends build-essential cmake nasm bash findutils \
+ && rm -rf /var/lib/apt/lists/*
 COPY script/extract ./
 ENV CPATH=/usr/local/include
 
 FROM rust:1 AS cargo
-RUN apt-get update && apt-get install -y build-essential
+RUN apt-get update \
+ && apt-get install -y --no-install-recommends build-essential \
+ && rm -rf /var/lib/apt/lists/*
 COPY script/extract ./
 
 FROM cargo 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
+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
+RUN ./extract libpng \
+ && cd build/libpng \
+ && ./configure --with-zlib-prefix=/usr/local \
+ && make install
 
 FROM libpng AS liblcms2
 ARG LIBLCMS2_VER
 ARG LIBLCMS2_SHA256
 COPY download/liblcms2-$LIBLCMS2_VER.tar.gz download/
-RUN ./extract liblcms2 && \
-    cd build/liblcms2 && \
-    ./configure && \
-    make install
+RUN ./extract liblcms2 \
+ && cd build/liblcms2 \
+ && ./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
+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 -DCMAKE_POLICY_VERSION_MINIMUM=3.5 . && \
-    make install
+RUN ./extract libmozjpeg \
+ && cd build/libmozjpeg \
+ && cmake -DPNG_SUPPORTED=0 -DCMAKE_POLICY_VERSION_MINIMUM=3.5 . \
+ && 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
+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
+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
+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 && \
-    CFLAGS=-fcommon make install
+RUN ./extract jpegarchive \
+ && cd build/jpegarchive \
+ && CFLAGS=-fcommon 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
+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
+RUN ./extract optipng \
+ && cd build/optipng \
+ && ./configure \
+ && make install
 
 FROM cargo AS oxipng
 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
+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/
 COPY patches/pngcrush.patch patches/
-RUN ./extract pngcrush && \
-    cd build/pngcrush && \
-    patch < ../../patches/pngcrush.patch && \
-    make && \
-    install -c pngcrush /usr/local/bin
+RUN ./extract pngcrush \
+ && cd build/pngcrush \
+ && patch < ../../patches/pngcrush.patch \
+ && make \
+ && install -c pngcrush /usr/local/bin
 
 FROM build AS pngout
 ARG PNGOUT_LINUX_VER
 ARG PNGOUT_LINUX_SHA256
 COPY download/pngout_linux-$PNGOUT_LINUX_VER.tar.gz download/
-RUN ./extract pngout_linux && \
-    cd build/pngout_linux && \
-    cp amd64/pngout /usr/local/bin/pngout
+RUN ./extract pngout_linux \
+ && cd build/pngout_linux \
+ && cp amd64/pngout /usr/local/bin/pngout
 
 FROM liblcms2 AS pngquant
 ARG PNGQUANT_VER
 ARG PNGQUANT_SHA256
 COPY download/pngquant-$PNGQUANT_VER.tar.gz download/
-RUN ./extract pngquant && \
-    cd build/pngquant && \
-    cargo build --release && \
-    install -c target/release/pngquant /usr/local/bin
+RUN ./extract pngquant \
+ && cd build/pngquant \
+ && cargo build --release \
+ && install -c target/release/pngquant /usr/local/bin
 
 # 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
+# RUN ./extract [name] \
+#  && cd build/[name] \
+#  && ./configure \
+#  && make install
 
 FROM base AS image_optim
-RUN apt-get update && apt-get install -y ruby npm perl-base dumb-init
+RUN apt-get update \
+ && apt-get install -y --no-install-recommends ruby npm perl-base dumb-init \
+ && rm -rf /var/lib/apt/lists/*
 
 COPY README.markdown /
 COPY acknowledgements /acknowledgements

data/Makefile

@@ -15,7 +15,7 @@ JPEGOPTIM_VER := 1.5.6
 LIBJPEG_VER := 9f
 LIBLCMS2_VER := 2.17
 LIBMOZJPEG_VER := 4.1.5
-LIBPNG_VER := 1.6.56
+LIBPNG_VER := 1.6.58
 LIBZ_VER := 1.3.2
 OPTIPNG_VER := 7.9.1
 OXIPNG_VER := 10.1.0
@@ -101,7 +101,6 @@ endef
 # $1 - name of archive
 # $2 - url of archive with [VER] for replace with version
 # $3 - extension to use
-# $4 - extra arguments to wget
 define archive-dl
 $(call archive,$1,$3)
 # download archive from url
@@ -109,7 +108,7 @@ $$($1_ARC) :
 	mkdir -p $(DL_DIR)
 	test -w $(DL_DIR)
 	tmpfile=`mktemp "$$@.XXXXXXXXXX"` && \
-		wget -O "$$$$tmpfile" --no-use-server-timestamps $4 "$(subst [VER],$($1_VER),$(strip $2))" && \
+		wget -O "$$$$tmpfile" --no-use-server-timestamps "$(subst [VER],$($1_VER),$(strip $2))" && \
 		chmod 644 "$$$$tmpfile" && \
 		mv "$$$$tmpfile" "$$@"
 endef
@@ -127,9 +126,9 @@ $(eval $(call archive-dl,LIBZ,        https://github.com/madler/zlib/archive/v[V
 $(eval $(call archive-dl,OPTIPNG,     https://prdownloads.sourceforge.net/optipng/optipng-[VER].tar.gz?download))
 $(eval $(call archive-dl,OXIPNG,      https://github.com/oxipng/oxipng/archive/v[VER].tar.gz))
 $(eval $(call archive-dl,PNGCRUSH,    https://prdownloads.sourceforge.net/pmt/pngcrush-[VER]-nolib.tar.gz?download))
-$(eval $(call archive-dl,PNGOUT_LINUX,https://www.jonof.id.au/files/kenutils/pngout-[VER]-linux.tar.gz,,--retry-on-http-error=415))
-$(eval $(call archive-dl,PNGOUT_LINUX_STATIC,https://www.jonof.id.au/files/kenutils/pngout-[VER]-linux-static.tar.gz,,--retry-on-http-error=415))
-$(eval $(call archive-dl,PNGOUT_DARWIN,https://www.jonof.id.au/files/kenutils/pngout-[VER]-mac.zip,zip,--retry-on-http-error=415))
+$(eval $(call archive-dl,PNGOUT_LINUX,https://www.jonof.id.au/files/kenutils/pngout-[VER]-linux.tar.gz))
+$(eval $(call archive-dl,PNGOUT_LINUX_STATIC,https://www.jonof.id.au/files/kenutils/pngout-[VER]-linux-static.tar.gz))
+$(eval $(call archive-dl,PNGOUT_DARWIN,https://www.jonof.id.au/files/kenutils/pngout-[VER]-mac.zip,zip))
 $(eval $(call archive-dl,PNGQUANT,    https://crates.io/api/v1/crates/pngquant/[VER]/download))
 
 download : $(foreach archive,$(ARCHIVES),$($(archive)_ARC))
@@ -140,8 +139,12 @@ download-dependencies : $(OXIPNG_EXTRACTED) $(PNGQUANT_EXTRACTED)
 	cd $(PNGQUANT_DIR) && cargo fetch --locked
 .PHONY : download-dependencies
 
+purge-dependencies :
+	rm -rf $(CARGO_HOME)
+.PHONY : purge-dependencies
+
 download-tidy-up :
-	rm -f $(filter-out $(foreach archive,$(ARCHIVES),$($(archive)_ARC)),$(wildcard $(DL_DIR)/*.*))
+	rm -fv $(filter-out $(foreach archive,$(ARCHIVES),$($(archive)_ARC)),$(wildcard $(DL_DIR)/*.*))
 .PHONY : download-tidy-up
 
 checksum : download

data/README.markdown

@@ -1,9 +1,10 @@
 [![Gem Version](https://img.shields.io/gem/v/image_optim_pack?logo=rubygems)](https://rubygems.org/gems/image_optim_pack)
 [![Check](https://img.shields.io/github/actions/workflow/status/toy/image_optim_pack/check.yml?label=check&logo=github)](https://github.com/toy/image_optim_pack/actions/workflows/check.yml)
 [![Rubocop](https://img.shields.io/github/actions/workflow/status/toy/image_optim_pack/rubocop.yml?label=rubocop&logo=rubocop)](https://github.com/toy/image_optim_pack/actions/workflows/rubocop.yml)
+[![Build](https://img.shields.io/github/actions/workflow/status/toy/image_optim_pack/build.yml?label=build&logo=github)](https://github.com/toy/image_optim_pack/actions/workflows/build.yml)
 [![Docker build](https://img.shields.io/github/actions/workflow/status/toy/image_optim_pack/docker-build.yml?label=docker+build&logo=docker)](https://github.com/toy/image_optim_pack/actions/workflows/docker-build.yml)
 [![Livecheck](https://img.shields.io/github/actions/workflow/status/toy/image_optim_pack/livecheck.yml?label=livecheck&logo=github)](https://github.com/toy/image_optim_pack/actions/workflows/livecheck.yml)
-[![Build](https://img.shields.io/github/actions/workflow/status/toy/image_optim_pack/build.yml?label=build&logo=github)](https://github.com/toy/image_optim_pack/actions/workflows/build.yml)
+[![Cache downloads](https://img.shields.io/github/actions/workflow/status/toy/image_optim_pack/cache-downloads.yml?label=cache-downloads&logo=github)](https://github.com/toy/image_optim_pack/actions/workflows/cache-downloads.yml)
 [![Depfu](https://img.shields.io/depfu/toy/image_optim_pack)](https://depfu.com/github/toy/image_optim_pack)
 [![Inch CI](https://inch-ci.org/github/toy/image_optim_pack.svg?branch=master)](https://inch-ci.org/github/toy/image_optim_pack)
 

data/checksums.mk

@@ -6,7 +6,7 @@ JPEGOPTIM_SHA256 := 661a808dfffa933d78c6beb47a2937d572b9f03e94cbaaab3d4c0d72f410
 LIBJPEG_SHA256 := 04705c110cb2469caa79fb71fba3d7bf834914706e9641a4589485c1f832565b
 LIBLCMS2_SHA256 := d11af569e42a1baa1650d20ad61d12e41af4fead4aa7964a01f93b08b53ab074
 LIBMOZJPEG_SHA256 := 9fcbb7171f6ac383f5b391175d6fb3acde5e64c4c4727274eade84ed0998fcc1
-LIBPNG_SHA256 := 8f91e941a07fb1069ebb3855278f82a849e6af14ca05821e14ec3d5348697ea5
+LIBPNG_SHA256 := 8c9b05b675ca7301a458df2c2e46f26e1d41ff36b8863f8c33530bc58c2e6225
 LIBZ_SHA256 := b99a0b86c0ba9360ec7e78c4f1e43b1cbdf1e6936c8fa0f6835c0cd694a495a1
 OPTIPNG_SHA256 := c2579be58c2c66dae9d63154edcb3d427fef64cb00ec0aff079c9d156ec46f29
 OXIPNG_SHA256 := 6c5e1d021a844ba730193943ab63ad99e7d9f1089c36f3db59014517ea99cf99

data/image_optim_pack-linux-aarch64.gemspec

@@ -0,0 +1,3 @@
+# encoding: UTF-8
+
+eval "gemspec_path = #{__FILE__.inspect}; #{File.read('image_optim_pack.gemspec')}"

data/image_optim_pack-linux-x86_64.gemspec

@@ -0,0 +1,3 @@
+# encoding: UTF-8
+
+eval "gemspec_path = #{__FILE__.inspect}; #{File.read('image_optim_pack.gemspec')}"

data/image_optim_pack.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_optim_pack'
-  s.version     = '0.13.0'
+  s.version     = '0.13.1.20260418'
   s.summary     = %q{Precompiled binaries for image_optim: advpng, gifsicle, jhead, jpeg-recompress, jpegoptim, jpegtran, optipng, oxipng, pngcrush, pngout, pngquant}
   s.homepage    = "https://github.com/toy/#{s.name}"
   s.authors     = ['Ivan Kuchin']
@@ -17,38 +17,46 @@ Gem::Specification.new do |s|
     'source_code_uri'   => "https://github.com/toy/#{s.name}",
   }
 
-  s.files         = `git ls-files`.split("\n")
-  if defined?(gemspec_path)
-    gem_os, gem_arch, gem_version = File.basename(gemspec_path, File.extname(gemspec_path)).split('-').drop(1)
+  s.files = Dir[*%w[
+    .dockerignore
+    .gitignore
+    .rubocop.yml
+    checksums.mk
+    Gemfile
+    LICENSE.txt
+    Makefile
+    *.markdown
+    Dockerfile*
+    *.gemspec
+    {.github,acknowledgements,lib,patches,script,spec,vendor}/**/*
+  ]].reject(&File.method(:directory?))
 
-    s.platform = Gem::Platform.new([gem_arch, gem_os, gem_version])
+  if defined?(gemspec_path)
+    platform_parts = File.basename(gemspec_path, File.extname(gemspec_path)).split('-').drop(1)
+    s.platform = Gem::Platform.new(platform_parts.values_at(1, 0, 2))
 
-    arch_aliases = {
-      'x86_64' => %w[x86_64 amd64],
-    }[gem_arch] || [gem_arch]
+    all_vendor_dirs = s.files.filter_map do |path|
+      parts = path.split('/')
+      parts[1] if parts[0] == 'vendor'
+    end.uniq
 
-    possible_vendor_dirs = arch_aliases.map do |arch_alias|
-      [gem_os, arch_alias, gem_version].compact.join('-')
+    vendor_dirs = all_vendor_dirs.select do |vendor_dir|
+      s.platform =~ Gem::Platform.new(vendor_dir.split('-').values_at(1, 0, 2))
     end
 
-    existing_vendor_dirs = possible_vendor_dirs.select do |vendor_dir|
-      File.directory?(File.join('vendor', vendor_dir))
-    end
+    expected_vendor_dirs = s.platform.os == 'linux' && !s.platform.version ? 2 : 1
 
-    vendor_dir = if existing_vendor_dirs.length == 1
-      existing_vendor_dirs.first
-    else
-      message = existing_vendor_dirs.empty? ? 'no vendor dir' : 'multiple vendor dirs'
-      fail "#{message} found for os #{gem_os} and arch #{gem_arch} out of: #{possible_vendor_dirs.join(', ')}"
+    unless vendor_dirs.length == expected_vendor_dirs
+      fail "expected #{expected_vendor_dirs}, got #{vendor_dirs.length} (#{vendor_dirs.join(', ')}) for #{s.platform}"
     end
 
     s.files.reject! do |path|
       parts = path.split('/')
-      parts[0] == 'vendor' && parts[1] != vendor_dir
+      parts[0] == 'vendor' && !vendor_dirs.include?(parts[1])
     end
   end
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+
+  s.test_files    = Dir['spec/**/*.*']
   s.require_paths = %w[lib]
 
   s.add_dependency 'image_optim', '~> 0.19'

data/script/livecheck

@@ -1,6 +1,8 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
+require 'bundler/setup'
+
 require 'uri'
 require 'net/http'
 require 'openssl'
@@ -94,12 +96,13 @@ Thread.report_on_exception = false
 # Fetch and compare latest tool/library versions
 class Livecheck
   # Commands
-  class Cli
+  class CLI
     VERSION_REGEXP = /^([A-Z_]+)_VER *:= *([^$\n]*)$/.freeze
 
     def initialize(args)
       @update = args.delete('--update')
-      abort '--update is the only supported option' unless args.empty?
+      @verbose = args.delete('--verbose')
+      abort '--update and --verbose are the only supported options' unless args.empty?
     end
 
     def run
@@ -153,7 +156,7 @@ class Livecheck
 
     def livechecks
       @livechecks ||= makefile.read.scan(VERSION_REGEXP).map do |name, version|
-        Livecheck.new(name.downcase, version)
+        Livecheck.new(name.downcase, version, @verbose)
       end
     end
 
@@ -202,6 +205,12 @@ class Livecheck
       end
     end
 
+    def hash
+      @string.hash
+    end
+
+    alias_method :eql?, :==
+
     def <=>(other)
       if parsed && other.parsed
         parsed <=> other.parsed
@@ -211,16 +220,32 @@ class Livecheck
     end
   end
 
+  # Don't fetch twice
+  module Fetcher
+    @cache = {}
+
+    def self.get(url, verbose)
+      @cache[url] ||= Thread.new do
+        $stderr << "GET #{url}\n" if verbose
+        uri = URI(url)
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.use_ssl = (uri.scheme == 'https')
+        http.request_get(uri.request_uri).body
+      end
+    end
+  end
+
   attr_reader :name, :current_version
 
-  def initialize(name, current_version)
+  def initialize(name, current_version, verbose)
     @name = name
+    @verbose = verbose
     @current_version = Version.new(current_version)
-    @fetcher = Thread.new{ fetch_versions.last }
+    @fetcher = Fetcher.get(config[:url], verbose)
   end
 
   def latest_version
-    @fetcher.value
+    versions.last
   end
 
   def changed?
@@ -241,23 +266,20 @@ private
     CONFIG[name.to_sym] || fail(ArgumentError, "Livecheck for #{name} not defined")
   end
 
-  def get(url)
-    uri = URI(url)
-    http = Net::HTTP.new(uri.host, uri.port)
-    http.use_ssl = (uri.scheme == 'https')
-    http.request_get(uri.request_uri).body
-  end
+  def versions
+    @versions ||= begin
+      body = @fetcher.value
 
-  def fetch_versions
-    body = get(config[:url])
+      version_regex = config[:regexp]
 
-    version_regex = config[:regexp]
+      versions = body.scan(version_regex).map{ |match| Version.new(*match) }.uniq.sort
+      fail "No versions found for #{name} in body:\n#{body}" if versions.empty?
 
-    versions = body.scan(version_regex).map{ |match| Version.new(*match) }.sort
-    fail "No versions found for #{name} in body:\n#{body}" if versions.empty?
+      $stderr << "#{name}: #{versions.join(', ')}\n" if @verbose
 
-    versions
+      versions
+    end
   end
 end
 
-Livecheck::Cli.new(ARGV).run
+Livecheck::CLI.new(ARGV).run

data/script/platform_downloads

@@ -1,17 +1,23 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
+require 'bundler/setup'
+
 require 'gems'
 require 'ostruct'
 require 'terminal-table'
 
+def platform_parts(platform)
+  platform.split('-', 3).values_at(1, 0, 2).compact
+end
+
 versions = Gems.versions('image_optim_pack').map do |attributes|
   attributes['number'] = Gem::Version.new(attributes['number'])
   OpenStruct.new(attributes) # rubocop:disable Style/OpenStructUse
 end
 
 platforms = versions.map(&:platform).uniq.sort_by do |platform|
-  platform.sub('amd64', 'x86_64').split('-').reverse
+  platform_parts(platform)
 end
 
 version_time = begin
@@ -28,7 +34,7 @@ end
 table = Terminal::Table.new
 
 table.headings = ['version', 'days', 'base dls'] + platforms.map do |platform|
-  platform.split('-').reverse.join("\n")
+  platform_parts(platform).join("\n")
 end + ['total']
 
 versions.group_by(&:number).each do |version_n, platform_versions|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: image_optim_pack
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.1.20260418
 platform: ruby
 authors:
 - Ivan Kuchin
@@ -98,6 +98,7 @@ files:
 - ".dockerignore"
 - ".github/dependabot.yml"
 - ".github/workflows/build.yml"
+- ".github/workflows/cache-downloads.yml"
 - ".github/workflows/check.yml"
 - ".github/workflows/docker-build.yml"
 - ".github/workflows/livecheck.yml"
@@ -142,8 +143,10 @@ files:
 - image_optim_pack-darwin-x86_64.gemspec
 - image_optim_pack-linux-aarch64-gnu.gemspec
 - image_optim_pack-linux-aarch64-musl.gemspec
+- image_optim_pack-linux-aarch64.gemspec
 - image_optim_pack-linux-x86_64-gnu.gemspec
 - image_optim_pack-linux-x86_64-musl.gemspec
+- image_optim_pack-linux-x86_64.gemspec
 - image_optim_pack.gemspec
 - lib/image_optim/pack.rb
 - lib/image_optim_pack.rb
@@ -251,7 +254,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.13.0
+  documentation_uri: https://www.rubydoc.info/gems/image_optim_pack/0.13.1.20260418
   source_code_uri: https://github.com/toy/image_optim_pack
 rdoc_options: []
 require_paths: