omnibus 8.3.2 → 9.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ead593d30d6adc565642ff443cce0b239294752253a6811d94f830160af190c
-  data.tar.gz: b75f1260a3b3acfb23bc31f9f376edb1be0799567d5623a2c33a3d350041468f
+  metadata.gz: 4c7c8bc84ab97c3a75715fc42df6d16ea4df3a301cc24fd6b6b096f65684790f
+  data.tar.gz: 70613619043bc015ad98e7748f4bf93ba6daad5c41eb41155bb817edd2e06d98
 SHA512:
-  metadata.gz: c403ea34e2b0352ed171abc7d329a797f36f1b8bd9d79c4bd2f4da1c3d5c187a9caa7bcad4fca8d7ab4577b9d3c079b05927fe872d145ccd0e2ffa1b9c302820
-  data.tar.gz: 3230fb144ca86a372f6de1e3e5fd21f1e9e0c72c95c2a8ef0194bca0b0f8437a7881d1de882666c9980d2a9c2ccaba371646ae69648eb6191d55266875d3258e
+  metadata.gz: 060c19bb8659c184104e6dd7e4a035ff6250098b555948202a5ecaaf11af00f94e9625c8a07aeb337ec9748c3a8e5b6c2e48edd866b85a582387dbe8db26f1df
+  data.tar.gz: fd7b52b9bf73774a0b42b3dc5bca7e367abce0660c64e1df1d26bb78b77b106e33f9e759c52caf526445392bcd52fc6f41fe3a54006aec055cce5a776b807d89

data/lib/omnibus/config.rb

@@ -601,6 +601,18 @@ module Omnibus
     # @return [true, false]
     default(:fatal_transitive_dependency_licensing_warnings, false)
 
+    # Fail the build when health check does not succeed. This may only be set to false
+    # for very specific use-cases in the omnibus project. e.g. creating a wrapper installer
+    #
+    # @return [true, false]
+    default(:health_check, true)
+
+    # Use the internal_source URL when fetching software dependencies. e.g. when creating an
+    # omnibus package using artifactory as the source url.
+    #
+    # @return [true, false]
+    default(:use_internal_sources, false)
+
     # --------------------------------------------------
     # @!endgroup
     #

data/lib/omnibus/exceptions.rb

@@ -351,4 +351,15 @@ module Omnibus
       EOH
     end
   end
+
+  class InternalSourceMissing < Error
+    def initialize(software)
+      super <<~EOH
+        Internal source missing for #{software.name}.
+
+        When :use_internal_sources is set in the configuration you must specify an
+        internal_source for sources fetched from a url.
+      EOH
+    end
+  end
 end

data/lib/omnibus/fetchers/net_fetcher.rb

@@ -147,6 +147,8 @@ module Omnibus
     def download_url
       if Config.use_s3_caching
         S3Cache.url_for(self)
+      elsif Config.use_internal_sources && !source[:internal]
+        raise InternalSourceMissing.new(self)
       else
         source[:url]
       end
@@ -212,7 +214,7 @@ module Omnibus
     #   :seven_zip - use 7zip for all tar/compressed tar files on windows.
     #   :lax_tar - use tar.exe on windows but ignore errors.
     #
-    # Both 7z and bsdtar have issues on windows.
+    # 7z has issues on windows.
     #
     # 7z cannot extract and untar at the same time. You need to extract to a
     # temporary location and then extract again into project_dir.
@@ -221,15 +223,6 @@ module Omnibus
     # location simply results in a text file with the target path written in
     # it. It does this without throwing any errors.
     #
-    # bsdtar will exit(1) if it is encounters symlinks on windows. So we can't
-    # use shellout! directly.
-    #
-    # bsdtar will also exit(1) and fail to overwrite files at the destination
-    # during extraction if a file already exists at the destination and is
-    # marked read-only. This used to be a problem when we weren't properly
-    # cleaning an existing project_dir. It should be less of a problem now...
-    # but who knows.
-    #
     def extract
       # Only used by tar
       compression_switch = ""
