omnibus-software 23.2.281 → 23.6.291

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36bf57f73432072fe0c722468defd598aaa523287a7c9a69536e16a07aa4b8c0
-  data.tar.gz: 2a4920d441619c76333085932d6aa5f0bc5b6638867d799aa2628e4b74a5fdb8
+  metadata.gz: da1f323d0ca318625d978c23b0594bce43125a5b41fee09ce116c56f1f551113
+  data.tar.gz: 95b8d2f10a30e19df8265b7f4609c719a0d24402c855846b0b45e6d128e9f02d
 SHA512:
-  metadata.gz: 8628faec6137dac6ccd700f7ae5ae321505daecd9116b1647cd50bc48ed06443e651ba93793f81644603568a186267e1e7963bac2a074bfa4cc2e2add8b6b6ce
-  data.tar.gz: a23467ed12d1ee71a38b475821c9cd3f03014cf41e67604341de3bca8962b105d2ba0c9488ad722bbf7b81a3f59a84bf05ed1c28bebb41368a443610ca69523b
+  metadata.gz: d3051479e3df52bb4b7372414455e744b88bdbaaa7d6b5b11dcd86438c35c9f1f93136e635bb20a55e716f7f07c00e5f571ec1046166dcf3db7b5f6fb67d082e
+  data.tar.gz: 8bde105e20967381cf64cf371d3c96cc6034fa5da1cacb9653a0d82a26eb0a9b4897f58ab16fcc99528fd4e6c539f7b6c88df79de26edf3f3774aa4a07122ec5

data/.buildkite/hooks/pre-command

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+set -eu
+
+if [[ $BUILDKITE_ORGANIZATION_SLUG != "chef-oss" ]]; then
+  export VAULT_ADDR="https://vault.ps.chef.co"
+  export VAULT_TOKEN=$(vault login -method=aws -path=aws/private-cd -token-only header_value=vault.ps.chef.co role=ci)
+  export ARTIFACTORY_PASSWORD=$(vault kv get -field password account/static/artifactory/buildkite)
+fi

data/.expeditor/Version_inspector/prod_default_version.json

@@ -91,7 +91,7 @@
 "rust-uninstall": "0.0.1" ,
 "rust": "1.37.0" ,
 "sequel-gem": "4.47.0" ,
-"server-open-jre": "11.0.16.1+1" ,
+"server-open-jre": "11.0.18+10" ,
 "setuptools": "0.7.7" ,
 "shebang-cleanup": "0.0.2" ,
 "sqitch": "1.3.0" ,

data/.expeditor/software_upload.pipeline.yml

@@ -1,13 +1,17 @@
 ---
 steps:
 - label: ":file_folder: upload software to internal sources"
-  command: export PATH=/opt/omnibus-toolchain/bin/:$PATH && ./scripts/internal_sources.rb ./scripts/internal_sources.yml
-  expeditor:
-    executor:
-      docker:
-        image: chefes/omnibus-toolchain-ubuntu-2204-x86
-    secrets:
-      ARTIFACTORY_TOKEN:
-        path: account/static/artifactory/buildkite
-        field: token
-
+  agents:
+    queue: default
+  plugins:
+  - docker#v3.5.0:
+      image: chefes/omnibus-toolchain-ubuntu-2204-x86
+      shell:
+      - "/bin/bash"
+      - "-e"
+      - "-c"
+      propagate-environment: true
+  commands:
+  - export PATH=/opt/omnibus-toolchain/bin/:/app/bin:/usr/local/bundle/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+    && ./scripts/internal_sources.rb ./scripts/internal_sources.yml
+  timeout_in_minutes: 20

data/CHANGELOG.md

@@ -3,8 +3,12 @@
 <!-- latest_release -->
 <!-- latest_release -->
 
-<!-- release_rollup -->
+<!-- release_rollup since=23.2.283 -->
+### Changes since 23.2.283 release
 <!-- release_rollup -->
 
 <!-- latest_stable_release -->
+## [23.2.283](https://github.com/chef/omnibus-software/tree/23.2.283) (2023-02-20)
 <!-- latest_stable_release -->
+
+## [23.2.281](https://github.com/chef/omnibus-software/tree/23.2.281) (2023-02-06)

data/VERSION

@@ -1 +1 @@
-23.2.281
+23.6.291

data/config/patches/ruby/ruby-3.0.5-configure.patch

