Merge branch 'master' into dist/3.2/focal

Author: sorah

ChangeLog

@@ -979,7 +979,6 @@ mentioned below.
     {MIT License}[rdoc-label:label-MIT+License]
 
 [lib/rubygems/resolver/molinillo]
-[lib/bundler/vendor/molinillo]
 
   molinillo is under the following license.
 
@@ -988,6 +987,15 @@ mentioned below.
 
     {MIT License}[rdoc-label:label-MIT+License]
 
+[lib/bundler/vendor/pub_grub]
+
+  pub_grub is under the following license.
+
+  >>>
+    Copyright (c) 2018 John Hawthorn
+
+    {MIT License}[rdoc-label:label-MIT+License]
+
 [lib/bundler/vendor/connection_pool]
 
   connection_pool is under the following license.

LEGAL

@@ -202,6 +202,11 @@ static VALUE
 node_id_for_backtrace_location(rb_execution_context_t *ec, VALUE module, VALUE location)
 {
     int node_id;
+
+    if (!rb_frame_info_p(location)) {
+        rb_raise(rb_eTypeError, "Thread::Backtrace::Location object expected");
+    }
+
     node_id = rb_get_node_id_from_frame_info(location);
     if (node_id == -1) {
         return Qnil;

ast.c

@@ -4184,7 +4184,6 @@ rb_int_parse_cstr(const char *str, ssize_t len, char **endp, size_t *ndigits,
         }
         if (!c || ISSPACE(c)) --str;
         if (end) len = end - str;
-        ASSERT_LEN();
     }
     c = *str;
     c = conv_digit(c);

bignum.c

@@ -1375,7 +1375,6 @@ update-config_files: PHONY
 
 refresh-gems: update-bundled_gems prepare-gems
 prepare-gems: $(HAVE_BASERUBY:yes=update-gems) $(HAVE_BASERUBY:yes=extract-gems)
-prepare-gems: $(DOT_WAIT) $(HAVE_BASERUBY:yes=outdate-bundled-gems)
 extract-gems: $(HAVE_BASERUBY:yes=update-gems)
 
 update-gems$(gnumake:yes=-sequential): PHONY

common.mk

@@ -12311,7 +12311,7 @@ ibf_load_iseq_each(struct ibf_load *load, rb_iseq_t *iseq, ibf_offset_t offset)
     verify_call_cache(iseq);
 
     RB_GC_GUARD(dummy_frame);
-    rb_vm_pop_frame(ec);
+    rb_vm_pop_frame_no_int(ec);
 }
 
 struct ibf_dump_iseq_list_arg

compile.c

@@ -1,3 +1,9 @@
+ruby3.2 (3.2.1-0nkmi1~dist) unstable; urgency=medium
+
+  * Ruby 3.2.1
+
+ -- Sorah Fukumori <[email protected]>  Wed, 08 Feb 2023 21:58:56 +0900
+
 ruby3.2 (3.2.0-1nkmi1~dist) unstable; urgency=medium
 
   * Ruby 3.2.0

debian/changelog

@@ -11,10 +11,10 @@ Partially reverts https://github.com/ruby/ruby/pull/6203
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/common.mk b/common.mk
-index e89d127..c57ee31 100644
+index 3798f82..5375f52 100644
 --- a/common.mk
 +++ b/common.mk
-@@ -1394,7 +1394,7 @@ update-gems$(gnumake:yes=-sequential): PHONY
+@@ -1393,7 +1393,7 @@ update-gems$(gnumake:yes=-sequential): PHONY
 
  extract-gems$(gnumake:yes=-sequential): PHONY
  	$(ECHO) Extracting bundled gem files...

debian/patches/Fix-undefined-behavior-in-shape.c.patch

@@ -8,4 +8,3 @@ TestProcess-disable-gems-to-disable-rubygems_integration.patch
 ruby_default_arch.m4-don-t-require-arhitectures-to-be-kno.patch
 extract-gems-sequential-Keep-using-RUNRUBY.patch
 test_dumb_terminal-ruby-command-is-not-always-available.patch
-Fix-undefined-behavior-in-shape.c.patch