@@ -243,7 +236,7 @@ module Omnibus
           returns = [0]
           returns << 1 if source[:extract] == :lax_tar
 
-          shellout!("tar #{compression_switch}xf #{safe_downloaded_file} -C#{safe_project_dir}", returns: returns)
+          shellout!("tar #{compression_switch}xf #{downloaded_file} --force-local -C#{project_dir}", returns: returns)
         elsif downloaded_file.end_with?(*COMPRESSED_TAR_EXTENSIONS)
           Dir.mktmpdir do |temp_dir|
             log.debug(log_key) { "Temporarily extracting `#{safe_downloaded_file}' to `#{temp_dir}'" }

data/lib/omnibus/health_check.rb

@@ -64,6 +64,10 @@ module Omnibus
     #   if the healthchecks pass
     #
     def run!
+      unless Config.health_check
+        log.info(log_key) { "Health check skipped as specified in config for #{project.name}" }
+        return true
+      end
       measure("Health check time") do
         log.info(log_key) { "Running health on #{project.name}" }
         bad_libs, good_libs =
@@ -345,11 +349,16 @@ module Omnibus
       bad_libs = {}
       good_libs = {}
 
-      read_shared_libs("find #{project.install_dir}/ -type f | xargs file | grep \"ELF\" | awk -F: '{print $1}' | sed -e 's/:$//'", "xargs -n 1 ldd") do |line|
+      # The case/when below depends on the "current_library" being output with a : at the end
+      # and then the dependencies on subsequent lines in the form "library.so.1 => /lib/64/library.so.1"
+      # This output format only happens if ldd is passed multiple libraries (for Solaris, similar to Linux)
+      # FIXME if any of the `when` clauses in the `health_check_*` methods run before the `current_library`
+      # they probably should error out with an explicit callout of formatting with their environment's
+      # respective ldd parsing
+      read_shared_libs("find #{project.install_dir}/ -type f | xargs file | grep \"ELF\" | awk -F: '{print $1}' | sed -e 's/:$//'", "xargs ldd") do |line|
         case line
         when /^(.+):$/
           current_library = Regexp.last_match[1]
-          log.debug(log_key) { "Analyzing dependencies for #{current_library}" }
         when /^\s+(.+) \=\>\s+(.+)( \(.+\))?$/
           name = Regexp.last_match[1]
           linked = Regexp.last_match[2]

data/lib/omnibus/metadata.rb

@@ -218,7 +218,7 @@ module Omnibus
           # version is the same as Windows 2012R2. It's only here for completeness
           # and documentation.
           when /6\.3\.\d+/, "8.1" then "8.1"
-          when /^10\.0/ then "10"
+          when "10", /^10\.0/ then "10"
           else
             raise UnknownPlatformVersion.new(platform, platform_version)
           end

data/lib/omnibus/project.rb

@@ -179,7 +179,7 @@ module Omnibus
       if null?(val)
         @install_dir || raise(MissingRequiredAttribute.new(self, :install_dir, "/opt/chef"))
       else
-        @install_dir = val.tr('\\', "/").squeeze("/").chomp("/")
+        @install_dir = val.tr('\\', "/").squeeze("/").chomp("/") # rubocop:disable Style/StringLiterals
       end
     end
     expose :install_dir

data/lib/omnibus/software.rb

@@ -336,7 +336,7 @@ module Omnibus
         extra_keys = val.keys - [
           :git, :file, :path, :url, # fetcher types
           :md5, :sha1, :sha256, :sha512, # hash type - common to all fetchers
-          :cookie, :warning, :unsafe, :extract, :cached_name, :authorization, # used by net_fetcher
+          :cookie, :warning, :unsafe, :extract, :cached_name, :authorization, :internal, # used by net_fetcher
           :options, # used by path_fetcher
           :submodules # used by git_fetcher
         ]
@@ -351,8 +351,21 @@ module Omnibus
             "not include duplicate keys. Duplicate keys: #{duplicate_keys.inspect}")
         end
 
