Source Mage code commit list

[Treeve Jelbert <scm AT sourcemage.org>]

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

 ruby-raa/ruby-2.5/HISTORY               |    3 +++
 ruby-raa/ruby-2.5/PRE_BUILD             |    3 +++
 ruby-raa/ruby-2.5/patches/..pp          |   28 ++++++++++++++++++++++++++++
 ruby-raa/ruby-2.5/patches/openssl.patch |   18 ++++++++++++++++++
 4 files changed, 52 insertions(+)

New commits:
commit d67e687d826ab9495d70450028e1561e46efe265
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    ruby-2.5 - fix for openssl-2.7

diff --git a/ruby-raa/ruby-2.5/HISTORY b/ruby-raa/ruby-2.5/HISTORY
index bb699db..eee8e07 100644
--- a/ruby-raa/ruby-2.5/HISTORY
+++ b/ruby-raa/ruby-2.5/HISTORY
@@ -1,3 +1,6 @@
+2018-04-06 Treeve Jelbert <treeve AT sourcemage.org>
+       * PRE_BUILD openssl.patch: added
+
 2018-03-29 Pavel Vinogradov <public AT sourcemage.org>
        * DETAILS: version 2.5.1, SECURITY_PATCH++,
          (CVE-2017-17742, CVE-2018-6914, CVE-2018-8777, CVE-2018-8778,
diff --git a/ruby-raa/ruby-2.5/PRE_BUILD b/ruby-raa/ruby-2.5/PRE_BUILD
new file mode 100755
index 0000000..922c0ab
--- /dev/null
+++ b/ruby-raa/ruby-2.5/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build    &&
+cd $SOURCE_DIRECTORY &&
+apply_patch_dir patches
diff --git a/ruby-raa/ruby-2.5/patches/..pp b/ruby-raa/ruby-2.5/patches/..pp
new file mode 100644
index 0000000..05ecbbd
--- /dev/null
+++ b/ruby-raa/ruby-2.5/patches/..pp
@@ -0,0 +1,28 @@
+--- r/ext/openssl/openssl_missing.h.orig        2018-03-22 19:37:19 UTC
++++ r/ext/openssl/openssl_missing.h
+@@ -72,6 +72,9 @@ void ossl_HMAC_CTX_free(HMAC_CTX *);
+ #if !defined(HAVE_X509_STORE_SET_EX_DATA)
+ #  define X509_STORE_set_ex_data(x, idx, data) \
+         CRYPTO_set_ex_data(&(x)->ex_data, (idx), (data))
++#endif
++
++#if !defined(HAVE_X509_STORE_GET_EX_NEW_INDEX)
+ #  define X509_STORE_get_ex_new_index(l, p, newf, dupf, freef) \
+         CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_X509_STORE, (l), (p), \
+                                 (newf), (dupf), (freef))
+@@ -145,6 +148,7 @@ void ossl_X509_REQ_get0_signature(const 
+ #endif
+ 
+ #if !defined(HAVE_OPAQUE_OPENSSL)
++#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 
0x2070000fL
+ #define IMPL_PKEY_GETTER(_type, _name) \
+ static inline _type *EVP_PKEY_get0_##_type(EVP_PKEY *pkey) { \
+         return pkey->pkey._name; }
+@@ -196,6 +200,7 @@ IMPL_PKEY_GETTER(EC_KEY, ec)
+ #undef IMPL_PKEY_GETTER
+ #undef IMPL_KEY_ACCESSOR2
+ #undef IMPL_KEY_ACCESSOR3
++#endif
+ #endif /* HAVE_OPAQUE_OPENSSL */
+ 
+ #if !defined(EVP_CTRL_AEAD_GET_TAG)
diff --git a/ruby-raa/ruby-2.5/patches/openssl.patch 
b/ruby-raa/ruby-2.5/patches/openssl.patch
new file mode 100644
index 0000000..9156e5f
--- /dev/null
+++ b/ruby-raa/ruby-2.5/patches/openssl.patch
@@ -0,0 +1,18 @@
+--- r/ext/openssl/openssl_missing.h.orig        2018-03-22 19:37:19 UTC
++++ r/ext/openssl/openssl_missing.h
+@@ -145,6 +148,7 @@ void ossl_X509_REQ_get0_signature(const 
+ #endif
+ 
+ #if !defined(HAVE_OPAQUE_OPENSSL)
++#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 
0x2070000fL
+ #define IMPL_PKEY_GETTER(_type, _name) \
+ static inline _type *EVP_PKEY_get0_##_type(EVP_PKEY *pkey) { \
+         return pkey->pkey._name; }
+@@ -196,6 +200,7 @@ IMPL_PKEY_GETTER(EC_KEY, ec)
+ #undef IMPL_PKEY_GETTER
+ #undef IMPL_KEY_ACCESSOR2
+ #undef IMPL_KEY_ACCESSOR3
++#endif
+ #endif /* HAVE_OPAQUE_OPENSSL */
+ 
+ #if !defined(EVP_CTRL_AEAD_GET_TAG)