Browse Source

Upgrade to ruby 2.3 (2.3.0-preview1)

master
Aeris 4 years ago
parent
commit
1e135aa635
3 changed files with 12 additions and 11 deletions
  1. 3
    2
      .gitignore
  2. 3
    3
      Makefile
  3. 6
    6
      patch

+ 3
- 2
.gitignore View File

@@ -1,9 +1,10 @@
*.iml
*.gem
Gemfile.lock
/.idea/
.rakeTasks
.idea/
/html/
/.rspec
.rspec
/rakefile
/output/*.html
/db/*.sqlite3

+ 3
- 3
Makefile View File

@@ -3,9 +3,9 @@ export CPATH = $(PWD)/openssl/include
export LIBRARY_PATH = $(PWD)/openssl
OPENSSL_VERSION = 1.0.2d
OPENSSL_DIR = openssl-$(OPENSSL_VERSION)
RUBY_MAJOR_VERSION = 2.2
RUBY_VERSION = $(RUBY_MAJOR_VERSION).2
RUBY_DIR = ruby-$(RUBY_VERSION)
RUBY_MAJOR_VERSION = 2.3
RUBY_VERSION = $(RUBY_MAJOR_VERSION).0
RUBY_DIR = ruby-$(RUBY_VERSION)-preview1
RUBY_OPENSSL_EXT_DIR = $(RUBY_DIR)/ext/openssl
export LIBRARY_PATH = $(PWD)/lib
export C_INCLUDE_PATH = $(PWD)/$(OPENSSL_DIR)/include

+ 6
- 6
patch View File

@@ -5,12 +5,12 @@
bindir = $(exec_prefix)/bin
archdir = $(rubyarchdir)
+top_srcdir = ../..
CC = gcc
--- ossl_ssl.c 2014-12-12 22:58:34.000000000 +0100
+++ ossl_ssl.c 2015-08-03 23:40:32.177619138 +0200
@@ -1878,6 +1878,19 @@
@@ -1915,6 +1915,19 @@
# endif
#endif /* !defined(OPENSSL_NO_SOCK) */

@@ -30,13 +30,13 @@
void
Init_ossl_ssl(void)
{
@@ -2238,6 +2241,9 @@
@@ -2301,6 +2314,9 @@
rb_define_method(cSSLSocket, "session=", ossl_ssl_set_session, 1);
rb_define_method(cSSLSocket, "verify_result", ossl_ssl_get_verify_result, 0);
rb_define_method(cSSLSocket, "client_ca", ossl_ssl_get_client_ca_list, 0);
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L
+ rb_define_method(cSSLSocket, "tmp_key", ossl_ssl_tmp_key, 0);
+#endif
# ifdef HAVE_OPENSSL_NPN_NEGOTIATED
rb_define_method(cSSLSocket, "npn_protocol", ossl_ssl_npn_protocol, 0);
# ifdef HAVE_SSL_CTX_SET_ALPN_SELECT_CB
rb_define_method(cSSLSocket, "alpn_protocol", ossl_ssl_alpn_protocol, 0);
# endif

Loading…
Cancel
Save