1 |
commit: 1b192fbb0cf6895d06c585e7a9791fdcd8542e20 |
2 |
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Sep 12 07:06:10 2021 +0000 |
4 |
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Sep 12 07:11:20 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b192fbb |
7 |
|
8 |
dev-lang/ruby: cleanup of masked ruby:2.5 |
9 |
|
10 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
11 |
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org> |
12 |
|
13 |
dev-lang/ruby/Manifest | 2 - |
14 |
dev-lang/ruby/files/2.4/002_windows_crossdev.patch | 64 ---- |
15 |
dev-lang/ruby/files/2.4/005_no-undefined-ext.patch | 11 - |
16 |
dev-lang/ruby/files/2.4/009_no-gems.patch | 112 ------- |
17 |
dev-lang/ruby/files/2.4/011-gcc8.patch | 64 ---- |
18 |
dev-lang/ruby/files/2.4/012-openssl_1.1.patch | 339 --------------------- |
19 |
...-ia64-specific-code-to-use-execution-cont.patch | 67 ---- |
20 |
dev-lang/ruby/files/2.5/002-autoconf-2.70.patch | 65 ---- |
21 |
dev-lang/ruby/files/2.5/005_no-undefined-ext.patch | 11 - |
22 |
dev-lang/ruby/files/2.5/009_no-gems.patch | 95 ------ |
23 |
dev-lang/ruby/files/2.5/011-no-gems.patch | 85 ------ |
24 |
dev-lang/ruby/ruby-2.5.8-r2.ebuild | 220 ------------- |
25 |
dev-lang/ruby/ruby-2.5.9-r1.ebuild | 246 --------------- |
26 |
13 files changed, 1381 deletions(-) |
27 |
|
28 |
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest |
29 |
index 71e795e96a4..c2fd5cc82ae 100644 |
30 |
--- a/dev-lang/ruby/Manifest |
31 |
+++ b/dev-lang/ruby/Manifest |
32 |
@@ -1,5 +1,3 @@ |
33 |
-DIST ruby-2.5.8.tar.xz 11298404 BLAKE2B 3256c0448e72b63c0bd89f89a27fa9c09c8feed54d42cd79899b7d5cfe9dbc29ca708d12c630b3f52ff85b0c6a4011ae7ff0483d64b2fd445700a72a91028035 SHA512 2886be764a454425c5beef2777c64a70ee0d048b07896b327633d904f5077fea4299526689f9e2ac4dcd2fc4811cf9a6c8ce75367ed35d29dfe1a54222872e0d |
34 |
-DIST ruby-2.5.9.tar.xz 11314448 BLAKE2B ed3c698f076066b0ca771d69ffeb92bf10de6fe051a36d373445ce071af850cb707344becf610657b473d14c7d4dcfb6a814b9d69ed6999e69c6dc3bfb3eaee4 SHA512 239f73eb4049ae2654b648ab927b1f74643d38a5f29572e4bd4e6aa3c53c1df29e0a995fd90d4ab9d4b2ff073fd809b12df820ccb1ddf395684bba6be1855b7a |
35 |
DIST ruby-2.6.8.tar.xz 11599488 BLAKE2B e5b2949233d8540f72d4d8b9c246f9bd0d1342426d2a1c19cb240b7c86f37299e9dc1dfc98ef2a86d1d91055865b4542d690de5567c71189bf2973a4989fa0fd SHA512 d040ad2238523587d8f356fcb796b8b6ad7f8caff7dd6df09e3f7efcbfa0369e33600e78c7f2bc713ae77c040757cce5c4fec223cb9070209f2bf741899c556d |
36 |
DIST ruby-2.7.4.tar.xz 12067588 BLAKE2B 2680a7ccd1daf3d156d9519d9132853e68f5f1aad592abce3e73fdd03314a6c28e7d94590153aead86af8952ff51f804ee029f8100b0137919cc27373cb8b9cd SHA512 2cbb70ecfdd69120e789023ddb2b25cab0d03bc33fdc367a8f74ca8a3ee785c18c8ded9de3ecee627c7e275ffb85147e6abf921b6a61e31851b37c7fedf45bf9 |
37 |
DIST ruby-3.0.2.tar.xz 14746080 BLAKE2B 47c5591261fb63b1ec3ca719ea6b0c348937456c3711351c1f5317d1e6a748de197e90c8bd4ff822f7b2d4580ad7ed0b54b9eb7aaa5166ea1a15ab2deae96439 SHA512 0f702e2d8ca1342a9d4284dbdd234a3588e057b92566353aa7c21835cf09a3932864b2acf459a976960a1704e9befa562155d36b98b7cda8bd99526e10a374c4 |
38 |
|
39 |
diff --git a/dev-lang/ruby/files/2.4/002_windows_crossdev.patch b/dev-lang/ruby/files/2.4/002_windows_crossdev.patch |
40 |
deleted file mode 100644 |
41 |
index 7e290d434f0..00000000000 |
42 |
--- a/dev-lang/ruby/files/2.4/002_windows_crossdev.patch |
43 |
+++ /dev/null |
44 |
@@ -1,64 +0,0 @@ |
45 |
-Bug: https://bugs.gentoo.org/show_bug.cgi?id=618878 |
46 |
- |
47 |
-A few patches to make crossdev for mingw-w64 play nice with ruby's ebuilds. |
48 |
-Basic gist is that without the following patch to configure.in ruby-2.4.1 |
49 |
-hardcodes 240 into the shared, static, and import library names, which when |
50 |
-built with the current ruby ebuilds results in names like libx64-msvcrt-ruby24240.dll and so on. The patch is in ruby-trunk[1], but may take a while |
51 |
-to hit the tarballs that gentoo uses. |
52 |
- |
53 |
-Index: configure.in |
54 |
-=================================================================== |
55 |
---- a/configure.in (revision 57824) |
56 |
-+++ b/configure.in (revision 57825) |
57 |
-@@ -3825,7 +3825,23 @@ |
58 |
- |
59 |
- AC_ARG_WITH(soname, |
60 |
- AS_HELP_STRING([--with-soname=SONAME], [base name of shared library]), |
61 |
-- [RUBY_SO_NAME=$withval], [RUBY_SO_NAME='$(RUBY_BASE_NAME)']) |
62 |
-+ [RUBY_SO_NAME=$withval], |
63 |
-+ [ |
64 |
-+ AS_CASE(["$target_os"], |
65 |
-+ [darwin*], [ |
66 |
-+ RUBY_SO_NAME='$(RUBY_BASE_NAME).$(RUBY_PROGRAM_VERSION)' |
67 |
-+ ], |
68 |
-+ [cygwin*], [ |
69 |
-+ RUBY_SO_NAME='$(RUBY_BASE_NAME)$(MAJOR)$(MINOR)0' |
70 |
-+ ], |
71 |
-+ [mingw*], [ |
72 |
-+ RUBY_SO_NAME="${rb_cv_msvcrt}"'-$(RUBY_BASE_NAME)$(MAJOR)$(MINOR)0' |
73 |
-+ AS_IF([test x"${target_cpu}" != xi386], [ |
74 |
-+ RUBY_SO_NAME="${target_cpu}-${RUBY_SO_NAME}" |
75 |
-+ ]) |
76 |
-+ ], |
77 |
-+ [RUBY_SO_NAME='$(RUBY_BASE_NAME)']) |
78 |
-+ ]) |
79 |
- |
80 |
- LIBRUBY_LDSHARED=$LDSHARED |
81 |
- LIBRUBY_DLDFLAGS=$DLDFLAGS |
82 |
-@@ -3925,7 +3941,6 @@ |
83 |
- SOLIBS='-lm -lc' |
84 |
- ], |
85 |
- [darwin*], [ |
86 |
-- RUBY_SO_NAME="$RUBY_SO_NAME"'.$(RUBY_PROGRAM_VERSION)' |
87 |
- LIBRUBY_LDSHARED='$(CC) -dynamiclib' |
88 |
- if test "$load_relative" = yes; then |
89 |
- libprefix="@executable_path/../${libdir_basename}" |
90 |
-@@ -4157,7 +4172,6 @@ |
91 |
- fi |
92 |
- ], |
93 |
- [cygwin*|mingw*], [ |
94 |
-- RUBY_SO_NAME="${RUBY_SO_NAME}"'$(MAJOR)$(MINOR)0' |
95 |
- LIBRUBY_DLDFLAGS="${DLDFLAGS}"' -Wl,--out-implib=$(LIBRUBY)' |
96 |
- AS_CASE(["$target_os"], |
97 |
- [cygwin*], [ |
98 |
-@@ -4167,10 +4181,6 @@ |
99 |
- fi |
100 |
- ], |
101 |
- [mingw*], [ |
102 |
-- RUBY_SO_NAME="${rb_cv_msvcrt}-${RUBY_SO_NAME}" |
103 |
-- if test x"${target_cpu}" != xi386; then |
104 |
-- RUBY_SO_NAME="${target_cpu}-${RUBY_SO_NAME}" |
105 |
-- fi |
106 |
- if test x"$enable_shared" = xyes; then |
107 |
- LIBRUBY_SO='$(RUBY_SO_NAME)'.dll |
108 |
- LIBRUBY_DLDFLAGS="${LIBRUBY_DLDFLAGS}"' $(RUBYDEF)' |
109 |
|
110 |
diff --git a/dev-lang/ruby/files/2.4/005_no-undefined-ext.patch b/dev-lang/ruby/files/2.4/005_no-undefined-ext.patch |
111 |
deleted file mode 100644 |
112 |
index f2799324012..00000000000 |
113 |
--- a/dev-lang/ruby/files/2.4/005_no-undefined-ext.patch |
114 |
+++ /dev/null |
115 |
@@ -1,11 +0,0 @@ |
116 |
---- ruby-1.9.3-preview1.orig/configure.in |
117 |
-+++ ruby-1.9.3-preview1/configure.in |
118 |
-@@ -2038,7 +2038,7 @@ if test "$with_dln_a_out" != yes; then |
119 |
- [linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi* | kopensolaris*-gnu], [ |
120 |
- : ${LDSHARED='$(CC) -shared'} |
121 |
- if test "$rb_cv_binary_elf" = yes; then |
122 |
-- LDFLAGS="$LDFLAGS -Wl,-export-dynamic" |
123 |
-+ LDFLAGS="$LDFLAGS -Wl,-export-dynamic -Wl,--no-undefined" |
124 |
- fi |
125 |
- rb_cv_dlopen=yes], |
126 |
- [interix*], [ : ${LDSHARED='$(CC) -shared'} |
127 |
|
128 |
diff --git a/dev-lang/ruby/files/2.4/009_no-gems.patch b/dev-lang/ruby/files/2.4/009_no-gems.patch |
129 |
deleted file mode 100644 |
130 |
index 6e4e2643d4c..00000000000 |
131 |
--- a/dev-lang/ruby/files/2.4/009_no-gems.patch |
132 |
+++ /dev/null |
133 |
@@ -1,112 +0,0 @@ |
134 |
---- a/tool/rbinstall.rb.~1~ 2016-10-17 09:17:07.000000000 +0200 |
135 |
-+++ b/tool/rbinstall.rb 2016-12-25 08:20:07.873491045 +0100 |
136 |
-@@ -695,107 +695,11 @@ |
137 |
- # :startdoc: |
138 |
- |
139 |
- install?(:ext, :comm, :gem) do |
140 |
-- gem_dir = Gem.default_dir |
141 |
-- directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode) |
142 |
-- prepare "default gems", gem_dir, directories |
143 |
-- |
144 |
-- spec_dir = File.join(gem_dir, directories.grep(/^spec/)[0]) |
145 |
-- default_spec_dir = "#{spec_dir}/default" |
146 |
-- makedirs(default_spec_dir) |
147 |
-- |
148 |
-- gems = Dir.glob(srcdir+"/{lib,ext}/**/*.gemspec").map {|src| |
149 |
-- spec = Gem::Specification.load(src) || raise("invalid spec in #{src}") |
150 |
-- file_collector = RbInstall::Specs::FileCollector.new(File.dirname(src)) |
151 |
-- files = file_collector.collect |
152 |
-- next if files.empty? |
153 |
-- spec.files = files |
154 |
-- spec |
155 |
-- } |
156 |
-- gems.compact.sort_by(&:name).each do |gemspec| |
157 |
-- full_name = "#{gemspec.name}-#{gemspec.version}" |
158 |
-- |
159 |
-- puts "#{" "*30}#{gemspec.name} #{gemspec.version}" |
160 |
-- gemspec_path = File.join(default_spec_dir, "#{full_name}.gemspec") |
161 |
-- open_for_install(gemspec_path, $data_mode) do |
162 |
-- gemspec.to_ruby |
163 |
-- end |
164 |
-- |
165 |
-- unless gemspec.executables.empty? then |
166 |
-- bin_dir = File.join(gem_dir, 'gems', full_name, gemspec.bindir) |
167 |
-- makedirs(bin_dir) |
168 |
-- |
169 |
-- execs = gemspec.executables.map {|exec| File.join(srcdir, 'bin', exec)} |
170 |
-- install(execs, bin_dir, :mode => $script_mode) |
171 |
-- end |
172 |
-- end |
173 |
-+ # gems are unbundled in Gentoo |
174 |
- end |
175 |
- |
176 |
- install?(:ext, :comm, :gem) do |
177 |
-- gem_dir = Gem.default_dir |
178 |
-- directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode) |
179 |
-- prepare "bundle gems", gem_dir, directories |
180 |
-- install_dir = with_destdir(gem_dir) |
181 |
-- installed_gems = {} |
182 |
-- options = { |
183 |
-- :install_dir => install_dir, |
184 |
-- :bin_dir => with_destdir(bindir), |
185 |
-- :domain => :local, |
186 |
-- :ignore_dependencies => true, |
187 |
-- :dir_mode => $dir_mode, |
188 |
-- :data_mode => $data_mode, |
189 |
-- :prog_mode => $prog_mode, |
190 |
-- :wrappers => true, |
191 |
-- :format_executable => true, |
192 |
-- } |
193 |
-- gem_ext_dir = "#$extout/gems/#{CONFIG['arch']}" |
194 |
-- extensions_dir = Gem::StubSpecification.gemspec_stub("", gem_dir, gem_dir).extensions_dir |
195 |
-- Gem::Specification.each_gemspec([srcdir+'/gems/*']) do |path| |
196 |
-- dir = File.dirname(path) |
197 |
-- spec = Dir.chdir(dir) { |
198 |
-- Gem::Specification.load(File.basename(path)) |
199 |
-- } |
200 |
-- next unless spec.platform == Gem::Platform::RUBY |
201 |
-- next unless spec.full_name == path[srcdir.size..-1][/\A\/gems\/([^\/]+)/, 1] |
202 |
-- spec.extension_dir = "#{extensions_dir}/#{spec.full_name}" |
203 |
-- if File.directory?(ext = "#{gem_ext_dir}/#{spec.full_name}") |
204 |
-- spec.extensions[0] ||= "-" |
205 |
-- end |
206 |
-- ins = RbInstall::UnpackedInstaller.new(spec, options) |
207 |
-- puts "#{" "*30}#{spec.name} #{spec.version}" |
208 |
-- ins.install |
209 |
-- File.chmod($data_mode, File.join(install_dir, "specifications", "#{spec.full_name}.gemspec")) |
210 |
-- unless spec.extensions.empty? |
211 |
-- install_recursive(ext, spec.extension_dir) |
212 |
-- end |
213 |
-- installed_gems[spec.full_name] = true |
214 |
-- end |
215 |
-- installed_gems, gems = Dir.glob(srcdir+'/gems/*.gem').partition {|gem| installed_gems.key?(File.basename(gem, '.gem'))} |
216 |
-- unless installed_gems.empty? |
217 |
-- install installed_gems, gem_dir+"/cache" |
218 |
-- end |
219 |
-- next if gems.empty? |
220 |
-- if defined?(Zlib) |
221 |
-- Gem.instance_variable_set(:@ruby, with_destdir(File.join(bindir, ruby_install_name))) |
222 |
-- silent = Gem::SilentUI.new |
223 |
-- gems.each do |gem| |
224 |
-- inst = Gem::Installer.new(gem, options) |
225 |
-- inst.spec.extension_dir = with_destdir(inst.spec.extension_dir) |
226 |
-- begin |
227 |
-- Gem::DefaultUserInteraction.use_ui(silent) {inst.install} |
228 |
-- rescue Gem::InstallError => e |
229 |
-- next |
230 |
-- end |
231 |
-- gemname = File.basename(gem) |
232 |
-- puts "#{" "*30}#{gemname}" |
233 |
-- end |
234 |
-- # fix directory permissions |
235 |
-- # TODO: Gem.install should accept :dir_mode option or something |
236 |
-- File.chmod($dir_mode, *Dir.glob(install_dir+"/**/")) |
237 |
-- # fix .gemspec permissions |
238 |
-- File.chmod($data_mode, *Dir.glob(install_dir+"/specifications/*.gemspec")) |
239 |
-- else |
240 |
-- puts "skip installing bundle gems because of lacking zlib" |
241 |
-- end |
242 |
-+ # gems are unbundled in Gentoo |
243 |
- end |
244 |
- |
245 |
- parse_args() |
246 |
|
247 |
diff --git a/dev-lang/ruby/files/2.4/011-gcc8.patch b/dev-lang/ruby/files/2.4/011-gcc8.patch |
248 |
deleted file mode 100644 |
249 |
index cb2443631dd..00000000000 |
250 |
--- a/dev-lang/ruby/files/2.4/011-gcc8.patch |
251 |
+++ /dev/null |
252 |
@@ -1,64 +0,0 @@ |
253 |
-From 027b576b31cd12bad575b3a39476726273f58c41 Mon Sep 17 00:00:00 2001 |
254 |
-From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> |
255 |
-Date: Mon, 18 Dec 2017 09:03:59 +0000 |
256 |
-Subject: [PATCH] suppress warning: 'const' attribute on function returning |
257 |
- 'void' |
258 |
- |
259 |
-git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61323 b2dd03c8-39d4-4d8f-98ff-823fe69b080e |
260 |
---- |
261 |
- include/ruby/intern.h | 4 ++-- |
262 |
- include/ruby/ruby.h | 2 +- |
263 |
- internal.h | 4 ++-- |
264 |
- 3 files changed, 5 insertions(+), 5 deletions(-) |
265 |
- |
266 |
-diff --git a/include/ruby/intern.h b/include/ruby/intern.h |
267 |
-index 5684b3230a67..a711b861159f 100644 |
268 |
---- a/include/ruby/intern.h |
269 |
-+++ b/include/ruby/intern.h |
270 |
-@@ -249,9 +249,9 @@ PRINTF_ARGS(NORETURN(void rb_name_error_str(VALUE, const char*, ...)), 2, 3); |
271 |
- NORETURN(void rb_invalid_str(const char*, const char*)); |
272 |
- NORETURN(void rb_error_frozen(const char*)); |
273 |
- NORETURN(void rb_error_frozen_object(VALUE)); |
274 |
--CONSTFUNC(void rb_error_untrusted(VALUE)); |
275 |
-+void rb_error_untrusted(VALUE); |
276 |
- void rb_check_frozen(VALUE); |
277 |
--CONSTFUNC(void rb_check_trusted(VALUE)); |
278 |
-+void rb_check_trusted(VALUE); |
279 |
- #define rb_check_frozen_internal(obj) do { \ |
280 |
- VALUE frozen_obj = (obj); \ |
281 |
- if (OBJ_FROZEN(frozen_obj)) { \ |
282 |
-diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h |
283 |
-index 9c7d2fb68439..3210103c648a 100644 |
284 |
---- a/include/ruby/ruby.h |
285 |
-+++ b/include/ruby/ruby.h |
286 |
-@@ -628,7 +628,7 @@ int ruby_safe_level_2_warning(void) __attribute__((const,warning("$SAFE=2 to 4 a |
287 |
- # define rb_set_safe_level(level) rb_set_safe_level(RUBY_SAFE_LEVEL_CHECK(level, error)) |
288 |
- #endif |
289 |
- void rb_set_safe_level_force(int); |
290 |
--CONSTFUNC(void rb_secure_update(VALUE)); |
291 |
-+void rb_secure_update(VALUE); |
292 |
- NORETURN(void rb_insecure_operation(void)); |
293 |
- |
294 |
- VALUE rb_errinfo(void); |
295 |
-diff --git a/internal.h b/internal.h |
296 |
-index d0257a8d8ba0..4ccf3218c6ca 100644 |
297 |
---- a/internal.h |
298 |
-+++ b/internal.h |
299 |
-@@ -1110,7 +1110,7 @@ VALUE rb_invcmp(VALUE, VALUE); |
300 |
- struct rb_block; |
301 |
- int rb_dvar_defined(ID, const struct rb_block *); |
302 |
- int rb_local_defined(ID, const struct rb_block *); |
303 |
--CONSTFUNC(const char * rb_insns_name(int i)); |
304 |
-+const char * rb_insns_name(int i); |
305 |
- VALUE rb_insns_name_array(void); |
306 |
- |
307 |
- /* complex.c */ |
308 |
-@@ -1136,7 +1136,7 @@ void Init_ext(void); |
309 |
- |
310 |
- /* encoding.c */ |
311 |
- ID rb_id_encoding(void); |
312 |
--CONSTFUNC(void rb_gc_mark_encodings(void)); |
313 |
-+void rb_gc_mark_encodings(void); |
314 |
- rb_encoding *rb_enc_get_from_index(int index); |
315 |
- rb_encoding *rb_enc_check_str(VALUE str1, VALUE str2); |
316 |
- int rb_encdb_replicate(const char *alias, const char *orig); |
317 |
|
318 |
diff --git a/dev-lang/ruby/files/2.4/012-openssl_1.1.patch b/dev-lang/ruby/files/2.4/012-openssl_1.1.patch |
319 |
deleted file mode 100644 |
320 |
index edf344bedc8..00000000000 |
321 |
--- a/dev-lang/ruby/files/2.4/012-openssl_1.1.patch |
322 |
+++ /dev/null |
323 |
@@ -1,339 +0,0 @@ |
324 |
-From 7af808153dd34a980e027a04d4490ae38019b3ed Mon Sep 17 00:00:00 2001 |
325 |
-From: Mark Wright <gienah@g.o> |
326 |
-Date: Sun, 15 Oct 2017 01:24:12 +1100 |
327 |
-Subject: [PATCH] Fix build failure against OpenSSL 1.1 built with |
328 |
- no-deprecated Thanks rhenium for the code review and fixes. |
329 |
- |
330 |
---- |
331 |
- ext/openssl/openssl_missing.h | 4 +++ |
332 |
- ext/openssl/ossl.c | 23 ++++++--------- |
333 |
- ext/openssl/ossl.h | 5 ++++ |
334 |
- ext/openssl/ossl_cipher.c | 14 ++++----- |
335 |
- ext/openssl/ossl_engine.c | 54 ++++++++++++++++++++++------------- |
336 |
- ext/openssl/ossl_ssl.c | 2 +- |
337 |
- ext/openssl/ossl_x509cert.c | 4 +-- |
338 |
- ext/openssl/ossl_x509crl.c | 4 +-- |
339 |
- 8 files changed, 63 insertions(+), 47 deletions(-) |
340 |
- |
341 |
-diff --git a/ext/openssl/openssl_missing.h b/ext/openssl/openssl_missing.h |
342 |
-index cc31f6ac..debd25ad 100644 |
343 |
---- a/ext/openssl/openssl_missing.h |
344 |
-+++ b/ext/openssl/openssl_missing.h |
345 |
-@@ -209,6 +209,10 @@ IMPL_PKEY_GETTER(EC_KEY, ec) |
346 |
- # define X509_get0_notAfter(x) X509_get_notAfter(x) |
347 |
- # define X509_CRL_get0_lastUpdate(x) X509_CRL_get_lastUpdate(x) |
348 |
- # define X509_CRL_get0_nextUpdate(x) X509_CRL_get_nextUpdate(x) |
349 |
-+# define X509_set1_notBefore(x, t) X509_set_notBefore(x, t) |
350 |
-+# define X509_set1_notAfter(x, t) X509_set_notAfter(x, t) |
351 |
-+# define X509_CRL_set1_lastUpdate(x, t) X509_CRL_set_lastUpdate(x, t) |
352 |
-+# define X509_CRL_set1_nextUpdate(x, t) X509_CRL_set_nextUpdate(x, t) |
353 |
- #endif |
354 |
- |
355 |
- #if !defined(HAVE_SSL_SESSION_GET_PROTOCOL_VERSION) |
356 |
-diff --git a/ext/openssl/ossl.c b/ext/openssl/ossl.c |
357 |
-index 93ecc7d4..245385e7 100644 |
358 |
---- a/ext/openssl/ossl.c |
359 |
-+++ b/ext/openssl/ossl.c |
360 |
-@@ -1109,25 +1109,14 @@ Init_openssl(void) |
361 |
- /* |
362 |
- * Init all digests, ciphers |
363 |
- */ |
364 |
-- /* CRYPTO_malloc_init(); */ |
365 |
-- /* ENGINE_load_builtin_engines(); */ |
366 |
-+#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000 |
367 |
-+ if (!OPENSSL_init_ssl(0, NULL)) |
368 |
-+ rb_raise(rb_eRuntimeError, "OPENSSL_init_ssl"); |
369 |
-+#else |
370 |
- OpenSSL_add_ssl_algorithms(); |
371 |
- OpenSSL_add_all_algorithms(); |
372 |
- ERR_load_crypto_strings(); |
373 |
- SSL_load_error_strings(); |
374 |
-- |
375 |
-- /* |
376 |
-- * FIXME: |
377 |
-- * On unload do: |
378 |
-- */ |
379 |
--#if 0 |
380 |
-- CONF_modules_unload(1); |
381 |
-- destroy_ui_method(); |
382 |
-- EVP_cleanup(); |
383 |
-- ENGINE_cleanup(); |
384 |
-- CRYPTO_cleanup_all_ex_data(); |
385 |
-- ERR_remove_state(0); |
386 |
-- ERR_free_strings(); |
387 |
- #endif |
388 |
- |
389 |
- /* |
390 |
-@@ -1149,7 +1138,11 @@ Init_openssl(void) |
391 |
- /* |
392 |
- * Version of OpenSSL the ruby OpenSSL extension is running with |
393 |
- */ |
394 |
-+#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000 |
395 |
-+ rb_define_const(mOSSL, "OPENSSL_LIBRARY_VERSION", rb_str_new2(OpenSSL_version(OPENSSL_VERSION))); |
396 |
-+#else |
397 |
- rb_define_const(mOSSL, "OPENSSL_LIBRARY_VERSION", rb_str_new2(SSLeay_version(SSLEAY_VERSION))); |
398 |
-+#endif |
399 |
- |
400 |
- /* |
401 |
- * Version number of OpenSSL the ruby OpenSSL extension was built with |
402 |
-diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h |
403 |
-index f08889b2..5a15839c 100644 |
404 |
---- a/ext/openssl/ossl.h |
405 |
-+++ b/ext/openssl/ossl.h |
406 |
-@@ -35,6 +35,11 @@ |
407 |
- #if !defined(OPENSSL_NO_OCSP) |
408 |
- # include <openssl/ocsp.h> |
409 |
- #endif |
410 |
-+#include <openssl/bn.h> |
411 |
-+#include <openssl/rsa.h> |
412 |
-+#include <openssl/dsa.h> |
413 |
-+#include <openssl/evp.h> |
414 |
-+#include <openssl/dh.h> |
415 |
- |
416 |
- /* |
417 |
- * Common Module |
418 |
-diff --git a/ext/openssl/ossl_cipher.c b/ext/openssl/ossl_cipher.c |
419 |
-index bfa76c1a..e6179733 100644 |
420 |
---- a/ext/openssl/ossl_cipher.c |
421 |
-+++ b/ext/openssl/ossl_cipher.c |
422 |
-@@ -508,9 +508,9 @@ ossl_cipher_set_iv(VALUE self, VALUE iv) |
423 |
- StringValue(iv); |
424 |
- GetCipher(self, ctx); |
425 |
- |
426 |
- #if defined(HAVE_AUTHENTICATED_ENCRYPTION) |
427 |
-- if (EVP_CIPHER_CTX_flags(ctx) & EVP_CIPH_FLAG_AEAD_CIPHER) |
428 |
-+ if (EVP_CIPHER_flags(EVP_CIPHER_CTX_cipher(ctx)) & EVP_CIPH_FLAG_AEAD_CIPHER) |
429 |
- iv_len = (int)(VALUE)EVP_CIPHER_CTX_get_app_data(ctx); |
430 |
- #endif |
431 |
- if (!iv_len) |
432 |
- iv_len = EVP_CIPHER_CTX_iv_length(ctx); |
433 |
-@@ -535,7 +535,7 @@ ossl_cipher_is_authenticated(VALUE self) |
434 |
- |
435 |
- GetCipher(self, ctx); |
436 |
- |
437 |
- #if defined(HAVE_AUTHENTICATED_ENCRYPTION) |
438 |
-- return (EVP_CIPHER_CTX_flags(ctx) & EVP_CIPH_FLAG_AEAD_CIPHER) ? Qtrue : Qfalse; |
439 |
-+ return (EVP_CIPHER_flags(EVP_CIPHER_CTX_cipher(ctx)) & EVP_CIPH_FLAG_AEAD_CIPHER) ? Qtrue : Qfalse; |
440 |
- #else |
441 |
- return Qfalse; |
442 |
- #endif |
443 |
-@@ -606,7 +606,7 @@ ossl_cipher_get_auth_tag(int argc, VALUE *argv, VALUE self) |
444 |
- |
445 |
- GetCipher(self, ctx); |
446 |
- |
447 |
-- if (!(EVP_CIPHER_CTX_flags(ctx) & EVP_CIPH_FLAG_AEAD_CIPHER)) |
448 |
-+ if (!(EVP_CIPHER_flags(EVP_CIPHER_CTX_cipher(ctx)) & EVP_CIPH_FLAG_AEAD_CIPHER)) |
449 |
- ossl_raise(eCipherError, "authentication tag not supported by this cipher"); |
450 |
- |
451 |
- ret = rb_str_new(NULL, tag_len); |
452 |
-@@ -641,7 +641,7 @@ ossl_cipher_set_auth_tag(VALUE self, VALUE vtag) |
453 |
- tag_len = RSTRING_LENINT(vtag); |
454 |
- |
455 |
- GetCipher(self, ctx); |
456 |
-- if (!(EVP_CIPHER_CTX_flags(ctx) & EVP_CIPH_FLAG_AEAD_CIPHER)) |
457 |
-+ if (!(EVP_CIPHER_flags(EVP_CIPHER_CTX_cipher(ctx)) & EVP_CIPH_FLAG_AEAD_CIPHER)) |
458 |
- ossl_raise(eCipherError, "authentication tag not supported by this cipher"); |
459 |
- |
460 |
- if (!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG, tag_len, tag)) |
461 |
-@@ -668,7 +668,7 @@ ossl_cipher_set_auth_tag_len(VALUE self, VALUE vlen) |
462 |
- EVP_CIPHER_CTX *ctx; |
463 |
- |
464 |
- GetCipher(self, ctx); |
465 |
-- if (!(EVP_CIPHER_CTX_flags(ctx) & EVP_CIPH_FLAG_AEAD_CIPHER)) |
466 |
-+ if (!(EVP_CIPHER_flags(EVP_CIPHER_CTX_cipher(ctx)) & EVP_CIPH_FLAG_AEAD_CIPHER)) |
467 |
- ossl_raise(eCipherError, "AEAD not supported by this cipher"); |
468 |
- |
469 |
- if (!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG, tag_len, NULL)) |
470 |
-@@ -695,7 +695,7 @@ ossl_cipher_set_iv_length(VALUE self, VALUE iv_length) |
471 |
- EVP_CIPHER_CTX *ctx; |
472 |
- |
473 |
- GetCipher(self, ctx); |
474 |
-- if (!(EVP_CIPHER_CTX_flags(ctx) & EVP_CIPH_FLAG_AEAD_CIPHER)) |
475 |
-+ if (!(EVP_CIPHER_flags(EVP_CIPHER_CTX_cipher(ctx)) & EVP_CIPH_FLAG_AEAD_CIPHER)) |
476 |
- ossl_raise(eCipherError, "cipher does not support AEAD"); |
477 |
- |
478 |
- if (!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_IVLEN, len, NULL)) |
479 |
-@@ -786,9 +786,9 @@ ossl_cipher_iv_length(VALUE self) |
480 |
- int len = 0; |
481 |
- |
482 |
- GetCipher(self, ctx); |
483 |
- #if defined(HAVE_AUTHENTICATED_ENCRYPTION) |
484 |
-- if (EVP_CIPHER_CTX_flags(ctx) & EVP_CIPH_FLAG_AEAD_CIPHER) |
485 |
-+ if (EVP_CIPHER_flags(EVP_CIPHER_CTX_cipher(ctx)) & EVP_CIPH_FLAG_AEAD_CIPHER) |
486 |
- len = (int)(VALUE)EVP_CIPHER_CTX_get_app_data(ctx); |
487 |
- #endif |
488 |
- if (!len) |
489 |
- len = EVP_CIPHER_CTX_iv_length(ctx); |
490 |
-diff --git a/ext/openssl/ossl_engine.c b/ext/openssl/ossl_engine.c |
491 |
-index d69b5dca..5ca0d4ca 100644 |
492 |
---- a/ext/openssl/ossl_engine.c |
493 |
-+++ b/ext/openssl/ossl_engine.c |
494 |
-@@ -46,13 +46,25 @@ VALUE eEngineError; |
495 |
- /* |
496 |
- * Private |
497 |
- */ |
498 |
--#define OSSL_ENGINE_LOAD_IF_MATCH(x) \ |
499 |
-+#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000 |
500 |
-+#define OSSL_ENGINE_LOAD_IF_MATCH(engine_name, x) \ |
501 |
- do{\ |
502 |
-- if(!strcmp(#x, RSTRING_PTR(name))){\ |
503 |
-- ENGINE_load_##x();\ |
504 |
-+ if(!strcmp(#engine_name, RSTRING_PTR(name))){\ |
505 |
-+ if (OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_##x, NULL))\ |
506 |
-+ return Qtrue;\ |
507 |
-+ else\ |
508 |
-+ ossl_raise(eEngineError, "OPENSSL_init_crypto"); \ |
509 |
-+ }\ |
510 |
-+}while(0) |
511 |
-+#else |
512 |
-+#define OSSL_ENGINE_LOAD_IF_MATCH(engine_name, x) \ |
513 |
-+do{\ |
514 |
-+ if(!strcmp(#engine_name, RSTRING_PTR(name))){\ |
515 |
-+ ENGINE_load_##engine_name();\ |
516 |
- return Qtrue;\ |
517 |
- }\ |
518 |
- }while(0) |
519 |
-+#endif |
520 |
- |
521 |
- static void |
522 |
- ossl_engine_free(void *engine) |
523 |
-@@ -94,55 +106,55 @@ ossl_engine_s_load(int argc, VALUE *argv, VALUE klass) |
524 |
- StringValueCStr(name); |
525 |
- #ifndef OPENSSL_NO_STATIC_ENGINE |
526 |
- #if HAVE_ENGINE_LOAD_DYNAMIC |
527 |
-- OSSL_ENGINE_LOAD_IF_MATCH(dynamic); |
528 |
-+ OSSL_ENGINE_LOAD_IF_MATCH(dynamic, DYNAMIC); |
529 |
- #endif |
530 |
- #if HAVE_ENGINE_LOAD_4758CCA |
531 |
-- OSSL_ENGINE_LOAD_IF_MATCH(4758cca); |
532 |
-+ OSSL_ENGINE_LOAD_IF_MATCH(4758cca, 4758CCA); |
533 |
- #endif |
534 |
- #if HAVE_ENGINE_LOAD_AEP |
535 |
-- OSSL_ENGINE_LOAD_IF_MATCH(aep); |
536 |
-+ OSSL_ENGINE_LOAD_IF_MATCH(aep, AEP); |
537 |
- #endif |
538 |
- #if HAVE_ENGINE_LOAD_ATALLA |
539 |
-- OSSL_ENGINE_LOAD_IF_MATCH(atalla); |
540 |
-+ OSSL_ENGINE_LOAD_IF_MATCH(atalla, ATALLA); |
541 |
- #endif |
542 |
- #if HAVE_ENGINE_LOAD_CHIL |
543 |
-- OSSL_ENGINE_LOAD_IF_MATCH(chil); |
544 |
-+ OSSL_ENGINE_LOAD_IF_MATCH(chil, CHIL); |
545 |
- #endif |
546 |
- #if HAVE_ENGINE_LOAD_CSWIFT |
547 |
-- OSSL_ENGINE_LOAD_IF_MATCH(cswift); |
548 |
-+ OSSL_ENGINE_LOAD_IF_MATCH(cswift, CSWIFT); |
549 |
- #endif |
550 |
- #if HAVE_ENGINE_LOAD_NURON |
551 |
-- OSSL_ENGINE_LOAD_IF_MATCH(nuron); |
552 |
-+ OSSL_ENGINE_LOAD_IF_MATCH(nuron, NURON); |
553 |
- #endif |
554 |
- #if HAVE_ENGINE_LOAD_SUREWARE |
555 |
-- OSSL_ENGINE_LOAD_IF_MATCH(sureware); |
556 |
-+ OSSL_ENGINE_LOAD_IF_MATCH(sureware, SUREWARE); |
557 |
- #endif |
558 |
- #if HAVE_ENGINE_LOAD_UBSEC |
559 |
-- OSSL_ENGINE_LOAD_IF_MATCH(ubsec); |
560 |
-+ OSSL_ENGINE_LOAD_IF_MATCH(ubsec, UBSEC); |
561 |
- #endif |
562 |
- #if HAVE_ENGINE_LOAD_PADLOCK |
563 |
-- OSSL_ENGINE_LOAD_IF_MATCH(padlock); |
564 |
-+ OSSL_ENGINE_LOAD_IF_MATCH(padlock, PADLOCK); |
565 |
- #endif |
566 |
- #if HAVE_ENGINE_LOAD_CAPI |
567 |
-- OSSL_ENGINE_LOAD_IF_MATCH(capi); |
568 |
-+ OSSL_ENGINE_LOAD_IF_MATCH(capi, CAPI); |
569 |
- #endif |
570 |
- #if HAVE_ENGINE_LOAD_GMP |
571 |
-- OSSL_ENGINE_LOAD_IF_MATCH(gmp); |
572 |
-+ OSSL_ENGINE_LOAD_IF_MATCH(gmp, GMP); |
573 |
- #endif |
574 |
- #if HAVE_ENGINE_LOAD_GOST |
575 |
-- OSSL_ENGINE_LOAD_IF_MATCH(gost); |
576 |
-+ OSSL_ENGINE_LOAD_IF_MATCH(gost, GOST); |
577 |
- #endif |
578 |
- #if HAVE_ENGINE_LOAD_CRYPTODEV |
579 |
-- OSSL_ENGINE_LOAD_IF_MATCH(cryptodev); |
580 |
-+ OSSL_ENGINE_LOAD_IF_MATCH(cryptodev, CRYPTODEV); |
581 |
- #endif |
582 |
- #if HAVE_ENGINE_LOAD_AESNI |
583 |
-- OSSL_ENGINE_LOAD_IF_MATCH(aesni); |
584 |
-+ OSSL_ENGINE_LOAD_IF_MATCH(aesni, AESNI); |
585 |
- #endif |
586 |
- #endif |
587 |
- #ifdef HAVE_ENGINE_LOAD_OPENBSD_DEV_CRYPTO |
588 |
-- OSSL_ENGINE_LOAD_IF_MATCH(openbsd_dev_crypto); |
589 |
-+ OSSL_ENGINE_LOAD_IF_MATCH(openbsd_dev_crypto, OPENBSD_DEV_CRYPTO); |
590 |
- #endif |
591 |
-- OSSL_ENGINE_LOAD_IF_MATCH(openssl); |
592 |
-+ OSSL_ENGINE_LOAD_IF_MATCH(openssl, OPENSSL); |
593 |
- rb_warning("no such builtin loader for `%"PRIsVALUE"'", name); |
594 |
- return Qnil; |
595 |
- #endif /* HAVE_ENGINE_LOAD_BUILTIN_ENGINES */ |
596 |
-@@ -160,7 +172,9 @@ ossl_engine_s_load(int argc, VALUE *argv, VALUE klass) |
597 |
- static VALUE |
598 |
- ossl_engine_s_cleanup(VALUE self) |
599 |
- { |
600 |
-+#if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000 |
601 |
- ENGINE_cleanup(); |
602 |
-+#endif |
603 |
- return Qnil; |
604 |
- } |
605 |
- |
606 |
-diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c |
607 |
-index 8e3c0c42..d32a299c 100644 |
608 |
---- a/ext/openssl/ossl_ssl.c |
609 |
-+++ b/ext/openssl/ossl_ssl.c |
610 |
-@@ -379,7 +379,7 @@ ossl_call_session_get_cb(VALUE ary) |
611 |
- |
612 |
- /* this method is currently only called for servers (in OpenSSL <= 0.9.8e) */ |
613 |
- static SSL_SESSION * |
614 |
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) |
615 |
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER) |
616 |
- ossl_sslctx_session_get_cb(SSL *ssl, const unsigned char *buf, int len, int *copy) |
617 |
- #else |
618 |
- ossl_sslctx_session_get_cb(SSL *ssl, unsigned char *buf, int len, int *copy) |
619 |
-diff --git a/ext/openssl/ossl_x509cert.c b/ext/openssl/ossl_x509cert.c |
620 |
-index cf82a53d..8d16b9b7 100644 |
621 |
---- a/ext/openssl/ossl_x509cert.c |
622 |
-+++ b/ext/openssl/ossl_x509cert.c |
623 |
-@@ -440,7 +440,7 @@ ossl_x509_set_not_before(VALUE self, VALUE time) |
624 |
- |
625 |
- GetX509(self, x509); |
626 |
- asn1time = ossl_x509_time_adjust(NULL, time); |
627 |
-- if (!X509_set_notBefore(x509, asn1time)) { |
628 |
-+ if (!X509_set1_notBefore(x509, asn1time)) { |
629 |
- ASN1_TIME_free(asn1time); |
630 |
- ossl_raise(eX509CertError, "X509_set_notBefore"); |
631 |
- } |
632 |
-@@ -479,7 +479,7 @@ ossl_x509_set_not_after(VALUE self, VALUE time) |
633 |
- |
634 |
- GetX509(self, x509); |
635 |
- asn1time = ossl_x509_time_adjust(NULL, time); |
636 |
-- if (!X509_set_notAfter(x509, asn1time)) { |
637 |
-+ if (!X509_set1_notAfter(x509, asn1time)) { |
638 |
- ASN1_TIME_free(asn1time); |
639 |
- ossl_raise(eX509CertError, "X509_set_notAfter"); |
640 |
- } |
641 |
-diff --git a/ext/openssl/ossl_x509crl.c b/ext/openssl/ossl_x509crl.c |
642 |
-index 5ecd7ea0..45cf7fb4 100644 |
643 |
---- a/ext/openssl/ossl_x509crl.c |
644 |
-+++ b/ext/openssl/ossl_x509crl.c |
645 |
-@@ -226,7 +226,7 @@ ossl_x509crl_set_last_update(VALUE self, VALUE time) |
646 |
- |
647 |
- GetX509CRL(self, crl); |
648 |
- asn1time = ossl_x509_time_adjust(NULL, time); |
649 |
-- if (!X509_CRL_set_lastUpdate(crl, asn1time)) { |
650 |
-+ if (!X509_CRL_set1_lastUpdate(crl, asn1time)) { |
651 |
- ASN1_TIME_free(asn1time); |
652 |
- ossl_raise(eX509CRLError, "X509_CRL_set_lastUpdate"); |
653 |
- } |
654 |
-@@ -257,7 +257,7 @@ ossl_x509crl_set_next_update(VALUE self, VALUE time) |
655 |
- |
656 |
- GetX509CRL(self, crl); |
657 |
- asn1time = ossl_x509_time_adjust(NULL, time); |
658 |
-- if (!X509_CRL_set_nextUpdate(crl, asn1time)) { |
659 |
-+ if (!X509_CRL_set1_nextUpdate(crl, asn1time)) { |
660 |
- ASN1_TIME_free(asn1time); |
661 |
- ossl_raise(eX509CRLError, "X509_CRL_set_nextUpdate"); |
662 |
- } |
663 |
|
664 |
diff --git a/dev-lang/ruby/files/2.5/001-ia64-update-ia64-specific-code-to-use-execution-cont.patch b/dev-lang/ruby/files/2.5/001-ia64-update-ia64-specific-code-to-use-execution-cont.patch |
665 |
deleted file mode 100644 |
666 |
index 2ade8b8d420..00000000000 |
667 |
--- a/dev-lang/ruby/files/2.5/001-ia64-update-ia64-specific-code-to-use-execution-cont.patch |
668 |
+++ /dev/null |
669 |
@@ -1,67 +0,0 @@ |
670 |
-From 5af43b1ec2674e9f86090790bc61abdb96be14ff Mon Sep 17 00:00:00 2001 |
671 |
-From: hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> |
672 |
-Date: Tue, 30 Jan 2018 05:43:42 +0000 |
673 |
-Subject: [PATCH] ia64: update ia64-specific code to use execution context |
674 |
- |
675 |
-This change follows commit 837fd5e494731d7d44786f29e7d6e8c27029806f |
676 |
-in '#ifdef __ia64' branches. |
677 |
- |
678 |
-Noticed as a build failure by John Paul Adrian Glaubitz: |
679 |
- |
680 |
-``` |
681 |
- cont.c:502:50: error: 'rb_thread_t {aka struct rb_thread_struct}' |
682 |
- has no member named 'machine' |
683 |
- size = cont->machine.register_stack_size = |
684 |
- th->machine.register_stack_end - th->machine.register_stack_start; |
685 |
- ^~ |
686 |
-``` |
687 |
- |
688 |
-The change is trivial: update 'th->machine' usage to 'th->ec->machine'. |
689 |
-Signed-off-by: Sergei Trofimovich <slyfox@g.o> |
690 |
- |
691 |
-git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62106 b2dd03c8-39d4-4d8f-98ff-823fe69b080e |
692 |
---- |
693 |
- cont.c | 6 +++--- |
694 |
- thread.c | 2 +- |
695 |
- 2 files changed, 4 insertions(+), 4 deletions(-) |
696 |
- |
697 |
-diff --git a/cont.c b/cont.c |
698 |
-index f48fd2e52b..93a64f8fe6 100644 |
699 |
---- a/cont.c |
700 |
-+++ b/cont.c |
701 |
-@@ -475,7 +475,7 @@ cont_save_machine_stack(rb_thread_t *th, rb_context_t *cont) |
702 |
- |
703 |
- SET_MACHINE_STACK_END(&th->ec->machine.stack_end); |
704 |
- #ifdef __ia64 |
705 |
-- th->machine.register_stack_end = rb_ia64_bsp(); |
706 |
-+ th->ec->machine.register_stack_end = rb_ia64_bsp(); |
707 |
- #endif |
708 |
- |
709 |
- if (th->ec->machine.stack_start > th->ec->machine.stack_end) { |
710 |
-@@ -499,8 +499,8 @@ cont_save_machine_stack(rb_thread_t *th, rb_context_t *cont) |
711 |
- |
712 |
- #ifdef __ia64 |
713 |
- rb_ia64_flushrs(); |
714 |
-- size = cont->machine.register_stack_size = th->machine.register_stack_end - th->machine.register_stack_start; |
715 |
-- cont->machine.register_stack_src = th->machine.register_stack_start; |
716 |
-+ size = cont->machine.register_stack_size = th->ec->machine.register_stack_end - th->ec->machine.register_stack_start; |
717 |
-+ cont->machine.register_stack_src = th->ec->machine.register_stack_start; |
718 |
- if (cont->machine.register_stack) { |
719 |
- REALLOC_N(cont->machine.register_stack, VALUE, size); |
720 |
- } |
721 |
-diff --git a/thread.c b/thread.c |
722 |
-index acb53354fd..23957eba09 100644 |
723 |
---- a/thread.c |
724 |
-+++ b/thread.c |
725 |
-@@ -133,7 +133,7 @@ static inline void blocking_region_end(rb_thread_t *th, struct rb_blocking_regio |
726 |
- |
727 |
- #ifdef __ia64 |
728 |
- #define RB_GC_SAVE_MACHINE_REGISTER_STACK(th) \ |
729 |
-- do{(th)->machine.register_stack_end = rb_ia64_bsp();}while(0) |
730 |
-+ do{(th)->ec->machine.register_stack_end = rb_ia64_bsp();}while(0) |
731 |
- #else |
732 |
- #define RB_GC_SAVE_MACHINE_REGISTER_STACK(th) |
733 |
- #endif |
734 |
--- |
735 |
-2.16.1 |
736 |
- |
737 |
|
738 |
diff --git a/dev-lang/ruby/files/2.5/002-autoconf-2.70.patch b/dev-lang/ruby/files/2.5/002-autoconf-2.70.patch |
739 |
deleted file mode 100644 |
740 |
index 576ed6c759b..00000000000 |
741 |
--- a/dev-lang/ruby/files/2.5/002-autoconf-2.70.patch |
742 |
+++ /dev/null |
743 |
@@ -1,65 +0,0 @@ |
744 |
-From 6160ea5e22ee7353a0814159c94bd3cf890a52ce Mon Sep 17 00:00:00 2001 |
745 |
-From: Sergei Trofimovich <slyfox@g.o> |
746 |
-Date: Mon, 16 Nov 2020 08:42:15 +0000 |
747 |
-Subject: [PATCH] configure.ac: fix for upcoming autoconf-2.70 |
748 |
- |
749 |
-The failure initially noticed on `autoconf-2.69d` (soon to become 2.70): |
750 |
- |
751 |
-``` |
752 |
-$ ./configure |
753 |
-./configure: line 8720: syntax error near unexpected token `fi' |
754 |
-./configure: line 8720: `fi' |
755 |
-``` |
756 |
- |
757 |
-Before the change generated `./configure ` snippet looked like: |
758 |
- |
759 |
-``` |
760 |
- if ! $CC -E -xc - <<SRC >/dev/null |
761 |
-then : |
762 |
- |
763 |
- #if defined __APPLE_CC__ && defined __clang_major__ && __clang_major__ < 3 |
764 |
- #error premature clang |
765 |
- #endif |
766 |
-SRC |
767 |
- as_fn_error $? "clang version 3.0 or later is required" "$LINENO" 5 |
768 |
-fi |
769 |
-``` |
770 |
- |
771 |
-Note the newline that breaks here-document syntax. |
772 |
- |
773 |
-After the change the snippet does not use here-document. |
774 |
- |
775 |
-Signed-off-by: Sergei Trofimovich <slyfox@g.o> |
776 |
---- |
777 |
- configure.ac | 15 ++++++++------- |
778 |
- 1 file changed, 8 insertions(+), 7 deletions(-) |
779 |
- |
780 |
-diff --git a/configure.ac b/configure.ac |
781 |
-index a5e3dc76f6..4e4a52f066 100644 |
782 |
---- a/configure.ac |
783 |
-+++ b/configure.ac |
784 |
-@@ -271,13 +271,14 @@ AS_CASE(["$host_os:$build_os"], |
785 |
- # clang version 1.0 (http://llvm.org/svn/llvm-project/cfe/tags/Apple/clang-23 exported) |
786 |
- # Apple clang version 2.0 (tags/Apple/clang-137) (based on LLVM 2.9svn) |
787 |
- # Apple clang version 2.1 (tags/Apple/clang-163.7.1) (based on LLVM 3.0svn) |
788 |
-- AS_IF([! $CC -E -xc - <<SRC >/dev/null], [ |
789 |
-- @%:@if defined __APPLE_CC__ && defined __clang_major__ && __clang_major__ < 3 |
790 |
-- @%:@error premature clang |
791 |
-- @%:@endif |
792 |
--SRC |
793 |
-- AC_MSG_ERROR([clang version 3.0 or later is required]) |
794 |
-- ]) |
795 |
-+ AC_PREPROC_IFELSE( |
796 |
-+ [AC_LANG_PROGRAM([ |
797 |
-+ @%:@if defined __APPLE_CC__ && defined __clang_major__ && __clang_major__ < 3 |
798 |
-+ @%:@error premature clang |
799 |
-+ @%:@endif |
800 |
-+ ])], |
801 |
-+ [], |
802 |
-+ [AC_MSG_ERROR([clang version 3.0 or later is required])]) |
803 |
- ]) |
804 |
- |
805 |
- AS_CASE(["$target_os"], |
806 |
--- |
807 |
-2.29.2 |
808 |
- |
809 |
|
810 |
diff --git a/dev-lang/ruby/files/2.5/005_no-undefined-ext.patch b/dev-lang/ruby/files/2.5/005_no-undefined-ext.patch |
811 |
deleted file mode 100644 |
812 |
index 1f0fdda08da..00000000000 |
813 |
--- a/dev-lang/ruby/files/2.5/005_no-undefined-ext.patch |
814 |
+++ /dev/null |
815 |
@@ -1,11 +0,0 @@ |
816 |
---- a/configure.ac.~1~ 2017-12-15 10:43:40.000000000 +0100 |
817 |
-+++ b/configure.ac 2017-12-25 11:02:19.099076831 +0100 |
818 |
-@@ -3233,7 +3233,7 @@ |
819 |
- [linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi* | kopensolaris*-gnu | haiku*], [ |
820 |
- : ${LDSHARED='$(CC) -shared'} |
821 |
- AS_IF([test "$rb_cv_binary_elf" = yes], [ |
822 |
-- LDFLAGS="$LDFLAGS -Wl,-export-dynamic" |
823 |
-+ LDFLAGS="$LDFLAGS -Wl,-export-dynamic -Wl,--no-undefined" |
824 |
- ]) |
825 |
- rb_cv_dlopen=yes], |
826 |
- [interix*], [ : ${LDSHARED='$(CC) -shared'} |
827 |
|
828 |
diff --git a/dev-lang/ruby/files/2.5/009_no-gems.patch b/dev-lang/ruby/files/2.5/009_no-gems.patch |
829 |
deleted file mode 100644 |
830 |
index e12429a4324..00000000000 |
831 |
--- a/dev-lang/ruby/files/2.5/009_no-gems.patch |
832 |
+++ /dev/null |
833 |
@@ -1,95 +0,0 @@ |
834 |
---- a/tool/rbinstall.rb.~1~ 2017-10-30 06:45:20.000000000 +0100 |
835 |
-+++ b/tool/rbinstall.rb 2017-12-25 11:06:53.340432435 +0100 |
836 |
-@@ -700,20 +700,10 @@ |
837 |
- # :startdoc: |
838 |
- |
839 |
- install?(:ext, :comm, :gem, :'default-gems', :'default-gems-comm') do |
840 |
-- install_default_gem('lib', srcdir) |
841 |
-+ # Gems are unbundled in Gentoo |
842 |
- end |
843 |
- install?(:ext, :arch, :gem, :'default-gems', :'default-gems-arch') do |
844 |
-- install_default_gem('ext', srcdir) do |path| |
845 |
-- # assume that gemspec and extconf.rb are placed in the same directory |
846 |
-- success = false |
847 |
-- begin |
848 |
-- IO.foreach(File.dirname(path[(srcdir.size+1)..-1]) + "/Makefile") do |l| |
849 |
-- break success = true if /^TARGET\s*=/ =~ l |
850 |
-- end |
851 |
-- rescue Errno::ENOENT |
852 |
-- end |
853 |
-- success |
854 |
-- end |
855 |
-+ # Gems are unbundled in Gentoo |
856 |
- end |
857 |
- |
858 |
- def load_gemspec(file) |
859 |
-@@ -765,68 +755,7 @@ |
860 |
- end |
861 |
- |
862 |
- install?(:ext, :comm, :gem, :'bundled-gems') do |
863 |
-- gem_dir = Gem.default_dir |
864 |
-- directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode) |
865 |
-- prepare "bundled gems", gem_dir, directories |
866 |
-- install_dir = with_destdir(gem_dir) |
867 |
-- installed_gems = {} |
868 |
-- options = { |
869 |
-- :install_dir => install_dir, |
870 |
-- :bin_dir => with_destdir(bindir), |
871 |
-- :domain => :local, |
872 |
-- :ignore_dependencies => true, |
873 |
-- :dir_mode => $dir_mode, |
874 |
-- :data_mode => $data_mode, |
875 |
-- :prog_mode => $prog_mode, |
876 |
-- :wrappers => true, |
877 |
-- :format_executable => true, |
878 |
-- } |
879 |
-- gem_ext_dir = "#$extout/gems/#{CONFIG['arch']}" |
880 |
-- extensions_dir = Gem::StubSpecification.gemspec_stub("", gem_dir, gem_dir).extensions_dir |
881 |
-- Gem::Specification.each_gemspec([srcdir+'/gems/*']) do |path| |
882 |
-- spec = load_gemspec(path) |
883 |
-- next unless spec.platform == Gem::Platform::RUBY |
884 |
-- next unless spec.full_name == path[srcdir.size..-1][/\A\/gems\/([^\/]+)/, 1] |
885 |
-- spec.extension_dir = "#{extensions_dir}/#{spec.full_name}" |
886 |
-- if File.directory?(ext = "#{gem_ext_dir}/#{spec.full_name}") |
887 |
-- spec.extensions[0] ||= "-" |
888 |
-- end |
889 |
-- ins = RbInstall::UnpackedInstaller.new(spec, options) |
890 |
-- puts "#{INDENT}#{spec.name} #{spec.version}" |
891 |
-- ins.install |
892 |
-- File.chmod($data_mode, File.join(install_dir, "specifications", "#{spec.full_name}.gemspec")) |
893 |
-- unless spec.extensions.empty? |
894 |
-- install_recursive(ext, spec.extension_dir) |
895 |
-- end |
896 |
-- installed_gems[spec.full_name] = true |
897 |
-- end |
898 |
-- installed_gems, gems = Dir.glob(srcdir+'/gems/*.gem').partition {|gem| installed_gems.key?(File.basename(gem, '.gem'))} |
899 |
-- unless installed_gems.empty? |
900 |
-- install installed_gems, gem_dir+"/cache" |
901 |
-- end |
902 |
-- next if gems.empty? |
903 |
-- if defined?(Zlib) |
904 |
-- Gem.instance_variable_set(:@ruby, with_destdir(File.join(bindir, ruby_install_name))) |
905 |
-- silent = Gem::SilentUI.new |
906 |
-- gems.each do |gem| |
907 |
-- inst = Gem::Installer.new(gem, options) |
908 |
-- inst.spec.extension_dir = with_destdir(inst.spec.extension_dir) |
909 |
-- begin |
910 |
-- Gem::DefaultUserInteraction.use_ui(silent) {inst.install} |
911 |
-- rescue Gem::InstallError => e |
912 |
-- next |
913 |
-- end |
914 |
-- gemname = File.basename(gem) |
915 |
-- puts "#{INDENT}#{gemname}" |
916 |
-- end |
917 |
-- # fix directory permissions |
918 |
-- # TODO: Gem.install should accept :dir_mode option or something |
919 |
-- File.chmod($dir_mode, *Dir.glob(install_dir+"/**/")) |
920 |
-- # fix .gemspec permissions |
921 |
-- File.chmod($data_mode, *Dir.glob(install_dir+"/specifications/*.gemspec")) |
922 |
-- else |
923 |
-- puts "skip installing bundled gems because of lacking zlib" |
924 |
-- end |
925 |
-+ # Gems are unbundled in Gentoo |
926 |
- end |
927 |
- |
928 |
- parse_args() |
929 |
|
930 |
diff --git a/dev-lang/ruby/files/2.5/011-no-gems.patch b/dev-lang/ruby/files/2.5/011-no-gems.patch |
931 |
deleted file mode 100644 |
932 |
index 2ebe064c8ac..00000000000 |
933 |
--- a/dev-lang/ruby/files/2.5/011-no-gems.patch |
934 |
+++ /dev/null |
935 |
@@ -1,85 +0,0 @@ |
936 |
---- a/tool/rbinstall.rb.~1~ 2017-10-30 06:45:20.000000000 +0100 |
937 |
-+++ b/tool/rbinstall.rb 2017-12-25 11:06:53.340432435 +0100 |
938 |
-@@ -700,10 +700,10 @@ |
939 |
- # :startdoc: |
940 |
- |
941 |
- install?(:ext, :comm, :gem, :'default-gems', :'default-gems-comm') do |
942 |
-- install_default_gem('lib', srcdir) |
943 |
-+ # Gems are unbundled in Gentoo |
944 |
- end |
945 |
- install?(:ext, :arch, :gem, :'default-gems', :'default-gems-arch') do |
946 |
-- install_default_gem('ext', srcdir) |
947 |
-+ # Gems are unbundled in Gentoo |
948 |
- end |
949 |
- |
950 |
- def load_gemspec(file) |
951 |
-@@ -765,68 +755,7 @@ |
952 |
- end |
953 |
- |
954 |
- install?(:ext, :comm, :gem, :'bundled-gems') do |
955 |
-- gem_dir = Gem.default_dir |
956 |
-- directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode) |
957 |
-- prepare "bundled gems", gem_dir, directories |
958 |
-- install_dir = with_destdir(gem_dir) |
959 |
-- installed_gems = {} |
960 |
-- options = { |
961 |
-- :install_dir => install_dir, |
962 |
-- :bin_dir => with_destdir(bindir), |
963 |
-- :domain => :local, |
964 |
-- :ignore_dependencies => true, |
965 |
-- :dir_mode => $dir_mode, |
966 |
-- :data_mode => $data_mode, |
967 |
-- :prog_mode => $prog_mode, |
968 |
-- :wrappers => true, |
969 |
-- :format_executable => true, |
970 |
-- } |
971 |
-- gem_ext_dir = "#$extout/gems/#{CONFIG['arch']}" |
972 |
-- extensions_dir = Gem::StubSpecification.gemspec_stub("", gem_dir, gem_dir).extensions_dir |
973 |
-- Gem::Specification.each_gemspec([srcdir+'/gems/*']) do |path| |
974 |
-- spec = load_gemspec(path) |
975 |
-- next unless spec.platform == Gem::Platform::RUBY |
976 |
-- next unless spec.full_name == path[srcdir.size..-1][/\A\/gems\/([^\/]+)/, 1] |
977 |
-- spec.extension_dir = "#{extensions_dir}/#{spec.full_name}" |
978 |
-- if File.directory?(ext = "#{gem_ext_dir}/#{spec.full_name}") |
979 |
-- spec.extensions[0] ||= "-" |
980 |
-- end |
981 |
-- ins = RbInstall::UnpackedInstaller.new(spec, options) |
982 |
-- puts "#{INDENT}#{spec.name} #{spec.version}" |
983 |
-- ins.install |
984 |
-- File.chmod($data_mode, File.join(install_dir, "specifications", "#{spec.full_name}.gemspec")) |
985 |
-- unless spec.extensions.empty? |
986 |
-- install_recursive(ext, spec.extension_dir) |
987 |
-- end |
988 |
-- installed_gems[spec.full_name] = true |
989 |
-- end |
990 |
-- installed_gems, gems = Dir.glob(srcdir+'/gems/*.gem').partition {|gem| installed_gems.key?(File.basename(gem, '.gem'))} |
991 |
-- unless installed_gems.empty? |
992 |
-- install installed_gems, gem_dir+"/cache" |
993 |
-- end |
994 |
-- next if gems.empty? |
995 |
-- if defined?(Zlib) |
996 |
-- Gem.instance_variable_set(:@ruby, with_destdir(File.join(bindir, ruby_install_name))) |
997 |
-- silent = Gem::SilentUI.new |
998 |
-- gems.each do |gem| |
999 |
-- inst = Gem::Installer.new(gem, options) |
1000 |
-- inst.spec.extension_dir = with_destdir(inst.spec.extension_dir) |
1001 |
-- begin |
1002 |
-- Gem::DefaultUserInteraction.use_ui(silent) {inst.install} |
1003 |
-- rescue Gem::InstallError => e |
1004 |
-- next |
1005 |
-- end |
1006 |
-- gemname = File.basename(gem) |
1007 |
-- puts "#{INDENT}#{gemname}" |
1008 |
-- end |
1009 |
-- # fix directory permissions |
1010 |
-- # TODO: Gem.install should accept :dir_mode option or something |
1011 |
-- File.chmod($dir_mode, *Dir.glob(install_dir+"/**/")) |
1012 |
-- # fix .gemspec permissions |
1013 |
-- File.chmod($data_mode, *Dir.glob(install_dir+"/specifications/*.gemspec")) |
1014 |
-- else |
1015 |
-- puts "skip installing bundled gems because of lacking zlib" |
1016 |
-- end |
1017 |
-+ # Gems are unbundled in Gentoo |
1018 |
- end |
1019 |
- |
1020 |
- parse_args() |
1021 |
|
1022 |
diff --git a/dev-lang/ruby/ruby-2.5.8-r2.ebuild b/dev-lang/ruby/ruby-2.5.8-r2.ebuild |
1023 |
deleted file mode 100644 |
1024 |
index b8c9bb040a1..00000000000 |
1025 |
--- a/dev-lang/ruby/ruby-2.5.8-r2.ebuild |
1026 |
+++ /dev/null |
1027 |
@@ -1,220 +0,0 @@ |
1028 |
-# Copyright 1999-2021 Gentoo Authors |
1029 |
-# Distributed under the terms of the GNU General Public License v2 |
1030 |
- |
1031 |
-EAPI=7 |
1032 |
- |
1033 |
-inherit autotools flag-o-matic multilib |
1034 |
- |
1035 |
-MY_P="${PN}-$(ver_cut 1-3)" |
1036 |
-S=${WORKDIR}/${MY_P} |
1037 |
- |
1038 |
-SLOT=$(ver_cut 1-2) |
1039 |
-MY_SUFFIX=$(ver_rs 1 '' ${SLOT}) |
1040 |
-RUBYVERSION=${SLOT}.0 |
1041 |
- |
1042 |
-DESCRIPTION="An object-oriented scripting language" |
1043 |
-HOMEPAGE="https://www.ruby-lang.org/" |
1044 |
-SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz" |
1045 |
- |
1046 |
-LICENSE="|| ( Ruby-BSD BSD-2 )" |
1047 |
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86" |
1048 |
-IUSE="berkdb debug doc examples gdbm ipv6 jemalloc +rdoc rubytests socks5 +ssl static-libs tk xemacs" |
1049 |
- |
1050 |
-RDEPEND=" |
1051 |
- berkdb? ( sys-libs/db:= ) |
1052 |
- gdbm? ( sys-libs/gdbm:= ) |
1053 |
- jemalloc? ( dev-libs/jemalloc:= ) |
1054 |
- ssl? ( |
1055 |
- dev-libs/openssl:0= |
1056 |
- ) |
1057 |
- socks5? ( >=net-proxy/dante-1.1.13 ) |
1058 |
- tk? ( |
1059 |
- dev-lang/tcl:0=[threads] |
1060 |
- dev-lang/tk:0=[threads] |
1061 |
- ) |
1062 |
- dev-libs/libyaml |
1063 |
- dev-libs/libffi:= |
1064 |
- sys-libs/readline:0= |
1065 |
- sys-libs/zlib |
1066 |
- virtual/libcrypt:= |
1067 |
- >=app-eselect/eselect-ruby-20171225 |
1068 |
-" |
1069 |
- |
1070 |
-DEPEND="${RDEPEND}" |
1071 |
- |
1072 |
-BUNDLED_GEMS=" |
1073 |
- >=dev-ruby/did_you_mean-1.2.0:2.5[ruby_targets_ruby25] |
1074 |
- >=dev-ruby/minitest-5.10.3[ruby_targets_ruby25] |
1075 |
- >=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby25] |
1076 |
- >=dev-ruby/power_assert-1.1.1[ruby_targets_ruby25] |
1077 |
- >=dev-ruby/rake-12.3.0[ruby_targets_ruby25] |
1078 |
- >=dev-ruby/test-unit-3.2.7[ruby_targets_ruby25] |
1079 |
- >=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby25] |
1080 |
-" |
1081 |
- |
1082 |
-PDEPEND=" |
1083 |
- ${BUNDLED_GEMS} |
1084 |
- virtual/rubygems[ruby_targets_ruby25] |
1085 |
- >=dev-ruby/json-2.0.2[ruby_targets_ruby25] |
1086 |
- rdoc? ( >=dev-ruby/rdoc-6.1.2[ruby_targets_ruby25] ) |
1087 |
- xemacs? ( app-xemacs/ruby-modes )" |
1088 |
- |
1089 |
-src_prepare() { |
1090 |
- eapply "${FILESDIR}"/${SLOT}/{001,005,011}*.patch |
1091 |
- |
1092 |
- einfo "Unbundling gems..." |
1093 |
- cd "$S" |
1094 |
- # Remove bundled gems that we will install via PDEPEND, bug |
1095 |
- # 539700. Use explicit version numbers to ensure rm fails when they |
1096 |
- # change so we can update dependencies accordingly. |
1097 |
- rm -f gems/{did_you_mean-1.2.0,minitest-5.10.3,net-telnet-0.1.1,power_assert-1.1.1,rake-12.3.0,test-unit-3.2.7,xmlrpc-0.3.0}.gem || die |
1098 |
- |
1099 |
- einfo "Removing bundled libraries..." |
1100 |
- rm -fr ext/fiddle/libffi-3.2.1 || die |
1101 |
- |
1102 |
- eapply_user |
1103 |
- |
1104 |
- eautoreconf |
1105 |
-} |
1106 |
- |
1107 |
-src_configure() { |
1108 |
- local modules= myconf= |
1109 |
- |
1110 |
- # -fomit-frame-pointer makes ruby segfault, see bug #150413. |
1111 |
- filter-flags -fomit-frame-pointer |
1112 |
- # In many places aliasing rules are broken; play it safe |
1113 |
- # as it's risky with newer compilers to leave it as it is. |
1114 |
- append-flags -fno-strict-aliasing |
1115 |
- |
1116 |
- # Socks support via dante |
1117 |
- if use socks5 ; then |
1118 |
- # Socks support can't be disabled as long as SOCKS_SERVER is |
1119 |
- # set and socks library is present, so need to unset |
1120 |
- # SOCKS_SERVER in that case. |
1121 |
- unset SOCKS_SERVER |
1122 |
- fi |
1123 |
- |
1124 |
- # Increase GC_MALLOC_LIMIT if set (default is 8000000) |
1125 |
- if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then |
1126 |
- append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}" |
1127 |
- fi |
1128 |
- |
1129 |
- # ipv6 hack, bug 168939. Needs --enable-ipv6. |
1130 |
- use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET" |
1131 |
- |
1132 |
- # Determine which modules *not* to build depending in the USE flags. |
1133 |
- if ! use berkdb ; then |
1134 |
- modules="${modules},dbm" |
1135 |
- fi |
1136 |
- if ! use gdbm ; then |
1137 |
- modules="${modules},gdbm" |
1138 |
- fi |
1139 |
- if ! use ssl ; then |
1140 |
- modules="${modules},openssl" |
1141 |
- fi |
1142 |
- if ! use tk ; then |
1143 |
- modules="${modules},tk" |
1144 |
- fi |
1145 |
- |
1146 |
- # Provide an empty LIBPATHENV because we disable rpath but we do not |
1147 |
- # need LD_LIBRARY_PATH by default since that breaks USE=multitarget |
1148 |
- # #564272 |
1149 |
- INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \ |
1150 |
- --program-suffix=${MY_SUFFIX} \ |
1151 |
- --with-soname=ruby${MY_SUFFIX} \ |
1152 |
- --enable-shared \ |
1153 |
- --enable-pthread \ |
1154 |
- --disable-rpath \ |
1155 |
- --with-out-ext="${modules}" \ |
1156 |
- $(use_with jemalloc jemalloc) \ |
1157 |
- $(use_enable socks5 socks) \ |
1158 |
- $(use_enable doc install-doc) \ |
1159 |
- --enable-ipv6 \ |
1160 |
- $(use_enable static-libs static) \ |
1161 |
- $(use_enable static-libs install-static-library) \ |
1162 |
- $(use_with static-libs static-linked-ext) \ |
1163 |
- $(use_enable debug) \ |
1164 |
- ${myconf} \ |
1165 |
- --enable-option-checking=no |
1166 |
-} |
1167 |
- |
1168 |
-src_compile() { |
1169 |
- emake V=1 EXTLDFLAGS="${LDFLAGS}" |
1170 |
-} |
1171 |
- |
1172 |
-src_test() { |
1173 |
- emake -j1 V=1 test |
1174 |
- |
1175 |
- elog "Ruby's make test has been run. Ruby also ships with a make check" |
1176 |
- elog "that cannot be run until after ruby has been installed." |
1177 |
- elog |
1178 |
- if use rubytests; then |
1179 |
- elog "You have enabled rubytests, so they will be installed to" |
1180 |
- elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other" |
1181 |
- elog "than root, and you must place them into a writeable directory." |
1182 |
- elog "Then call: " |
1183 |
- elog |
1184 |
- elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb" |
1185 |
- else |
1186 |
- elog "Enable the rubytests USE flag to install the make check tests" |
1187 |
- fi |
1188 |
-} |
1189 |
- |
1190 |
-src_install() { |
1191 |
- # Remove the remaining bundled gems. We do this late in the process |
1192 |
- # since they are used during the build to e.g. create the |
1193 |
- # documentation. |
1194 |
- rm -rf ext/json || die |
1195 |
- |
1196 |
- # Ruby is involved in the install process, we don't want interference here. |
1197 |
- unset RUBYOPT |
1198 |
- |
1199 |
- local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby) |
1200 |
- |
1201 |
- LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}" |
1202 |
- RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}" |
1203 |
- for d in $(find "${S}/ext" -type d) ; do |
1204 |
- RUBYLIB="${RUBYLIB}:$d" |
1205 |
- done |
1206 |
- export LD_LIBRARY_PATH RUBYLIB |
1207 |
- |
1208 |
- emake V=1 DESTDIR="${D}" install |
1209 |
- |
1210 |
- # Remove installed rubygems and rdoc copy |
1211 |
- rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed" |
1212 |
- rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed" |
1213 |
- rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed" |
1214 |
- rm -rf "${ED}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed" |
1215 |
- |
1216 |
- if use doc; then |
1217 |
- make DESTDIR="${D}" install-doc || die "make install-doc failed" |
1218 |
- fi |
1219 |
- |
1220 |
- if use examples; then |
1221 |
- dodoc -r sample |
1222 |
- fi |
1223 |
- |
1224 |
- dodoc ChangeLog NEWS doc/NEWS* README* |
1225 |
- |
1226 |
- if use rubytests; then |
1227 |
- pushd test |
1228 |
- insinto /usr/share/${PN}-${SLOT}/test |
1229 |
- doins -r . |
1230 |
- popd |
1231 |
- fi |
1232 |
-} |
1233 |
- |
1234 |
-pkg_postinst() { |
1235 |
- if [[ ! -n $(readlink "${EROOT}"/usr/bin/ruby) ]] ; then |
1236 |
- eselect ruby set ruby${MY_SUFFIX} |
1237 |
- fi |
1238 |
- |
1239 |
- elog |
1240 |
- elog "To switch between available Ruby profiles, execute as root:" |
1241 |
- elog "\teselect ruby set ruby(23|24|...)" |
1242 |
- elog |
1243 |
-} |
1244 |
- |
1245 |
-pkg_postrm() { |
1246 |
- eselect ruby cleanup |
1247 |
-} |
1248 |
|
1249 |
diff --git a/dev-lang/ruby/ruby-2.5.9-r1.ebuild b/dev-lang/ruby/ruby-2.5.9-r1.ebuild |
1250 |
deleted file mode 100644 |
1251 |
index 7b5728b5c05..00000000000 |
1252 |
--- a/dev-lang/ruby/ruby-2.5.9-r1.ebuild |
1253 |
+++ /dev/null |
1254 |
@@ -1,246 +0,0 @@ |
1255 |
-# Copyright 1999-2021 Gentoo Authors |
1256 |
-# Distributed under the terms of the GNU General Public License v2 |
1257 |
- |
1258 |
-EAPI=7 |
1259 |
- |
1260 |
-inherit autotools flag-o-matic multilib |
1261 |
- |
1262 |
-MY_P="${PN}-$(ver_cut 1-3)" |
1263 |
-S=${WORKDIR}/${MY_P} |
1264 |
- |
1265 |
-SLOT=$(ver_cut 1-2) |
1266 |
-MY_SUFFIX=$(ver_rs 1 '' ${SLOT}) |
1267 |
-RUBYVERSION=${SLOT}.0 |
1268 |
- |
1269 |
-DESCRIPTION="An object-oriented scripting language" |
1270 |
-HOMEPAGE="https://www.ruby-lang.org/" |
1271 |
-SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz" |
1272 |
- |
1273 |
-LICENSE="|| ( Ruby-BSD BSD-2 )" |
1274 |
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
1275 |
-IUSE="berkdb debug doc examples gdbm ipv6 jemalloc +rdoc rubytests socks5 +ssl static-libs systemtap tk xemacs" |
1276 |
- |
1277 |
-RDEPEND=" |
1278 |
- berkdb? ( sys-libs/db:= ) |
1279 |
- gdbm? ( sys-libs/gdbm:= ) |
1280 |
- jemalloc? ( dev-libs/jemalloc:= ) |
1281 |
- ssl? ( |
1282 |
- dev-libs/openssl:0= |
1283 |
- ) |
1284 |
- socks5? ( >=net-proxy/dante-1.1.13 ) |
1285 |
- systemtap? ( dev-util/systemtap ) |
1286 |
- tk? ( |
1287 |
- dev-lang/tcl:0=[threads] |
1288 |
- dev-lang/tk:0=[threads] |
1289 |
- ) |
1290 |
- dev-libs/libyaml |
1291 |
- dev-libs/libffi:= |
1292 |
- sys-libs/readline:0= |
1293 |
- sys-libs/zlib |
1294 |
- virtual/libcrypt:= |
1295 |
- >=app-eselect/eselect-ruby-20171225 |
1296 |
-" |
1297 |
- |
1298 |
-DEPEND="${RDEPEND}" |
1299 |
- |
1300 |
-BUNDLED_GEMS=" |
1301 |
- >=dev-ruby/did_you_mean-1.2.0:2.5[ruby_targets_ruby25] |
1302 |
- >=dev-ruby/minitest-5.10.3[ruby_targets_ruby25] |
1303 |
- >=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby25] |
1304 |
- >=dev-ruby/power_assert-1.1.1[ruby_targets_ruby25] |
1305 |
- >=dev-ruby/rake-12.3.0[ruby_targets_ruby25] |
1306 |
- >=dev-ruby/test-unit-3.2.7[ruby_targets_ruby25] |
1307 |
- >=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby25] |
1308 |
-" |
1309 |
- |
1310 |
-PDEPEND=" |
1311 |
- ${BUNDLED_GEMS} |
1312 |
- virtual/rubygems[ruby_targets_ruby25] |
1313 |
- >=dev-ruby/json-2.0.2[ruby_targets_ruby25] |
1314 |
- rdoc? ( >=dev-ruby/rdoc-6.1.2[ruby_targets_ruby25] ) |
1315 |
- xemacs? ( app-xemacs/ruby-modes )" |
1316 |
- |
1317 |
-src_prepare() { |
1318 |
- eapply "${FILESDIR}"/${SLOT}/{001,002,005,011}*.patch |
1319 |
- |
1320 |
- einfo "Unbundling gems..." |
1321 |
- cd "$S" |
1322 |
- # Remove bundled gems that we will install via PDEPEND, bug |
1323 |
- # 539700. Use explicit version numbers to ensure rm fails when they |
1324 |
- # change so we can update dependencies accordingly. |
1325 |
- rm -f gems/{did_you_mean-1.2.0,minitest-5.10.3,net-telnet-0.1.1,power_assert-1.1.1,rake-12.3.0,test-unit-3.2.7,xmlrpc-0.3.0}.gem || die |
1326 |
- |
1327 |
- einfo "Removing bundled libraries..." |
1328 |
- rm -fr ext/fiddle/libffi-3.2.1 || die |
1329 |
- |
1330 |
- if use prefix ; then |
1331 |
- # Fix hardcoded SHELL var in mkmf library |
1332 |
- sed -i -e "s#\(SHELL = \).*#\1${EPREFIX}/bin/sh#" lib/mkmf.rb || die |
1333 |
- |
1334 |
- if [[ ${CHOST} == *darwin* ]] ; then |
1335 |
- # avoid symlink loop on Darwin (?!) |
1336 |
- sed -i \ |
1337 |
- -e '/LIBRUBY_ALIASES=/s/lib$(RUBY_INSTALL_NAME).$(SOEXT)//' \ |
1338 |
- configure.ac || die |
1339 |
- |
1340 |
- # make ar/libtool hack for Darwin work |
1341 |
- sed -i \ |
1342 |
- -e "s/ac_cv_prog_ac_ct_AR='libtool/ac_cv_prog_AR='${CHOST}-libtool/" \ |
1343 |
- configure.ac || die |
1344 |
- fi |
1345 |
- fi |
1346 |
- |
1347 |
- eapply_user |
1348 |
- |
1349 |
- eautoreconf |
1350 |
-} |
1351 |
- |
1352 |
-src_configure() { |
1353 |
- local modules= myconf= |
1354 |
- |
1355 |
- # -fomit-frame-pointer makes ruby segfault, see bug #150413. |
1356 |
- filter-flags -fomit-frame-pointer |
1357 |
- # In many places aliasing rules are broken; play it safe |
1358 |
- # as it's risky with newer compilers to leave it as it is. |
1359 |
- append-flags -fno-strict-aliasing |
1360 |
- |
1361 |
- # Socks support via dante |
1362 |
- if use socks5 ; then |
1363 |
- # Socks support can't be disabled as long as SOCKS_SERVER is |
1364 |
- # set and socks library is present, so need to unset |
1365 |
- # SOCKS_SERVER in that case. |
1366 |
- unset SOCKS_SERVER |
1367 |
- fi |
1368 |
- |
1369 |
- # Increase GC_MALLOC_LIMIT if set (default is 8000000) |
1370 |
- if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then |
1371 |
- append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}" |
1372 |
- fi |
1373 |
- |
1374 |
- # ipv6 hack, bug 168939. Needs --enable-ipv6. |
1375 |
- use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET" |
1376 |
- |
1377 |
- # Determine which modules *not* to build depending in the USE flags. |
1378 |
- if ! use berkdb ; then |
1379 |
- modules="${modules},dbm" |
1380 |
- fi |
1381 |
- if ! use gdbm ; then |
1382 |
- modules="${modules},gdbm" |
1383 |
- fi |
1384 |
- if ! use ssl ; then |
1385 |
- modules="${modules},openssl" |
1386 |
- fi |
1387 |
- if ! use tk ; then |
1388 |
- modules="${modules},tk" |
1389 |
- fi |
1390 |
- |
1391 |
- # Provide an empty LIBPATHENV because we disable rpath but we do not |
1392 |
- # need LD_LIBRARY_PATH by default since that breaks USE=multitarget |
1393 |
- # #564272 |
1394 |
- INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \ |
1395 |
- --program-suffix=${MY_SUFFIX} \ |
1396 |
- --with-soname=ruby${MY_SUFFIX} \ |
1397 |
- --with-readline-dir="${EPREFIX}"/usr \ |
1398 |
- --enable-shared \ |
1399 |
- --enable-pthread \ |
1400 |
- --disable-rpath \ |
1401 |
- --with-out-ext="${modules}" \ |
1402 |
- $(use_with jemalloc jemalloc) \ |
1403 |
- $(use_enable socks5 socks) \ |
1404 |
- $(use_enable systemtap dtrace) \ |
1405 |
- $(use_enable doc install-doc) \ |
1406 |
- --enable-ipv6 \ |
1407 |
- $(use_enable static-libs static) \ |
1408 |
- $(use_enable static-libs install-static-library) \ |
1409 |
- $(use_with static-libs static-linked-ext) \ |
1410 |
- $(use_enable debug) \ |
1411 |
- ${myconf} \ |
1412 |
- --enable-option-checking=no |
1413 |
-} |
1414 |
- |
1415 |
-src_compile() { |
1416 |
- emake V=1 EXTLDFLAGS="${LDFLAGS}" |
1417 |
-} |
1418 |
- |
1419 |
-src_test() { |
1420 |
- emake -j1 V=1 test |
1421 |
- |
1422 |
- elog "Ruby's make test has been run. Ruby also ships with a make check" |
1423 |
- elog "that cannot be run until after ruby has been installed." |
1424 |
- elog |
1425 |
- if use rubytests; then |
1426 |
- elog "You have enabled rubytests, so they will be installed to" |
1427 |
- elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other" |
1428 |
- elog "than root, and you must place them into a writeable directory." |
1429 |
- elog "Then call: " |
1430 |
- elog |
1431 |
- elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb" |
1432 |
- else |
1433 |
- elog "Enable the rubytests USE flag to install the make check tests" |
1434 |
- fi |
1435 |
-} |
1436 |
- |
1437 |
-src_install() { |
1438 |
- # Remove the remaining bundled gems. We do this late in the process |
1439 |
- # since they are used during the build to e.g. create the |
1440 |
- # documentation. |
1441 |
- rm -rf ext/json || die |
1442 |
- |
1443 |
- # Ruby is involved in the install process, we don't want interference here. |
1444 |
- unset RUBYOPT |
1445 |
- |
1446 |
- local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby) |
1447 |
- |
1448 |
- LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}" |
1449 |
- |
1450 |
- if [[ ${CHOST} == *darwin* ]] ; then |
1451 |
- DYLD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${DYLD_LIBRARY_PATH+:}${DYLD_LIBRARY_PATH}" |
1452 |
- export DYLD_LIBRARY_PATH |
1453 |
- fi |
1454 |
- |
1455 |
- RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}" |
1456 |
- for d in $(find "${S}/ext" -type d) ; do |
1457 |
- RUBYLIB="${RUBYLIB}:$d" |
1458 |
- done |
1459 |
- export LD_LIBRARY_PATH RUBYLIB |
1460 |
- |
1461 |
- emake V=1 DESTDIR="${D}" install |
1462 |
- |
1463 |
- # Remove installed rubygems and rdoc copy |
1464 |
- rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed" |
1465 |
- rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed" |
1466 |
- rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed" |
1467 |
- rm -rf "${ED}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed" |
1468 |
- |
1469 |
- if use doc; then |
1470 |
- make DESTDIR="${D}" install-doc || die "make install-doc failed" |
1471 |
- fi |
1472 |
- |
1473 |
- if use examples; then |
1474 |
- dodoc -r sample |
1475 |
- fi |
1476 |
- |
1477 |
- dodoc ChangeLog NEWS doc/NEWS* README* |
1478 |
- |
1479 |
- if use rubytests; then |
1480 |
- pushd test |
1481 |
- insinto /usr/share/${PN}-${SLOT}/test |
1482 |
- doins -r . |
1483 |
- popd |
1484 |
- fi |
1485 |
-} |
1486 |
- |
1487 |
-pkg_postinst() { |
1488 |
- if [[ ! -n $(readlink "${EROOT}"/usr/bin/ruby) ]] ; then |
1489 |
- eselect ruby set ruby${MY_SUFFIX} |
1490 |
- fi |
1491 |
- |
1492 |
- elog |
1493 |
- elog "To switch between available Ruby profiles, execute as root:" |
1494 |
- elog "\teselect ruby set ruby(23|24|...)" |
1495 |
- elog |
1496 |
-} |
1497 |
- |
1498 |
-pkg_postrm() { |
1499 |
- eselect ruby cleanup |
1500 |
-} |