From 1e135aa635cf055a2969a113fbd632c5dfc21bef Mon Sep 17 00:00:00 2001
From: Aeris <aeris@imirhil.fr>
Date: Tue, 24 Nov 2015 00:24:34 +0100
Subject: [PATCH] Upgrade to ruby 2.3 (2.3.0-preview1)

---
 .gitignore |  5 +++--
 Makefile   |  6 +++---
 patch      | 12 ++++++------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index ce356a8..f5f470b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,10 @@
 *.iml
 *.gem
 Gemfile.lock
-/.idea/
+.rakeTasks
+.idea/
 /html/
-/.rspec
+.rspec
 /rakefile
 /output/*.html
 /db/*.sqlite3
diff --git a/Makefile b/Makefile
index 8c82e3e..aaec20e 100644
--- a/Makefile
+++ b/Makefile
@@ -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
diff --git a/patch b/patch
index 556d212..1e8044d 100644
--- a/patch
+++ b/patch
@@ -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