image_optim_pack 0.5.0.20180605 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 760508b176be48734451e8584fa1700c5b061cc746e07b98b15dee42016214b9
-  data.tar.gz: 0ff1d7364e30d879192a8c3e3d918f58b089e4b21644003a101fe0f8830dffc4
+  metadata.gz: 9ef36e670308415aee4a6b74a8d9970ab487b592a04fcd3dd726347fb1be16f7
+  data.tar.gz: f76e2eeb17232023cdbaac02b3ee1655496c6ebd008e6485444b08ff0deb3473
 SHA512:
-  metadata.gz: b5307385c7abe9aa23befc25d2da6a2e36322fb43529fad58c758a0f751b46f50cff4f8a628587843d4aa7d21e467a1307a079e2ef5e4b90ab7bd1374fd2cf4a
-  data.tar.gz: 15767ae2b7527f38be8a8c6030a26a98fad849ec8a00b6be228483e6129133ff64860a21b062403f1217f7bf21a88a71583b84afe0c4dac3e983f042a0dc484d
+  metadata.gz: be3089e31aaf95538dfd17de76330337d4b7b7a5cdd2cdf51f5f4a19bb638424a4cae8d7cd96f866819b14ee84dc196199f7d2f35b4c6f97a2b0673f45c9bf61
+  data.tar.gz: 4204acf30eb17d46ec73afc8191741782c95491a881976bd15ac7b0506477720ef9fe167e98082c9fee5ea18bbee3e1f425f39c6dbfbff28196d13aee75bd4f0

data/.travis.yml

@@ -19,6 +19,7 @@ before_install:
   - gem update --system
   - gem update bundler
   - if [ $TRAVIS_OS_NAME == osx ]; then brew update && brew install imagemagick; fi
+  - make ldd-version
 matrix:
   include:
     - dist: trusty
@@ -29,6 +30,9 @@ matrix:
     - os: osx
       rvm: default
       osx_image: xcode8.3
+    - os: osx
+      rvm: default
+      osx_image: xcode9.3
     - env: RUBOCOP=✓
       rvm: '2.4.4'
       script: bundle exec rubocop

data/CHANGELOG.markdown

@@ -2,6 +2,11 @@
 
 ## unreleased
 