@@ -0,0 +1,260 @@
+diff -ur ruby-3.0.1/configure.ac ruby-3.0.1-patched/configure.ac
+--- ruby-3.0.1/configure.ac	2021-04-05 05:33:42.000000000 -0700
++++ ruby-3.0.1-patched/configure.ac	2021-04-09 12:42:35.578174106 -0700
+@@ -544,11 +544,16 @@
+     rpathflag=`echo "$RPATHFLAG" | sed 's/%.*//'`
+ ])
+ 
+-RUBY_TRY_CFLAGS(-fdeclspec, [
+-  RUBY_APPEND_OPTIONS(CC, -fdeclspec)
+-  RUBY_APPEND_OPTIONS(MJIT_CC, -fdeclspec)
++RUBY_TRY_LDFLAGS(-fdeclspec, [fdeclspec=yes], [fdeclspec=no])
++AS_IF([test "$fdeclspec" = yes], [
++    RUBY_APPEND_OPTIONS(CFLAGS, -fdeclspec)
++    RUBY_APPEND_OPTIONS(cflags, -fdeclspec)
++    RUBY_APPEND_OPTIONS(orig_cflags, -fdeclspec)
++])
++RUBY_TRY_CXXFLAGS(-fdeclspec, [fdeclspec=yes], [fdeclspec=no])
++AS_IF([test "$fdeclspec" = yes], [
++    RUBY_APPEND_OPTIONS(CXXFLAGS, -fdeclspec)
+ ])
+-RUBY_TRY_CXXFLAGS(-fdeclspec, [RUBY_APPEND_OPTIONS(CXX, -fdeclspec)])
+ 
+ AS_CASE([$RUBY_PATCHLEVEL], [-*],
+ 	[RUBY_DEVEL=yes], [RUBY_DEVEL=no])
+@@ -1494,7 +1499,9 @@
+ 	AC_DEFINE_UNQUOTED([RUBY_ALIAS_FUNCTION_VOID(prot, name, args)],
+ 			   [RUBY_ALIAS_FUNCTION_TYPE(void, prot, name, args)])
+     ])
++])
+ 
++{
+     AC_CACHE_CHECK([for __atomic builtins], [rb_cv_gcc_atomic_builtins], [
+ 	AC_TRY_LINK([unsigned int atomic_var;],
+ 		    [
+@@ -1525,7 +1532,6 @@
+     AS_IF([test "$rb_cv_gcc_sync_builtins" = yes], [
+ 	AC_DEFINE(HAVE_GCC_SYNC_BUILTINS)
+     ])
+-])
+ 
+     AC_CACHE_CHECK(for __builtin_unreachable, rb_cv_func___builtin_unreachable,
+     [RUBY_WERROR_FLAG(
+@@ -1538,6 +1544,7 @@
+     AS_IF([test "$rb_cv_func___builtin_unreachable" = yes], [
+ 	AC_DEFINE_UNQUOTED(UNREACHABLE, [__builtin_unreachable()])
+     ])
++}
+ 
+ AC_CACHE_CHECK(for exported function attribute, rb_cv_func_exported, [
+ rb_cv_func_exported=no
+diff -ur ruby-3.0.1/template/Makefile.in ruby-3.0.1-patched/template/Makefile.in
+--- ruby-3.0.1/template/Makefile.in	2021-04-05 05:33:42.000000000 -0700
++++ ruby-3.0.1-patched/template/Makefile.in	2021-04-09 12:42:35.579834751 -0700
+@@ -75,7 +75,7 @@
+ CC_VERSION = @CC_VERSION@
+ OUTFLAG = @OUTFLAG@$(empty)
+ COUTFLAG = @COUTFLAG@$(empty)
+-CPPOUTFLAG = $(COUTFLAG)
++CPPOUTFLAG = >
+ ARCH_FLAG = @ARCH_FLAG@
+ CFLAGS_NO_ARCH = @CFLAGS@
+ CFLAGS = $(CFLAGS_NO_ARCH) $(ARCH_FLAG)
+diff -ur ruby-3.0.5/configure configure
+--- ruby-3.0.5/configure	2022-11-24 12:04:58
++++ configure	2022-12-05 14:06:03
+@@ -10384,6 +10384,8 @@
+ fi
+ 
+ 
++    save_LDFLAGS="$LDFLAGS"
++    LDFLAGS="$LDFLAGS -fdeclspec"
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -fdeclspec is accepted as CFLAGS" >&5
+ printf %s "checking whether -fdeclspec is accepted as CFLAGS... " >&6; }
+     save_CFLAGS="$CFLAGS"
+@@ -10400,7 +10402,6 @@
+ fi
+ ac_c_werror_flag=yes
+ 
+-    CFLAGS="$CFLAGS -fdeclspec"
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -10412,56 +10413,72 @@
+   return 0;
+ }
+ _ACEOF
+-if ac_fn_c_try_compile "$LINENO"
++if ac_fn_c_try_link "$LINENO"; then :
++  fdeclspec=yes
++  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++  printf "%s\n" "${msg_result_yes}yes${msg_reset}" >&6 ; }
++else $as_nop
++  fdeclspec=no
++  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
++  printf "%s\n" "${msg_result_no}no${msg_reset}" >&6 ; }
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext conftest.beam
++
++CFLAGS="$save_CFLAGS"
++save_CFLAGS=
++if test "${rb_c_werror_flag+set}"
+ then :
+ 
+-  # RUBY_APPEND_OPTIONS(CC)
++  ac_c_werror_flag="$rb_c_werror_flag"
++
++else $as_nop
++
++  unset ac_c_werror_flag
++
++fi
++    LDFLAGS="$save_LDFLAGS"
++    save_LDFLAGS=
++
++if test "$fdeclspec" = yes; then :
++
++    # RUBY_APPEND_OPTIONS(CFLAGS)
+ 	for rb_opt in -fdeclspec; do
+-	case " ${CC-} " in #(
++	case " ${CFLAGS-} " in #(
+   *" ${rb_opt} "*) :
+      ;; #(
+   '  ') :
+-     CC="${rb_opt}" ;; #(
++     CFLAGS="${rb_opt}" ;; #(
+   *) :
+-     CC="$CC ${rb_opt}" ;;
++     CFLAGS="$CFLAGS ${rb_opt}" ;;
+ esac
+ 	done
+-  # RUBY_APPEND_OPTIONS(MJIT_CC)
++    # RUBY_APPEND_OPTIONS(cflags)
+ 	for rb_opt in -fdeclspec; do
+-	case " ${MJIT_CC-} " in #(
++	case " ${cflags-} " in #(
+   *" ${rb_opt} "*) :
+      ;; #(
+   '  ') :
+-     MJIT_CC="${rb_opt}" ;; #(
++     cflags="${rb_opt}" ;; #(
+   *) :
+-     MJIT_CC="$MJIT_CC ${rb_opt}" ;;
++     cflags="$cflags ${rb_opt}" ;;
+ esac
+ 	done
++    # RUBY_APPEND_OPTIONS(orig_cflags)
++	for rb_opt in -fdeclspec; do
++	case " ${orig_cflags-} " in #(
++  *" ${rb_opt} "*) :
++     ;; #(
++  '  ') :
++     orig_cflags="${rb_opt}" ;; #(
++  *) :
++     orig_cflags="$orig_cflags ${rb_opt}" ;;
++esac
++	done
+ 
+-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-    printf "%s\n" "${msg_result_yes}yes${msg_reset}" >&6 ; }
+-else $as_nop
+-
+-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-    printf "%s\n" "${msg_result_no}no${msg_reset}" >&6 ; }
+ fi
+-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+ 
+-CFLAGS="$save_CFLAGS"
+-save_CFLAGS=
+-if test "${rb_c_werror_flag+set}"
+-then :
+ 
+-  ac_c_werror_flag="$rb_c_werror_flag"
+-
+-else $as_nop
+-
+-  unset ac_c_werror_flag
+-
+-fi
+-
+-
+-
+     save_CXXFLAGS="$CXXFLAGS"
+     CXXFLAGS="$CXXFLAGS -fdeclspec"
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -fdeclspec is accepted as CXXFLAGS" >&5
+@@ -10499,21 +10516,11 @@
+ _ACEOF
+ if ac_fn_cxx_try_link "$LINENO"
+ then :
+-  # RUBY_APPEND_OPTIONS(CXX)
+-	for rb_opt in -fdeclspec; do
+-	case " ${CXX-} " in #(
+-  *" ${rb_opt} "*) :
+-     ;; #(
+-  '  ') :
+-     CXX="${rb_opt}" ;; #(
+-  *) :
+-     CXX="$CXX ${rb_opt}" ;;
+-esac
+-	done
++  fdeclspec=yes
+ 	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+     printf "%s\n" "${msg_result_yes}yes${msg_reset}" >&6 ; }
+ else $as_nop
+-
++  fdeclspec=no
+ 	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+     printf "%s\n" "${msg_result_no}no${msg_reset}" >&6 ; }
+ fi
+@@ -10541,7 +10548,22 @@
+     CXXFLAGS="$save_CXXFLAGS"
+     save_CXXFLAGS=
+ 
++if test "$fdeclspec" = yes; then :
+ 
++    # RUBY_APPEND_OPTIONS(CXXFLAGS)
++	for rb_opt in -fdeclspec; do
++	case " ${CXXFLAGS-} " in #(
++  *" ${rb_opt} "*) :
++     ;; #(
++  '  ') :
++     CXXFLAGS="${rb_opt}" ;; #(
++  *) :
++     CXXFLAGS="$CXXFLAGS ${rb_opt}" ;;
++esac
++	done
++
++fi
++
+ case $RUBY_PATCHLEVEL in #(
+   -*) :
+     RUBY_DEVEL=yes ;; #(
+@@ -20529,6 +20551,9 @@
+ 
+ fi
+ 
++fi
++
++{
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __atomic builtins" >&5
+ printf %s "checking for __atomic builtins... " >&6; }
+ if test ${rb_cv_gcc_atomic_builtins+y}
+@@ -20616,8 +20641,6 @@
+ 
+ fi
+ 
+-fi
+-
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_unreachable" >&5
+ printf %s "checking for __builtin_unreachable... " >&6; }
+ if test ${rb_cv_func___builtin_unreachable+y}
+@@ -20680,6 +20703,7 @@
+ 
+ 
+ fi
++}
+ 
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for exported function attribute" >&5
+ printf %s "checking for exported function attribute... " >&6; }
+

