omnibus 7.0.13 → 8.1.15

data/lib/omnibus/git_cache.rb

@@ -14,8 +14,8 @@
 # limitations under the License.
 #
 
-require "digest"
-require "fileutils"
+require "digest" unless defined?(Digest)
+require "fileutils" unless defined?(FileUtils)
 
 module Omnibus
   class GitCache

data/lib/omnibus/health_check.rb

@@ -428,6 +428,8 @@ module Omnibus
                          ARCH_WHITELIST_LIBS
                        when "mac_os_x"
                          MAC_WHITELIST_LIBS
+                       when "omnios"
+                         OMNIOS_WHITELIST_LIBS
                        when "solaris2"
                          SOLARIS_WHITELIST_LIBS
                        when "smartos"

data/lib/omnibus/licensing.rb

@@ -14,8 +14,8 @@
 # limitations under the License.
 #
 
-require "uri"
-require "fileutils"
+require "uri" unless defined?(URI)
+require "fileutils" unless defined?(FileUtils)
 require "omnibus/download_helpers"
 require "license_scout/collector"
 require "license_scout/reporter"

data/lib/omnibus/logger.rb

@@ -17,7 +17,7 @@
 module Omnibus
   class Logger
 
-    require "time"
+    require "time" unless defined?(Time.zone_offset)
 
     #
     # The amount of padding on the left column.

data/lib/omnibus/manifest.rb

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 
 module Omnibus
   class Manifest

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

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 
 module Omnibus
   class Metadata
@@ -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/ohai.rb

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require "ohai"
+require "ohai" unless defined?(Ohai::System)
 
 module Omnibus
   class Ohai

data/lib/omnibus/package.rb

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 
 module Omnibus
   class Package

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.
@@ -46,6 +46,7 @@ module Omnibus
       "amazon" => RPM,
       "aix" => BFF,
       "solaris" => Solaris,
+      "omnios" => IPS,
       "ips" => IPS,
       "windows" => [MSI, APPX],
       "mac_os_x" => PKG,
@@ -65,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/base.rb

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require "fileutils"
+require "fileutils" unless defined?(FileUtils)
 
 module Omnibus
   class Packager::Base

data/lib/omnibus/packagers/msi.rb

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require "pathname"
+require "pathname" unless defined?(Pathname)
 require "omnibus/packagers/windows_base"
 
 module Omnibus

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/packagers/solaris.rb

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require "socket"
+require "socket" unless defined?(Socket)
 
 module Omnibus
   class Packager::Solaris < Packager::Base

data/lib/omnibus/project.rb

@@ -15,8 +15,8 @@
 # limitations under the License.
 #
 
-require "time"
-require "ffi_yajl"
+require "time" unless defined?(Time.zone_offset)
+require "ffi_yajl" unless defined?(FFI_Yajl)
 require "omnibus/manifest"
 require "omnibus/manifest_entry"
 require "omnibus/reports"

data/lib/omnibus/publishers/artifactory_publisher.rb

@@ -14,8 +14,8 @@
 # limitations under the License.
 #
 
-require "uri"
-require "benchmark"
+require "uri" unless defined?(URI)
+require "benchmark" unless defined?(Benchmark)
 
 module Omnibus
   class ArtifactoryPublisher < Publisher

data/lib/omnibus/s3_cache.rb

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require "fileutils"
+require "fileutils" unless defined?(FileUtils)
 require "omnibus/s3_helpers"
 
 module Omnibus

data/lib/omnibus/s3_helpers.rb

@@ -17,7 +17,7 @@
 require "aws-sdk-s3"
 require "aws-sdk-core/credentials"
 require "aws-sdk-core/shared_credentials"
-require "base64"
+require "base64" unless defined?(Base64)
 
 module Omnibus
   module S3Helpers

data/lib/omnibus/software.rb

@@ -14,8 +14,8 @@
 # limitations under the License.
 #
 
-require "fileutils"
-require "uri"
+require "fileutils" unless defined?(FileUtils)
+require "uri" unless defined?(URI)
 require "omnibus/manifest_entry"
 
 module Omnibus
@@ -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