image_optim_pack 0.10.1.20240317-x86_64-darwin → 0.11.1-x86_64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01d8667dbc1dcd30cb68ff1b7ac65eed2a06469ebd31ed3d2bb21e59871c92ff
-  data.tar.gz: bdf4005c0b367d3f848e3309056ab94da060b7618a9d8b6b83bb18b4389b909e
+  metadata.gz: 2c4418a82fab458305d0062a5171ea1241b340677b3699aaf7359866bdecf953
+  data.tar.gz: 5319cd849bc679b2ca2cc5050cc6e7368abcf13719fc3faea74b8b9ba10ece9e
 SHA512:
-  metadata.gz: 48bf33a79aced3505477b280c3fd7b3ce0363051c69153e1ee667a204aec86ce95b5f6774317c3bbffff0b3f041dd9edb66335cb085b6c7f366985d86bcfabce
-  data.tar.gz: 3a5685761146e9d6b0e58dad374bc8137f1df636b445e4733ff40ea7e4149646a0975899c52bd77494acfb9671f110412677385ed1d70a301bf99ac79f9832f3
+  metadata.gz: 93ce888d8df6cfa1a3f242043e75aea7e2d84b0b831fdf25fe31cc6f797fb80c9aa89445b46224e03b9c009b16b98c68660f366e75306f16136e37f25ab764b5
+  data.tar.gz: 10d588e13b5a1df44119b0a954c758dd69afe5131b2ad81fd4ca31ea27a17c15f16d34aee9265ac581825ada1eb1305b867e2919d3a1e89f252328549acf0190

data/.github/workflows/check.yml

@@ -11,15 +11,13 @@ jobs:
       matrix:
         os:
         - ubuntu-latest
-        - macos-latest
+        - macos-13
         ruby:
-        - '2.6'
         - '2.7'
         - '3.0'
         - '3.1'
         - '3.2'
         - '3.3'
-        - jruby-9.3
         - jruby-9.4
       fail-fast: false
     steps:

data/.gitignore

@@ -1,6 +1,5 @@
 /build/
 /download/
