diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2024-01-21 06:25:01 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2024-01-21 06:25:01 +0100 |
| commit | 632700baf79a1f9294a831787ce0af530030b72e (patch) | |
| tree | df349726cd4b41c03d259f4de268487cf75fe178 | |
| parent | 3c0e4097a4c00fbee2874503688e9973cdbb3ee3 (diff) | |
ruby: update to 3.3.0
| -rw-r--r-- | package/ruby/Makefile | 7 | ||||
| -rw-r--r-- | package/ruby/patches/0001-Fix-build-with-LibreSSL-3-5.patch | 25 |
2 files changed, 4 insertions, 28 deletions
diff --git a/package/ruby/Makefile b/package/ruby/Makefile index 536d09593..f0a55595b 100644 --- a/package/ruby/Makefile +++ b/package/ruby/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= ruby -PKG_VERSION:= 3.1.2 +PKG_VERSION:= 3.3.0 PKG_RELEASE:= 1 -PKG_HASH:= ca10d017f8a1b6d247556622c841fc56b90c03b1803f87198da1e4fd3ec3bf2a +PKG_HASH:= 676b65a36e637e90f982b57b059189b3276b9045034dcd186a7e9078847b975b PKG_DESCR:= scripting language PKG_SECTION:= dev/lang PKG_DEPENDS:= libressl zlib @@ -14,7 +14,7 @@ PKG_BUILDDEP:= ruby-host libressl zlib HOST_BUILDDEP:= libressl-host PKG_NEEDS:= threads PKG_URL:= http://www.ruby-lang.org/ -PKG_SITES:= http://ftp.ruby-lang.org/pub/ruby/3.1/ +PKG_SITES:= http://ftp.ruby-lang.org/pub/ruby/3.3/ include ${ADK_TOPDIR}/mk/host.mk include ${ADK_TOPDIR}/mk/package.mk @@ -39,6 +39,7 @@ ALL_TARGET:= main INSTALL_TARGET:= install-nodoc HOST_CONFIGURE_ARGS+= --disable-install-doc \ + --disable-yjit \ --disable-shared \ --with-out-ext=curses,readline,openssl \ --disable-rubygems diff --git a/package/ruby/patches/0001-Fix-build-with-LibreSSL-3-5.patch b/package/ruby/patches/0001-Fix-build-with-LibreSSL-3-5.patch deleted file mode 100644 index 805dfd2f8..000000000 --- a/package/ruby/patches/0001-Fix-build-with-LibreSSL-3-5.patch +++ /dev/null @@ -1,25 +0,0 @@ -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)) { |