-        @source ||= {}
-        @source.merge!(val)
+        if Config.use_internal_sources && val[:url]
+          if internal_source_set? && val[:internal].nil?
+            # We only want to replace the hash types here
+            hash_types = %i{md5 sha1 sha256 sha512}
+            val.each_key do |key|
+              val.delete(key) unless hash_types.include?(key)
+            end
+          end
+
+          @source ||= {}
+          @source.merge!(val)
+        else
+          @source ||= {}
+          @source.merge!(val)
+        end
       end
 
       override = canonicalize_source(overrides[:source])
@@ -360,6 +373,22 @@ module Omnibus
     end
     expose :source
 
+    def internal_source_set?
+      @source && @source[:internal] == true
+    end
+
+    def internal_source(val = NULL)
+      unless val.is_a?(Hash)
+        raise InvalidValue.new(:internal_source,
+          "be a kind of `Hash', but was `#{val.class.inspect}'")
+      end
+      if Config.use_internal_sources
+        val[:internal] = true
+        source(val)
+      end
+    end
+    expose :internal_source
+
     #
     # Set or retrieve the {#default_version} of the software to build.
     #
@@ -717,7 +746,7 @@ module Omnibus
           {
             "CC" => "clang",
             "CXX" => "clang++",
-            "LDFLAGS" => "-L#{install_dir}/embedded/lib",
+            "LDFLAGS" => "-L#{install_dir}/embedded/lib -Wl,-rpath,#{install_dir}/embedded/lib",
             "CFLAGS" => "-I#{install_dir}/embedded/include -O3 -D_FORTIFY_SOURCE=2 -fstack-protector",
           }
         when "windows"

data/lib/omnibus/version.rb

@@ -15,5 +15,5 @@
 #
 
 module Omnibus
-  VERSION = "8.3.2".freeze
+  VERSION = "9.0.11".freeze
 end

data/lib/omnibus/whitelist.rb