-/.vagrant/
 
 Gemfile.lock
 /*.gem

data/CHANGELOG.markdown

@@ -2,6 +2,15 @@
 
 ## unreleased
 
+## v0.11.1 (2024-05-09)
+
+* Use oldest maintained debian buster instead of newest bookworm for building linux binaries [@toy](https://github.com/toy)
+
+## v0.11.0 (2024-05-05)
+
+* Use container instead of vagrant to build linux binaries [@toy](https://github.com/toy)
+* oxipng 9.1.1 [@toy](https://github.com/toy)
+
 ## v0.10.1.20240317 (2024-03-17)
 
 * gifsicle 1.95 [@toy](https://github.com/toy)

data/Dockerfile

@@ -120,8 +120,10 @@ 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
 

data/Dockerfile.debian

@@ -120,8 +120,10 @@ 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
 

data/Makefile

@@ -13,7 +13,7 @@ LIBMOZJPEG_VER := 4.1.5
 LIBPNG_VER := 1.6.43
 LIBZ_VER := 1.2.11
 OPTIPNG_VER := 0.7.8
-OXIPNG_VER := 9.0.0
+OXIPNG_VER := 9.1.1
 PNGCRUSH_VER := 1.8.13
 PNGOUT_VER := 20200115
 PNGOUT_LINUX_VER := $(PNGOUT_VER)
@@ -45,6 +45,8 @@ OUTPUT_ROOT_DIR := $(CURDIR)/vendor
 OUTPUT_DIR := $(OUTPUT_ROOT_DIR)/$(OS)-$(ARCH)
 PATCHES_DIR := $(CURDIR)/patches
 
+export CARGO_HOME := $(DL_DIR)/cargo
+
 ANSI_RED=\033[31m
 ANSI_GREEN=\033[32m
 ANSI_MAGENTA=\033[35m
@@ -113,6 +115,10 @@ $(eval $(call archive-dl,PNGQUANT,    https://pngquant.org/pngquant-[VER]-src.ta
 download : $(foreach archive,$(ARCHIVES),$($(archive)_ARC))
 .PHONY : download
 
+download-dependencies : $(OXIPNG_EXTRACTED)
+	cd $(OXIPNG_DIR) && cargo fetch --locked
+.PHONY : download-dependencies
+
 download-tidy-up :
 	rm -f $(filter-out $(foreach archive,$(ARCHIVES),$($(archive)_ARC)),$(wildcard $(DL_DIR)/*.*))
 .PHONY : download-tidy-up
@@ -270,6 +276,7 @@ test :
 update-versions :
 	script/livecheck --update
 	make checksum-update
+	make download-dependencies
 .PHONY : update-versions
 
 # ====== DOCKER ======
@@ -411,7 +418,7 @@ $(JHEAD_TARGET) :
 ## jpeg-recompress
 $(eval $(call depend-build,JPEG-RECOMPRESS,LIBMOZJPEG))
 $(JPEG-RECOMPRESS_TARGET) :
-	cd $(DIR) && $(MAKE) jpeg-recompress CC="$(CC) $(CFLAGS)" LIBJPEG=$(LIBMOZJPEG_TARGET) \
+	cd $(DIR) && $(MAKE) jpeg-recompress CC="$(CC) $(CFLAGS) -fcommon" LIBJPEG=$(LIBMOZJPEG_TARGET) \
 		MAKE=$(MAKE) # fix for bsd in jpeg-archive-2.1.1
 
 ## jpegoptim
@@ -490,7 +497,7 @@ $(OPTIPNG_TARGET) :
 
 ## oxipng
 $(OXIPNG_TARGET) :
-	cd $(DIR) && cargo build --release --locked
+	cd $(DIR) && cargo build --release --frozen --offline
 
 ## pngcrush
 $(eval $(call depend,PNGCRUSH,LIBPNG LIBZ))

data/README.markdown

@@ -70,9 +70,7 @@ gem 'image_optim_pack'
 
 ## Development
 
-Mac OS X binaries and libraries are built on host, others using [vagrant](https://www.vagrantup.com/).
-
-Boxes for vagrant are built using [veewee](https://github.com/jedi4ever/veewee), check [boxes/Rakefile](boxes/Rakefile) and [boxes/definitions](boxes/definitions).
+Mac OS X binaries and libraries are built on host, others using containers.
 
 ```sh
 script/run # Build and test all for all oses and architectures

data/checksums.mk

@@ -9,7 +9,7 @@ LIBMOZJPEG_SHA256 := 9fcbb7171f6ac383f5b391175d6fb3acde5e64c4c4727274eade84ed099
 LIBPNG_SHA256 := e804e465d4b109b5ad285a8fb71f0dd3f74f0068f91ce3cdfde618180c174925
 LIBZ_SHA256 := c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
 OPTIPNG_SHA256 := 25a3bd68481f21502ccaa0f4c13f84dcf6b20338e4c4e8c51f2cefbd8513398c
-OXIPNG_SHA256 := 534fa8f349f52b01c2ee4332cef25ce1311edca04209ac6d972e38b171550a1b
+OXIPNG_SHA256 := f50db90c7ef95c0964dc980f6596b821f362e15d6d4bab247f1eb4aab7554db8
 PNGCRUSH_SHA256 := fed0aaf5c098aa8c7f78c75365cd18d7341417326ecbdba547876b7b4f3df4be
 PNGOUT_LINUX_SHA256 := ac38bba6f0de29033de866538c3afa64341319b695bbe388efbc5fd9e830e928
 PNGOUT_LINUX_STATIC_SHA256 := 7a78ea475d65a00981bf418e5dfa3b34e42d6460fb992340802873bb14b08597

data/image_optim_pack.gemspec

@@ -2,8 +2,8 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_optim_pack'
-  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.version     = '0.11.1'
+  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']
   s.license     = 'MIT'

data/script/livecheck

@@ -122,8 +122,13 @@ class Livecheck
     def update_changelog
       changelog = FSPath('CHANGELOG.markdown')
       lines = changelog.readlines
-      lines.insert(4, "\n") if lines[4] =~ /^## /
-      lines.insert(4, changelog_entry)
+      i = 4
+      if lines[i] =~ /^## /
+        lines.insert(i, "\n")
+      else
+        i += 1 while lines[i] =~ /^\* /
+      end
+      lines.insert(i, changelog_entry)
       write(changelog, lines.join(''))
     end
 

data/script/platform_downloads

@@ -5,7 +5,10 @@ require 'gems'
 require 'ostruct'
 require 'terminal-table'
 
-versions = Gems.versions('image_optim_pack').map(&OpenStruct.method(:new)) # rubocop:disable Style/OpenStructUse
+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

data/script/run

@@ -1,9 +1,7 @@
-#!/usr/bin/env bash
+#!/usr/bin/env bash -e
 
 # Build tools on Mac OS X host and in all vms
 
-set -e
-
 MAKE_TASK='all -j'
 
 filters=()
@@ -29,6 +27,8 @@ if [[ $(uname -s) != 'Darwin' ]]; then
   exit 1
 fi
 
+make download-dependencies
+
 for arch in x86_64; do
   platform="darwin-$arch"
   passes-filter "$platform" || continue
@@ -38,53 +38,85 @@ for arch in x86_64; do
 
   mkdir -p "vendor/$platform"
 
-  sudo -u _image_optim --set-home bash -c "
-    set -e
+  rsync -aR --del Makefile checksums.mk download patches "$build_dir"
 
+  sudo -u _image_optim --set-home bash -exc "
     mkdir -p '$build_dir'
     cd '$build_dir'
 
-    ln -nsf '$PWD/Makefile' '$PWD/checksums.mk' '$PWD/download' '$PWD/patches' .
-    rsync -aR --del '$PWD/./vendor/$platform' .
-
     make $MAKE_TASK ARCH=$arch
   "
 
   rsync -aR --del "$build_dir/./vendor/$platform" .
 done
 
-for vm in $(perl -pe "s/.*?'(.+?-.+?)'\s+=>\s+'.+?\/.+?'.*|.*/\$1/" Vagrantfile | uniq); do
-  passes-filter "$vm" || continue
-  header "$vm"
+if command -v docker &> /dev/null; then
+  container_tool="docker"
+elif command -v podman &> /dev/null; then
+  container_tool="podman"
+else
+  echo "neither docker nor podman found"
+  exit 1
+fi
 
