Pullup ticket #6707 - requested by taca

lang/ruby30-base: security fix

Revisions pulled up:
- lang/ruby/Makefile                                            1.74
- lang/ruby/rubyversion.mk                                      1.257
- lang/ruby30-base/Makefile                                     1.9
- lang/ruby30-base/distinfo                                     1.11
- lang/ruby30-base/patches/patch-configure                      1.3

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Sat Nov 26 13:07:52 UTC 2022

   Modified Files:
   	pkgsrc/lang/ruby: Makefile rubyversion.mk
   	pkgsrc/lang/ruby30-base: Makefile distinfo
   	pkgsrc/lang/ruby30-base/patches: patch-configure

   Log Message:
   lang/ruby30-base: update to 3.0.5

   Ruby 3.0.5 Released (2022-11-24)

   Ruby 3.0.5 has been released.

   This release includes a security fix.  Please check the topics below for
   details.

   * CVE-2021-33621: HTTP response splitting in CGI

   This release also includes some bug fixes.  See the commit logs for further
   details.

5 files changed, 55 insertions, 44 deletions

diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile
index 7e17f56c5cc..054f8a440a6 100644
--- a/lang/ruby/Makefile
+++ b/lang/ruby/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.71 2022/09/10 13:19:28 taca Exp $
+# $NetBSD: Makefile,v 1.71.2.1 2022/11/30 17:25:42 bsiegert Exp $
 
 DISTNAME=	# empty
 PKGNAME=	ruby-${RUBY_VERSION}
-PKGREVISION=	1
 CATEGORIES=	lang ruby
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/lang/ruby/rubyversion.mk b/lang/ruby/rubyversion.mk
index e224fba1f14..bc422ea9707 100644
--- a/lang/ruby/rubyversion.mk
+++ b/lang/ruby/rubyversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.252.4.1 2022/11/30 17:19:02 bsiegert Exp $
+# $NetBSD: rubyversion.mk,v 1.252.4.2 2022/11/30 17:25:42 bsiegert Exp $
 #
 
 # This file determines which Ruby version is used as a dependency for
@@ -215,7 +215,7 @@ RUBY_VERSION_REQD?=	${PKGNAME_REQD:C/ruby([0-9][0-9])-.*/\1/}
 # current supported Ruby's version
 RUBY26_VERSION=		2.6.10
 RUBY27_VERSION=		2.7.6
-RUBY30_VERSION=		3.0.4
+RUBY30_VERSION=		3.0.5
 RUBY31_VERSION=		3.1.3
 
 # current API compatible version; used for version of shared library
@@ -395,7 +395,7 @@ RUBY_BASE64_VER=		0.1.0
 RUBY_BENCHMARK_VER=		0.1.1
 RUBY_BIGDECIMAL_VER=		3.0.0
 RUBY_BUNDLER_VER=		2.2.33
-RUBY_CGI_VER=			0.2.1
+RUBY_CGI_VER=			0.2.2
 RUBY_CSV_VER=			3.1.9
 RUBY_DATE_VER=			3.1.3
 RUBY_DBM_VER=			1.1.0
@@ -433,7 +433,7 @@ RUBY_NKF_VER=			0.1.0
 RUBY_OBSERVER_VER=		0.1.1
 RUBY_OPEN_URI_VER=		0.1.0
 RUBY_OPEN3_VER=			0.1.1
-RUBY_OPENSSL_VER=		2.2.1
+RUBY_OPENSSL_VER=		2.2.2
 RUBY_OPTPARSE_VER=		0.1.1
 RUBY_OSTRUCT_VER=		0.3.1
 RUBY_PATHNAME_VER=		0.1.0
diff --git a/lang/ruby30-base/Makefile b/lang/ruby30-base/Makefile
index 87994f3661d..6efe0cadd67 100644
--- a/lang/ruby30-base/Makefile
+++ b/lang/ruby30-base/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2022/07/18 12:47:52 jperkin Exp $
+# $NetBSD: Makefile,v 1.8.2.1 2022/11/30 17:25:42 bsiegert Exp $
 
 DISTNAME=	${RUBY_DISTNAME}
 PKGNAME=	${RUBY_PKGPREFIX}-base-${RUBY_VERSION}
-PKGREVISION=	2
 CATEGORIES=	lang ruby
 MASTER_SITES=	${MASTER_SITE_RUBY}
 
diff --git a/lang/ruby30-base/distinfo b/lang/ruby30-base/distinfo
index 7c0f05a4bfe..05170f665a5 100644
--- a/lang/ruby30-base/distinfo
+++ b/lang/ruby30-base/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.10 2022/05/04 16:44:53 taca Exp $
+$NetBSD: distinfo,v 1.10.4.1 2022/11/30 17:25:42 bsiegert Exp $
 
