omnibus-software 22.11.239 → 23.2.283

data/config/software/ruby.rb

@@ -60,6 +60,8 @@ version("2.6.8")      { source sha256: "1807b78577bc08596a390e8a41aede37b8512190
 version("2.6.7")      { source sha256: "e4227e8b7f65485ecb73397a83e0d09dcd39f25efd411c782b69424e55c7a99e" }
 
 source url: "https://cache.ruby-lang.org/pub/ruby/#{version.match(/^(\d+\.\d+)/)[0]}/ruby-#{version}.tar.gz"
+internal_source url: "#{ENV["ARTIFACTORY_REPO_URL"]}/#{name}/#{name}-#{version}.tar.gz",
+                authorization: "X-JFrog-Art-Api:#{ENV["ARTIFACTORY_TOKEN"]}"
 
 # In order to pass notarization we need to sign any binaries and libraries included in the package.
 # This makes sure we include and bins and libs that are brought in by gems.

data/config/software/runit.rb

@@ -27,7 +27,8 @@ version("2.1.2") { source sha256: "6fd0160cb0cf1207de4e66754b6d39750cff14bb0aa66
 version("2.1.1") { source sha256: "ffcf2d27b32f59ac14f2d4b0772a3eb80d9342685a2042b7fbbc472c07cf2a2c" }
 
 source url: "http://smarden.org/runit/runit-#{version}.tar.gz"
-
+internal_source url: "#{ENV["ARTIFACTORY_REPO_URL"]}/#{name}/#{name}-#{version}.tar.gz",
+           authorization: "X-JFrog-Art-Api:#{ENV["ARTIFACTORY_TOKEN"]}"
 relative_path "admin/runit-#{version}/src"
 
 build do

data/config/software/server-jre.rb

@@ -49,7 +49,8 @@ version "8u202" do
          cookie: license_cookie,
          warning: license_warning,
          unsafe:  true
-
+  internal_source url: "#{ENV["ARTIFACTORY_REPO_URL"]}/#{name}/#{name}-#{version}.tar.gz",
+         authorization: "X-JFrog-Art-Api:#{ENV["ARTIFACTORY_TOKEN"]}"
   relative_path "jdk1.8.0_202"
 end
 
@@ -60,7 +61,8 @@ version "8u162" do
          cookie: license_cookie,
          warning: license_warning,
          unsafe:  true
-
+  internal_source url: "#{ENV["ARTIFACTORY_REPO_URL"]}/#{name}/#{name}-#{version}.tar.gz",
+         authorization: "X-JFrog-Art-Api:#{ENV["ARTIFACTORY_TOKEN"]}"
   relative_path "jdk1.8.0_162"
 end
 
@@ -71,7 +73,8 @@ version "8u151" do
          cookie: license_cookie,
          warning: license_warning,
          unsafe:  true
-
+  internal_source url: "#{ENV["ARTIFACTORY_REPO_URL"]}/#{name}/#{name}-#{version}.tar.gz",
+         authorization: "X-JFrog-Art-Api:#{ENV["ARTIFACTORY_TOKEN"]}"
   relative_path "jdk1.8.0_151"
 end
 
@@ -82,7 +85,8 @@ version "8u144" do
          cookie: license_cookie,
          warning: license_warning,
          unsafe:  true
-
+  internal_source url: "#{ENV["ARTIFACTORY_REPO_URL"]}/#{name}/#{name}-#{version}.tar.gz",
+         authorization: "X-JFrog-Art-Api:#{ENV["ARTIFACTORY_TOKEN"]}"
   relative_path "jdk1.8.0_144"
 end
 
@@ -93,7 +97,8 @@ version "8u121" do
          cookie: license_cookie,
          warning: license_warning,
          unsafe:  true
-
+  internal_source url: "#{ENV["ARTIFACTORY_REPO_URL"]}/#{name}/#{name}-#{version}.tar.gz",
+         authorization: "X-JFrog-Art-Api:#{ENV["ARTIFACTORY_TOKEN"]}"
   relative_path "jdk1.8.0_121"
 end
 
@@ -104,7 +109,8 @@ version "8u111" do
          cookie: license_cookie,
          warning: license_warning,
          unsafe:  true
-
+  internal_source url: "#{ENV["ARTIFACTORY_REPO_URL"]}/#{name}/#{name}-#{version}.tar.gz",
+         authorization: "X-JFrog-Art-Api:#{ENV["ARTIFACTORY_TOKEN"]}"
   relative_path "jdk1.8.0_111"
 end
 
@@ -115,7 +121,8 @@ version "8u91" do
          cookie: license_cookie,
          warning: license_warning,
          unsafe:  true
-
+  internal_source url: "#{ENV["ARTIFACTORY_REPO_URL"]}/#{name}/#{name}-#{version}.tar.gz",
+         authorization: "X-JFrog-Art-Api:#{ENV["ARTIFACTORY_TOKEN"]}"
   relative_path "jdk1.8.0_91"
 end
 

data/config/software/server-open-jre.rb

@@ -43,6 +43,8 @@ version "11.0.17+8" do
   sha256: "752616097e09d7f60a3ad8bd312f90eaf50ac72577e55df229fe6e8091148f79",
   warning: license_warning,
   unsafe: true
+  internal_source url: "#{ENV["ARTIFACTORY_REPO_URL"]}/#{name}/#{name}-#{version}.tar.gz",
+           authorization: "X-JFrog-Art-Api:#{ENV["ARTIFACTORY_TOKEN"]}"
 end
 
 version "11.0.16.1+1" do
@@ -50,6 +52,8 @@ version "11.0.16.1+1" do
   sha256: "1ffe1a682e8179e35238bf3f93aba0cb185850e202c676f41d38cb0561883eda",
   warning: license_warning,
   unsafe: true
+  internal_source url: "#{ENV["ARTIFACTORY_REPO_URL"]}/#{name}/#{name}-#{version}.tar.gz",
+           authorization: "X-JFrog-Art-Api:#{ENV["ARTIFACTORY_TOKEN"]}"
 end
 
 version "11.0.15+10" do
@@ -57,6 +61,8 @@ version "11.0.15+10" do
   sha256: "22831fd097dfb39e844cb34f42064ff26a0ada9cd13621d7b8bca8e9b9d3a5ee",
   warning: license_warning,
   unsafe: true
+  internal_source url: "#{ENV["ARTIFACTORY_REPO_URL"]}/#{name}/#{name}-#{version}.tar.gz",
+           authorization: "X-JFrog-Art-Api:#{ENV["ARTIFACTORY_TOKEN"]}"
 end
 
 version "11.0.14.1+1" do
@@ -64,6 +70,8 @@ version "11.0.14.1+1" do
   sha256: "b5a6960bc6bb0b1a967e307f908ea9b06ad7adbbd9df0b8954ab51374faa8a98",
   warning: license_warning,
   unsafe: true
+  internal_source url: "#{ENV["ARTIFACTORY_REPO_URL"]}/#{name}/#{name}-#{version}.tar.gz",
+           authorization: "X-JFrog-Art-Api:#{ENV["ARTIFACTORY_TOKEN"]}"
 end
 
 version "11.0.13+8" do
@@ -71,6 +79,8 @@ version "11.0.13+8" do
   sha256: "fb0a27e6e1f26a1ee79daa92e4cfe3ec0d676acfe114d99dd84b3414f056e8a0",
   warning: license_warning,
   unsafe: true
+  internal_source url: "#{ENV["ARTIFACTORY_REPO_URL"]}/#{name}/#{name}-#{version}.tar.gz",
+           authorization: "X-JFrog-Art-Api:#{ENV["ARTIFACTORY_TOKEN"]}"
 end
 
 version "11.0.12+7" do
@@ -78,6 +88,8 @@ version "11.0.12+7" do
   sha256: "e813e270b7ea0a13f9c400ce5abd4cb811aacbd536b8909e6c7f0e346f78348c",
   warning: license_warning,
   unsafe: true
+  internal_source url: "#{ENV["ARTIFACTORY_REPO_URL"]}/#{name}/#{name}-#{version}.tar.gz",
+           authorization: "X-JFrog-Art-Api:#{ENV["ARTIFACTORY_TOKEN"]}"
 end
 
 version "11.0.11+9" do
@@ -85,6 +97,8 @@ version "11.0.11+9" do
   sha256: "144f2c6bcf64faa32016f2474b6c01031be75d25325e9c3097aed6589bc5d548",
   warning: license_warning,
   unsafe: true
+  internal_source url: "#{ENV["ARTIFACTORY_REPO_URL"]}/#{name}/#{name}-#{version}.tar.gz",
+           authorization: "X-JFrog-Art-Api:#{ENV["ARTIFACTORY_TOKEN"]}"
 end
 
 version "11.0.10+9" do
@@ -92,6 +106,8 @@ version "11.0.10+9" do
   sha256: "25fdcf9427095ac27c8bdfc82096ad2e615693a3f6ea06c700fca7ffb271131a",
   warning: license_warning,
   unsafe: true
+  internal_source url: "#{ENV["ARTIFACTORY_REPO_URL"]}/#{name}/#{name}-#{version}.tar.gz",
+           authorization: "X-JFrog-Art-Api:#{ENV["ARTIFACTORY_TOKEN"]}"
 end
 
 relative_path "jdk-#{version}-jre"

data/config/software/sqitch.rb

@@ -15,7 +15,7 @@
 #
 
 name "sqitch"
-default_version "1.3.0"
+default_version "1.3.1"
 
 license "MIT"
 license_file "https://raw.githubusercontent.com/theory/sqitch/master/README.md"
@@ -28,6 +28,7 @@ dependency "libintl-perl"
 
 # version_list: url=https://github.com/theory/#{name}/releases/download/v#{version}/ filter=app-sqitch-*.tar.gz
 
+version("1.3.1")  { source sha256: "f5e768d298cd4047ee2ae42319782e8c2cda312737bcbdbfaf580bd47efe8b94" }
 version("1.3.0")  { source sha256: "7d07635ec77a7faf3c50281c76ec833c68702f14470996cb2203a8bc6abc5bf2" }
 version("1.2.1")  { source sha256: "020835a13429effd8fda12d5627604ecf99293775918f4f8ba9ccc5ed796e5e7" }
 version("1.1.0")  { source sha256: "ee146cd75d6300837e6ca559bb0bde247d42123c96b2c5d4b2800f38d3e3d1ab" }
@@ -36,9 +37,13 @@ version("0.973")  { source sha256: "95fc7f18fff786c5d2579133e2e3ac56779e54bb3a06
 
 if version >= "1.1.0"
   source url: "https://github.com/theory/#{name}/releases/download/v#{version}/app-sqitch-v#{version}.tar.gz"
+  internal_source url: "#{ENV["ARTIFACTORY_REPO_URL"]}/#{name}/#{name}-#{version}.tar.gz",
+           authorization: "X-JFrog-Art-Api:#{ENV["ARTIFACTORY_TOKEN"]}"
   relative_path "App-Sqitch-v#{version}"
 else
   source url: "https://github.com/theory/#{name}/releases/download/v#{version}/app-sqitch-#{version}.tar.gz"
+  internal_source url: "#{ENV["ARTIFACTORY_REPO_URL"]}/#{name}/#{name}-#{version}.tar.gz",
+           authorization: "X-JFrog-Art-Api:#{ENV["ARTIFACTORY_TOKEN"]}"
   relative_path "App-Sqitch-#{version}"
 end
 

data/config/software/stunnel.rb

@@ -26,12 +26,14 @@ dependency "openssl"
 
 # version_list: url=https://www.stunnel.org/downloads/ filter=*.tar.gz
 
-if version < "5.65"
-  source url: "https://www.stunnel.org/archive/5.x/stunnel-#{version}.tar.gz"
-else
-  source url: "https://www.stunnel.org/downloads/stunnel-#{version}.tar.gz"
-end
+source url: "https://www.stunnel.org/archive/5.x/stunnel-#{version}.tar.gz"
+internal_source url: "#{ENV["ARTIFACTORY_REPO_URL"]}/#{name}/#{name}-#{version}.tar.gz",
+           authorization: "X-JFrog-Art-Api:#{ENV["ARTIFACTORY_TOKEN"]}"
+
 relative_path "stunnel-#{version}"
+
+version("5.67") { source sha256: "3086939ee6407516c59b0ba3fbf555338f9d52f459bcab6337c0f00e91ea8456" }
+version("5.66") { source sha256: "558178704d1aa5f6883aac6cc5d6bbf2a5714c8a0d2e91da0392468cee9f579c" }
 version("5.65") { source sha256: "60c500063bd1feff2877f5726e38278c086f96c178f03f09d264a2012d6bf7fc" }
 version("5.64") { source sha256: "eebe53ed116ba43b2e786762b0c2b91511e7b74857ad4765824e7199e6faf883" }
 version("5.63") { source sha256: "c74c4e15144a3ae34b8b890bb31c909207301490bd1e51bfaaa5ffeb0a994617" }
@@ -58,7 +60,7 @@ build do
     env["WIN32_SSL_DIR_PATCHED"] = "#{install_dir}/embedded"
 
     mingw = ENV["MSYSTEM"].downcase
-    target = (mingw == "mingw32" ? "mingw" : mingw)
+    target = (mingw == "mingw32" ? "mingw" : "mingw64")
     # Starting omnibus-toolchain version 1.1.115 we do not build msys2 as a part of omnibus-toolchain anymore, but pre install it in image
     # so here we set the path to default install of msys2 first and default to OMNIBUS_TOOLCHAIN_INSTALL_DIR for backward compatibility
     msys_path = ENV["MSYS2_INSTALL_DIR"] ? "#{ENV["MSYS2_INSTALL_DIR"]}" : "#{ENV["OMNIBUS_TOOLCHAIN_INSTALL_DIR"]}/embedded/bin"

data/config/software/util-macros.rb

@@ -24,6 +24,8 @@ version("1.19.0") { source sha256: "0d4df51b29023daf2f63aebf3ebc638ea88efedfd560
 version("1.18.0") { source sha256: "cf4ab0e17bfee0f7689cdcff8c7d7f164c9a710f851f91c488f5cd81fac9c0aa" }
 
 source url: "https://www.x.org/releases/individual/util/util-macros-#{version}.tar.gz"
+internal_source url: "#{ENV["ARTIFACTORY_REPO_URL"]}/#{name}/#{name}-#{version}.tar.gz",
+                authorization: "X-JFrog-Art-Api:#{ENV["ARTIFACTORY_TOKEN"]}"
 
 license "MIT"
 license_file "COPYING"

data/config/software/xproto.rb

@@ -24,7 +24,8 @@ version("7.0.28") { source sha256: "6cabc8ce3fa2b1a2427871167b62c24d5b08a58bd3e8
 version("7.0.25") { source sha256: "e3dc634103f923a2276289745eb7b702b18cfc885ea4b2382bd35a8cc3d935cb" }
 
 source url: "https://www.x.org/releases/individual/proto/xproto-#{version}.tar.gz"
-
+internal_source url: "#{ENV["ARTIFACTORY_REPO_URL"]}/#{name}/#{name}-#{version}.tar.gz",
+                authorization: "X-JFrog-Art-Api:#{ENV["ARTIFACTORY_TOKEN"]}"
 license "MIT"
 license_file "COPYING"
 skip_transitive_dependency_licensing true

data/config/software/zlib.rb

@@ -15,16 +15,19 @@
 #
 
 name "zlib"
-default_version "1.2.12"
+default_version "1.2.13"
 
 # version_list: url=https://zlib.net/fossils/ filter=*.tar.gz
 
+version("1.2.13") { source sha256: "b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30" }
 version("1.2.12") { source sha256: "91844808532e5ce316b3c010929493c0244f3d37593afd6de04f71821d5136d9" }
 version("1.2.11") { source sha256: "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1" }
 version("1.2.8")  { source sha256: "36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d" }
 version("1.2.6")  { source sha256: "21235e08552e6feba09ea5e8d750805b3391c62fb81c71a235c0044dc7a8a61b" }
 
 source url: "https://zlib.net/fossils/zlib-#{version}.tar.gz"
+internal_source url: "#{ENV["ARTIFACTORY_REPO_URL"]}/#{name}/#{name}-#{version}.tar.gz",
+                authorization: "X-JFrog-Art-Api:#{ENV["ARTIFACTORY_TOKEN"]}"
 
 license "Zlib"
 license_file "README"

data/scripts/internal_sources.rb

@@ -0,0 +1,78 @@
+#!/usr/bin/env ruby
+require "net/http"
+require "openssl"
+require "tmpdir"
+require "yaml"
+
+ARTIFACTORY_REPO_URL = ENV["ARTIFACTORY_REPO_URL"] || "https://artifactory-internal.ps.chef.co/artifactory/omnibus-software-local"
+ARTIFACTORY_PASSWORD = ENV["ARTIFACTORY_PASSWORD"]
+
+def print_usage
+  puts "Must provide path to internal_sources.yml file."
+  puts "Usage: ./internal_sources.rb <file path> [only]"
+  puts ""
+  puts "          <file path>: Path to an internal_sources.yml file."
+  puts "          [only]: (Optional) Name of software to upload. Skips all others."
+end
+
+def validate_checksum!(response, source)
+  if source.key?("sha256")
+    response.header["x-checksum-sha256"] == source["sha256"]
+  elsif source.key?("md5")
+    response.header["x-checksum-md5"]  == source["md5"]
+  elsif source.key?("sha1")
+    response.header["x-checksum-sha1"] == source["sha1"]
+  else
+    raise "Unknown checksum format supplied for '#{source["url"]}'"
+  end
+end
+
+def exists_in_artifactory?(name, source)
+  uri = URI(ARTIFACTORY_REPO_URL)
+  file_name = File.basename(source["url"])
+  dir_name = name
+  path = File.join(uri.path, dir_name, file_name)
+  http = Net::HTTP.new(uri.host, uri.port)
+  http.use_ssl = true
+  response = http.head(path)
+  validate_checksum!(response, source)
+end
+
+def maybe_upload(name, source)
+  unless exists_in_artifactory?(name, source)
+    Dir.mktmpdir do |dir|
+      puts "Downloading #{name} from #{source["url"]}"
+      raise "Failed to download" unless system("wget -q -P #{dir} #{source["url"]}")
+
+      file_name = File.basename(source["url"])
+      downloaded_file = File.join(dir, file_name)
+      repo_url = File.join(ARTIFACTORY_REPO_URL, name, file_name)
+      puts "Uploading #{downloaded_file} to #{repo_url}"
+      raise "Failed to upload" unless system("curl -s -H 'X-JFrog-Art-Api:#{ARTIFACTORY_PASSWORD}' -T '#{downloaded_file}' #{repo_url}")
+
+      puts ""
+    end
+  else
+    puts "#{File.basename(source["url"])} exists in artifactory already...skipping"
+  end
+end
+
+if ARGV.size < 1 || ARGV.size > 2
+  print_usage
+  exit(1)
+end
+
+file_path = ARGV[0]
+only = ARGV[1]
+
+unless File.exist?(file_path)
+  abort("File '#{file_path}' does not exist")
+end
+
+yaml = YAML.load_file file_path
+yaml["software"].each do |software|
+  next if only && software["name"] != only
+
+  name = software["name"]
+  software["sources"].each { |source| maybe_upload(name, source) }
+end