-  if [[ -z "$NO_UP" ]]; then
-    vagrant status "$vm" | grep -q running || vagrant up "$vm"
-  fi
+container_build() {
+  vm=$1
+  image=$2
+
+  passes-filter "$vm" || return 0
+  header "$vm"
 
-  # create ssh config
-  ssh_config=".vagrant/ssh_config.$vm"
-  vagrant ssh-config "$vm" > "$ssh_config"
+  container_name="image_optim_pack-build-$vm"
+  workdir=/pack
 
-  # rsync needed files to the box
-  mkdir -p "vendor/$vm"
-  rsync -e "ssh -F $ssh_config" -aR --del Makefile checksums.mk download patches "vendor/$vm" "$vm:/vagrant"
+  if [[ -z "$NO_UP" ]]; then
+    status=$("$container_tool" inspect --format '{{.State.Status}}' "$container_name" 2>/dev/null || true)
+
+    if [[ "$status" == "" ]]; then
+      mount="./_path_:$workdir/_path_"
+
+      "$container_tool" \
+        container create \
+        --name="$container_name" \
+        --stop-signal SIGHUP \
+        -it \
+        -v "${mount//_path_/}:ro" \
+        -v "${mount//_path_/build/$vm}" \
+        -v "${mount//_path_/vendor/$vm}" \
+        --workdir "$workdir" \
+        "$image"
+
+      "$container_tool" container start "$container_name"
+
+      "$container_tool" exec -it "$container_name" bash -exc "
+        apt update
+        apt -y install make gcc g++ chrpath perl pkg-config autoconf automake libtool nasm cmake patch
+      "
+    fi
 
-  # sync time and run make
-  ssh -F "$ssh_config" "$vm" "
-    set -e
+    if [[ "$status" = @(created|exited) ]]; then
+      "$container_tool" container start "$container_name"
+    fi
 
-    sudo ntpdate pool.ntp.org
+    if [[ "$status" = @(created|exited|running) ]]; then
+      "$container_tool" exec -it "$container_name" bash -exc "
+        apt update
+        apt -y dist-upgrade
+        rustup update
+      "
+    fi
 
-    cd /vagrant
-    if make -v 2>&1 | grep -q GNU\ Make; then
-      make $MAKE_TASK
-    else
-      gmake $MAKE_TASK
+    if ! [[ "$status" = @(|created|exited|running) ]]; then
+      echo "unexpected status $status"
+      exit 1
     fi
+  fi
+
+  "$container_tool" exec -it "$container_name" bash -exc "
+    make $MAKE_TASK
   "
 
-  # rsync files in vendor from the box
-  rsync -e "ssh -F $ssh_config" -aR --del "$vm:/vagrant/./vendor/$vm" .
+  [[ -n "$NO_HALT" ]] || "$container_tool" container stop "$container_name"
+}
 