-BLAKE2s (ruby-3.0.4.tar.xz) = 2487d6f4bd37ef20715935a50d2cc50f9d50589c9223836bfaa6c3ac7de57b4d
-SHA512 (ruby-3.0.4.tar.xz) = 53bf7dd403b0c68af9691882ad8ed7422c8d1f496627428fb4c3caf0b0313715524b744c5f453aced2d49e16e55f3f45b46b9a77aa3097dbfcae7caa0208194b
-Size (ruby-3.0.4.tar.xz) = 15830368 bytes
+BLAKE2s (ruby-3.0.5.tar.xz) = 21cbe465dddcd8f3fdd19190cab6b513e7a1ae68f6686b0b9f3a95ce86d88bf1
+SHA512 (ruby-3.0.5.tar.xz) = 1c69d18210a2156f7696c678a8d54bf05c4dc49a1401c1ecc5760b1c23fb6ac14053873a225564664d6a327cda274ce72f47d112a6ad8d378f978de4e507e9a0
+Size (ruby-3.0.5.tar.xz) = 15880196 bytes
 SHA1 (patch-common.mk) = c23eed58427b2fd4ba8fdb3692f609701a666c6d
-SHA1 (patch-configure) = 8499cad3c1fb1a1b15392ba375f8d4e737fef2e4
+SHA1 (patch-configure) = a6ef87bfefd5f753d0b331c6b5493ef189f69d6a
 SHA1 (patch-ext_dbm_extconf.rb) = c998f8735db54b1ae2bc8b6caa359ce88bc7a45b
 SHA1 (patch-ext_openssl_openssl__missing.h) = 3f8d79736fd14806dfaf76e333eec63ff3ff5890
 SHA1 (patch-ext_openssl_ossl__pkey__rsa.c) = 32054bad7bf31040e6d8828f8786de26dc860518
diff --git a/lang/ruby30-base/patches/patch-configure b/lang/ruby30-base/patches/patch-configure
index e8c89b4d0f5..6b243ea98e3 100644
--- a/lang/ruby30-base/patches/patch-configure
+++ b/lang/ruby30-base/patches/patch-configure
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.2 2022/05/04 15:49:16 jperkin Exp $
+$NetBSD: patch-configure,v 1.2.4.1 2022/11/30 17:25:43 bsiegert Exp $
 
 * Adding Interix support.
 * Ignore doxygen.
@@ -7,26 +7,26 @@ $NetBSD: patch-configure,v 1.2 2022/05/04 15:49:16 jperkin Exp $
 * Retain _XOPEN_SOURCE, fixes eventmachine.
 * Fix argument for pthread_self() on NetBSD.
 
---- configure.orig	2022-04-12 11:48:57.000000000 +0000
+--- configure.orig	2022-11-24 11:04:58.000000000 +0000
 +++ configure
-@@ -8381,7 +8381,7 @@ else
-     if test x"$target_alias" = x; then :
+@@ -9270,7 +9270,7 @@ else $as_nop
+ then :
  
  	case "$target_os" in #(
 -  darwin*) :
 +  nodarwin*) :
  
- 	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for real target cpu" >&5
- $as_echo_n "checking for real target cpu... " >&6; }
-@@ -10094,6 +10094,7 @@ fi
+ 	    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for real target cpu" >&5
+ printf %s "checking for real target cpu... " >&6; }
+@@ -11095,6 +11095,7 @@ fi
  	stack_protector=no
       ;; #(
    *) :
 +	stack_protector=no
       ;;
  esac
-     if test -z "${stack_protector+set}"; then :
-@@ -11794,18 +11795,6 @@ fi
+     if test -z "${stack_protector+set}"
+@@ -12893,18 +12894,6 @@ then :
       CPPFLAGS="$CPPFLAGS ${rb_opt}" ;;
  esac
  	done
@@ -45,7 +45,7 @@ $NetBSD: patch-configure,v 1.2 2022/05/04 15:49:16 jperkin Exp $
  
  fi
  
-@@ -11970,6 +11959,10 @@ esac
+@@ -13060,6 +13049,10 @@ esac
  
  			ac_cv_func___builtin_setjmp=no
  		 ;; #(
@@ -56,16 +56,18 @@ $NetBSD: patch-configure,v 1.2 2022/05/04 15:49:16 jperkin Exp $
    *) :
       ;;
  esac
