omnibus-software 23.2.283 → 23.6.291
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.expeditor/Version_inspector/prod_default_version.json +1 -1
- data/CHANGELOG.md +4 -3
- data/VERSION +1 -1
- data/config/patches/ruby/ruby-3.0.5-configure.patch +260 -0
- data/config/software/libxslt.rb +1 -1
- data/config/software/openssl.rb +8 -2
- data/config/software/ruby-cleanup.rb +23 -6
- data/config/software/ruby.rb +6 -1
- data/config/software/server-open-jre.rb +19 -1
- metadata +3 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: da1f323d0ca318625d978c23b0594bce43125a5b41fee09ce116c56f1f551113
|
4
|
+
data.tar.gz: 95b8d2f10a30e19df8265b7f4609c719a0d24402c855846b0b45e6d128e9f02d
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: d3051479e3df52bb4b7372414455e744b88bdbaaa7d6b5b11dcd86438c35c9f1f93136e635bb20a55e716f7f07c00e5f571ec1046166dcf3db7b5f6fb67d082e
|
7
|
+
data.tar.gz: 8bde105e20967381cf64cf371d3c96cc6034fa5da1cacb9653a0d82a26eb0a9b4897f58ab16fcc99528fd4e6c539f7b6c88df79de26edf3f3774aa4a07122ec5
|
data/CHANGELOG.md
CHANGED
@@ -3,11 +3,12 @@
|
|
3
3
|
<!-- latest_release -->
|
4
4
|
<!-- latest_release -->
|
5
5
|
|
6
|
-
<!-- release_rollup since=23.2.
|
7
|
-
### Changes since 23.2.
|
6
|
+
<!-- release_rollup since=23.2.283 -->
|
7
|
+
### Changes since 23.2.283 release
|
8
8
|
<!-- release_rollup -->
|
9
9
|
|
10
10
|
<!-- latest_stable_release -->
|
11
|
-
## [23.2.
|
11
|
+
## [23.2.283](https://github.com/chef/omnibus-software/tree/23.2.283) (2023-02-20)
|
12
12
|
<!-- latest_stable_release -->
|
13
13
|
|
14
|
+
## [23.2.281](https://github.com/chef/omnibus-software/tree/23.2.281) (2023-02-06)
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
23.
|
1
|
+
23.6.291
|
@@ -0,0 +1,260 @@
|
|
1
|
+
diff -ur ruby-3.0.1/configure.ac ruby-3.0.1-patched/configure.ac
|
2
|
+
--- ruby-3.0.1/configure.ac 2021-04-05 05:33:42.000000000 -0700
|
3
|
+
+++ ruby-3.0.1-patched/configure.ac 2021-04-09 12:42:35.578174106 -0700
|
4
|
+
@@ -544,11 +544,16 @@
|
5
|
+
rpathflag=`echo "$RPATHFLAG" | sed 's/%.*//'`
|
6
|
+
])
|
7
|
+
|
8
|
+
-RUBY_TRY_CFLAGS(-fdeclspec, [
|
9
|
+
- RUBY_APPEND_OPTIONS(CC, -fdeclspec)
|
10
|
+
- RUBY_APPEND_OPTIONS(MJIT_CC, -fdeclspec)
|
11
|
+
+RUBY_TRY_LDFLAGS(-fdeclspec, [fdeclspec=yes], [fdeclspec=no])
|
12
|
+
+AS_IF([test "$fdeclspec" = yes], [
|
13
|
+
+ RUBY_APPEND_OPTIONS(CFLAGS, -fdeclspec)
|
14
|
+
+ RUBY_APPEND_OPTIONS(cflags, -fdeclspec)
|
15
|
+
+ RUBY_APPEND_OPTIONS(orig_cflags, -fdeclspec)
|
16
|
+
+])
|
17
|
+
+RUBY_TRY_CXXFLAGS(-fdeclspec, [fdeclspec=yes], [fdeclspec=no])
|
18
|
+
+AS_IF([test "$fdeclspec" = yes], [
|
19
|
+
+ RUBY_APPEND_OPTIONS(CXXFLAGS, -fdeclspec)
|
20
|
+
])
|
21
|
+
-RUBY_TRY_CXXFLAGS(-fdeclspec, [RUBY_APPEND_OPTIONS(CXX, -fdeclspec)])
|
22
|
+
|
23
|
+
AS_CASE([$RUBY_PATCHLEVEL], [-*],
|
24
|
+
[RUBY_DEVEL=yes], [RUBY_DEVEL=no])
|
25
|
+
@@ -1494,7 +1499,9 @@
|
26
|
+
AC_DEFINE_UNQUOTED([RUBY_ALIAS_FUNCTION_VOID(prot, name, args)],
|
27
|
+
[RUBY_ALIAS_FUNCTION_TYPE(void, prot, name, args)])
|
28
|
+
])
|
29
|
+
+])
|
30
|
+
|
31
|
+
+{
|
32
|
+
AC_CACHE_CHECK([for __atomic builtins], [rb_cv_gcc_atomic_builtins], [
|
33
|
+
AC_TRY_LINK([unsigned int atomic_var;],
|
34
|
+
[
|
35
|
+
@@ -1525,7 +1532,6 @@
|
36
|
+
AS_IF([test "$rb_cv_gcc_sync_builtins" = yes], [
|
37
|
+
AC_DEFINE(HAVE_GCC_SYNC_BUILTINS)
|
38
|
+
])
|
39
|
+
-])
|
40
|
+
|
41
|
+
AC_CACHE_CHECK(for __builtin_unreachable, rb_cv_func___builtin_unreachable,
|
42
|
+
[RUBY_WERROR_FLAG(
|
43
|
+
@@ -1538,6 +1544,7 @@
|
44
|
+
AS_IF([test "$rb_cv_func___builtin_unreachable" = yes], [
|
45
|
+
AC_DEFINE_UNQUOTED(UNREACHABLE, [__builtin_unreachable()])
|
46
|
+
])
|
47
|
+
+}
|
48
|
+
|
49
|
+
AC_CACHE_CHECK(for exported function attribute, rb_cv_func_exported, [
|
50
|
+
rb_cv_func_exported=no
|
51
|
+
diff -ur ruby-3.0.1/template/Makefile.in ruby-3.0.1-patched/template/Makefile.in
|
52
|
+
--- ruby-3.0.1/template/Makefile.in 2021-04-05 05:33:42.000000000 -0700
|
53
|
+
+++ ruby-3.0.1-patched/template/Makefile.in 2021-04-09 12:42:35.579834751 -0700
|
54
|
+
@@ -75,7 +75,7 @@
|
55
|
+
CC_VERSION = @CC_VERSION@
|
56
|
+
OUTFLAG = @OUTFLAG@$(empty)
|
57
|
+
COUTFLAG = @COUTFLAG@$(empty)
|
58
|
+
-CPPOUTFLAG = $(COUTFLAG)
|
59
|
+
+CPPOUTFLAG = >
|
60
|
+
ARCH_FLAG = @ARCH_FLAG@
|
61
|
+
CFLAGS_NO_ARCH = @CFLAGS@
|
62
|
+
CFLAGS = $(CFLAGS_NO_ARCH) $(ARCH_FLAG)
|
63
|
+
diff -ur ruby-3.0.5/configure configure
|
64
|
+
--- ruby-3.0.5/configure 2022-11-24 12:04:58
|
65
|
+
+++ configure 2022-12-05 14:06:03
|
66
|
+
@@ -10384,6 +10384,8 @@
|
67
|
+
fi
|
68
|
+
|
69
|
+
|
70
|
+
+ save_LDFLAGS="$LDFLAGS"
|
71
|
+
+ LDFLAGS="$LDFLAGS -fdeclspec"
|
72
|
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -fdeclspec is accepted as CFLAGS" >&5
|
73
|
+
printf %s "checking whether -fdeclspec is accepted as CFLAGS... " >&6; }
|
74
|
+
save_CFLAGS="$CFLAGS"
|
75
|
+
@@ -10400,7 +10402,6 @@
|
76
|
+
fi
|
77
|
+
ac_c_werror_flag=yes
|
78
|
+
|
79
|
+
- CFLAGS="$CFLAGS -fdeclspec"
|
80
|
+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
81
|
+
/* end confdefs.h. */
|
82
|
+
|
83
|
+
@@ -10412,56 +10413,72 @@
|
84
|
+
return 0;
|
85
|
+
}
|
86
|
+
_ACEOF
|
87
|
+
-if ac_fn_c_try_compile "$LINENO"
|
88
|
+
+if ac_fn_c_try_link "$LINENO"; then :
|
89
|
+
+ fdeclspec=yes
|
90
|
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
91
|
+
+ printf "%s\n" "${msg_result_yes}yes${msg_reset}" >&6 ; }
|
92
|
+
+else $as_nop
|
93
|
+
+ fdeclspec=no
|
94
|
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
95
|
+
+ printf "%s\n" "${msg_result_no}no${msg_reset}" >&6 ; }
|
96
|
+
+fi
|
97
|
+
+rm -f core conftest.err conftest.$ac_objext \
|
98
|
+
+ conftest$ac_exeext conftest.$ac_ext conftest.beam
|
99
|
+
+
|
100
|
+
+CFLAGS="$save_CFLAGS"
|
101
|
+
+save_CFLAGS=
|
102
|
+
+if test "${rb_c_werror_flag+set}"
|
103
|
+
then :
|
104
|
+
|
105
|
+
- # RUBY_APPEND_OPTIONS(CC)
|
106
|
+
+ ac_c_werror_flag="$rb_c_werror_flag"
|
107
|
+
+
|
108
|
+
+else $as_nop
|
109
|
+
+
|
110
|
+
+ unset ac_c_werror_flag
|
111
|
+
+
|
112
|
+
+fi
|
113
|
+
+ LDFLAGS="$save_LDFLAGS"
|
114
|
+
+ save_LDFLAGS=
|
115
|
+
+
|
116
|
+
+if test "$fdeclspec" = yes; then :
|
117
|
+
+
|
118
|
+
+ # RUBY_APPEND_OPTIONS(CFLAGS)
|
119
|
+
for rb_opt in -fdeclspec; do
|
120
|
+
- case " ${CC-} " in #(
|
121
|
+
+ case " ${CFLAGS-} " in #(
|
122
|
+
*" ${rb_opt} "*) :
|
123
|
+
;; #(
|
124
|
+
' ') :
|
125
|
+
- CC="${rb_opt}" ;; #(
|
126
|
+
+ CFLAGS="${rb_opt}" ;; #(
|
127
|
+
*) :
|
128
|
+
- CC="$CC ${rb_opt}" ;;
|
129
|
+
+ CFLAGS="$CFLAGS ${rb_opt}" ;;
|
130
|
+
esac
|
131
|
+
done
|
132
|
+
- # RUBY_APPEND_OPTIONS(MJIT_CC)
|
133
|
+
+ # RUBY_APPEND_OPTIONS(cflags)
|
134
|
+
for rb_opt in -fdeclspec; do
|
135
|
+
- case " ${MJIT_CC-} " in #(
|
136
|
+
+ case " ${cflags-} " in #(
|
137
|
+
*" ${rb_opt} "*) :
|
138
|
+
;; #(
|
139
|
+
' ') :
|
140
|
+
- MJIT_CC="${rb_opt}" ;; #(
|
141
|
+
+ cflags="${rb_opt}" ;; #(
|
142
|
+
*) :
|
143
|
+
- MJIT_CC="$MJIT_CC ${rb_opt}" ;;
|
144
|
+
+ cflags="$cflags ${rb_opt}" ;;
|
145
|
+
esac
|
146
|
+
done
|
147
|
+
+ # RUBY_APPEND_OPTIONS(orig_cflags)
|
148
|
+
+ for rb_opt in -fdeclspec; do
|
149
|
+
+ case " ${orig_cflags-} " in #(
|
150
|
+
+ *" ${rb_opt} "*) :
|
151
|
+
+ ;; #(
|
152
|
+
+ ' ') :
|
153
|
+
+ orig_cflags="${rb_opt}" ;; #(
|
154
|
+
+ *) :
|
155
|
+
+ orig_cflags="$orig_cflags ${rb_opt}" ;;
|
156
|
+
+esac
|
157
|
+
+ done
|
158
|
+
|
159
|
+
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
160
|
+
- printf "%s\n" "${msg_result_yes}yes${msg_reset}" >&6 ; }
|
161
|
+
-else $as_nop
|
162
|
+
-
|
163
|
+
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
164
|
+
- printf "%s\n" "${msg_result_no}no${msg_reset}" >&6 ; }
|
165
|
+
fi
|
166
|
+
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
|
167
|
+
|
168
|
+
-CFLAGS="$save_CFLAGS"
|
169
|
+
-save_CFLAGS=
|
170
|
+
-if test "${rb_c_werror_flag+set}"
|
171
|
+
-then :
|
172
|
+
|
173
|
+
- ac_c_werror_flag="$rb_c_werror_flag"
|
174
|
+
-
|
175
|
+
-else $as_nop
|
176
|
+
-
|
177
|
+
- unset ac_c_werror_flag
|
178
|
+
-
|
179
|
+
-fi
|
180
|
+
-
|
181
|
+
-
|
182
|
+
-
|
183
|
+
save_CXXFLAGS="$CXXFLAGS"
|
184
|
+
CXXFLAGS="$CXXFLAGS -fdeclspec"
|
185
|
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -fdeclspec is accepted as CXXFLAGS" >&5
|
186
|
+
@@ -10499,21 +10516,11 @@
|
187
|
+
_ACEOF
|
188
|
+
if ac_fn_cxx_try_link "$LINENO"
|
189
|
+
then :
|
190
|
+
- # RUBY_APPEND_OPTIONS(CXX)
|
191
|
+
- for rb_opt in -fdeclspec; do
|
192
|
+
- case " ${CXX-} " in #(
|
193
|
+
- *" ${rb_opt} "*) :
|
194
|
+
- ;; #(
|
195
|
+
- ' ') :
|
196
|
+
- CXX="${rb_opt}" ;; #(
|
197
|
+
- *) :
|
198
|
+
- CXX="$CXX ${rb_opt}" ;;
|
199
|
+
-esac
|
200
|
+
- done
|
201
|
+
+ fdeclspec=yes
|
202
|
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
203
|
+
printf "%s\n" "${msg_result_yes}yes${msg_reset}" >&6 ; }
|
204
|
+
else $as_nop
|
205
|
+
-
|
206
|
+
+ fdeclspec=no
|
207
|
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
208
|
+
printf "%s\n" "${msg_result_no}no${msg_reset}" >&6 ; }
|
209
|
+
fi
|
210
|
+
@@ -10541,7 +10548,22 @@
|
211
|
+
CXXFLAGS="$save_CXXFLAGS"
|
212
|
+
save_CXXFLAGS=
|
213
|
+
|
214
|
+
+if test "$fdeclspec" = yes; then :
|
215
|
+
|
216
|
+
+ # RUBY_APPEND_OPTIONS(CXXFLAGS)
|
217
|
+
+ for rb_opt in -fdeclspec; do
|
218
|
+
+ case " ${CXXFLAGS-} " in #(
|
219
|
+
+ *" ${rb_opt} "*) :
|
220
|
+
+ ;; #(
|
221
|
+
+ ' ') :
|
222
|
+
+ CXXFLAGS="${rb_opt}" ;; #(
|
223
|
+
+ *) :
|
224
|
+
+ CXXFLAGS="$CXXFLAGS ${rb_opt}" ;;
|
225
|
+
+esac
|
226
|
+
+ done
|
227
|
+
+
|
228
|
+
+fi
|
229
|
+
+
|
230
|
+
case $RUBY_PATCHLEVEL in #(
|
231
|
+
-*) :
|
232
|
+
RUBY_DEVEL=yes ;; #(
|
233
|
+
@@ -20529,6 +20551,9 @@
|
234
|
+
|
235
|
+
fi
|
236
|
+
|
237
|
+
+fi
|
238
|
+
+
|
239
|
+
+{
|
240
|
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __atomic builtins" >&5
|
241
|
+
printf %s "checking for __atomic builtins... " >&6; }
|
242
|
+
if test ${rb_cv_gcc_atomic_builtins+y}
|
243
|
+
@@ -20616,8 +20641,6 @@
|
244
|
+
|
245
|
+
fi
|
246
|
+
|
247
|
+
-fi
|
248
|
+
-
|
249
|
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_unreachable" >&5
|
250
|
+
printf %s "checking for __builtin_unreachable... " >&6; }
|
251
|
+
if test ${rb_cv_func___builtin_unreachable+y}
|
252
|
+
@@ -20680,6 +20703,7 @@
|
253
|
+
|
254
|
+
|
255
|
+
fi
|
256
|
+
+}
|
257
|
+
|
258
|
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for exported function attribute" >&5
|
259
|
+
printf %s "checking for exported function attribute... " >&6; }
|
260
|
+
|
data/config/software/libxslt.rb
CHANGED
data/config/software/openssl.rb
CHANGED
@@ -23,7 +23,7 @@ skip_transitive_dependency_licensing true
|
|
23
23
|
dependency "cacerts"
|
24
24
|
dependency "openssl-fips" if fips_mode?
|
25
25
|
|
26
|
-
default_version "1.0.
|
26
|
+
default_version "1.0.2zg" # do_not_auto_update
|
27
27
|
|
28
28
|
# Openssl builds engines as libraries into a special directory. We need to include
|
29
29
|
# 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
|
|
52
52
|
version("3.0.4") { source sha256: "2831843e9a668a0ab478e7020ad63d2d65e51f72977472dc73efcefbafc0c00f" }
|
53
53
|
version("3.0.3") { source sha256: "ee0078adcef1de5f003c62c80cc96527721609c6f3bb42b7795df31f8b558c0b" }
|
54
54
|
version("3.0.1") { source sha256: "c311ad853353bce796edad01a862c50a8a587f62e7e2100ef465ab53ec9b06d1" } # only ruby 3.1 supports openssl-3.0.1
|
55
|
+
version("1.1.1t") { source sha256: "8dee9b24bdb1dcbf0c3d1e9b02fb8f6bf22165e807f45adeb7c9677536859d3b" }
|
55
56
|
version("1.1.1q") { source sha256: "d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca" }
|
56
57
|
version("1.1.1p") { source sha256: "bf61b62aaa66c7c7639942a94de4c9ae8280c08f17d4eac2e44644d9fc8ace6f" }
|
57
58
|
version("1.1.1o") { source sha256: "9384a2b0570dd80358841464677115df785edb941c71211f75076d72fe6b438f" }
|
58
59
|
version("1.1.1m") { source sha256: "f89199be8b23ca45fc7cb9f1d8d3ee67312318286ad030f5316aca6462db6c96" }
|
59
60
|
version("1.1.1l") { source sha256: "0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1" }
|
61
|
+
version("1.0.2zg") { source sha256: "09f8372eaede77ec8e6945e2d2d8eeb1b91662980cf23fe95f627b377162296c" }
|
60
62
|
version("1.0.2zb") { source sha256: "b7d8f8c895279caa651e7f3de9a7b87b8dd01a452ca3d9327f45a9ef31d0c518" }
|
61
63
|
version("1.0.2za") { source sha256: "86ec5d2ecb53839e9ec999db7f8715d0eb7e534d8a1d8688ef25280fbeee2ff8" }
|
62
64
|
|
@@ -97,7 +99,11 @@ build do
|
|
97
99
|
# https://www.openssl.org/blog/blog/2021/09/13/LetsEncryptRootCertExpire/
|
98
100
|
configure_args += [ "-DOPENSSL_TRUSTED_FIRST_DEFAULT" ] if version.satisfies?(">= 1.0.2zb") && version.satisfies?("< 1.1.0")
|
99
101
|
|
100
|
-
|
102
|
+
if version.satisfies?("< 3.0.0")
|
103
|
+
configure_args += ["--with-fipsdir=#{install_dir}/embedded", "fips"] if fips_mode?
|
104
|
+
else
|
105
|
+
configure_args += ["-enable-fips"] if fips_mode?
|
106
|
+
end
|
101
107
|
|
102
108
|
configure_cmd =
|
103
109
|
if aix?
|
@@ -26,7 +26,7 @@ default_version "1.0.0"
|
|
26
26
|
license :project_license
|
27
27
|
skip_transitive_dependency_licensing true
|
28
28
|
|
29
|
-
dependency "ruby
|
29
|
+
dependency "zlib" # just so we clear health-check & zlib is ruby dependency
|
30
30
|
|
31
31
|
build do
|
32
32
|
env = with_standard_compiler_flags(with_embedded_path)
|
@@ -39,7 +39,10 @@ build do
|
|
39
39
|
# except AIX which uses them at runtime.
|
40
40
|
unless aix?
|
41
41
|
block "Remove static libraries" do
|
42
|
-
|
42
|
+
gemfile = "#{install_dir}/embedded/bin/gem"
|
43
|
+
next unless File.exist?(gemfile)
|
44
|
+
|
45
|
+
gemdir = shellout!("#{gemfile} environment gemdir", env: env).stdout.chomp
|
43
46
|
|
44
47
|
# find all the static *.a files and delete them
|
45
48
|
Dir.glob("#{gemdir}/**/*.a").each do |f|
|
@@ -51,7 +54,10 @@ build do
|
|
51
54
|
|
52
55
|
# Clear the now-unnecessary git caches, docs, and build information
|
53
56
|
block "Delete bundler git cache, docs, and build info" do
|
54
|
-
|
57
|
+
gemfile = "#{install_dir}/embedded/bin/gem"
|
58
|
+
next unless File.exist?(gemfile)
|
59
|
+
|
60
|
+
gemdir = shellout!("#{gemfile} environment gemdir", env: env).stdout.chomp
|
55
61
|
|
56
62
|
remove_directory "#{gemdir}/cache"
|
57
63
|
remove_directory "#{gemdir}/doc"
|
@@ -59,7 +65,10 @@ build do
|
|
59
65
|
end
|
60
66
|
|
61
67
|
block "Remove bundler gem caches" do
|
62
|
-
|
68
|
+
gemfile = "#{install_dir}/embedded/bin/gem"
|
69
|
+
next unless File.exist?(gemfile)
|
70
|
+
|
71
|
+
gemdir = shellout!("#{gemfile} environment gemdir", env: env).stdout.chomp
|
63
72
|
|
64
73
|
Dir.glob("#{gemdir}/bundler/gems/**").each do |f|
|
65
74
|
puts "Deleting #{f}"
|
@@ -69,6 +78,8 @@ build do
|
|
69
78
|
|
70
79
|
block "Remove leftovers from compiling gems" do
|
71
80
|
# find the embedded ruby gems dir and clean it up for globbing
|
81
|
+
next unless File.directory?("#{install_dir}/embedded/lib/ruby/gems")
|
82
|
+
|
72
83
|
target_dir = "#{install_dir}/embedded/lib/ruby/gems/*/".tr("\\", "/")
|
73
84
|
|
74
85
|
# find gem_make.out and mkmf.log files
|
@@ -89,7 +100,10 @@ build do
|
|
89
100
|
delete "#{install_dir}/embedded/info"
|
90
101
|
|
91
102
|
block "Remove leftovers from compiling gems" do
|
92
|
-
|
103
|
+
gemfile = "#{install_dir}/embedded/bin/gem"
|
104
|
+
next unless File.exist?(gemfile)
|
105
|
+
|
106
|
+
gemdir = shellout!("#{gemfile} environment gemdir", env: env).stdout.chomp
|
93
107
|
|
94
108
|
# find gem_make.out and mkmf.log files
|
95
109
|
Dir.glob("#{gemdir}/extensions/**/{gem_make.out,mkmf.log}").each do |f|
|
@@ -99,7 +113,10 @@ build do
|
|
99
113
|
end
|
100
114
|
|
101
115
|
block "Removing random non-code files from installed gems" do
|
102
|
-
|
116
|
+
gemfile = "#{install_dir}/embedded/bin/gem"
|
117
|
+
next unless File.exist?(gemfile)
|
118
|
+
|
119
|
+
gemdir = shellout!("#{gemfile} environment gemdir", env: env).stdout.chomp
|
103
120
|
|
104
121
|
# find the embedded ruby gems dir and clean it up for globbing
|
105
122
|
files = %w{
|
data/config/software/ruby.rb
CHANGED
@@ -26,7 +26,7 @@ skip_transitive_dependency_licensing true
|
|
26
26
|
# the default versions should always be the latest release of ruby
|
27
27
|
# if you consume this definition it is your responsibility to pin
|
28
28
|
# to the desired version of ruby. don't count on this not changing.
|
29
|
-
default_version "3.1.
|
29
|
+
default_version "3.1.3"
|
30
30
|
|
31
31
|
dependency "zlib"
|
32
32
|
dependency "openssl"
|
@@ -42,13 +42,16 @@ dependency "libyaml"
|
|
42
42
|
dependency "ncurses" if freebsd?
|
43
43
|
|
44
44
|
# version_list: url=https://cache.ruby-lang.org/pub/ruby/ filter=*.tar.gz
|
45
|
+
version("3.1.3") { source sha256: "5ea498a35f4cd15875200a52dde42b6eb179e1264e17d78732c3a57cd1c6ab9e" }
|
45
46
|
version("3.1.2") { source sha256: "61843112389f02b735428b53bb64cf988ad9fb81858b8248e22e57336f24a83e" }
|
46
47
|
version("3.1.1") { source sha256: "fe6e4782de97443978ddba8ba4be38d222aa24dc3e3f02a6a8e7701c0eeb619d" }
|
48
|
+
version("3.0.5") { source sha256: "9afc6380a027a4fe1ae1a3e2eccb6b497b9c5ac0631c12ca56f9b7beb4848776" }
|
47
49
|
version("3.0.4") { source sha256: "70b47c207af04bce9acea262308fb42893d3e244f39a4abc586920a1c723722b" }
|
48
50
|
version("3.0.3") { source sha256: "3586861cb2df56970287f0fd83f274bd92058872d830d15570b36def7f1a92ac" }
|
49
51
|
version("3.0.2") { source sha256: "5085dee0ad9f06996a8acec7ebea4a8735e6fac22f22e2d98c3f2bc3bef7e6f1" }
|
50
52
|
version("3.0.1") { source sha256: "369825db2199f6aeef16b408df6a04ebaddb664fb9af0ec8c686b0ce7ab77727" }
|
51
53
|
|
54
|
+
version("2.7.7") { source sha256: "e10127db691d7ff36402cfe88f418c8d025a3f1eea92044b162dd72f0b8c7b90" }
|
52
55
|
version("2.7.6") { source sha256: "e7203b0cc09442ed2c08936d483f8ac140ec1c72e37bb5c401646b7866cb5d10" }
|
53
56
|
version("2.7.5") { source sha256: "2755b900a21235b443bb16dadd9032f784d4a88f143d852bc5d154f22b8781f1" }
|
54
57
|
version("2.7.4") { source sha256: "3043099089608859fc8cce7f9fdccaa1f53a462457e3838ec3b25a7d609fbc5b" }
|
@@ -133,6 +136,8 @@ build do
|
|
133
136
|
case version
|
134
137
|
when "3.0.1"
|
135
138
|
patch source: "ruby-3.0.1-configure.patch", plevel: 1, env: patch_env
|
139
|
+
when "3.0.5"
|
140
|
+
patch source: "ruby-3.0.5-configure.patch", plevel: 1, env: patch_env
|
136
141
|
else
|
137
142
|
patch source: "ruby-3.0.2-configure.patch", plevel: 1, env: patch_env
|
138
143
|
end
|
@@ -17,7 +17,7 @@ dependency "zlib"
|
|
17
17
|
dependency "patchelf"
|
18
18
|
|
19
19
|
name "server-open-jre"
|
20
|
-
default_version "11.0.
|
20
|
+
default_version "11.0.19+7"
|
21
21
|
|
22
22
|
unless _64_bit?
|
23
23
|
raise "Server-open-jre can only be installed on x86_64 systems."
|
@@ -38,6 +38,24 @@ license_warning = "By including the JRE, you accept the terms of AdoptOpenJRE."
|
|
38
38
|
|
39
39
|
# version_list: url=https://github.com/adoptium/temurin11-binaries/releases filter=*.tar.gz
|
40
40
|
|
41
|
+
version "11.0.19+7" do
|
42
|
+
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",
|
43
|
+
sha256: "32dcf760664f93531594b72ce9226e9216567de5705a23c9ff5a77c797948054",
|
44
|
+
warning: license_warning,
|
45
|
+
unsafe: true
|
46
|
+
internal_source url: "#{ENV["ARTIFACTORY_REPO_URL"]}/#{name}/#{name}-#{version}.tar.gz",
|
47
|
+
authorization: "X-JFrog-Art-Api:#{ENV["ARTIFACTORY_TOKEN"]}"
|
48
|
+
end
|
49
|
+
|
50
|
+
version "11.0.18+10" do
|
51
|
+
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",
|
52
|
+
sha256: "0e7b196ef8603ac3d38caaf7768b7b0a3c613d60e15a6511bcfb2c894b609e99",
|
53
|
+
warning: license_warning,
|
54
|
+
unsafe: true
|
55
|
+
internal_source url: "#{ENV["ARTIFACTORY_REPO_URL"]}/#{name}/#{name}-#{version}.tar.gz",
|
56
|
+
authorization: "X-JFrog-Art-Api:#{ENV["ARTIFACTORY_TOKEN"]}"
|
57
|
+
end
|
58
|
+
|
41
59
|
version "11.0.17+8" do
|
42
60
|
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",
|
43
61
|
sha256: "752616097e09d7f60a3ad8bd312f90eaf50ac72577e55df229fe6e8091148f79",
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: omnibus-software
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 23.
|
4
|
+
version: 23.6.291
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Chef Software, Inc.
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2023-
|
11
|
+
date: 2023-06-05 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: omnibus
|
@@ -124,6 +124,7 @@ files:
|
|
124
124
|
- config/patches/ruby/ruby-2.6.7_c99.patch
|
125
125
|
- config/patches/ruby/ruby-3.0.1-configure.patch
|
126
126
|
- config/patches/ruby/ruby-3.0.2-configure.patch
|
127
|
+
- config/patches/ruby/ruby-3.0.5-configure.patch
|
127
128
|
- config/patches/ruby/ruby-aix-atomic.patch
|
128
129
|
- config/patches/ruby/ruby-aix-configure_26_and_later.patch
|
129
130
|
- config/patches/ruby/ruby-aix-vm-core.patch
|