-  [[ -n "$NO_HALT" ]] || vagrant halt "$vm"
-done
+container_build linux-x86_64 rust:slim-buster

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_optim_pack
 version: !ruby/object:Gem::Version
-  version: 0.10.1.20240317
+  version: 0.11.1
 platform: x86_64-darwin
 authors:
 - Ivan Kuchin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-17 00:00:00.000000000 Z
+date: 2024-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: image_optim
@@ -112,7 +112,6 @@ files:
 - LICENSE.txt
 - Makefile
 - README.markdown
-- Vagrantfile
 - acknowledgements/7z.txt
 - acknowledgements/advancecomp.txt
 - acknowledgements/bmp2png.txt
@@ -139,13 +138,6 @@ files:
 - acknowledgements/zlib.txt
 - acknowledgements/zopfli-contributors.txt
 - acknowledgements/zopfli.txt
-- boxes/.gitignore
-- boxes/.rubocop.yml
-- boxes/Gemfile
-- boxes/Rakefile
-- boxes/definitions/centos-amd64/definition.rb
-- boxes/definitions/centos-amd64/ks.cfg
-- boxes/definitions/centos-postinstall.sh
 - checksums.mk
 - image_optim_pack-darwin-x86_64.gemspec
 - image_optim_pack-linux-x86_64.gemspec
@@ -181,7 +173,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.1.20240317
+  documentation_uri: https://www.rubydoc.info/gems/image_optim_pack/0.11.1
   source_code_uri: https://github.com/toy/image_optim_pack
 post_install_message:
 rdoc_options: []
@@ -202,7 +194,7 @@ rubygems_version: 3.5.5
 signing_key:
 specification_version: 4
 summary: 'Precompiled binaries for image_optim: advpng, gifsicle, jhead, jpeg-recompress,
-  jpegoptim, jpegtran, optipng, pngcrush, pngquant'
+  jpegoptim, jpegtran, optipng, oxipng, pngcrush, pngout, pngquant'
 test_files:
 - spec/image_optim/pack_spec.rb
 - spec/image_optim_spec.rb

data/Vagrantfile