+## v0.5.1 (2018-06-10)
+
+* Switching back to centos (6.9) for linux to use more widely compatible glibc during compilation [#12](https://github.com/toy/image_optim_pack/issues/12) [@toy](https://github.com/toy)
+* Add archive checksum verification [#10](https://github.com/toy/image_optim_pack/issues/10) [@toy](https://github.com/toy)
+
 ## v0.5.0.20180605 (2018-06-05)
 
 * pngquant 2.12.0 [@toy](https://github.com/toy)
@@ -29,8 +34,8 @@
 
 ## v0.5.0.20171208 (2017-12-08)
 
-* ensure unused libgcc is not dynamically linked with pngquant [@toy](https://github.com/toy)
-* don’t use lcms (colour profiles) in pngquant [@toy](https://github.com/toy)
+* Ensure unused libgcc is not dynamically linked with pngquant [@toy](https://github.com/toy)
+* Don’t use lcms (colour profiles) in pngquant [@toy](https://github.com/toy)
 * pngquant 2.11.2 [@toy](https://github.com/toy)
 * pngquant 2.11.1 [@toy](https://github.com/toy)
 

data/Makefile

@@ -15,6 +15,21 @@ OPTIPNG_VER := 0.7.7
 PNGCRUSH_VER := 1.8.13
 PNGQUANT_VER := 2.12.0
 
+# ====== CHECKSUMS ======
+
+ADVANCECOMP_SHA256 := 3ac0875e86a8517011976f04107186d5c60d434954078bc502ee731480933eb8
+GIFSICLE_SHA256 := 0a4ee602aa244cdcdd86a250a6b39c94d8343cf526b8fae862d8a0efc337a800
+JHEAD_SHA256 := 88cc01da018e242fe2e05db73f91b6288106858dd70f27506c4989a575d2895e
+JPEGARCHIVE_SHA256 := 494534f5308f99743f11f3a7c151a8d5ca8a5f1f8b61ea119098511d401bc618
+JPEGOPTIM_SHA256 := 88b1eb64c2a33a2f013f068df8b0331f42c019267401ae3fa28e3277403a5ab7
+LIBJPEG_SHA256 := 650250979303a649e21f87b5ccd02672af1ea6954b911342ea491f351ceb7122
+LIBMOZJPEG_SHA256 := 11823198f3c677b1832fa2dcf702e458f70c959661c4bec9c8922b7c36e94739
+LIBPNG_SHA256 := 574623a4901a9969080ab4a2df9437026c8a87150dfd5c235e28c94b212964a7
+LIBZ_SHA256 := c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
+OPTIPNG_SHA256 := 4f32f233cef870b3f95d3ad6428bfe4224ef34908f1b42b0badf858216654452
+PNGCRUSH_SHA256 := fed0aaf5c098aa8c7f78c75365cd18d7341417326ecbdba547876b7b4f3df4be
+PNGQUANT_SHA256 := 0e540c64bb58c05f2a05b4eaf1d3d165f0d3278500f15abfeac47f93f8fa8fa8
+
 # ====== CONSTANTS ======
 
 OS := $(shell uname -s | tr A-Z a-z)
@@ -46,6 +61,7 @@ downcase = $(shell echo $1 | tr A-Z a-z)
 
 ln_s := ln -sf
 tar := $(shell if command -v gtar >/dev/null 2>&1; then echo gtar; 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)
 
 # ====== ARCHIVES ======
 
@@ -59,6 +75,7 @@ $1_TGZ := $(DL_DIR)/$(call downcase,$1)-$($1_VER).tar.gz
 $1_EXTRACTED := $$($1_DIR)/__$$(notdir $$($1_TGZ))__
 $$($1_EXTRACTED) : $$($1_TGZ)
 	rm -rf $$(@D)
+	echo "$$($1_SHA256)  $$($1_TGZ)" | $(sha256sum) -c
 	mkdir $$(@D)
 	$(tar) -C $$(@D) --strip-components=1 -xzf $$<
 	touch $$(@D)/__$$(notdir $$<)__
@@ -87,23 +104,23 @@ $(eval $(call archive-dl,LIBPNG,      http://prdownloads.sourceforge.net/libpng/
 $(eval $(call archive-dl,LIBZ,        http://prdownloads.sourceforge.net/libpng/zlib-[VER].tar.gz?download))
 $(eval $(call archive-dl,OPTIPNG,     http://prdownloads.sourceforge.net/optipng/optipng-[VER].tar.gz?download))
 $(eval $(call archive-dl,PNGCRUSH,    http://prdownloads.sourceforge.net/pmt/pngcrush-[VER]-nolib.tar.gz?download))
-$(eval $(call archive,PNGQUANT))
-
-PNGQUANT_GIT := $(DL_DIR)/pngquant.git
-$(PNGQUANT_GIT) :; git clone --recursive https://github.com/kornelski/pngquant.git $@
-$(PNGQUANT_TGZ) : $(PNGQUANT_GIT)
-	while ! mkdir $@.lock 2> /dev/null; do sleep 1; done
-	cd $(PNGQUANT_GIT) && git fetch && git checkout -q $(PNGQUANT_VER) && git submodule -q update
-	cd $(PNGQUANT_GIT) && $(tar) --exclude=.git -czf $(PNGQUANT_TGZ) .
-	rm -r $@.lock
+$(eval $(call archive-dl,PNGQUANT,    http://pngquant.org/pngquant-[VER]-src.tar.gz))
 
 download : $(foreach archive,$(ARCHIVES),$($(archive)_TGZ))
 .PHONY : download
 
 download-tidy-up :
-	rm -f $(filter-out $(foreach archive,$(ARCHIVES),$($(archive)_TGZ)) $(PNGQUANT_GIT),$(wildcard $(DL_DIR)/*.*))
+	rm -f $(filter-out $(foreach archive,$(ARCHIVES),$($(archive)_TGZ)),$(wildcard $(DL_DIR)/*.*))
 .PHONY : download-tidy-up
 
+checksum : download
+	@$(sha256sum) $(foreach archive,$(ARCHIVES),$($(archive)_TGZ))
+.PHONY : checksum
+
+checksum-verify : download
+	@printf '%s  %s\n' $(foreach archive,$(ARCHIVES),$($(archive)_SHA256) $($(archive)_TGZ)) | $(sha256sum) -c
+.PHONY : checksum
+
 # ====== PRODUCTS ======
 
 PRODUCTS :=
@@ -168,6 +185,9 @@ else
 ldd := ldd
 endif
 
+ldd-version :; $(ldd) --version
+.PHONY : ldd-version
+
 define check_exists
 	@test -f $(OUTPUT_DIR)/$1 || \
 		{ printf "$1: $(ANSI_RED)not found$(ANSI_RESET)\n"; exit 1; }

data/Vagrantfile

@@ -17,8 +17,8 @@ Vagrant.configure('2') do |config|
   config.vm.synced_folder '.', '/vagrant', disabled: true
 
   {
-    'linux-x86_64'  => 'ubuntu/trusty64',
-    'linux-i686'    => 'ubuntu/trusty32',
+    'linux-x86_64'  => 'boxes/centos-amd64.box',
+    'linux-i686'    => 'boxes/centos-i386.box',
     'freebsd-amd64' => 'boxes/freebsd-amd64.box',
     'freebsd-i386'  => 'boxes/freebsd-i386.box',
     'openbsd-amd64' => 'boxes/openbsd-amd64.box',
@@ -32,7 +32,12 @@ Vagrant.configure('2') do |config|
       when /^linux/
         <<-SH
           set -ex
-          apt-get -y install rsync ntpdate make wget gcc g++ chrpath perl pkg-config autoconf automake libtool nasm
+          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
+          else
+            yum -y install rsync ntpdate make wget gcc gcc-c++ chrpath perl pkg-config autoconf automake libtool nasm
+          fi
         SH
       when /^freebsd/
         <<-SH

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

@@ -0,0 +1,30 @@
+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-6.9-x86_64-minimal.iso',
+  :iso_src => 'http://artfiles.org/centos.org/6.9/isos/x86_64/CentOS-6.9-x86_64-minimal.iso',
+  :iso_sha256 => '422af57b493b8af49d485885a730c5a1d955f803fac85aa51311c393168b9080',
+  :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-amd64/ks.cfg

@@ -0,0 +1,37 @@
+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
+

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

@@ -0,0 +1,30 @@
+Veewee::Session.declare({
+  :cpu_count => '1',
+  :memory_size => '512',
+  :disk_size => '8192',
+  :disk_format => 'VDI',
+  :hostiocache => 'off',
+  :os_type_id => 'RedHat',
+  :iso_file => 'CentOS-6.9-i386-minimal.iso',
+  :iso_src => 'http://artfiles.org/centos.org/6.9/isos/i386/CentOS-6.9-i386-minimal.iso',
+  :iso_sha256 => 'e104b3bc2261e40c020e4047d31a4454a00435787c54fb0a376261f9348382b7',
+  :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

@@ -0,0 +1,37 @@
+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
+

data/boxes/definitions/centos-postinstall.sh

@@ -0,0 +1,33 @@
+set -ex
+
+sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers
+
+yum -y install wget
+
+# Make ssh faster by not waiting on DNS
+echo "UseDNS no" >> /etc/ssh/sshd_config
+
+# Vagrant specific
+date > /etc/vagrant_box_build_time
+
+# Add vagrant user
+/usr/sbin/groupadd vagrant
+/usr/sbin/useradd vagrant -g vagrant -G wheel
+echo "vagrant"|passwd --stdin vagrant
+echo "vagrant        ALL=(ALL)       NOPASSWD: ALL" >> /etc/sudoers.d/vagrant
+chmod 0440 /etc/sudoers.d/vagrant
+
+# Installing vagrant keys
+mkdir -pm 700 /home/vagrant/.ssh
+wget --no-check-certificate 'https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub' -O /home/vagrant/.ssh/authorized_keys
+chmod 0600 /home/vagrant/.ssh/authorized_keys
+chown -R vagrant /home/vagrant/.ssh
+
+yum -y clean all
+
+# Remove traces of mac address from network configuration
+sed -i /HWADDR/d /etc/sysconfig/network-scripts/ifcfg-eth0
+rm /etc/udev/rules.d/70-persistent-net.rules
+
+# Zero out the free space to save space in the final image
+dd if=/dev/zero of=/filler bs=1M || rm /filler

data/image_optim_pack.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_optim_pack'
-  s.version     = '0.5.0.20180605'
+  s.version     = '0.5.1'
   s.summary     = %q{Precompiled binaries for image_optim: advpng, gifsicle, jhead, jpeg-recompress, jpegoptim, jpegtran, optipng, pngcrush, pngquant}
   s.homepage    = "http://github.com/toy/#{s.name}"
   s.authors     = ['Ivan Kuchin']

data/script/livecheck

@@ -203,5 +203,5 @@ pngcrush:
   url: https://sourceforge.net/projects/pmt/rss?path=/pngcrush
   regexp: /pngcrush/(\d+(?:\.\d+)*)/
 pngquant:
-  url: https://github.com/kornelski/pngquant/releases.atom
-  regexp: /kornelski/pngquant/releases/tag/(\d+(?:\.\d+)*)
+  url: https://pngquant.org/releases.html
+  regexp: <span itemprop='version'>(\d+(?:\.\d+)*)</span>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_optim_pack
 version: !ruby/object:Gem::Version
-  version: 0.5.0.20180605
+  version: 0.5.1
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-05 00:00:00.000000000 Z
+date: 2018-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: image_optim
@@ -114,6 +114,11 @@ files:
 - boxes/.rubocop.yml
 - boxes/Gemfile
 - 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
 - boxes/definitions/freebsd-amd64/definition.rb
 - boxes/definitions/freebsd-amd64/install.sh
 - boxes/definitions/freebsd-i386/definition.rb