From 5853abf6f60770c28a3af0c0c8826e74c39f5f5b Mon Sep 17 00:00:00 2001
From: Zach van Rijn <me@zv.io>
Date: Mon, 25 Dec 2023 08:26:25 -0800
Subject: system/ruby: bump { 3.1.4 --> 3.3.0 }.

The 'libedit' dependency is no longer required.
---
 system/ruby/APKBUILD             | 10 ++++------
 system/ruby/libedit-compat.patch | 22 ----------------------
 2 files changed, 4 insertions(+), 28 deletions(-)
 delete mode 100644 system/ruby/libedit-compat.patch

diff --git a/system/ruby/APKBUILD b/system/ruby/APKBUILD
index db2e2a3c7..2e03708be 100644
--- a/system/ruby/APKBUILD
+++ b/system/ruby/APKBUILD
@@ -42,7 +42,7 @@
 #     - CVE-2020-8130
 #
 pkgname=ruby
-pkgver=3.1.4
+pkgver=3.3.0
 _abiver="${pkgver%.*}.0"
 pkgrel=0
 pkgdesc="An object-oriented language for quick and easy programming"
@@ -51,7 +51,7 @@ arch="all"
 license="Ruby AND BSD-2-Clause"
 depends="ca-certificates"
 depends_dev="ruby=$pkgver-r$pkgrel gmp-dev libucontext-dev"
-makedepends="$depends_dev zlib-dev openssl-dev db-dev libedit-dev
+makedepends="$depends_dev zlib-dev openssl-dev db-dev
 	libffi-dev coreutils yaml-dev linux-headers autoconf"
 install="$pkgname.post-upgrade"
 subpackages="$pkgname-doc $pkgname-dev
@@ -72,7 +72,6 @@ source="https://cache.ruby-lang.org/pub/ruby/${pkgver%.*}/$pkgname-$pkgver.tar.x
 	rubygems-avoid-platform-specific-gems.patch
 	test_insns-lower-recursion-depth.patch
 	fix-get_main_stack.patch
-	libedit-compat.patch
 	"
 replaces="ruby-etc ruby-gems"
 
@@ -275,8 +274,7 @@ _mvgem() {
 	done
 }
 
-sha512sums="a627bb629a10750b8b2081ad451a41faea0fc85d95aa1e267e3d2a0f56a35bb58195d4a8d13bbdbd82f4197a96dae22b1cee1dfc83861ec33a67ece07aef5633  ruby-3.1.4.tar.xz
+sha512sums="7959c5753bfa0bfc4d6d74060869aabbe9815c1c97930659da11b917ee0803ddbbd80e869e00c48b8694b4ba48709c3b6493fd045568e36e902616c35ababf01  ruby-3.3.0.tar.xz
 a142199140fa711a64717429e9069fd2082319abaf4b129f561db374b3bc16e2a90cc4c849b5d28334505d1c71fed242aef3c44d983da3513d239dcb778673a5  rubygems-avoid-platform-specific-gems.patch
 814fe6359505b70d8ff680adf22f20a74b4dbd3fecc9a63a6c2456ee9824257815929917b6df5394ed069a6869511b8c6dce5b95b4acbbb7867c1f3a975a0150  test_insns-lower-recursion-depth.patch
-3ffc034c01110ee5531265333ca5ee8d61d08131843fe3004c5b34c88c9c1b32cb4ed89574f393177c8bd526e9c15da61ab344f93adf07b9148c561ee19e2eb5  fix-get_main_stack.patch
-6cbeb9d05a3c028e6bd371deaeec6e97fa8ebd03f0dc9d406648a03b569bb44a148e2bd81998a2a973e91ded8a08af141bdebe3e324bdc32df5e74209a42b024  libedit-compat.patch"
+3ffc034c01110ee5531265333ca5ee8d61d08131843fe3004c5b34c88c9c1b32cb4ed89574f393177c8bd526e9c15da61ab344f93adf07b9148c561ee19e2eb5  fix-get_main_stack.patch"
diff --git a/system/ruby/libedit-compat.patch b/system/ruby/libedit-compat.patch
deleted file mode 100644
index 670b16dc8..000000000
--- a/system/ruby/libedit-compat.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- ruby-2.5.5/ext/readline/readline.c.old	2017-09-30 08:35:23.000000000 +0000
-+++ ruby-2.5.5/ext/readline/readline.c	2019-09-09 06:12:00.300098741 +0000
-@@ -572,6 +572,9 @@
-             rb_syserr_fail(save_errno, "fdopen");
-         }
-         rl_instream = readline_rl_instream = f;
-+#ifdef HAVE_EDITLINE_READLINE_H
-+        rl_initialize();
-+#endif
-         readline_instream = input;
-     }
-     return input;
-@@ -608,6 +611,9 @@
-             rb_syserr_fail(save_errno, "fdopen");
-         }
-         rl_outstream = readline_rl_outstream = f;
-+#ifdef HAVE_EDITLINE_READLINE_H
-+        rl_initialize();
-+#endif
-         readline_outstream = output;
-     }
-     return output;
-- 
cgit v1.2.3-60-g2f50