@@ -1,61 +0,0 @@
-Vagrant.configure('2') do |config|
-  # don't mess with keys
-  config.ssh.insert_key = false
-
-  # doesn't make sense to check updates for local boxes
-  config.vm.box_check_update = false
-
-  # there are no guest additions
-  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
-  config.vm.synced_folder '.', '/vagrant', disabled: true
-
-  {
-    'linux-x86_64'  => 'boxes/centos-amd64.box',
-  }.each do |name, location|
-    config.vm.define name do |machine|
-      machine.vm.hostname = name.gsub('_', '-')
-      machine.vm.box = location
-
-      machine.vm.provision :shell, inline: <<-SH
-        if command -v apt-get; then
-          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 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 patch
-        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
-
-          if [ $(lsb_release -r | egrep -o '[0-9]+' | head -1) -lt 18 ]; then
-            do-release-upgrade -f DistUpgradeViewNonInteractive
-          fi
-        else
-          set -ex
-
-          yum -y update
-        fi
-      SH
-    end
-  end
-end

data/boxes/.gitignore

@@ -1,3 +0,0 @@
-/*.box
-/.env
-/iso/

data/boxes/.rubocop.yml

@@ -1,10 +0,0 @@
-inherit_from: ../.rubocop.yml
-
-Layout/LineLength:
-  Enabled: false
-
-Lint/RedundantSplatExpansion:
-  Enabled: false
-
-Security/Eval:
-  Exclude: [Rakefile]

data/boxes/Gemfile

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-
-gem 'rake'
-
-gem 'veewee', '= 0.4.5.1'
-
-gem 'net-scp'
-gem 'progressbar', '~> 0.21.0'

data/boxes/Rakefile

@@ -1,88 +0,0 @@
-# frozen_string_literal: true
-
-require 'pathname'
-
-class Box # :nodoc:
-  attr_reader :definition_path, :definition_dir, :name, :path, :groups
-
-  def initialize(definition_path)
-    @definition_path = Pathname(definition_path)
-    @definition_dir = @definition_path.dirname
-    @name = @definition_dir.basename.to_s
-    @path = Pathname("#{@name}.box")
-    parts = @name.split('-')
-    @groups = (1...parts.length).map{ |n| parts.take(n).join('-') }
-  end
-
-  def dependencies
-    postinstall_file_paths = Array(definition[:postinstall_files]).map do |path|
-      definition_dir + path
-    end
-    [definition_path] + postinstall_file_paths
-  end
-
-  def build
-    sh(*%W[veewee vbox build --auto --checksum --force --nogui #{name}])
-    sh(*%w[sleep 30])
-    sh(*%W[veewee vbox export --force #{name}])
-    sh(*%W[veewee vbox destroy #{name}])
-  end
-
-  def add
-    assert_box_created
-
-    sh(*%W[vagrant box add --force --name boxes/#{path} #{path}])
-  end
-
-private
-
-  def definition
-    @definition ||= eval definition_path.read.sub('Veewee::Session.declare', '{}.merge')
-  end
-
-  def assert_box_created
-    abort "#{path} doesn't exist" unless path.size?
-  end
-
-  def sh(*args)
-    abort unless system(*args)
-  end
-end
-
-Dir['definitions/*/definition.rb'].each do |definition_path|
-  box = Box.new(definition_path)
-
-  desc "build #{box.name} box"
-  file box.path => box.dependencies do
-    box.build
-  end
-
-  namespace :add do
-    desc "add #{box.name} box to vagrant"
-    task box.name => box.path do
-      box.add
-    end
-  end
-
-  box.groups.each do |group|
-    desc "build #{group} boxes"
-    task "build:#{group}" => box.path
-
-    desc "add #{group} boxes to vagrant"
-    task "add:#{group}" => "add:#{box.name}"
-  end
-
-  desc 'build all boxes'
-  task build: box.path
-
-  desc 'add all boxes to vagrant'
-  task add: "add:#{box.name}"
-end
-
-desc 'remove *.box and iso dir'
-task :clean do
-  sh 'rm *.box || true'
-  sh 'rm -r iso || true'
-end
-
-task default: :build

data/boxes/definitions/centos-amd64/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: '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,
-})

data/boxes/definitions/centos-amd64/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
-

data/boxes/definitions/centos-postinstall.sh

@@ -1,29 +0,0 @@
-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
-
-# Zero out the free space to save space in the final image
-dd if=/dev/zero of=/filler bs=1M || rm /filler