diff --git a/srcpkgs/ruby/patches/patch-ext_openssl_extconf_rb.patch b/srcpkgs/ruby/patches/patch-ext_openssl_extconf_rb.patch new file mode 100644 index 00000000000..d70ba513de5 --- /dev/null +++ b/srcpkgs/ruby/patches/patch-ext_openssl_extconf_rb.patch @@ -0,0 +1,13 @@ +$OpenBSD: patch-ext_openssl_extconf_rb,v 1.1 2018/02/23 09:54:25 sthen Exp $ + +Index: ext/openssl/extconf.rb +--- ext/openssl/extconf.rb.orig ++++ ext/openssl/extconf.rb +@@ -134,6 +134,7 @@ have_func("HMAC_CTX_free") + OpenSSL.check_func("RAND_pseudo_bytes", "openssl/rand.h") # deprecated + have_func("X509_STORE_get_ex_data") + have_func("X509_STORE_set_ex_data") ++have_func("X509_STORE_get_ex_new_index") + have_func("X509_CRL_get0_signature") + have_func("X509_REQ_get0_signature") + have_func("X509_REVOKED_get0_serialNumber") diff --git a/srcpkgs/ruby/patches/patch-ext_openssl_openssl_missing_h.patch b/srcpkgs/ruby/patches/patch-ext_openssl_openssl_missing_h.patch new file mode 100644 index 00000000000..a06760c4186 --- /dev/null +++ b/srcpkgs/ruby/patches/patch-ext_openssl_openssl_missing_h.patch @@ -0,0 +1,31 @@ +$OpenBSD: patch-ext_openssl_openssl_missing_h,v 1.4 2018/02/23 09:54:25 sthen Exp $ + +Index: ext/openssl/openssl_missing.h +--- ext/openssl/openssl_missing.h.orig ++++ 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 X509_REQ *, co + #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/srcpkgs/ruby/template b/srcpkgs/ruby/template index 003b59615fe..7a7bd54b842 100644 --- a/srcpkgs/ruby/template +++ b/srcpkgs/ruby/template @@ -3,7 +3,7 @@ _ruby_abiver=2.5.0 pkgname=ruby version=2.5.1 -revision=2 +revision=3 build_style=gnu-configure configure_args="--enable-shared --disable-rpath DOXYGEN=/usr/bin/doxygen DOT=/usr/bin/dot PKG_CONFIG=/usr/bin/pkg-config"