From e2fe59f345cd33a07fddccf3bb7739da606cd000 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 14 Jul 2021 20:07:05 +0200
Subject: [PATCH] ruby: update to 3.0.2.

---
 common/shlibs                                 |  2 +-
 .../patch-ext_openssl_extconf_rb.patch        | 13 --------
 .../patch-ext_openssl_openssl_missing_h.patch | 31 -------------------
 srcpkgs/ruby/template                         |  8 ++---
 4 files changed, 5 insertions(+), 49 deletions(-)
 delete mode 100644 srcpkgs/ruby/patches/patch-ext_openssl_extconf_rb.patch
 delete mode 100644 srcpkgs/ruby/patches/patch-ext_openssl_openssl_missing_h.patch

diff --git a/common/shlibs b/common/shlibs
index c35332b64a..a7afbf2a56 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -434,7 +434,7 @@ libKScreenLocker.so.5 kscreenlocker-5.8.4_1
 libparted.so.2 libparted-3.1_1
 libparted-fs-resize.so.0 libparted-3.1_1
 libntfs-3g.so.88 ntfs-3g-2017.3.23_1
-libruby.so.2.7 ruby-2.7.2_3
+libruby.so.3.0 ruby-3.0.2_1
 libprocessui.so.9 libksysguard-5.18.90_1
 libksignalplotter.so.9 libksysguard-5.18.90_1
 libksgrd.so.9 libksysguard-5.18.90_1
diff --git a/srcpkgs/ruby/patches/patch-ext_openssl_extconf_rb.patch b/srcpkgs/ruby/patches/patch-ext_openssl_extconf_rb.patch
deleted file mode 100644
index 0d1f0db978..0000000000
--- a/srcpkgs/ruby/patches/patch-ext_openssl_extconf_rb.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-$OpenBSD: patch-ext_openssl_extconf_rb,v 1.1 2018/02/23 09:54:25 sthen Exp $
-
-Index: ext/openssl/extconf.rb
---- a/ext/openssl/extconf.rb
-+++ b/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
deleted file mode 100644
index 98d356aeda..0000000000
--- a/srcpkgs/ruby/patches/patch-ext_openssl_openssl_missing_h.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-$OpenBSD: patch-ext_openssl_openssl_missing_h,v 1.4 2018/02/23 09:54:25 sthen Exp $
-
-Index: ext/openssl/openssl_missing.h
---- a/ext/openssl/openssl_missing.h
-+++ b/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 41c6ff9726..0411719edc 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -1,8 +1,8 @@
 # Template file for 'ruby'
-_ruby_abiver=2.7.0
+_ruby_abiver=3.0.0
 
 pkgname=ruby
-version=2.7.4
+version=3.0.2
 revision=1
 build_style=gnu-configure
 configure_args="--enable-shared --disable-rpath
@@ -15,8 +15,8 @@ short_desc="Ruby programming language"
 homepage="http://www.ruby-lang.org/en/"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Ruby, BSD-2-Clause"
-distfiles="https://cache.ruby-lang.org/pub/ruby/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=bffa8aec9da392eda98f1c561071bb6e71d217d541c617fc6e3282d79f4e7d48
+distfiles="https://cache.ruby-lang.org/pub/ruby/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=570e7773100f625599575f363831166d91d49a1ab97d3ab6495af44774155c40
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Broken on the builders but successfully built locally