CVS commit: pkgsrc/lang/ruby30-base

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue Nov  9 12:14:53 UTC 2021

Modified Files:
        pkgsrc/lang/ruby30-base: distinfo
Added Files:
        pkgsrc/lang/ruby30-base/patches: patch-ext_openssl_openssl__missing.h
            patch-ext_openssl_ossl__pkey__rsa.c

Log Message:
ruby30-base: Support OpenSSL 3.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/ruby30-base/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/ruby30-base/patches/patch-ext_openssl_openssl__missing.h \
    pkgsrc/lang/ruby30-base/patches/patch-ext_openssl_ossl__pkey__rsa.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/ruby30-base/distinfo
diff -u pkgsrc/lang/ruby30-base/distinfo:1.5 pkgsrc/lang/ruby30-base/distinfo:1.6
--- pkgsrc/lang/ruby30-base/distinfo:1.5        Tue Oct 26 10:51:54 2021
+++ pkgsrc/lang/ruby30-base/distinfo    Tue Nov  9 12:14:52 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2021/10/26 10:51:54 nia Exp $
+$NetBSD: distinfo,v 1.6 2021/11/09 12:14:52 jperkin Exp $
 
 BLAKE2s (ruby-3.0.2.tar.xz) = a475450d0808f13669ce156dfa1c49c8a48d6f2c3a51bcd016eca00263ea1df9
 SHA512 (ruby-3.0.2.tar.xz) = 0f702e2d8ca1342a9d4284dbdd234a3588e057b92566353aa7c21835cf09a3932864b2acf459a976960a1704e9befa562155d36b98b7cda8bd99526e10a374c4
@@ -6,6 +6,8 @@ Size (ruby-3.0.2.tar.xz) = 14746080 byte
 SHA1 (patch-common.mk) = c23eed58427b2fd4ba8fdb3692f609701a666c6d
 SHA1 (patch-configure) = a56184876caac5c24b2c2925f364d88c3ebc5662
 SHA1 (patch-ext_dbm_extconf.rb) = c998f8735db54b1ae2bc8b6caa359ce88bc7a45b
+SHA1 (patch-ext_openssl_openssl__missing.h) = 3f8d79736fd14806dfaf76e333eec63ff3ff5890
+SHA1 (patch-ext_openssl_ossl__pkey__rsa.c) = 32054bad7bf31040e6d8828f8786de26dc860518
 SHA1 (patch-lib_mkmf.rb) = 4a3cd18548dbdf43a13695d4e76f817c0347e335
 SHA1 (patch-lib_rdoc_encoding.rb) = 0e82d2942d9bfcb67dc7c994889d7bc5ec2ae85a
 SHA1 (patch-lib_rdoc_ri_driver.rb) = f4d3e59e35b608acd4edc17916142c7f033e6198

Added files:

Index: pkgsrc/lang/ruby30-base/patches/patch-ext_openssl_openssl__missing.h
diff -u /dev/null pkgsrc/lang/ruby30-base/patches/patch-ext_openssl_openssl__missing.h:1.1
--- /dev/null   Tue Nov  9 12:14:53 2021
+++ pkgsrc/lang/ruby30-base/patches/patch-ext_openssl_openssl__missing.h        Tue Nov  9 12:14:52 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-ext_openssl_openssl__missing.h,v 1.1 2021/11/09 12:14:52 jperkin Exp $
+
+Support OpenSSL 3.
+
+--- ext/openssl/openssl_missing.h.orig 2021-07-07 10:08:35.000000000 +0000
++++ ext/openssl/openssl_missing.h
+@@ -235,7 +235,7 @@ IMPL_PKEY_GETTER(EC_KEY, ec)
+ #  define TS_STATUS_INFO_get0_failure_info(a) ((a)->failure_info)
+ #endif
+ 
+-#if !defined(HAVE_TS_VERIFY_CTS_SET_CERTS)
++#if !defined(HAVE_TS_VERIFY_CTS_SET_CERTS) && !defined(TS_VERIFY_CTS_set_certs)
+ #  define TS_VERIFY_CTS_set_certs(ctx, crts) ((ctx)->certs=(crts))
+ #endif
+ 
Index: pkgsrc/lang/ruby30-base/patches/patch-ext_openssl_ossl__pkey__rsa.c
diff -u /dev/null pkgsrc/lang/ruby30-base/patches/patch-ext_openssl_ossl__pkey__rsa.c:1.1
--- /dev/null   Tue Nov  9 12:14:53 2021
+++ pkgsrc/lang/ruby30-base/patches/patch-ext_openssl_ossl__pkey__rsa.c Tue Nov  9 12:14:52 2021
@@ -0,0 +1,16 @@
+$NetBSD: patch-ext_openssl_ossl__pkey__rsa.c,v 1.1 2021/11/09 12:14:52 jperkin Exp $
+
+Support OpenSSL 3.
+
+--- ext/openssl/ossl_pkey_rsa.c.orig   2021-07-07 10:08:35.000000000 +0000
++++ ext/openssl/ossl_pkey_rsa.c
+@@ -947,7 +947,9 @@ Init_ossl_rsa(void)
+     rb_define_method(cRSA, "params", ossl_rsa_get_params, 0);
+ 
+     DefRSAConst(PKCS1_PADDING);
++#ifdef SSLV23_PADDING
+     DefRSAConst(SSLV23_PADDING);
++#endif
+     DefRSAConst(NO_PADDING);
+     DefRSAConst(PKCS1_OAEP_PADDING);
+