omnibus 7.0.34 → 8.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c40c81af2fa93ca8c9e87d9e49a37cef3ea8145355700490d0ad5ce1a71cd169
-  data.tar.gz: c31ffa9da067d89db43aaff9963408ed4f56150abeb295f4e0733787f001df13
+  metadata.gz: af0b9ab4b9d9903d007df7fe7ef6400f29c440f6de01c3c76f2fb18690f04001
+  data.tar.gz: aa35f665517e110e781329b7e97ea9ff154633fb25c80d274bae96d4f46a6bde
 SHA512:
-  metadata.gz: 8d309f0c4d0cb1e0ecc57dcd5aac4c21e5be7b4b71781e5a0c134a723721963e248c673b969398c5b6dd733cc0eabf18bcbb965d122f3b4f5b788634f98d522a
-  data.tar.gz: 5db4091ae7e877d04705089c14e8401816ca1ac8828c99e160b8161109892956c2f348dbf9cbca95f03414cd051e3240d58402867592892b2b20fcef464f20ab
+  metadata.gz: f8a052707df85029b1a29c3b55a24abd7f81d9b288707bc98512c1bc185c1f309c753d72e792dc68e814c67ccc06f059cddf1b16c593f913de68cfb356d8a903
+  data.tar.gz: 46626cb42cca8480b546bd4281b853bc2c5a51063350109cff57a2f51c766963be06737af5ff26f0610c9ac9b9d2cf53ba5ae6da5df5077901569baf2bd00bfb

data/README.md

