Browse Source

ruby: add libressl patch from buildroot

Waldemar Brodkorb 1 year ago
parent
commit
c7b30bdd07
2 changed files with 28 additions and 0 deletions
  1. 3 0
      package/ruby/Makefile
  2. 25 0
      package/ruby/patches/0001-Fix-build-with-LibreSSL-3-5.patch

+ 3 - 0
package/ruby/Makefile

@@ -25,6 +25,9 @@ $(eval $(call PKG_template,RUBY,ruby,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS
 # uClibc setpgrp does not take arguments
 CONFIGURE_ENV+=         ac_cv_func_setpgrp_void=yes \
 			stack_protector=no \
+			ac_cv_func_finite=yes \
+			ac_cv_func_isinf=yes \
+			ac_cv_func_isnan=yes \
 			rb_cv_binary_elf=yes
 CONFIGURE_ARGS+=	--disable-install-doc \
 			--with-out-ext=fiddle \

+ 25 - 0
package/ruby/patches/0001-Fix-build-with-LibreSSL-3-5.patch

@@ -0,0 +1,25 @@
+From e25fb0d0d86da5a9398ebdc9216b2ea89f80fa3d Mon Sep 17 00:00:00 2001
+From: Jeremy Evans <code@jeremyevans.net>
+Date: Fri, 25 Mar 2022 13:11:31 -0700
+Subject: [PATCH] Fix build with LibreSSL 3.5
+
+[Retrieved from:
+https://github.com/ruby/openssl/commit/e25fb0d0d86da5a9398ebdc9216b2ea89f80fa3d]
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+---
+ ext/openssl/ossl_pkey.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ext/openssl/ossl_pkey.c b/ext/openssl/ossl_pkey.c
+index 2a4835a2..24d0da46 100644
+--- a/ext/openssl/ossl_pkey.c
++++ b/ext/openssl/ossl_pkey.c
+@@ -710,7 +710,7 @@ ossl_pkey_export_traditional(int argc, VALUE *argv, VALUE self, int to_der)
+ 	}
+     }
+     else {
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
++#if OSSL_OPENSSL_PREREQ(1, 1, 0) || OSSL_LIBRESSL_PREREQ(3, 5, 0)
+ 	if (!PEM_write_bio_PrivateKey_traditional(bio, pkey, enc, NULL, 0,
+ 						  ossl_pem_passwd_cb,
+ 						  (void *)pass)) {