@@ -88,11 +88,13 @@ OMNIOS_WHITELIST_LIBS = [
 SOLARIS_WHITELIST_LIBS = [
   /libaio\.so/,
   /libavl\.so/,
+  /libbsm\.so/,
   /libcrypt_[di]\.so/,
   /libcrypto.so/,
   /libcurses\.so/,
   /libdoor\.so/,
   /libgen\.so/,
+  /libinetutil\.so/,
   /libmd5\.so/,
   /libmd\.so/,
   /libmp\.so/,
@@ -102,9 +104,11 @@ SOLARIS_WHITELIST_LIBS = [
   /libsocket\.so/,
   /libssl.so/,
   /libthread.so/,
+  /libtsol\.so/,
   /libuutil\.so/,
   /libkstat\.so/,
   # solaris 11 libraries:
+  /libstdc\+\+\.so/,
   /libc\.so\.1/,
   /libm\.so\.2/,
   /libdl\.so\.1/,
@@ -173,6 +177,8 @@ MAC_WHITELIST_LIBS = [
 
 FREEBSD_WHITELIST_LIBS = [
   /libc\.so/,
+  /libc\+\+\.so/,
+  /libcxxrt\.so/,
   /libgcc_s\.so/,
   /libcrypt\.so/,
   /libm\.so/,

data/omnibus.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |gem|
   gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "aws-sdk-s3",       "~> 1"
+  gem.add_dependency "aws-sdk-s3",       "~> 1.116.0"
   gem.add_dependency "chef-utils",       ">= 15.4"
   gem.add_dependency "chef-cleanroom",   "~> 1.0"
   gem.add_dependency "ffi-yajl",         "~> 2.2"
@@ -30,13 +30,14 @@ Gem::Specification.new do |gem|
   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 "rexml",            "~> 3.2"
 
   gem.add_dependency "mixlib-versioning"
   gem.add_dependency "pedump"
 
   gem.add_development_dependency "artifactory", "~> 3.0"
   gem.add_development_dependency "aruba",       "~> 2.0"
-  gem.add_development_dependency "chefstyle",   "= 1.7.5"
+  gem.add_development_dependency "chefstyle",   "= 2.2.2"
   gem.add_development_dependency "fauxhai-ng",  ">= 7.5"
   gem.add_development_dependency "rspec",       "~> 3.0"
   gem.add_development_dependency "rspec-json_expectations"

data/spec/functional/builder_spec.rb

@@ -222,7 +222,7 @@ module Omnibus
         output = capture_logging { subject.build }
 
         appbundler_path = File.join(embedded_bin_dir, "appbundler")
-        appbundler_path.gsub!(%r{/}, '\\') if windows?
+        appbundler_path.gsub!(%r{/}, '\\') if windows? # rubocop:disable Style/StringLiterals
         expect(output).to include("#{appbundler_path} '#{project_dir}' '#{bin_dir}'")
       end
     end

data/spec/functional/fetchers/net_fetcher_spec.rb

@@ -173,6 +173,26 @@ module Omnibus
         end
       end
 
+      context "when use_internal_sources is true and no internal source url" do
+        before { Omnibus::Config.use_internal_sources(true) }
+
+        it "raises an exception" do
+          expect { fetch! }.to raise_error(InternalSourceMissing)
+        end
+      end
+
+      context "when use_internal_sources is true and internal source url given" do
+        before { Omnibus::Config.use_internal_sources(true) }
+        let(:source) do
+          { url: source_url, md5: source_md5, internal: true }
+        end
+
+        it "downloads the file" do
+          fetch!
+          expect(downloaded_file).to be_a_file
+        end
+      end
+
       context "source with sha1" do
         let(:source) do
           { url: source_url, sha1: source_sha1 }

data/spec/support/examples.rb

@@ -60,7 +60,7 @@ RSpec.shared_examples "a software" do |name = "chefdk"|
 
     allow(software).to receive(:embedded_bin) do |binary|
       p = File.join(embedded_bin_dir, binary)
-      p.gsub!(%r{/}, '\\') if windows?
+      p.gsub!(%r{/}, '\\') if windows? # rubocop:disable Style/StringLiterals
       p
     end
   end

data/spec/support/ohai_helpers.rb

@@ -14,7 +14,7 @@ module Omnibus
         # If we asked for Windows, we should also specify that magical
         # +File::ALT_SEPARATOR+ variable
         if options[:platform] && options[:platform] == "windows"
-          stub_const("File::ALT_SEPARATOR", '\\')
+          stub_const("File::ALT_SEPARATOR", '\\') # rubocop:disable Style/StringLiterals
         end
       end
     end

data/spec/unit/builder_spec.rb

@@ -23,7 +23,7 @@ module Omnibus
       allow(subject).to receive(:windows?).and_return(on_windows)
       allow(subject).to receive(:windows_safe_path) do |*args|
         path = File.join(*args)
-        path.gsub!(File::SEPARATOR, '\\') if on_windows
+        path.gsub!(File::SEPARATOR, '\\') if on_windows # rubocop:disable Style/StringLiterals
       end
     end
 
@@ -171,7 +171,7 @@ module Omnibus
       context "when :bin is present" do
         it "uses the custom bin" do
           expect(subject).to receive(:command)
-            .with("/path/to/make", in_msys_bash: true)
+            .with("/path/to/make", { in_msys_bash: true })
           subject.make(bin: "/path/to/make")
         end
       end
@@ -185,7 +185,7 @@ module Omnibus
 
         it "uses gmake and sets MAKE=gmake" do
           expect(subject).to receive(:command)
-            .with("gmake", env: { "MAKE" => "gmake" }, in_msys_bash: true)
+            .with("gmake", { env: { "MAKE" => "gmake" }, in_msys_bash: true } )
           subject.make
         end
       end
@@ -198,26 +198,26 @@ module Omnibus
 
         it "uses make" do
           expect(subject).to receive(:command)
-            .with("make", in_msys_bash: true)
+            .with("make", { in_msys_bash: true } )
           subject.make
         end
       end
 
       it "accepts 0 options" do
         expect(subject).to receive(:command)
-          .with("make", in_msys_bash: true)
+          .with("make", { in_msys_bash: true } )
         expect { subject.make }.to_not raise_error
       end
 
       it "accepts an additional command string" do
         expect(subject).to receive(:command)
-          .with("make install", in_msys_bash: true)
+          .with("make install", { in_msys_bash: true } )
         expect { subject.make("install") }.to_not raise_error
       end
 
       it "persists given options" do
         expect(subject).to receive(:command)
-          .with("make", timeout: 3600, in_msys_bash: true)
+          .with("make", { timeout: 3600, in_msys_bash: true } )
         subject.make(timeout: 3600)
       end
     end
@@ -242,7 +242,7 @@ module Omnibus
 
         it "appends platform host to the options" do
           expect(subject).to receive(:command)
-            .with("./configure --build=x86_64-w64-mingw32 --prefix=#{project_dir}/embedded", in_msys_bash: true)
+            .with("./configure --build=x86_64-w64-mingw32 --prefix=#{project_dir}/embedded", { in_msys_bash: true } )
           subject.configure
         end
       end
@@ -258,7 +258,7 @@ module Omnibus
 
         it "appends platform host to the options" do
           expect(subject).to receive(:command)
-            .with("./configure --build=i686-w64-mingw32 --prefix=#{project_dir}/embedded", in_msys_bash: true)
+            .with("./configure --build=i686-w64-mingw32 --prefix=#{project_dir}/embedded", { in_msys_bash: true } )
           subject.configure
         end
       end
@@ -266,7 +266,7 @@ module Omnibus
       context "when :bin is present" do
         it "uses the custom bin" do
           expect(subject).to receive(:command)
-            .with("/path/to/configure --prefix=#{project_dir}/embedded", in_msys_bash: true)
+            .with("/path/to/configure --prefix=#{project_dir}/embedded", { in_msys_bash: true } )
           subject.configure(bin: "/path/to/configure")
         end
       end
@@ -274,32 +274,32 @@ module Omnibus
       context "when :prefix is present" do
         it "emits non-empty prefix" do
           expect(subject).to receive(:command)
-            .with("./configure --prefix=/some/prefix", in_msys_bash: true)
+            .with("./configure --prefix=/some/prefix", { in_msys_bash: true } )
           subject.configure(prefix: "/some/prefix")
         end
 
         it "omits prefix if empty" do
           expect(subject).to receive(:command)
-            .with("./configure", in_msys_bash: true)
+            .with("./configure", { in_msys_bash: true } )
           subject.configure(prefix: "")
         end
       end
 
       it "accepts 0 options" do
         expect(subject).to receive(:command)
-          .with("./configure --prefix=#{project_dir}/embedded", in_msys_bash: true)
+          .with("./configure --prefix=#{project_dir}/embedded", { in_msys_bash: true } )
         expect { subject.configure }.to_not raise_error
       end
 
       it "accepts an additional command string" do
         expect(subject).to receive(:command)
-          .with("./configure --prefix=#{project_dir}/embedded --myopt", in_msys_bash: true)
+          .with("./configure --prefix=#{project_dir}/embedded --myopt", { in_msys_bash: true } )
         expect { subject.configure("--myopt") }.to_not raise_error
       end
 
       it "persists given options" do
         expect(subject).to receive(:command)
-          .with("./configure --prefix=#{project_dir}/embedded", timeout: 3600, in_msys_bash: true)
+          .with("./configure --prefix=#{project_dir}/embedded", { timeout: 3600, in_msys_bash: true } )
         subject.configure(timeout: 3600)
       end
     end
@@ -321,28 +321,28 @@ module Omnibus
       it "invokes patch with patch level 1 unless specified" do
         expect { subject.patch(source: "good_patch") }.to_not raise_error
         expect(subject).to receive(:shellout!)
-          .with("patch -p1 -i #{project_dir}/patch_location2/good_patch", in_msys_bash: true)
+          .with("patch -p1 -i #{project_dir}/patch_location2/good_patch", { in_msys_bash: true } )
         run_build_command
       end
 
       it "invokes patch with patch level provided" do
         expect { subject.patch(source: "good_patch", plevel: 0) }.to_not raise_error
         expect(subject).to receive(:shellout!)
-          .with("patch -p0 -i #{project_dir}/patch_location2/good_patch", in_msys_bash: true)
+          .with("patch -p0 -i #{project_dir}/patch_location2/good_patch", { in_msys_bash: true } )
         run_build_command
       end
 
       it "invokes patch differently if target is provided" do
         expect { subject.patch(source: "good_patch", target: "target/path") }.to_not raise_error
         expect(subject).to receive(:shellout!)
-          .with("cat #{project_dir}/patch_location2/good_patch | patch -p1 target/path", in_msys_bash: true)
+          .with("cat #{project_dir}/patch_location2/good_patch | patch -p1 target/path", { in_msys_bash: true } )
         run_build_command
       end
 
       it "persists other options" do
         expect { subject.patch(source: "good_patch", timeout: 3600) }.to_not raise_error
         expect(subject).to receive(:shellout!)
-          .with("patch -p1 -i #{project_dir}/patch_location2/good_patch", timeout: 3600, in_msys_bash: true)
+          .with("patch -p1 -i #{project_dir}/patch_location2/good_patch", { timeout: 3600, in_msys_bash: true } )
         run_build_command
       end
     end

data/spec/unit/config_spec.rb

@@ -45,6 +45,7 @@ module Omnibus
     include_examples "a configurable", :fetcher_read_timeout, 60
     include_examples "a configurable", :fetcher_retries, 5
     include_examples "a configurable", :fatal_licensing_warnings, false
+    include_examples "a configurable", :health_check, true
     include_examples "a configurable", :fips_mode, false
 
     describe "#workers" do

data/spec/unit/fetchers/net_fetcher_spec.rb

@@ -421,19 +421,19 @@ module Omnibus
           it_behaves_like "an extractor", "zip", {},
             ['7z.exe x C:\\file.zip -oC:\\tmp\\project -r -y']
           it_behaves_like "an extractor", "tar", {},
-            [['tar xf C:\\file.tar -CC:\\tmp\\project', { returns: [0] }]]
+            [["tar xf C:/file.tar --force-local -CC:/tmp/project", { returns: [0] }]]
           it_behaves_like "an extractor", "tgz", {},
-            [['tar zxf C:\\file.tgz -CC:\\tmp\\project', { returns: [0] }]]
+            [["tar zxf C:/file.tgz --force-local -CC:/tmp/project", { returns: [0] }]]
           it_behaves_like "an extractor", "tar.gz", {},
-            [['tar zxf C:\\file.tar.gz -CC:\\tmp\\project', { returns: [0] }]]
+            [["tar zxf C:/file.tar.gz --force-local -CC:/tmp/project", { returns: [0] }]]
           it_behaves_like "an extractor", "tar.bz2", {},
-            [['tar jxf C:\\file.tar.bz2 -CC:\\tmp\\project', { returns: [0] }]]
+            [["tar jxf C:/file.tar.bz2 --force-local -CC:/tmp/project", { returns: [0] }]]
           it_behaves_like "an extractor", "txz", {},
-            [['tar Jxf C:\\file.txz -CC:\\tmp\\project', { returns: [0] }]]
+            [["tar Jxf C:/file.txz --force-local -CC:/tmp/project", { returns: [0] }]]
           it_behaves_like "an extractor", "tar.xz", {},
-            [['tar Jxf C:\\file.tar.xz -CC:\\tmp\\project', { returns: [0] }]]
+            [["tar Jxf C:/file.tar.xz --force-local -CC:/tmp/project", { returns: [0] }]]
           it_behaves_like "an extractor", "tar.lzma", {},
-            [['tar --lzma -xf C:\\file.tar.lzma -CC:\\tmp\\project', { returns: [0] }]]
+            [["tar --lzma -xf C:/file.tar.lzma --force-local -CC:/tmp/project", { returns: [0] }]]
         end
 
         context "when seven_zip extract strategy is chosen" do
@@ -469,19 +469,19 @@ module Omnibus
           it_behaves_like "an extractor", "zip", { extract: :lax_tar },
             ['7z.exe x C:\\file.zip -oC:\\tmp\\project -r -y']
           it_behaves_like "an extractor", "tar", { extract: :lax_tar },
-            [['tar xf C:\\file.tar -CC:\\tmp\\project', { returns: [0, 1] }]]
+            [["tar xf C:/file.tar --force-local -CC:/tmp/project", { returns: [0, 1] }]]
           it_behaves_like "an extractor", "tgz", { extract: :lax_tar },
-            [['tar zxf C:\\file.tgz -CC:\\tmp\\project', { returns: [0, 1] }]]
+            [["tar zxf C:/file.tgz --force-local -CC:/tmp/project", { returns: [0, 1] }]]
           it_behaves_like "an extractor", "tar.gz", { extract: :lax_tar },
-            [['tar zxf C:\\file.tar.gz -CC:\\tmp\\project', { returns: [0, 1] }]]
+            [["tar zxf C:/file.tar.gz --force-local -CC:/tmp/project", { returns: [0, 1] }]]
           it_behaves_like "an extractor", "tar.bz2", { extract: :lax_tar },
-            [['tar jxf C:\\file.tar.bz2 -CC:\\tmp\\project', { returns: [0, 1] }]]
+            [["tar jxf C:/file.tar.bz2 --force-local -CC:/tmp/project", { returns: [0, 1] }]]
           it_behaves_like "an extractor", "txz", { extract: :lax_tar },
-            [['tar Jxf C:\\file.txz -CC:\\tmp\\project', { returns: [0, 1] }]]
+            [["tar Jxf C:/file.txz --force-local -CC:/tmp/project", { returns: [0, 1] }]]
           it_behaves_like "an extractor", "tar.xz", { extract: :lax_tar },
-            [['tar Jxf C:\\file.tar.xz -CC:\\tmp\\project', { returns: [0, 1] }]]
+            [["tar Jxf C:/file.tar.xz --force-local -CC:/tmp/project", { returns: [0, 1] }]]
           it_behaves_like "an extractor", "tar.lzma", { extract: :lax_tar },
-            [['tar --lzma -xf C:\\file.tar.lzma -CC:\\tmp\\project', { returns: [0, 1] }]]
+            [["tar --lzma -xf C:/file.tar.lzma --force-local -CC:/tmp/project", { returns: [0, 1] }]]
         end
       end
 

data/spec/unit/project_spec.rb

@@ -229,7 +229,7 @@ module Omnibus
 
       context "when on Windows" do
         before { stub_ohai(platform: "windows", version: "2019") }
-        before { stub_const("File::ALT_SEPARATOR", '\\') }
+        before { stub_const("File::ALT_SEPARATOR", '\\') } # rubocop:disable Style/StringLiterals
         it "returns a Windows iteration" do
           expect(subject.build_iteration).to eq(1)
         end

data/spec/unit/software_spec.rb

@@ -16,10 +16,18 @@ module Omnibus
       }
     end
 
+    let(:internal_source) do
+      {
+        url: "http://internal.com/",
+        md5: "efgh5678",
+      }
+    end
+
     let(:rel_path) { "software" }
 
     subject do
       local_source = source
+      local_internal_source = internal_source
       local_rel_path = rel_path
 
       described_class.new(project).evaluate do
@@ -27,6 +35,7 @@ module Omnibus
         default_version "1.2.3"
 
         source local_source
+        internal_source local_internal_source
         relative_path local_rel_path
       end
     end
@@ -239,7 +248,7 @@ module Omnibus
             "CXXFLAGS"  => "-I/opt/project/embedded/include -O3 -D_FORTIFY_SOURCE=2 -fstack-protector",
             "CPPFLAGS"  => "-I/opt/project/embedded/include -O3 -D_FORTIFY_SOURCE=2 -fstack-protector",
             "CXX" => "clang++",
-            "LDFLAGS" => "-L/opt/project/embedded/lib",
+            "LDFLAGS" => "-L/opt/project/embedded/lib -Wl,-rpath,/opt/project/embedded/lib",
             "LD_RUN_PATH" => "/opt/project/embedded/lib",
             "PKG_CONFIG_PATH" => "/opt/project/embedded/lib/pkgconfig",
             "OMNIBUS_INSTALL_DIR" => "/opt/project"
@@ -543,7 +552,7 @@ module Omnibus
 
       it "fetches from a fully expanded git path" do
         expect(subject.source).to eq(git: "https://github.com/chef/ohai.git")
-        expect(Omnibus::Fetcher).to receive(:resolve_version).with("1.2.3", git: "https://github.com/chef/ohai.git").and_return("1.2.8")
+        expect(Omnibus::Fetcher).to receive(:resolve_version).with("1.2.3", { git: "https://github.com/chef/ohai.git" } ).and_return("1.2.8")
         subject.send(:fetcher)
       end
 
@@ -552,7 +561,7 @@ module Omnibus
 
         it "fetches from the override path" do
           expect(subject.source).to eq(git: "https://blah.com/git.git")
-          expect(Omnibus::Fetcher).to receive(:resolve_version).with("1.2.3", git: "https://blah.com/git.git").and_return("1.2.8")
+          expect(Omnibus::Fetcher).to receive(:resolve_version).with("1.2.3", { git: "https://blah.com/git.git" } ).and_return("1.2.8")
           subject.send(:fetcher)
         end
       end
@@ -562,7 +571,7 @@ module Omnibus
 
         it "fetches from the override path" do
           expect(subject.source).to eq(git: "https://github.com/a/b.git")
-          expect(Omnibus::Fetcher).to receive(:resolve_version).with("1.2.3", git: "https://github.com/a/b.git").and_return("1.2.8")
+          expect(Omnibus::Fetcher).to receive(:resolve_version).with("1.2.3", { git: "https://github.com/a/b.git" } ).and_return("1.2.8")
           subject.send(:fetcher)
         end
       end
@@ -577,7 +586,7 @@ module Omnibus
 
       it "fetches from the git spec" do
         expect(subject.source).to eq(git: "https://blah.com/git.git")
-        expect(Omnibus::Fetcher).to receive(:resolve_version).with("1.2.3", git: "https://blah.com/git.git").and_return("1.2.8")
+        expect(Omnibus::Fetcher).to receive(:resolve_version).with("1.2.3", { git: "https://blah.com/git.git" } ).and_return("1.2.8")
         subject.send(:fetcher)
       end
 
@@ -586,12 +595,20 @@ module Omnibus
 
         it "fetches from the override path" do
           expect(subject.source).to eq(git: "https://github.com/a/b.git")
-          expect(Omnibus::Fetcher).to receive(:resolve_version).with("1.2.3", git: "https://github.com/a/b.git").and_return("1.2.8")
+          expect(Omnibus::Fetcher).to receive(:resolve_version).with("1.2.3", { git: "https://github.com/a/b.git" } ).and_return("1.2.8")
           subject.send(:fetcher)
         end
       end
     end
 
+    context "when software internal_source is given" do
+      before { Omnibus::Config.use_internal_sources(true) }
+
+      it "sets the source with internal: true" do
+        expect(subject.source).to eq(url: "http://internal.com/", md5: "efgh5678", internal: true)
+      end
+    end
+
     describe "#fetcher" do
       before do
         expect(Omnibus::Fetcher).to receive(:resolve_version).with("1.2.3", source).and_return("1.2.8")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omnibus
 version: !ruby/object:Gem::Version
-  version: 8.3.2
+  version: 9.0.11
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-15 00:00:00.000000000 Z
+date: 2022-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: 1.116.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: 1.116.0
 - !ruby/object:Gem::Dependency
   name: chef-utils
   requirement: !ruby/object:Gem::Requirement
@@ -174,6 +174,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 0.17.0
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: mixlib-versioning
   requirement: !ruby/object:Gem::Requirement
@@ -236,14 +250,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.5
+        version: 2.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.5
+        version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: fauxhai-ng
   requirement: !ruby/object:Gem::Requirement