data/config/software/cpanminus.rb

@@ -31,7 +31,8 @@ version("1.7040") { source sha256: "48a747c040689445f7db0edd169da0abd709a37cfece
 version("1.7004") { source sha256: "5cef499d12418a877c68070fc14193bd700d47a286d95e16c517f9673493af79" }
 
 source url: "https://github.com/miyagawa/cpanminus/archive/#{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 "cpanminus-#{version}"
 
 build do

data/config/software/elasticsearch.rb

@@ -24,6 +24,8 @@ license_file "LICENSE.txt"
 skip_transitive_dependency_licensing true
 
 source url: "https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-#{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 "elasticsearch-#{version}"
 
 version "5.6.16" do
@@ -33,11 +35,15 @@ end
 version "6.8.22" do
   source url: "https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-#{version}.tar.gz",
          sha256: "836a50df324a98837dcadbc7d55782cc9525f15cc6a8aa0c657e199667ebb996"
+  internal_source url: "#{ENV["ARTIFACTORY_REPO_URL"]}/#{name}/#{name}-#{version}.tar.gz",
+         authorization: "X-JFrog-Art-Api:#{ENV["ARTIFACTORY_TOKEN"]}"
 end
 
 version "6.8.23" do
   source url: "https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-#{version}.tar.gz",
          sha256: "60e77b5ca3ce11771469bcc2e009c49c8aadb831faebd170e7abcedc16b3e36d"
+  internal_source url: "#{ENV["ARTIFACTORY_REPO_URL"]}/#{name}/#{name}-#{version}.tar.gz",
+         authorization: "X-JFrog-Art-Api:#{ENV["ARTIFACTORY_TOKEN"]}"
 end
 
 target_path = "#{install_dir}/embedded/elasticsearch"

data/config/software/erlang.rb

@@ -28,6 +28,8 @@ dependency "config_guess"
 
 # grab from github so we can get patch releases if we need to
 source url: "https://github.com/erlang/otp/archive/OTP-#{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 "otp-OTP-#{version}"
 
 # versions_list: https://github.com/erlang/otp/tags filter=*.tar.gz

data/config/software/gecode.rb

@@ -32,6 +32,8 @@ version("5.1.0") { source sha256: "77863f4638c6b77d24a29bf6aeac370c56cd808fe9aab
 version("4.4.0") { source sha256: "ca261c6c876950191d4ec2f277e5bfee1c3eae8a81af9b5c970d9b0c2930db37" }
 
 source url: "https://github.com/Gecode/gecode/archive/refs/tags/release-#{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 "gecode-release-#{version}"
 

data/config/software/gmp.rb

@@ -24,6 +24,8 @@ version("6.1.0")  { source sha256: "498449a994efeba527885c10405993427995d3f86b87
 version("6.0.0a") { source sha256: "7f8e9a804b9c6d07164cf754207be838ece1219425d64e28cfa3e70d5c759aaf" }
 
 source url: "https://ftp.gnu.org/gnu/gmp/gmp-#{version}.tar.bz2"
+internal_source url: "#{ENV["ARTIFACTORY_REPO_URL"]}/#{name}/#{name}-#{version}.tar.bz2",
+                authorization: "X-JFrog-Art-Api:#{ENV["ARTIFACTORY_TOKEN"]}"
 
 if version == "6.0.0a"
   # version 6.0.0a expands to 6.0.0

data/config/software/go.rb

@@ -108,6 +108,8 @@ else
 end
 
 source url: "https://dl.google.com/go/go#{version}.%{platform}-%{arch}.%{ext}" % { platform: platform, arch: arch, ext: ext }
+internal_source url: "#{ENV["ARTIFACTORY_REPO_URL"]}/#{name}/#{name}-#{version}.%{platform}-%{arch}.%{ext}",
+                authorization: "X-JFrog-Art-Api:#{ENV["ARTIFACTORY_TOKEN"]}"
 
 build do
   # We do not use 'sync' since we've found multiple errors with other software definitions

data/config/software/libintl-perl.rb

@@ -45,6 +45,8 @@ version("1.32") { source sha256: "80108298f2564ecbfc7110a3042008e665ed00c2e155b3
 version("1.23") { source sha256: "60da16356c2fa89a0c542c825d626c8c2811202b6002b56d8574b928a1379ffa" }
 
 source url: "https://search.cpan.org/CPAN/authors/id/G/GU/GUIDO/libintl-perl-#{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 "libintl-perl-#{version}"
 

data/config/software/libossp-uuid.rb

@@ -29,6 +29,8 @@ version("1.6.2") { source sha256: "11a615225baa5f8bb686824423f50e4427acd3f70d394
 
 # ftp on ftp.ossp.org is unavaiable so we must use another mirror site.
 source url: "https://www.mirrorservice.org/sites/ftp.ossp.org/pkg/lib/uuid/uuid-#{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 "uuid-#{version}"
 

data/config/software/libsodium.rb

@@ -29,6 +29,8 @@ version("1.0.17") { source sha256: "0cc3dae33e642cc187b5ceb467e0ad0e1b51dcba577d
 version("1.0.18") { source sha256: "6f504490b342a4f8a4c4a02fc9b866cbef8622d5df4e5452b46be121e46636c1" }
 
 source url: "https://download.libsodium.org/libsodium/releases/libsodium-#{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 "libsodium-#{version}"
 

data/config/software/libuuid.rb

@@ -23,7 +23,6 @@ license "LGPL-2.1"
 license_file "COPYING"
 
 source url: "https://www.kernel.org/pub/linux/utils/util-linux/v#{version}/util-linux-#{version}.tar.gz"
-
 # We use the version in util-linux, and only build the libuuid subdirectory
 version "2.27.1" do
   source md5: "e9c73747eadf5201b2a198530add4f87",

data/config/software/libxslt.rb

@@ -15,7 +15,7 @@
 #
 
 name "libxslt"
-default_version "1.1.37"
+default_version "1.1.35"
 
 license "MIT"
 license_file "COPYING"

data/config/software/logrotate.rb

@@ -24,6 +24,8 @@ skip_transitive_dependency_licensing true
 dependency "popt"
 
 source url: "https://github.com/logrotate/logrotate/archive/#{version}.tar.gz"
+internal_source url: "#{ENV["ARTIFACTORY_REPO_URL"]}/#{name}/#{name}-#{version}.tar.gz",
+                authorization: "X-JFrog-Art-Api:#{ENV["ARTIFACTORY_TOKEN"]}"
 
 # versions_list: https://github.com/logrotate/logrotate/tags filter=*.tar.gz
 

data/config/software/lua.rb

@@ -29,6 +29,8 @@ license_file "https://www.lua.org/license.html"
 skip_transitive_dependency_licensing true
 
 source url: "https://www.lua.org/ftp/lua-#{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 "lua-#{version}"
 

data/config/software/mpc.rb

@@ -31,6 +31,8 @@ version("1.2.1") { source sha256: "17503d2c395dfcf106b622dc142683c1199431d095367
 version("1.1.0") { source sha256: "6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e" }
 
 source url: "https://ftp.gnu.org/gnu/mpc/mpc-#{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 "mpc-#{version}"
 

data/config/software/mpfr.rb

@@ -31,6 +31,8 @@ version("3.1.3") { source sha256: "b87feae279e6da95a0b45eabdb04f3a35422dab0d3011
 version("3.1.2") { source sha256: "176043ec07f55cd02e91ee3219db141d87807b322179388413a9523292d2ee85" }
 
 source url: "https://ftp.gnu.org/gnu/mpfr/mpfr-#{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 "mpfr-#{version}"
 

data/config/software/nginx.rb

@@ -26,6 +26,8 @@ license "BSD-2-Clause"
 license_file "LICENSE"
 
 source url: "https://nginx.org/download/nginx-#{version}.tar.gz"
+internal_source url: "#{ENV["ARTIFACTORY_REPO_URL"]}/#{name}/#{name}-#{version}.tar.gz",
+                authorization: "X-JFrog-Art-Api:#{ENV["ARTIFACTORY_TOKEN"]}"
 
 # versions_list: https://nginx.org/download/ filter=*.tar.gz
 version("1.21.4") { source sha256: "d1f72f474e71bcaaf465dcc7e6f7b6a4705e4b1ed95c581af31df697551f3bfe" }

data/config/software/nodejs-binary.rb

@@ -82,6 +82,9 @@ arch_ext = if ppc64le?
            end
 
 source url: "https://nodejs.org/dist/v#{version}/node-v#{version}-linux-#{arch_ext}.tar.gz"
+internal_source url: "#{ENV["ARTIFACTORY_REPO_URL"]}/#{name}/#{name}-#{version}.tar.gz",
+                authorization: "X-JFrog-Art-Api:#{ENV["ARTIFACTORY_TOKEN"]}"
+
 relative_path "node-v#{version}-linux-#{arch_ext}"
 
 build do

data/config/software/openresty.rb

@@ -37,6 +37,8 @@ version("1.13.6.2")    { source sha256: "946e1958273032db43833982e2cec0766154a9b
 version("1.11.2.5")    { source sha256: "f8cc203e8c0fcd69676f65506a3417097fc445f57820aa8e92d7888d8ad657b9" }
 
 source url: "https://openresty.org/download/openresty-#{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 "openresty-#{version}"
 

data/config/software/opensearch.rb

@@ -23,6 +23,8 @@ license_file "LICENSE.txt"
 skip_transitive_dependency_licensing true
 
 source url: "https://artifacts.opensearch.org/releases/bundle/opensearch/#{version}/opensearch-#{version}-linux-x64.tar.gz"
+internal_source url: "#{ENV["ARTIFACTORY_REPO_URL"]}/#{name}/#{name}-#{version}.tar.gz",
+                authorization: "X-JFrog-Art-Api:#{ENV["ARTIFACTORY_TOKEN"]}"
 relative_path "opensearch-#{version}"
 
 # versions_list:https://opensearch.org/docs/latest/version-history/

data/config/software/openssl.rb

@@ -23,7 +23,7 @@ skip_transitive_dependency_licensing true
 dependency "cacerts"
 dependency "openssl-fips" if fips_mode?
 
-default_version "1.0.2zb" # do_not_auto_update
+default_version "1.0.2zg" # do_not_auto_update
 
 # Openssl builds engines as libraries into a special directory. We need to include
 # that directory in lib_dirs so omnibus can sign them during macOS deep signing.
@@ -52,11 +52,13 @@ version("3.0.5")   { source sha256: "aa7d8d9bef71ad6525c55ba11e5f4397889ce49c2c9
 version("3.0.4")   { source sha256: "2831843e9a668a0ab478e7020ad63d2d65e51f72977472dc73efcefbafc0c00f" }
 version("3.0.3")   { source sha256: "ee0078adcef1de5f003c62c80cc96527721609c6f3bb42b7795df31f8b558c0b" }
 version("3.0.1")   { source sha256: "c311ad853353bce796edad01a862c50a8a587f62e7e2100ef465ab53ec9b06d1" } # only ruby 3.1 supports openssl-3.0.1
+version("1.1.1t")  { source sha256: "8dee9b24bdb1dcbf0c3d1e9b02fb8f6bf22165e807f45adeb7c9677536859d3b" }
 version("1.1.1q")  { source sha256: "d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca" }
 version("1.1.1p")  { source sha256: "bf61b62aaa66c7c7639942a94de4c9ae8280c08f17d4eac2e44644d9fc8ace6f" }
 version("1.1.1o")  { source sha256: "9384a2b0570dd80358841464677115df785edb941c71211f75076d72fe6b438f" }
 version("1.1.1m")  { source sha256: "f89199be8b23ca45fc7cb9f1d8d3ee67312318286ad030f5316aca6462db6c96" }
 version("1.1.1l")  { source sha256: "0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1" }
+version("1.0.2zg") { source sha256: "09f8372eaede77ec8e6945e2d2d8eeb1b91662980cf23fe95f627b377162296c" }
 version("1.0.2zb") { source sha256: "b7d8f8c895279caa651e7f3de9a7b87b8dd01a452ca3d9327f45a9ef31d0c518" }
 version("1.0.2za") { source sha256: "86ec5d2ecb53839e9ec999db7f8715d0eb7e534d8a1d8688ef25280fbeee2ff8" }
 
@@ -97,7 +99,11 @@ build do
   # https://www.openssl.org/blog/blog/2021/09/13/LetsEncryptRootCertExpire/
   configure_args += [ "-DOPENSSL_TRUSTED_FIRST_DEFAULT" ] if version.satisfies?(">= 1.0.2zb") && version.satisfies?("< 1.1.0")
 
-  configure_args += ["--with-fipsdir=#{install_dir}/embedded", "fips"] if fips_mode?
+  if version.satisfies?("< 3.0.0")
+    configure_args += ["--with-fipsdir=#{install_dir}/embedded", "fips"] if fips_mode?
+  else
+    configure_args += ["-enable-fips"] if fips_mode?
+  end
 
   configure_cmd =
     if aix?

data/config/software/patchelf.rb

@@ -54,8 +54,12 @@ end
 
 if version.satisfies?(">= 0.12")
   source url: "https://github.com/NixOS/patchelf/releases/download/#{version}/patchelf-#{version}.tar.gz"
+  internal_source url: "#{ENV["ARTIFACTORY_REPO_URL"]}/#{name}/#{name}-#{version}.tar.gz",
+                authorization: "X-JFrog-Art-Api:#{ENV["ARTIFACTORY_TOKEN"]}"
 else
   source url: "https://nixos.org/releases/patchelf/patchelf-#{version}/patchelf-#{version}.tar.gz"
+  internal_source url: "#{ENV["ARTIFACTORY_REPO_URL"]}/#{name}/#{name}-#{version}.tar.gz",
+                authorization: "X-JFrog-Art-Api:#{ENV["ARTIFACTORY_TOKEN"]}"
 end
 
 build do

data/config/software/perl-extutils-embed.rb

@@ -22,7 +22,8 @@ dependency "perl"
 
 source url: "http://search.cpan.org/CPAN/authors/id/D/DO/DOUGM/ExtUtils-Embed-#{version}.tar.gz",
        md5: "b2a2c26a18bca3ce69f8a0b1b54a0105"
-
+internal_source url: "#{ENV["ARTIFACTORY_REPO_URL"]}/#{name}/#{name}-#{version}.tar.gz",
+       authorization: "X-JFrog-Art-Api:#{ENV["ARTIFACTORY_TOKEN"]}"
 relative_path "ExtUtils-Embed-#{version}"
 
 build do

data/config/software/perl-extutils-makemaker.rb

@@ -31,7 +31,8 @@ version "7.10" do
 end
 
 source url: "http://search.cpan.org/CPAN/authors/id/B/BI/BINGOS/ExtUtils-MakeMaker-#{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 "ExtUtils-MakeMaker-#{version}"
 
 build do

data/config/software/perl-thread-queue.rb

@@ -25,7 +25,8 @@ version "3.13" do
 end
 
 source url: "http://search.cpan.org/CPAN/authors/id/J/JD/JDHEDDEN/Thread-Queue-#{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 "Thread-Queue-#{version}"
 
 build do

data/config/software/perl.rb

@@ -31,6 +31,8 @@ version("5.30.0") { source sha256: "851213c754d98ccff042caa40ba7a796b2cee88c5325
 version("5.22.1") { source sha256: "2b475d0849d54c4250e9cba4241b7b7291cffb45dfd083b677ca7b5d38118f27" }
 version("5.18.1") { source sha256: "655e11a8ffba8853efcdce568a142c232600ed120ac24aaebb4e6efe74e85b2b" }
 source url: "https://www.cpan.org/src/5.0/perl-#{version}.tar.gz"
+internal_source url: "#{ENV["ARTIFACTORY_REPO_URL"]}/#{name}/#{name}-#{version}.tar.gz",
+                authorization: "X-JFrog-Art-Api:#{ENV["ARTIFACTORY_TOKEN"]}"
 
 # perl builds perl as libraries into a special directory. We need to include
 # that directory in lib_dirs so omnibus can sign them during macOS deep signing.

data/config/software/perl_pg_driver.rb

@@ -35,7 +35,8 @@ version("3.5.3")  { source sha256: "7e98a9b975256a4733db1c0e974cad5ad5cb82148932
 version("3.3.0")  { source sha256: "52f43de5b2d916d447d7ed252b127f728b226dc88db57d4fe9712e21d3586ffe" }
 
 source url: "https://search.cpan.org/CPAN/authors/id/T/TU/TURNSTEP/DBD-Pg-#{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 "DBD-Pg-#{version}"
 
 build do

data/config/software/pkg-config.rb

@@ -26,6 +26,8 @@ dependency "config_guess"
 version("0.28") { source sha256: "6b6eb31c6ec4421174578652c7e141fdaae2dabad1021f420d8713206ac1f845" }
 
 source url: "https://pkgconfig.freedesktop.org/releases/pkg-config-#{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 "pkg-config-#{version}"
 

data/config/software/popt.rb

@@ -29,9 +29,13 @@ version("1.18") { source sha256: "5159bc03a20b28ce363aa96765f37df99ea4d8850b1ece
 version("1.16") { source sha256: "e728ed296fe9f069a0e005003c3d6b2dde3d9cad453422a10d6558616d304cc8" }
 
 if version == "1.16"
-  source url: "ftp://anduin.linuxfromscratch.org/BLFS/popt/popt-#{version}.tar.gz"
+  source url: "https://src.fedoraproject.org/repo/pkgs/popt/popt-#{version}.tar.gz/3743beefa3dd6247a73f8f7a32c14c33/popt-#{version}.tar.gz"
+  internal_source url: "#{ENV["ARTIFACTORY_REPO_URL"]}/#{name}/#{name}-#{version}.tar.gz",
+                authorization: "X-JFrog-Art-Api:#{ENV["ARTIFACTORY_TOKEN"]}"
 else
   source url: "http://ftp.rpm.org/popt/releases/popt-1.x/popt-#{version}.tar.gz"
+  internal_source url: "#{ENV["ARTIFACTORY_REPO_URL"]}/#{name}/#{name}-#{version}.tar.gz",
+                authorization: "X-JFrog-Art-Api:#{ENV["ARTIFACTORY_TOKEN"]}"
 end
 
 relative_path "popt-#{version}"

data/config/software/postgresql.rb

@@ -48,6 +48,8 @@ version("9.6.22") { source sha256: "3d32cd101025a0556813397c69feff3df3d63736adb8
 version("9.3.25") { source sha256: "e4953e80415d039ccd33d34be74526a090fd585cf93f296cd9c593972504b6db" }
 
 source url: "https://ftp.postgresql.org/pub/source/v#{version}/postgresql-#{version}.tar.bz2"
+internal_source url: "#{ENV["ARTIFACTORY_REPO_URL"]}/#{name}/#{name}-#{version}.tar.gz",
+                authorization: "X-JFrog-Art-Api:#{ENV["ARTIFACTORY_TOKEN"]}"
 
 relative_path "postgresql-#{version}"
 

data/config/software/python.rb

@@ -43,6 +43,8 @@ version("2.7.14") { source sha256: "304c9b202ea6fbd0a4a8e0ad3733715fbd4749f2204a
 version("2.7.9")  { source sha256: "c8bba33e66ac3201dabdc556f0ea7cfe6ac11946ec32d357c4c6f9b018c12c5b" }
 
 source url: "https://python.org/ftp/python/#{version}/Python-#{version}.tgz"
+internal_source url: "#{ENV["ARTIFACTORY_REPO_URL"]}/#{name}/#{name}-#{version}.tar.gz",
+                authorization: "X-JFrog-Art-Api:#{ENV["ARTIFACTORY_TOKEN"]}"
 
 relative_path "Python-#{version}"
 major_version, minor_version = version.split(".")

data/config/software/redis.rb

@@ -33,6 +33,8 @@ version("6.2.5") { source sha256: "4b9a75709a1b74b3785e20a6c158cab94cf52298aa381
 version("5.0.14") { source sha256: "3ea5024766d983249e80d4aa9457c897a9f079957d0fb1f35682df233f997f32" }
 
 source url: "https://download.redis.io/releases/redis-#{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 "redis-#{version}"
 

data/config/software/rsync.rb

@@ -40,6 +40,8 @@ version "2.6.9" do
 end
 
 source url: "https://rsync.samba.org/ftp/rsync/src/rsync-#{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 "rsync-#{version}"
 

data/config/software/ruby-cleanup.rb

@@ -26,7 +26,7 @@ default_version "1.0.0"
 license :project_license
 skip_transitive_dependency_licensing true
 
-dependency "ruby"
+dependency "zlib" # just so we clear health-check & zlib is ruby dependency
 
 build do
   env = with_standard_compiler_flags(with_embedded_path)
@@ -39,7 +39,10 @@ build do
   # except AIX which uses them at runtime.
   unless aix?
     block "Remove static libraries" do
-      gemdir = shellout!("#{install_dir}/embedded/bin/gem environment gemdir", env: env).stdout.chomp
+      gemfile = "#{install_dir}/embedded/bin/gem"
+      next unless File.exist?(gemfile)
+
+      gemdir = shellout!("#{gemfile} environment gemdir", env: env).stdout.chomp
 
       # find all the static *.a files and delete them
       Dir.glob("#{gemdir}/**/*.a").each do |f|
@@ -51,7 +54,10 @@ build do
 
   # Clear the now-unnecessary git caches, docs, and build information
   block "Delete bundler git cache, docs, and build info" do
-    gemdir = shellout!("#{install_dir}/embedded/bin/gem environment gemdir", env: env).stdout.chomp
+    gemfile = "#{install_dir}/embedded/bin/gem"
+    next unless File.exist?(gemfile)
+
+    gemdir = shellout!("#{gemfile} environment gemdir", env: env).stdout.chomp
 
     remove_directory "#{gemdir}/cache"
     remove_directory "#{gemdir}/doc"
@@ -59,7 +65,10 @@ build do
   end
 
   block "Remove bundler gem caches" do
-    gemdir = shellout!("#{install_dir}/embedded/bin/gem environment gemdir", env: env).stdout.chomp
+    gemfile = "#{install_dir}/embedded/bin/gem"
+    next unless File.exist?(gemfile)
+
+    gemdir = shellout!("#{gemfile} environment gemdir", env: env).stdout.chomp
 
     Dir.glob("#{gemdir}/bundler/gems/**").each do |f|
       puts "Deleting #{f}"
@@ -69,6 +78,8 @@ build do
 
   block "Remove leftovers from compiling gems" do
     # find the embedded ruby gems dir and clean it up for globbing
+    next unless File.directory?("#{install_dir}/embedded/lib/ruby/gems")
+
     target_dir = "#{install_dir}/embedded/lib/ruby/gems/*/".tr("\\", "/")
 
     # find gem_make.out and mkmf.log files
@@ -89,7 +100,10 @@ build do
   delete "#{install_dir}/embedded/info"
 
   block "Remove leftovers from compiling gems" do
-    gemdir = shellout!("#{install_dir}/embedded/bin/gem environment gemdir", env: env).stdout.chomp
+    gemfile = "#{install_dir}/embedded/bin/gem"
+    next unless File.exist?(gemfile)
+
+    gemdir = shellout!("#{gemfile} environment gemdir", env: env).stdout.chomp
 
     # find gem_make.out and mkmf.log files
     Dir.glob("#{gemdir}/extensions/**/{gem_make.out,mkmf.log}").each do |f|
@@ -99,7 +113,10 @@ build do
   end
 
   block "Removing random non-code files from installed gems" do
-    gemdir = shellout!("#{install_dir}/embedded/bin/gem environment gemdir", env: env).stdout.chomp
+    gemfile = "#{install_dir}/embedded/bin/gem"
+    next unless File.exist?(gemfile)
+
+    gemdir = shellout!("#{gemfile} environment gemdir", env: env).stdout.chomp
 
     # find the embedded ruby gems dir and clean it up for globbing
     files = %w{

data/config/software/ruby-windows-devkit-bash.rb

@@ -30,6 +30,8 @@ skip_transitive_dependency_licensing true
 # dependency "ruby-windows-devkit"
 source url: "https://github.com/chef/msys-bash/releases/download/bash-#{version}/bash-#{version}-bin.tar.lzma",
        md5: "22d5dbbd9bd0b3e0380d7a0e79c3108e"
+internal_source url: "#{ENV["ARTIFACTORY_REPO_URL"]}/#{name}-#{version}/#{name}-#{version}-bin.tar.lzma",
+       authorization: "X-JFrog-Art-Api:#{ENV["ARTIFACTORY_TOKEN"]}"
 
 relative_path "bin"
 

data/config/software/ruby.rb

@@ -26,7 +26,7 @@ skip_transitive_dependency_licensing true
 # the default versions should always be the latest release of ruby
 # if you consume this definition it is your responsibility to pin
 # to the desired version of ruby. don't count on this not changing.
-default_version "3.1.2"
+default_version "3.1.3"
 
 dependency "zlib"
 dependency "openssl"
@@ -42,13 +42,16 @@ dependency "libyaml"
 dependency "ncurses" if freebsd?
 
 # version_list: url=https://cache.ruby-lang.org/pub/ruby/ filter=*.tar.gz
+version("3.1.3")      { source sha256: "5ea498a35f4cd15875200a52dde42b6eb179e1264e17d78732c3a57cd1c6ab9e" }
 version("3.1.2")      { source sha256: "61843112389f02b735428b53bb64cf988ad9fb81858b8248e22e57336f24a83e" }
 version("3.1.1")      { source sha256: "fe6e4782de97443978ddba8ba4be38d222aa24dc3e3f02a6a8e7701c0eeb619d" }
+version("3.0.5")      { source sha256: "9afc6380a027a4fe1ae1a3e2eccb6b497b9c5ac0631c12ca56f9b7beb4848776" }
 version("3.0.4")      { source sha256: "70b47c207af04bce9acea262308fb42893d3e244f39a4abc586920a1c723722b" }
 version("3.0.3")      { source sha256: "3586861cb2df56970287f0fd83f274bd92058872d830d15570b36def7f1a92ac" }
 version("3.0.2")      { source sha256: "5085dee0ad9f06996a8acec7ebea4a8735e6fac22f22e2d98c3f2bc3bef7e6f1" }
 version("3.0.1")      { source sha256: "369825db2199f6aeef16b408df6a04ebaddb664fb9af0ec8c686b0ce7ab77727" }
 
+version("2.7.7")      { source sha256: "e10127db691d7ff36402cfe88f418c8d025a3f1eea92044b162dd72f0b8c7b90" }
 version("2.7.6")      { source sha256: "e7203b0cc09442ed2c08936d483f8ac140ec1c72e37bb5c401646b7866cb5d10" }
 version("2.7.5")      { source sha256: "2755b900a21235b443bb16dadd9032f784d4a88f143d852bc5d154f22b8781f1" }
 version("2.7.4")      { source sha256: "3043099089608859fc8cce7f9fdccaa1f53a462457e3838ec3b25a7d609fbc5b" }
@@ -133,6 +136,8 @@ build do
     case version
     when "3.0.1"
       patch source: "ruby-3.0.1-configure.patch", plevel: 1, env: patch_env
+    when "3.0.5"
+      patch source: "ruby-3.0.5-configure.patch", plevel: 1, env: patch_env
     else
       patch source: "ruby-3.0.2-configure.patch", plevel: 1, env: patch_env
     end

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

@@ -17,7 +17,7 @@ dependency "zlib"
 dependency "patchelf"
 
 name "server-open-jre"
-default_version "11.0.17+8"
+default_version "11.0.19+7"
 
 unless _64_bit?
   raise "Server-open-jre can only be installed on x86_64 systems."
@@ -38,11 +38,31 @@ license_warning = "By including the JRE, you accept the terms of AdoptOpenJRE."
 
 # version_list: url=https://github.com/adoptium/temurin11-binaries/releases filter=*.tar.gz
 
+version "11.0.19+7" do
+  source url: "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_x64_linux_hotspot_11.0.19_7.tar.gz",
+  sha256: "32dcf760664f93531594b72ce9226e9216567de5705a23c9ff5a77c797948054",
+  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.18+10" do
+  source url: "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.18%2B10/OpenJDK11U-jre_x64_linux_hotspot_11.0.18_10.tar.gz",
+  sha256: "0e7b196ef8603ac3d38caaf7768b7b0a3c613d60e15a6511bcfb2c894b609e99",
+  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.17+8" do
   source url: "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jre_x64_linux_hotspot_11.0.17_8.tar.gz",
   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 +70,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 +79,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 +88,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 +97,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 +106,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 +115,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 +124,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

@@ -37,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

@@ -27,6 +27,8 @@ dependency "openssl"
 # version_list: url=https://www.stunnel.org/downloads/ filter=*.tar.gz
 
 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}"
 

data/scripts/internal_sources.rb

@@ -5,7 +5,7 @@ require "tmpdir"
 require "yaml"
 
 ARTIFACTORY_REPO_URL = ENV["ARTIFACTORY_REPO_URL"] || "https://artifactory-internal.ps.chef.co/artifactory/omnibus-software-local"
-ARTIFACTORY_TOKEN = ENV["ARTIFACTORY_TOKEN"]
+ARTIFACTORY_PASSWORD = ENV["ARTIFACTORY_PASSWORD"]
 
 def print_usage
   puts "Must provide path to internal_sources.yml file."
@@ -48,7 +48,7 @@ def maybe_upload(name, source)
       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_TOKEN}' -T '#{downloaded_file}' #{repo_url}")
+      raise "Failed to upload" unless system("curl -s -H 'X-JFrog-Art-Api:#{ARTIFACTORY_PASSWORD}' -T '#{downloaded_file}' #{repo_url}")
 
       puts ""
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omnibus-software
 version: !ruby/object:Gem::Version
-  version: 23.2.281
+  version: 23.6.291
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-06 00:00:00.000000000 Z
+date: 2023-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omnibus
@@ -31,6 +31,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".buildkite/hooks/pre-command"
 - ".expeditor/Version_inspector/README.md"
 - ".expeditor/Version_inspector/SW-Version-update.py"
 - ".expeditor/Version_inspector/manual_prod_list.json"
@@ -123,6 +124,7 @@ files:
 - config/patches/ruby/ruby-2.6.7_c99.patch
 - config/patches/ruby/ruby-3.0.1-configure.patch
 - config/patches/ruby/ruby-3.0.2-configure.patch
+- config/patches/ruby/ruby-3.0.5-configure.patch
 - config/patches/ruby/ruby-aix-atomic.patch
 - config/patches/ruby/ruby-aix-configure_26_and_later.patch
 - config/patches/ruby/ruby-aix-vm-core.patch