Merge branch 'master-2.6' into dist/2.6/buster

Author: sorah

ChangeLog

@@ -2,7 +2,7 @@
 
   cont.c -
 
-  $Author: samuel $
+  $Author: nagachika $
   created at: Thu May 23 09:03:43 2007
 
   Copyright (C) 2007 Koichi Sasada
@@ -626,6 +626,15 @@ cont_save_thread(rb_context_t *cont, rb_thread_t *th)
 #endif
 }
 
+static void
+cont_init_mjit_cont(rb_context_t *cont)
+{
+    VM_ASSERT(cont->mjit_cont == NULL);
+    if (mjit_enabled) {
+        cont->mjit_cont = mjit_cont_new(&(cont->saved_ec));
+    }
+}
+
 static void
 cont_init(rb_context_t *cont, rb_thread_t *th)
 {
@@ -635,9 +644,7 @@ cont_init(rb_context_t *cont, rb_thread_t *th)
     cont->saved_ec.local_storage = NULL;
     cont->saved_ec.local_storage_recursive_hash = Qnil;
     cont->saved_ec.local_storage_recursive_hash_for_trace = Qnil;
-    if (mjit_enabled) {
-        cont->mjit_cont = mjit_cont_new(&cont->saved_ec);
-    }
+    cont_init_mjit_cont(cont);
 }
 
 static rb_context_t *
@@ -654,6 +661,14 @@ cont_new(VALUE klass)
     return cont;
 }
 
+void
+rb_fiber_init_mjit_cont(struct rb_fiber_struct *fiber)
+{
+    // Currently this function is meant for root_fiber. Others go through cont_new.
+    // XXX: Is this mjit_cont `mjit_cont_free`d?
+    cont_init_mjit_cont(&fiber->cont);
+}
+
 #if 0
 void
 show_vm_stack(const rb_execution_context_t *ec)

cont.c

@@ -1,3 +1,10 @@
+ruby2.6 (2.6.6-0nkmi1~dist) unstable; urgency=medium
+
+  * 2.6.6
+  * fix sysconfdir and etc
+
+ -- Sorah Fukumori <[email protected]>  Tue, 31 Mar 2020 17:11:05 +0000
+
 ruby2.6 (2.6.5-0nkmi1~dist) unstable; urgency=medium
 
   * 2.6.5

debian/changelog

@@ -30,6 +30,9 @@ configure_options += --enable-install-static-library
 configure_options += --disable-rpath
 configure_options += --with-sitedir='/usr/local/lib/site_ruby'
 configure_options += --with-sitearchdir="/usr/local/lib/$(DEB_HOST_MULTIARCH)/site_ruby"
+configure_options += --runstatedir=/var/run
+configure_options += --localstatedir=/var
+configure_options += --sysconfdir=/etc
 
 ifneq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
 # Cross-building. This is the same logic that debhelper's

debian/rules

@@ -2,7 +2,7 @@
 
   enum.c -
 
-  $Author: nobu $
+  $Author: nagachika $
   created at: Fri Oct  1 15:15:19 JST 1993
 
   Copyright (C) 1993-2007 Yukihiro Matsumoto
@@ -2337,14 +2337,20 @@ static VALUE
 enum_reverse_each(int argc, VALUE *argv, VALUE obj)
 {
     VALUE ary;
-    long i;
+    long len;
 
     RETURN_SIZED_ENUMERATOR(obj, argc, argv, enum_size);
 
     ary = enum_to_a(argc, argv, obj);
 
-    for (i = RARRAY_LEN(ary); --i >= 0; ) {
-	rb_yield(RARRAY_AREF(ary, i));
+    len = RARRAY_LEN(ary);
+    while (len--) {
+        long nlen;
+        rb_yield(RARRAY_AREF(ary, len));
+        nlen = RARRAY_LEN(ary);
+        if (nlen < len) {
+            len = nlen;
+        }
     }
 
     return obj;

enum.c

@@ -89,6 +89,9 @@ get_noatime_p(VALUE self, VALUE str)
        rb_sys_fail_str(str);
     }
 # ifdef HAVE_STRUCT_STATFS_F_FLAGS
+#  ifdef MNT_STRICTATIME
+    if (!(st.f_flags & MNT_STRICTATIME)) return Qtrue;
+#  endif
 #  ifdef MNT_NOATIME
     return st.f_flags & MNT_NOATIME ? Qtrue : Qfalse;
 #  elif defined(ST_NOATIME)

ext/-test-/file/fs.c

@@ -1,4 +1,4 @@
-http://sourceware.org/pub/libffi/libffi-3.2.1.tar.gz \
+https://ftp.osuosl.org/pub/blfs/conglomeration/libffi/libffi-3.2.1.tar.gz \
   md5:83b89587607e3eb65c70d361f13bab43 \
   sha512:980ca30a8d76f963fca722432b1fe5af77d7a4e4d2eac5144fbc5374d4c596609a293440573f4294207e1bdd9fda80ad1e1cafb2ffb543df5a275bc3bd546483 \
   #

ext/fiddle/extlibs

@@ -1835,7 +1835,7 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
     } else {
         json->max_nesting = 100;
         json->allow_nan = 0;
-        json->create_additions = 1;
+        json->create_additions = 0;
         json->create_id = rb_funcall(mJSON, i_create_id, 0);
         json->object_class = Qnil;
         json->array_class = Qnil;

ext/json/parser/parser.c

@@ -730,7 +730,7 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
     } else {
         json->max_nesting = 100;
         json->allow_nan = 0;
-        json->create_additions = 1;
+        json->create_additions = 0;
         json->create_id = rb_funcall(mJSON, i_create_id, 0);
         json->object_class = Qnil;
         json->array_class = Qnil;

ext/json/parser/parser.rl

@@ -1824,7 +1824,7 @@ do{\
     rb_define_method(cASN1EndOfContent, "to_der", ossl_asn1eoc_to_der, 0);
 
     class_tag_map = rb_hash_new();
-    rb_global_variable(&class_tag_map);
+    rb_gc_register_mark_object(class_tag_map);
     rb_hash_aset(class_tag_map, cASN1EndOfContent, INT2NUM(V_ASN1_EOC));
     rb_hash_aset(class_tag_map, cASN1Boolean, INT2NUM(V_ASN1_BOOLEAN));
     rb_hash_aset(class_tag_map, cASN1Integer, INT2NUM(V_ASN1_INTEGER));