Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/ruby/files/2.5/, dev-lang/ruby/files/2.4/
Date: Mon, 03 May 2021 18:46:38
Message-Id: 1620067538.ad4455b43732385c7da43bc41a6d15545f033adb.sam@gentoo
1 commit: ad4455b43732385c7da43bc41a6d15545f033adb
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Mon May 3 18:32:34 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Mon May 3 18:45:38 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad4455b4
7
8 dev-lang/ruby: drop obsolete LibreSSL patches
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 dev-lang/ruby/files/2.4/010-libressl_2.7.patch | 15 ---------------
13 dev-lang/ruby/files/2.5/010-libressl_2.7.patch | 15 ---------------
14 2 files changed, 30 deletions(-)
15
16 diff --git a/dev-lang/ruby/files/2.4/010-libressl_2.7.patch b/dev-lang/ruby/files/2.4/010-libressl_2.7.patch
17 deleted file mode 100644
18 index 2e25ab09585..00000000000
19 --- a/dev-lang/ruby/files/2.4/010-libressl_2.7.patch
20 +++ /dev/null
21 @@ -1,15 +0,0 @@
22 ---- a/ext/openssl/extconf.rb.orig 2017-09-08 14:38:12 UTC
23 -+++ b/ext/openssl/extconf.rb
24 -@@ -157,8 +157,11 @@ OpenSSL.check_func_or_macro("SSL_get_ser
25 - have_func("SSL_is_server")
26 -
27 - # added in 1.1.0
28 -+if !have_struct_member("SSL", "ctx", "openssl/ssl.h") ||
29 -+ try_static_assert("LIBRESSL_VERSION_NUMBER >= 0x2070000fL", "openssl/opensslv.h")
30 -+ $defs.push("-DHAVE_OPAQUE_OPENSSL")
31 -+end
32 - have_func("CRYPTO_lock") || $defs.push("-DHAVE_OPENSSL_110_THREADING_API")
33 --have_struct_member("SSL", "ctx", "openssl/ssl.h") || $defs.push("-DHAVE_OPAQUE_OPENSSL")
34 - have_func("BN_GENCB_new")
35 - have_func("BN_GENCB_free")
36 - have_func("BN_GENCB_get_arg")
37
38 diff --git a/dev-lang/ruby/files/2.5/010-libressl_2.7.patch b/dev-lang/ruby/files/2.5/010-libressl_2.7.patch
39 deleted file mode 100644
40 index 150f43c9e55..00000000000
41 --- a/dev-lang/ruby/files/2.5/010-libressl_2.7.patch
42 +++ /dev/null
43 @@ -1,15 +0,0 @@
44 ---- a/ext/openssl/extconf.rb.orig 2018-04-02 09:57:14 UTC
45 -+++ b/ext/openssl/extconf.rb
46 -@@ -122,8 +122,11 @@ OpenSSL.check_func_or_macro("SSL_get_ser
47 - have_func("SSL_is_server")
48 -
49 - # added in 1.1.0
50 -+if !have_struct_member("SSL", "ctx", "openssl/ssl.h") ||
51 -+ try_static_assert("LIBRESSL_VERSION_NUMBER >= 0x2070000fL", "openssl/opensslv.h")
52 -+ $defs.push("-DHAVE_OPAQUE_OPENSSL")
53 -+end
54 - have_func("CRYPTO_lock") || $defs.push("-DHAVE_OPENSSL_110_THREADING_API")
55 --have_struct_member("SSL", "ctx", "openssl/ssl.h") || $defs.push("-DHAVE_OPAQUE_OPENSSL")
56 - have_func("BN_GENCB_new")
57 - have_func("BN_GENCB_free")
58 - have_func("BN_GENCB_get_arg")