-@@ -23324,6 +23317,8 @@ else
- # ifdef _MSC_VER
- #  include <malloc.h>
- #  define alloca _alloca
-+# elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
+@@ -24715,7 +24708,9 @@ else
+ #include <stdlib.h>
+ #include <stddef.h>
+ #ifndef alloca
+-# ifdef __GNUC__
++# if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
 +#   include <stdlib.h>
- # else
- #  ifdef HAVE_ALLOCA_H
- #   include <alloca.h>
-@@ -28622,7 +28617,9 @@ fi
++# elif defined __GNUC__
+ #  define alloca __builtin_alloca
+ # elif defined _MSC_VER
+ #  include <malloc.h>
+@@ -29662,7 +29657,9 @@ fi
    interix*) :
      	: ${LDSHARED='$(CC) -shared'}
  			XLDFLAGS="$XLDFLAGS -Wl,-E"
@@ -75,16 +77,25 @@ $NetBSD: patch-configure,v 1.2 2022/05/04 15:49:16 jperkin Exp $
  			rb_cv_dlopen=yes ;; #(
    freebsd*|dragonfly*) :
  
-@@ -29890,7 +29887,7 @@ fi
+@@ -29833,7 +29830,7 @@ fi
+       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $flag is accepted for bundle" >&5
+ printf %s "checking whether $flag is accepted for bundle... " >&6; }
+       : > conftest.c
+-      if ${LDSHARED/'$(CC)'/$CC} -o conftest.bundle $flag conftest.c >/dev/null 2>conftest.err &&
++      if $(echo ${LDSHARED} | sed -e "s/'$(CC)'/$CC/g") -o conftest.bundle $flag conftest.c >/dev/null 2>conftest.err &&
+           test ! -s conftest.err
+ then :
+ 
+@@ -30991,7 +30988,7 @@ fi
  	 ;; #(
    freebsd*|dragonfly*) :
  
 -	LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)'
 +	LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)$(TEENY)'
  	LIBRUBY_SONAME='$(LIBRUBY_SO)'
- 	if test "$rb_cv_binary_elf" != "yes" ; then :
- 
-@@ -29969,9 +29966,10 @@ esac
+ 	if test "$rb_cv_binary_elf" != "yes"
+ then :
+@@ -31072,9 +31069,10 @@ esac
  	 ;; #(
    darwin*) :
  
@@ -94,10 +105,10 @@ $NetBSD: patch-configure,v 1.2 2022/05/04 15:49:16 jperkin Exp $
 -	LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).$(SOEXT)'
 +	LIBRUBY_SONAME='lib$(RUBY_BASE_NAME).$(RUBY_API_VERSION).$(SOEXT)'
 +	LIBRUBY_ALIASES='$(LIBRUBY_SONAME) lib$(RUBY_INSTALL_NAME).$(SOEXT)'
- 	if test "$load_relative" = yes; then :
+ 	if test "$load_relative" = yes
+ then :
  
- 	    libprefix="@executable_path/../${libdir_basename}"
-@@ -29992,7 +29990,12 @@ fi
+@@ -31097,7 +31095,12 @@ fi
  	 ;; #(
    interix*) :
  
@@ -111,7 +122,7 @@ $NetBSD: patch-configure,v 1.2 2022/05/04 15:49:16 jperkin Exp $
  	 ;; #(
    mingw*|cygwin*|mswin*) :
  
-@@ -30174,7 +30177,7 @@ if test "$enable_rpath" = yes; then :
+@@ -31290,7 +31293,7 @@ then :
  esac
      rpathflag=`IFS="$PATH_SEPARATOR"
          echo x "$rpathflag" |
@@ -120,19 +131,21 @@ $NetBSD: patch-configure,v 1.2 2022/05/04 15:49:16 jperkin Exp $
      `
      LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${rpathflag}"
      LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED"
-@@ -32906,19 +32909,7 @@ which seems to be undefined.  Please mak
+@@ -34101,21 +34104,7 @@ which seems to be undefined.  Please mak
      "Makefile":F)
      tmpmk=confmk$$.tmp
      {
--	if test ${VCS+set}; then :
+-	if test ${VCS+set}
+-then :
 -
 -	    :
 -
--elif git_dir=`$GIT --work-tree="$srcdir" --git-dir="$srcdir/.git" rev-parse --git-dir 2>/dev/null`; then :
+-elif git_dir=`$GIT --work-tree="$srcdir" --git-dir="$srcdir/.git" rev-parse --git-dir 2>/dev/null`
+-then :
 -
 -	    VCS='$(GIT)'
 -
--else
+-else $as_nop
 -
  	    VCS='echo cannot'
 -