Merge branch 'master-3.0' into dist/3.0/focal

Author: sorah

ChangeLog

@@ -1,5 +1,219 @@
 -*- coding: utf-8 -*-
 
+commit 23a532679b406cb53c0edfc00c91c32a5ccd335a
+  Author:     NAKAMURA Usaku <[email protected]>
+  AuthorDate: 2023-03-30 21:41:03 +0900
+  Commit:     NAKAMURA Usaku <[email protected]>
+  CommitDate: 2023-03-30 21:41:03 +0900
+
+    Fix previous commit
+
+commit 4ec0bac2d9bd29541442709e6c2b62dee688c1ac
+  Author:     NAKAMURA Usaku <[email protected]>
+  AuthorDate: 2023-03-30 20:10:01 +0900
+  Commit:     NAKAMURA Usaku <[email protected]>
+  CommitDate: 2023-03-30 20:10:01 +0900
+
+    Limit header length
+
+commit b427e3570d16c7b68cfa0e5e05be84ba8e3eac36
+  Author:     NAKAMURA Usaku <[email protected]>
+  AuthorDate: 2023-03-30 19:59:19 +0900
+  Commit:     NAKAMURA Usaku <[email protected]>
+  CommitDate: 2023-03-30 19:59:19 +0900
+
+    [Backport #19161] merge part of 96d1acfdf6c6b42f2029f44d5b5920961d6efa92
+
+    Check for TLS usability
+
+    On all platforms using GCC, even other than darwin.
+
+commit 69f0cafa5ef6ef9c86b374531e757e885198b390
+  Author:     git <[email protected]>
+  AuthorDate: 2023-03-30 19:49:20 +0900
+  Commit:     git <[email protected]>
+  CommitDate: 2023-03-30 19:49:20 +0900
+
+    * 2023-03-30 [ci skip]
+
+commit 53a7cee6850bd0d5999fcb56471f0a507222f486
+  Author:     Hiroshi SHIBATA <[email protected]>
+  AuthorDate: 2023-03-29 13:29:08 +0900
+  Commit:     usa <[email protected]>
+  CommitDate: 2023-03-30 19:49:08 +0900
+
+    Merge Time-0.1.1
+
+commit 2d99ef4f74e13de352ffd867ffe7308f78d7418e
+  Author:     Hiroshi SHIBATA <[email protected]>
+  AuthorDate: 2023-03-29 14:54:14 +0900
+  Commit:     GitHub <[email protected]>
+  CommitDate: 2023-03-29 14:54:14 +0900
+
+    Merge URI-0.10.2 for Ruby 3.0 (#7607)
+
+    * Merge URI-0.10.2
+
+    * Merge URI-0.10.0.2 for bundler
+
+    * Added assert_linear_performance for URI tests
+
+commit 57e7caeac133cc3b42031ee487e4d7a0cd2487f4
+  Author:     git <[email protected]>
+  AuthorDate: 2023-03-29 10:58:10 +0900
+  Commit:     git <[email protected]>
+  CommitDate: 2023-03-29 10:58:10 +0900
+
+    * 2023-03-29 [ci skip]
+
+commit 998fe8ace4621b7337fcd88c78eec02588d0bc57
+  Author:     Nobuyoshi Nakada <[email protected]>
+  AuthorDate: 2023-03-26 23:10:50 +0900
+  Commit:     usa <[email protected]>
+  CommitDate: 2023-03-29 10:57:57 +0900
+
+    Historical timezones of Lisbon in tzdata are unstable
+
+commit 4527440b5242b7e26cce2500177e989853d7fb16
+  Author:     Takashi Kokubun <[email protected]>
+  AuthorDate: 2023-03-26 15:23:10 +0900
+  Commit:     usa <[email protected]>
+  CommitDate: 2023-03-29 10:57:57 +0900
+
+    Skip test_europe_lisbon on macOS
+
+    until we figure out why it's failing.
+
+commit 78c2e2827ef8a87da801a612b7a9418db703b2d6
+  Author:     Hiroshi SHIBATA <[email protected]>
+  AuthorDate: 2023-02-03 15:55:33 +0900
+  Commit:     usa <[email protected]>
+  CommitDate: 2023-03-29 10:57:57 +0900
+
+    Bump up CodeQL v2
+
+commit 408d2dbede5da0063da0cc71007bf897991e6ca1
+  Author:     Hiroshi SHIBATA <[email protected]>
+  AuthorDate: 2023-02-03 15:41:16 +0900
+  Commit:     usa <[email protected]>
+  CommitDate: 2023-03-29 10:57:57 +0900
+
+    Skip test-bundler-prallel with macOS. It mixed system bundler path.
+
+      https://github.com/ruby/ruby/actions/runs/4061314416/jobs/7033111867
+
+commit 57703ba1ec421c938181f49e8127c6e4ae83c281
+  Author:     Hiroshi SHIBATA <[email protected]>
+  AuthorDate: 2023-01-06 09:58:25 +0900
+  Commit:     usa <[email protected]>
+  CommitDate: 2023-03-29 10:57:57 +0900
+
+    Pin Ubuntu 20.04 because Ruby 3.0 didn't support OpenSSL 3
+
+commit 6ca5d3cfed45a8c42f6dbf8126e509792576cbe1
+  Author:     Hiroshi SHIBATA <[email protected]>
+  AuthorDate: 2023-01-06 09:36:07 +0900
+  Commit:     usa <[email protected]>
+  CommitDate: 2023-03-29 10:57:57 +0900
+
+    Ruby 3.0 only supports `--jit-*` options
+
+commit 9cb6b7d14571c93c5ddb4c5fbf18908b6f756b04
+  Author:     Takashi Kokubun <[email protected]>
+  AuthorDate: 2022-11-28 06:32:39 +0900
+  Commit:     usa <[email protected]>
+  CommitDate: 2023-03-29 10:57:57 +0900
+
+    Disable test-all on MJIT CI for now
+
+    https://github.com/ruby/ruby/actions/runs/3560006749/jobs/5979749144
+
+commit 54d0a2af33c7a43ad3bc7d54da8a68d0d31e1c0a
+  Author:     卜部昌平 <[email protected]>
+  AuthorDate: 2021-10-22 11:15:10 +0900
+  Commit:     usa <[email protected]>
+  CommitDate: 2023-03-29 10:57:57 +0900
+
+    .github: use GNUMAKEFLAGS instead of JOBS
+
+    A bit readable to me.
+    See also https://github.com/ruby/ruby/pull/4880
+
+commit fcab8cf702a529301568aa605774ebb470febe97
+  Author:     Takashi Kokubun <[email protected]>
+  AuthorDate: 2022-11-28 06:12:29 +0900
+  Commit:     usa <[email protected]>
+  CommitDate: 2023-03-29 10:57:57 +0900
+
+    Test only --mjit-wait for now
+
+    We've disabled MJIT CI on GitHub Actions for a while. It's convenient
+    that fork repositories need to see failures or disable it.
+
+    We should remove unused CI by default instead of silently disabling it.
+    Since I saw --mjit-wait passed on my fork, I'd like to try running
+    --mjit-wait one.
+
+commit d8b1279d3bf4c80ad461ed393e6e4839f3f6e1ca
+  Author:     Takashi Kokubun <[email protected]>
+  AuthorDate: 2021-12-14 09:08:01 +0900
+  Commit:     usa <[email protected]>
+  CommitDate: 2023-03-29 10:57:57 +0900
+
+    Rename --jit to --mjit (#5248)
+
+    * Rename --jit to --mjit
+
+    [Feature #18349]
+
+    * Fix a few more --jit references
+
+    * Fix MJIT Actions
+
+    * More s/jit/mjit/ and re-introduce --disable-jit
+
+    * Update NEWS.md
+
+    * Fix test_bug_reporter_add
+
+commit f84638273a51aa56513e8f64660411151b64a4f4
+  Author:     git <[email protected]>
+  AuthorDate: 2023-02-07 17:26:49 +0900
+  Commit:     git <[email protected]>
+  CommitDate: 2023-02-07 17:26:49 +0900
+
+    * 2023-02-07 [ci skip]
+
+commit 72beb9f868880a97c769d38b9aab99201300ece8
+  Author:     Nobuyoshi Nakada <[email protected]>
+  AuthorDate: 2022-10-15 01:03:47 +0900
+  Commit:     usa <[email protected]>
+  CommitDate: 2023-02-07 17:26:37 +0900
+
+    Remove wrong dollar
+
+commit a0a99185577794b1915eba0dc5154f09cc95e81d
+  Author:     NAKAMURA Usaku <[email protected]>
+  AuthorDate: 2022-12-08 12:31:20 +0900
+  Commit:     NAKAMURA Usaku <[email protected]>
+  CommitDate: 2022-12-08 12:31:20 +0900
+
+    merge revision(s) 58cc3c9f: [Backport #19187]
+
+            [Bug #19187] Fix for tzdata-2022g
+
+            ---
+             test/ruby/test_time_tz.rb | 21 +++++++++++++++------
+             1 file changed, 15 insertions(+), 6 deletions(-)
+
+commit 9de654cb74daaa8918ca6b04fbce211c3ccd4209
+  Author:     NAKAMURA Usaku <[email protected]>
+  AuthorDate: 2022-12-08 12:30:36 +0900
+  Commit:     NAKAMURA Usaku <[email protected]>
+  CommitDate: 2022-12-08 12:30:36 +0900
+
+    Bump teeny
+
 commit ba5cf0f7c52d4d35cc6a173c89eda98ceffa2dcf
   Author:     Kazuki Yamaguchi <[email protected]>
   AuthorDate: 2022-09-08 23:00:01 +0900

configure

@@ -8980,6 +8980,41 @@ then :
 
 fi
 
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if thread-local storage is supported" >&5
+printf %s "checking if thread-local storage is supported... " >&6; }
+if test ${rb_cv_tls_supported+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int __thread conftest;
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  rb_cv_tls_supported=yes
+else $as_nop
+  rb_cv_tls_supported=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $rb_cv_tls_supported" >&5
+    colorize_result "$rb_cv_tls_supported" ; }
+if test x"$rb_cv_tls_supported" != xyes
+then :
+  printf "%s\n" "#define RB_THREAD_LOCAL_SPECIFIER_IS_UNSUPPORTED 1" >>confdefs.h
+
+fi
+
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the linker is GNU ld" >&5
 printf %s "checking whether the linker is GNU ld... " >&6; }
 if test ${rb_cv_prog_gnu_ld+y}
@@ -29803,7 +29838,7 @@ then :
 	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
     printf "%s\n" "${msg_result_yes}yes${msg_reset}" >&6 ; }
 else $as_nop
-  $flag=
+  flag=
 	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
     printf "%s\n" "${msg_result_no}no${msg_reset}" >&6 ; }
 fi

configure.ac

@@ -348,6 +348,14 @@ AS_IF([test "$GCC" = yes -a "$gcc_major" -lt 3 ], [
     AC_MSG_ERROR([too old GCC])
 ])
 
+
+AC_CACHE_CHECK([if thread-local storage is supported], [rb_cv_tls_supported],
+    [AC_LINK_IFELSE([AC_LANG_PROGRAM([[int __thread conftest;]])],
+        [rb_cv_tls_supported=yes],
+        [rb_cv_tls_supported=no])])
+AS_IF([test x"$rb_cv_tls_supported" != xyes],
+    [AC_DEFINE(RB_THREAD_LOCAL_SPECIFIER_IS_UNSUPPORTED)])
+
 RUBY_PROG_GNU_LD
 RUBY_CPPOUTFILE
 
@@ -2890,7 +2898,7 @@ AS_IF([test "$with_dln_a_out" != yes], [
 	  "-undefined dynamic_lookup" \
 	  ; do
       test "x${linker_flag}" = x || flag="${linker_flag}`echo ${flag} | tr ' ' ,`"
-      RUBY_TRY_LDFLAGS([$flag], [], [$flag=])
+      RUBY_TRY_LDFLAGS([$flag], [], [flag=])
       AS_IF([test x"$flag" = x], [continue])
 
       AC_MSG_CHECKING([whether $flag is accepted for bundle])

debian/changelog

@@ -1,3 +1,9 @@
+ruby3.0 (3.0.6-0nkmi1~dist) unstable; urgency=medium
+
+  * Ruby 3.0.6
+
+ -- Sorah Fukumori <[email protected]>  Fri, 31 Mar 2023 16:09:54 +0900
+
 ruby3.0 (3.0.5-0nkmi1~dist) unstable; urgency=medium
 
   * Ruby 3.0.5

debian/patches/Fix-FTBFS-on-x32-misdetected-as-i386-or-amd64.patch

@@ -9,10 +9,10 @@ Bug: #954293
  1 file changed, 3 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index 158924a..1368961 100644
+index 28fdfef..634bc54 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2433,6 +2433,9 @@ AS_CASE([$rb_cv_coroutine], [yes|''], [
+@@ -2441,6 +2441,9 @@ AS_CASE([$rb_cv_coroutine], [yes|''], [
          [arm64-darwin*], [
              rb_cv_coroutine=arm64
          ],

debian/patches/Fix-for-tzdata-2022g.patch

@@ -7,10 +7,10 @@ Subject: Honor the tool prefix against pkg-config
  1 file changed, 8 insertions(+), 5 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 1368961..8d90b4c 100644
+index 634bc54..c875176 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -470,11 +470,14 @@ AS_IF([test "$cross_compiling:$ac_cv_prog_DTRACE" = no: -a -n "$ac_tool_prefix"]
+@@ -478,11 +478,14 @@ AS_IF([test "$cross_compiling:$ac_cv_prog_DTRACE" = no: -a -n "$ac_tool_prefix"]
  AC_CHECK_PROGS(DOT, dot)
  AC_CHECK_PROGS(DOXYGEN, doxygen)
 

debian/patches/Honor-the-tool-prefix-against-pkg-config.patch

@@ -9,4 +9,3 @@ ruby_default_arch.m4-don-t-require-arhitectures-to-be-kno.patch
 test-zlib-test_zlib.rb-stop-a-failure-on-armv7l.patch
 Fallback-PKG_CONFIG-to-the-configured-pkg-config-always.patch
 Honor-the-tool-prefix-against-pkg-config.patch
-Fix-for-tzdata-2022g.patch