@@ -2,7 +2,6 @@
 
 [![Gem Version](http://img.shields.io/gem/v/omnibus.svg)][gem]
 [![Build Status](https://badge.buildkite.com/446fd6049a9a5eeab50112aba117d3b7670ec085acb91f78dd.svg?branch=master)](https://buildkite.com/chef-oss/chef-omnibus-master-verify)
-[![AppVeyor Build Status](http://img.shields.io/appveyor/ci/chef/omnibus.svg?label=AppVeyor)][appveyor]
 
 **Umbrella Project**: [Chef Foundation](https://github.com/chef/chef-oss-practices/blob/master/projects/chef-foundation.md)
 
@@ -16,7 +15,6 @@ Easily create full-stack installers for your project across a variety of platfor
 
 Seth Chisamore and Christopher Maier of CHEF gave an introductory talk on Omnibus at ChefConf 2013, entitled **Eat the Whole Bowl: Building a Full-Stack Installer with Omnibus**:
 
-- [Video](http://www.youtube.com/watch?v=q8iJAntXCNY)
 - [Slides](https://speakerdeck.com/schisamo/eat-the-whole-bowl-building-a-full-stack-installer-with-omnibus)
 
 This project is managed by the CHEF Release Engineering team. For more information on the Release Engineering team's contribution, triage, and release process, please consult the [CHEF Release Engineering OSS Management Guide](https://docs.google.com/a/opscode.com/document/d/1oJB0vZb_3bl7_ZU2YMDBkMFdL-EWplW1BJv_FXTUOzg/edit).
@@ -196,6 +194,7 @@ DSL Method          | Description
 `patch`             | Apply a patch from disk
 `workers`           | The maximum number of builders
 `windows_safe_path` | Format the path to be safe for shelling out on Windows
+`go`                | Execute the code as the embedded Go
 `ruby`              | Execute the code as the embedded Ruby
 `gem`               | Execute the code as the embedded Rubygems
 `bundle`            | Execute the code as the embedded Bundler

data/lib/omnibus/builder.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -82,7 +82,7 @@ module Omnibus
       warn_for_shell_commands(command)
 
       build_commands << BuildCommand.new("Execute: `#{command}'") do
-        shellout!(command, options)
+        shellout!(command, **options)
       end
     end
     expose :command
@@ -248,7 +248,7 @@ module Omnibus
       patches << patch_path
       options[:in_msys_bash] = true
       build_commands << BuildCommand.new("Apply patch `#{source}'") do
-        shellout!(patch_cmd, options)
+        shellout!(patch_cmd, **options)
       end
     end
     expose :patch
@@ -296,6 +296,41 @@ module Omnibus
     # @!endgroup
     # --------------------------------------------------
 
+    #
+    # @!group Go DSL methods
+    #
+    # The following DSL methods are available from within build blocks and
+    # expose Go DSL methods.
+    # --------------------------------------------------
+
+    #
+    # Execute the given Go command or script against the embedded Go.
+    #
+    # @example
+    #   go 'build -o hello'
+    #
+    # @param (see #command)
+    # @return (see #command)
+    #
+    def go(command, options = {})
+      build_commands << BuildCommand.new("go `#{command}'") do
+        bin = windows? ? windows_safe_path("#{install_dir}/embedded/go/bin/go") : embedded_bin("go")
+
+        # Check if we are building a go binary and then check if we are on
+        # Red Hat or CentOS so we build the binary properly with a build-id
+        if command.start_with?("build", " build") && rhel?
+          command << " -ldflags=-linkmode=external"
+        end
+
+        shellout!("#{bin} #{command}", options)
+      end
+    end
+    expose :go
+
+    #
+    # @!endgroup
+    # --------------------------------------------------
+
     #
     # @!group Ruby DSL methods
     #
@@ -315,7 +350,7 @@ module Omnibus
     def ruby(command, options = {})
       build_commands << BuildCommand.new("ruby `#{command}'") do
         bin = embedded_bin("ruby")
-        shellout!("#{bin} #{command}", options)
+        shellout!("#{bin} #{command}", **options)
       end
     end
     expose :ruby
@@ -332,7 +367,7 @@ module Omnibus
     def gem(command, options = {})
       build_commands << BuildCommand.new("gem `#{command}'") do
         bin = embedded_bin("gem")
-        shellout!("#{bin} #{command}", options)
+        shellout!("#{bin} #{command}", **options)
       end
     end
     expose :gem
@@ -352,7 +387,7 @@ module Omnibus
     def bundle(command, options = {})
       build_commands << BuildCommand.new("bundle `#{command}'") do
         bin = embedded_bin("bundle")
-        shellout!("#{bin} #{command}", options)
+        shellout!("#{bin} #{command}", **options)
       end
     end
     expose :bundle
@@ -373,11 +408,16 @@ module Omnibus
     # @param (see #command)
     # @return (see #command)
     #
-    def appbundle(software_name, lockdir: nil, gem: nil, without: nil, extra_bin_files: nil , **options)
+    def appbundle(software_name, options = {})
       build_commands << BuildCommand.new("appbundle `#{software_name}'") do
         bin_dir            = "#{install_dir}/bin"
         appbundler_bin     = embedded_bin("appbundler")
 
+        lockdir = options.delete(:lockdir)
+        gem = options.delete(:gem)
+        without = options.delete(:without)
+        extra_bin_files = options.delete(:extra_bin_files)
+
         lockdir ||=
           begin
             app_software = project.softwares.find do |p|
@@ -425,7 +465,7 @@ module Omnibus
     def rake(command, options = {})
       build_commands << BuildCommand.new("rake `#{command}'") do
         bin = embedded_bin("rake")
-        shellout!("#{bin} #{command}", options)
+        shellout!("#{bin} #{command}", **options)
       end
     end
     expose :rake
@@ -535,7 +575,7 @@ module Omnibus
     def mkdir(directory, options = {})
       build_commands << BuildCommand.new("mkdir `#{directory}'") do
         Dir.chdir(software.project_dir) do
-          FileUtils.mkdir_p(directory, options)
+          FileUtils.mkdir_p(directory, **options)
         end
       end
     end
@@ -557,7 +597,7 @@ module Omnibus
           parent = File.dirname(file)
           FileUtils.mkdir_p(parent) unless File.directory?(parent)
 
-          FileUtils.touch(file, options)
+          FileUtils.touch(file, **options)
         end
       end
     end
@@ -578,7 +618,7 @@ module Omnibus
       build_commands << BuildCommand.new("delete `#{path}'") do
         Dir.chdir(software.project_dir) do
           FileSyncer.glob(path).each do |file|
-            FileUtils.rm_rf(file, options)
+            FileUtils.rm_rf(file, **options)
           end
         end
       end
@@ -629,7 +669,7 @@ module Omnibus
             log.warn(log_key) { "no matched files for glob #{command}" }
           else
             files.each do |file|
-              FileUtils.cp_r(file, destination, options)
+              FileUtils.cp_r(file, destination, **options)
             end
           end
         end
@@ -658,7 +698,7 @@ module Omnibus
             log.warn(log_key) { "no matched files for glob #{command}" }
           else
             files.each do |file|
-              FileUtils.mv(file, destination, options)
+              FileUtils.mv(file, destination, **options)
             end
           end
         end
@@ -683,14 +723,14 @@ module Omnibus
       build_commands << BuildCommand.new(command) do
         Dir.chdir(software.project_dir) do
           if options.delete(:unchecked)
-            FileUtils.ln_s(source, destination, options)
+            FileUtils.ln_s(source, destination, **options)
           else
             files = FileSyncer.glob(source)
             if files.empty?
               log.warn(log_key) { "no matched files for glob #{command}" }
             else
               files.each do |file|
-                FileUtils.ln_s(file, destination, options)
+                FileUtils.ln_s(file, destination, **options)
               end
             end
           end
@@ -711,7 +751,7 @@ module Omnibus
     def sync(source, destination, options = {})
       build_commands << BuildCommand.new("sync `#{source}' to `#{destination}'") do
         Dir.chdir(software.project_dir) do
-          FileSyncer.sync(source, destination, options)
+          FileSyncer.sync(source, destination, **options)
         end
       end
     end
@@ -868,7 +908,7 @@ module Omnibus
       options[:live_stream] ||= log.live_stream(:debug)
 
       # Use Util's shellout
-      super(command_string, options)
+      super(command_string, **options)
     end
 
     #

data/lib/omnibus/compressors/dmg.rb

@@ -259,8 +259,11 @@ module Omnibus
           sync
           hdiutil unmount "#{@device}"
           # Give some time to the system so unmount dmg
-          sleep 5
-          hdiutil detach "#{@device}" &&  \
+          ATTEMPTS=1
+          until [ $ATTEMPTS -eq 6 ] || hdiutil detach "#{@device}"; do
+            sleep 10
+            echo Attempt number $(( ATTEMPTS++ ))
+          done
           hdiutil convert \\
             "#{writable_dmg}" \\
             -format UDZO \\

data/lib/omnibus/manifest_diff.rb

@@ -25,28 +25,22 @@ module Omnibus
 
     def updated
       @updated ||=
-        begin
-          (first.entry_names & second.entry_names).collect do |name|
-            diff(first.entry_for(name), second.entry_for(name))
-          end.compact
-        end
+        (first.entry_names & second.entry_names).collect do |name|
+          diff(first.entry_for(name), second.entry_for(name))
+        end.compact
     end
 
     def removed
       @removed ||=
-        begin
-          (first.entry_names - second.entry_names).collect do |name|
-            removed_entry(first.entry_for(name))
-          end
+        (first.entry_names - second.entry_names).collect do |name|
+          removed_entry(first.entry_for(name))
         end
     end
 
     def added
       @added ||=
-        begin
-          (second.entry_names - first.entry_names).collect do |name|
-            new_entry(second.entry_for(name))
-          end
+        (second.entry_names - first.entry_names).collect do |name|
+          new_entry(second.entry_for(name))
         end
     end
 

data/lib/omnibus/metadata.rb

@@ -170,12 +170,16 @@ module Omnibus
       # rubocop:disable Lint/DuplicateCaseCondition
       def truncate_platform_version(platform_version, platform)
         case platform
-        when "centos", "debian", "el", "fedora", "freebsd", "omnios", "pidora", "raspbian", "rhel", "sles", "suse", "smartos"
+        when "centos", "cumulus", "debian", "el", "fedora", "freebsd", "omnios", "pidora", "raspbian", "rhel", "sles", "suse", "smartos"
           # Only want MAJOR (e.g. Debian 7, OmniOS r151006, SmartOS 20120809T221258Z)
           platform_version.split(".").first
-        when "aix", "alpine", "mac_os_x", "openbsd", "slackware", "solaris2", "opensuse", "opensuseleap", "ubuntu", "amazon"
-          # Only want MAJOR.MINOR (e.g. Mac OS X 10.9, Ubuntu 12.04)
+        when "aix", "alpine", "openbsd", "slackware", "solaris2", "opensuse", "opensuseleap", "ubuntu", "amazon"
+          # Only want MAJOR.MINOR (e.g. Ubuntu 12.04)
           platform_version.split(".")[0..1].join(".")
+        when "mac_os_x", "darwin", "macos"
+          # If running macOS >= 11, use only MAJOR version. Otherwise, use MAJOR.MINOR
+          pv_bits = platform_version.split(".")
+          pv_bits[0].to_i >= 11 ? pv_bits[0] : pv_bits[0..1].join(".")
         when "arch", "gentoo", "kali"
           # Arch Linux / Gentoo do not have a platform_version ohai attribute, they are rolling release (lsb_release -r)
           "rolling"

data/lib/omnibus/packager.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2014-2018 Chef Software, Inc.
+# Copyright 2014-2020, Chef Software Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -66,25 +66,16 @@ module Omnibus
       family = Ohai["platform_family"]
       version = Ohai["platform_version"]
 
-      if family == "solaris2" && Chef::Sugar::Constraints::Version.new(version).satisfies?(">= 5.11")
+      if family == "solaris2" && ChefUtils::VersionString.new(version).satisfies?(">= 5.11")
         family = "ips"
-      elsif family == "solaris2" && Chef::Sugar::Constraints::Version.new(version).satisfies?(">= 5.10")
+      elsif family == "solaris2" && ChefUtils::VersionString.new(version).satisfies?(">= 5.10")
         family = "solaris"
       end
       if klass = PLATFORM_PACKAGER_MAP[family]
-        package_types = klass.is_a?(Array) ? klass : [ klass ]
-
-        if package_types.include?(APPX) &&
-            !Chef::Sugar::Constraints::Version.new(version).satisfies?(">= 6.2")
-          log.warn(log_key) { "APPX generation is only supported on Windows versions 2012 and above" }
-          package_types -= [APPX]
-        end
-
-        package_types
+        klass.is_a?(Array) ? klass : [ klass ]
       else
         log.warn(log_key) do
-          "Could not determine packager for `#{family}', defaulting " \
-          "to `makeself'!"
+          "Could not determine packager for `#{family}`, defaulting to `makeself`!"
         end
         [Makeself]
       end

data/lib/omnibus/packagers/pkg.rb

@@ -125,7 +125,7 @@ module Omnibus
 
     # @see Base#package_name
     def package_name
-      "#{safe_base_package_name}-#{safe_version}-#{safe_build_iteration}.pkg"
+      "#{safe_base_package_name}-#{safe_version}-#{safe_build_iteration}.#{safe_architecture}.pkg"
     end
 
     #
@@ -286,6 +286,7 @@ module Omnibus
           identifier: safe_identifier,
           version: safe_version,
           component_pkg: component_pkg,
+          host_architecture: safe_architecture,
         })
     end
 
@@ -320,6 +321,15 @@ module Omnibus
       "#{safe_base_package_name}-core.pkg"
     end
 
+    #
+    # Return the architecture
+    #
+    # @return [String]
+    #
+    def safe_architecture
+      @safe_architecture ||= Ohai["kernel"]["machine"]
+    end
+
     #
     # Return the PKG-ready base package name, removing any invalid characters.
     #
@@ -424,7 +434,7 @@ module Omnibus
       is_binary = File.file?(bin) &&
         File.executable?(bin) &&
         !File.symlink?(bin)
-      log.debug(log_key) { "    removing from signing: #{bin}" } unless is_binary
+      log.debug(log_key) { "    removing non-binary file from signing: #{bin}" } unless is_binary
       is_binary
     end
 
@@ -434,9 +444,9 @@ module Omnibus
         command = "file #{lib}"
 
         stdout = shellout!(command).stdout
-        is_macho = stdout.match?(/Mach-O.*library/) || stdout.match?(/Mach-O.*bundle/)
+        is_macho = stdout.match?(/Mach-O.*(library|bundle)/)
       end
-      log.debug(log_key) { "    removing from signing: #{lib}" } unless is_macho
+      log.debug(log_key) { "    removing non-Mach-O library file from signing: #{lib}" } unless is_macho
       is_macho
     end
   end

data/lib/omnibus/packagers/rpm.rb

@@ -417,6 +417,10 @@ module Omnibus
       command << %{ -bb}
       command << %{ --buildroot #{staging_dir}/BUILD}
       command << %{ --define '_topdir #{staging_dir}'}
+      command << " #{spec_file}"
+
+      log.info(log_key) { "Creating .rpm file" }
+      shellout!("#{command}")
 
       if signing_passphrase
         log.info(log_key) { "Signing enabled for .rpm file" }
@@ -438,17 +442,18 @@ module Omnibus
             })
         end
 
-        command << " --sign"
-        command << " #{spec_file}"
-
+        sign_cmd = "rpmsign --addsign #{rpm_file}"
         with_rpm_signing do |signing_script|
-          log.info(log_key) { "Creating .rpm file" }
-          shellout!("#{signing_script} \"#{command}\"", environment: { "HOME" => home })
+          log.info(log_key) { "Signing the built rpm file" }
+
+          # RHEL 8 has gpg-agent running so we can skip the expect script since the agent
+          # takes care of the passphrase entering on the signing
+          if dist_tag != ".el8"
+            sign_cmd.prepend("#{signing_script} \"").concat("\"")
+          end
+
+          shellout!("#{sign_cmd}", environment: { "HOME" => home })
         end
-      else
-        log.info(log_key) { "Creating .rpm file" }
-        command << " #{spec_file}"
-        shellout!("#{command}")
       end
 
       FileSyncer.glob("#{staging_dir}/RPMS/**/*.rpm").each do |rpm|
@@ -483,6 +488,15 @@ module Omnibus
       "#{staging_dir}/SPECS/#{package_name}.spec"
     end
 
+    #
+    # The full path to the rpm file.
+    #
+    # @return [String]
+    #
+    def rpm_file
+      "#{staging_dir}/RPMS/#{safe_architecture}/#{package_name}"
+    end
+
     #
     # Render the rpm signing script with secure permissions, call the given
     # block with the path to the script, and ensure deletion of the script from

data/lib/omnibus/software.rb

@@ -525,7 +525,7 @@ module Omnibus
       return if final_version.nil?
 
       begin
-        Chef::Sugar::Constraints::Version.new(final_version)
+        ChefUtils::VersionString.new(final_version)
       rescue ArgumentError
         log.warn(log_key) do
           "Version #{final_version} for software #{name} was not parseable. " \
@@ -718,19 +718,8 @@ module Omnibus
             "CC" => "clang",
             "CXX" => "clang++",
             "LDFLAGS" => "-L#{install_dir}/embedded/lib",
-            "CFLAGS" => "-I#{install_dir}/embedded/include -O2 -D_FORTIFY_SOURCE=2 -fstack-protector",
+            "CFLAGS" => "-I#{install_dir}/embedded/include -O3 -D_FORTIFY_SOURCE=2 -fstack-protector",
           }
-        when "suse"
-          suse_flags = {
-            "LDFLAGS" => "-Wl,-rpath,#{install_dir}/embedded/lib -L#{install_dir}/embedded/lib",
-            "CFLAGS" => "-I#{install_dir}/embedded/include -O2 -D_FORTIFY_SOURCE=2 -fstack-protector",
-          }
-          # Enable gcc version 4.8 if it is available
-          if which("gcc-4.8") && platform_version.satisfies?("< 12")
-            suse_flags["CC"] = "gcc-4.8"
-            suse_flags["CXX"] = "g++-4.8"
-          end
-          suse_flags
         when "windows"
           arch_flag = windows_arch_i386? ? "-m32" : "-m64"
           opt_flag = windows_arch_i386? ? "-march=i686" : "-march=x86-64"
@@ -750,7 +739,7 @@ module Omnibus
         else
           {
             "LDFLAGS" => "-Wl,-rpath,#{install_dir}/embedded/lib -L#{install_dir}/embedded/lib",
-            "CFLAGS" => "-I#{install_dir}/embedded/include -O2 -D_FORTIFY_SOURCE=2 -fstack-protector",
+            "CFLAGS" => "-I#{install_dir}/embedded/include -O3 -D_FORTIFY_SOURCE=2 -fstack-protector",
           }
         end
 

data/lib/omnibus/sugarable.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2014-2018 Chef Software, Inc.
+# Copyright 2014-2020, Chef Software Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,31 +14,22 @@
 # limitations under the License.
 #
 
-require "chef/sugar/architecture"
-require "chef/sugar/cloud"
-require "chef/sugar/constraints"
-require "chef/sugar/ip"
-require "chef/sugar/init"
-require "chef/sugar/platform"
-require "chef/sugar/platform_family"
-require "chef/sugar/ruby"
-require "chef/sugar/shell"
-require "chef/sugar/vagrant"
+require "chef-utils" unless defined?(ChefUtils::CANARY)
 
 module Omnibus
   module Sugarable
     def self.extended(base)
-      base.send(:extend, Chef::Sugar::DSL)
+      base.send(:extend, ChefUtils)
       base.send(:extend, Omnibus::Sugar)
     end
 
     def self.included(base)
-      base.send(:include, Chef::Sugar::DSL)
+      base.send(:include, ChefUtils)
       base.send(:include, Omnibus::Sugar)
 
       if base < Cleanroom
         # Make all the "sugars" available in the cleanroom (DSL)
-        Chef::Sugar::DSL.instance_methods.each do |instance_method|
+        ChefUtils.instance_methods.each do |instance_method|
           base.send(:expose, instance_method)
         end
 

data/lib/omnibus/version.rb

@@ -15,5 +15,5 @@
 #
 
 module Omnibus
-  VERSION = "7.0.34".freeze
+  VERSION = "8.2.2".freeze
 end

data/lib/omnibus/whitelist.rb

@@ -162,6 +162,7 @@ MAC_WHITELIST_LIBS = [
   /libc\+\+\.1\.dylib/,
   /libzstd\.1\.dylib/,
   /Security/,
+  /SystemConfiguration/,
 ].freeze
 
 FREEBSD_WHITELIST_LIBS = [

data/omnibus.gemspec

@@ -21,22 +21,23 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency "aws-sdk-s3",       "~> 1"
-  gem.add_dependency "chef-sugar",       ">= 3.3"
+  gem.add_dependency "chef-utils",       ">= 15.4"
   gem.add_dependency "chef-cleanroom",   "~> 1.0"
   gem.add_dependency "ffi-yajl",         "~> 2.2"
   gem.add_dependency "mixlib-shellout",  ">= 2.0", "< 4.0"
-  gem.add_dependency "ohai",             ">= 15"
+  gem.add_dependency "ohai",             ">= 15", "< 17"
   gem.add_dependency "ruby-progressbar", "~> 1.7"
   gem.add_dependency "thor",             ">= 0.18", "< 2.0"
   gem.add_dependency "license_scout",    "~> 1.0"
+  gem.add_dependency "contracts",        ">= 0.16.0", "< 0.17.0"
 
   gem.add_dependency "mixlib-versioning"
   gem.add_dependency "pedump"
 
   gem.add_development_dependency "artifactory", "~> 3.0"
-  gem.add_development_dependency "aruba",       "~> 0.5"
-  gem.add_development_dependency "chefstyle",   "= 1.5.0"
-  gem.add_development_dependency "fauxhai",     ">= 5.2"
+  gem.add_development_dependency "aruba",       "~> 2.0"
+  gem.add_development_dependency "chefstyle",   "= 1.7.5"
+  gem.add_development_dependency "fauxhai-ng",  ">= 7.5"
   gem.add_development_dependency "rspec",       "~> 3.0"
   gem.add_development_dependency "rspec-json_expectations"
   gem.add_development_dependency "rspec-its"

data/resources/msi/source.wxs.erb

@@ -21,20 +21,12 @@
     <Media Id="1" Cabinet="Project.cab" EmbedCab="yes" CompressionLevel="high" />
 
     <!--
-      Take advantage of Windows Installer 5.0 feature (if available) to disable 
-      checkpointing and other costings that take significant amounts of time 
+      Take advantage of Windows Installer 5.0 feature (if available) to disable
+      checkpointing and other costings that take significant amounts of time
       ref: https://msdn.microsoft.com/en-us/library/windows/desktop/dd408005(v=vs.85).aspx
     -->
     <Property Id="MSIFASTINSTALL" Value="7" />
 
-    <!--
-      Uncomment launch condition below to check for minimum OS
-      601 = Windows 7/Server 2008R2.
-    -->
-    <!-- Condition Message="!(loc.MinimumOSVersionMessage)">
-      <![CDATA[Installed OR VersionNT >= 601]]>
-    </Condition -->
-
     <!-- We always do Major upgrades -->
     <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeErrorMessage)" />
 

data/resources/pkg/distribution.xml.erb

@@ -7,7 +7,7 @@
 
   <!-- Generated by productbuild - - synthesize -->
   <pkg-ref id="<%= identifier %>"/>
-  <options customize="never" require-scripts="false"/>
+  <options customize="never" require-scripts="false" hostArchitectures="<%= host_architecture %>" />
   <choices-outline>
     <line choice="default">
       <line choice="<%= identifier %>"/>

data/resources/rpm/spec.erb

@@ -8,8 +8,8 @@
 %define __spec_clean_post true
 %define __spec_clean_pre true
 
-# Use md5
-%define _binary_filedigest_algorithm 1
+# Use SHA256 checksums for all files
+%define _binary_filedigest_algorithm 8
 
 %define _binary_payload <%= compression %>
 

data/spec/functional/fetchers/net_fetcher_spec.rb

@@ -127,17 +127,8 @@ module Omnibus
         end
       end
 
-      context "when the source has read-only files" do
-        let(:source_url) { "http://dl.bintray.com/oneclick/OpenKnapsack/x86/openssl-1.0.0q-x86-windows.tar.lzma" }
-        let(:source_md5) { "577dbe528415c6f178a9431fd0554df4" }
-
-        it "extracts the asset without crashing" do
-          subject.clean
-          expect(extracted).to_not be_a_file
-          subject.clean
-          expect(extracted).to_not be_a_file
-        end
-      end
+      # we need to find a new test fixture because this one no longer exists
+      # context "when the source has read-only files"
 
       context "when the source has broken symlinks" do
         let(:source_url) { "http://www.openssl.org/source/openssl-1.0.1q.tar.gz" }

data/spec/unit/builder_spec.rb

@@ -39,6 +39,12 @@ module Omnibus
       end
     end
 
+    describe "#go" do
+      it "is a DSL method" do
+        expect(subject).to have_exposed_method(:go)
+      end
+    end
+
     describe "#ruby" do
       it "is a DSL method" do
         expect(subject).to have_exposed_method(:ruby)