Merge branch 'master' into dist/2.7/buster

Author: sorah

ChangeLog

@@ -3,17 +3,10 @@ version: '{build}'
 shallow_clone: true
 platform:
   - x64
-branches:
-  except:
-    - trunk # mirrored from trunk. avoid doubly building on it
 environment:
   ruby_version: "24-%Platform%"
   zlib_version: "1.2.11"
   matrix:
-    # to reduce time for finishing all jobs, run the slowest msys2 build first.
-    - build: msys2
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      GEMS_FOR_TEST: "timezone tzinfo"
     - build: vs
       vs: 120
       ssl: OpenSSL
@@ -78,52 +71,6 @@ for:
     # separately execute tests without -j which may crash worker with -j.
     - nmake -l "TESTOPTS=-v --timeout-scale=3.0 --excludes=../test/excludes/_appveyor" test-all TESTS="../test/win32ole ../test/ruby/test_bignum.rb ../test/ruby/test_syntax.rb ../test/open-uri/test_open-uri.rb ../test/rubygems/test_bundled_ca.rb"
     - nmake -l test-spec MSPECOPT=-fs # not using `-j` because sometimes `mspec -j` silently dies on Windows
--
-  matrix:
-    only:
-      - build: msys2
-  install:
-    - ver
-    - chcp
-    - set /a JOBS=%NUMBER_OF_PROCESSORS%
-    - set MSYS_NO_PATHCONV=1
-    - SET MSYSTEM=%Platform:x86=32%
-    - SET MSYSTEM=%MSYSTEM:x=MINGW%
-    - SET MSYS2_ARCH=%Platform:x86=i686%
-    - SET MSYS2_ARCH=%MSYS2_ARCH:x64=x86_64%
-    - set MSYSTEM_PREFIX=/mingw64
-    - set MINGW_CHOST=%MSYS2_ARCH%-w64-mingw32
-    - SET ruby_path=C:\Ruby%ruby_version:-x86=%
-    - cd ..
-    - mkdir build
-    - mkdir install
-    - SET PATH=%ruby_path%\bin;C:\msys64\%MSYSTEM%\bin;C:\msys64\usr\bin;%PATH%
-    - ruby --version
-  build_script:
-    - pacman -Syd --noconfirm --noprogressbar --needed mingw-w64-x86_64-binutils mingw-w64-x86_64-isl mingw-w64-x86_64-libiconv mingw-w64-x86_64-mpc mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-windows-default-manifest mingw-w64-x86_64-winpthreads mingw-w64-x86_64-gcc
-    # when fixed in MSYS2 / Mingw-w64, remove above and use normal code below
-    #- pacman -Sy --noconfirm --noprogressbar --needed mingw-w64-x86_64-toolchain
-    - pacman -S  --noconfirm --noprogressbar --needed mingw-w64-x86_64-gdbm mingw-w64-x86_64-gmp mingw-w64-x86_64-libffi mingw-w64-x86_64-libyaml mingw-w64-x86_64-openssl mingw-w64-x86_64-ragel mingw-w64-x86_64-readline mingw-w64-x86_64-zlib
-    - cd %APPVEYOR_BUILD_FOLDER%
-    - set CFLAGS=-march=%MSYS2_ARCH:_=-% -mtune=generic -O3 -pipe
-    - set CXXFLAGS=%CFLAGS%
-    - set CPPFLAGS=-D_FORTIFY_SOURCE=2 -D__USE_MINGW_ANSI_STDIO=1 -DFD_SETSIZE=2048
-    - set LDFLAGS=-pipe
-    - sh -c "autoreconf -fi"
-    - cd ..\build
-    - sh ../ruby/configure --disable-install-doc --prefix=/. --build=%MINGW_CHOST% --host=%MINGW_CHOST% --target=%MINGW_CHOST%
-    - mingw32-make %mflags% touch-unicode-files
-    - mingw32-make -j%JOBS% %UPDATE_UNICODE% up incs
-    - mingw32-make -j%JOBS% V=1
-    - mingw32-make DESTDIR=../install install-nodoc
-    - if not "%GEMS_FOR_TEST%" == "" ..\install\bin\gem install --no-document %GEMS_FOR_TEST%
-    - ..\install\bin\ruby.exe -v -ropenssl -e "puts 'Build    ' + OpenSSL::OPENSSL_VERSION, 'Runtime  ' + OpenSSL::OPENSSL_LIBRARY_VERSION"
-  test_script:
-    - mingw32-make test
-    - mingw32-make test-all TESTOPTS="--retry --job-status=normal --show-skip --timeout-scale=1.5 --excludes=../ruby/test/excludes/_appveyor -j %JOBS% --exclude win32ole --exclude test_open-uri"
-    # separately execute tests without -j which may crash worker with -j.
-    - mingw32-make test-all TESTOPTS="--retry --job-status=normal --show-skip --timeout-scale=1.5 --excludes=../ruby/test/excludes/_appveyor" TESTS="../ruby/test/win32ole ../ruby/test/open-uri/test_open-uri.rb"
-    - mingw32-make test-spec MSPECOPT=-fs # not using `-j` because sometimes `mspec -j` silently dies on Windows
 notifications:
   # Using "Webhook" with templated body to skip notification on Pull Request
   - provider: Webhook

appveyor.yml

@@ -3037,6 +3037,7 @@ transcode.$(OBJEXT): {$(VPATH)}assert.h
 transcode.$(OBJEXT): {$(VPATH)}config.h
 transcode.$(OBJEXT): {$(VPATH)}defines.h
 transcode.$(OBJEXT): {$(VPATH)}encoding.h
+transcode.$(OBJEXT): {$(VPATH)}id.h
 transcode.$(OBJEXT): {$(VPATH)}intern.h
 transcode.$(OBJEXT): {$(VPATH)}internal.h
 transcode.$(OBJEXT): {$(VPATH)}missing.h

common.mk

@@ -1096,6 +1096,15 @@ cont_save_thread(rb_context_t *cont, rb_thread_t *th)
     sec->machine.stack_end = NULL;
 }
 
+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)
 {
@@ -1105,9 +1114,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 *
@@ -1124,6 +1131,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.7 (2.7.1-0nkmi1~dist) unstable; urgency=medium
+
+  * bump
+  * fix sysconfdir and etc...
+
+ -- Sorah Fukumori <[email protected]>  Tue, 31 Mar 2020 16:44:13 +0000
+
 ruby2.7 (2.7.0-0nkmi1~dist) unstable; urgency=medium
 
   * 2.7.0, happy holidays.

debian/changelog

@@ -12,7 +12,7 @@ Signed-off-by: Christian Hofstaedtler <[email protected]>
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb
-index 4fd556f..55cffb1 100644
+index 5321edf..0ebd1f4 100644
 --- a/lib/rubygems/specification.rb
 +++ b/lib/rubygems/specification.rb
 @@ -1704,7 +1704,9 @@ class Gem::Specification < Gem::BasicSpecification

debian/patches/0003-Mark-Gemspec-reproducible-change-fixing-784225-too.patch

@@ -13,7 +13,7 @@ build unreproducible
  5 files changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/ext/bigdecimal/bigdecimal.gemspec b/ext/bigdecimal/bigdecimal.gemspec
-index 53dbe91..78d23bb 100644
+index 7d767f5..26de3e0 100644
 --- a/ext/bigdecimal/bigdecimal.gemspec
 +++ b/ext/bigdecimal/bigdecimal.gemspec
 @@ -6,6 +6,7 @@ Gem::Specification.new do |s|
@@ -37,7 +37,7 @@ index b29f4ec..36ed213 100644
    spec.email         = ["[email protected]", "[email protected]"]
 
 diff --git a/ext/io/console/io-console.gemspec b/ext/io/console/io-console.gemspec
-index eab5517..14bfcc1 100644
+index fac9bff..c495cfe 100644
 --- a/ext/io/console/io-console.gemspec
 +++ b/ext/io/console/io-console.gemspec
 @@ -5,7 +5,7 @@ date = %w$Date::                           $[1]

debian/patches/0004-Make-gemspecs-reproducible.patch

@@ -0,0 +1,43 @@
+From: =?utf-8?q?C=C3=A9dric_Boutillier?= <[email protected]>
+Date: Tue, 4 Feb 2020 18:55:42 +0100
+Subject: Fix priority order of paths in -I option
+
+Origin: https://github.com/rubygems/rubygems/pull/3124
+Author: deivid <[email protected]>
+---
+ lib/rubygems/core_ext/kernel_require.rb | 20 ++++++++++----------
+ 1 file changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/lib/rubygems/core_ext/kernel_require.rb b/lib/rubygems/core_ext/kernel_require.rb
+index 60f4d18..3828338 100644
+--- a/lib/rubygems/core_ext/kernel_require.rb
++++ b/lib/rubygems/core_ext/kernel_require.rb
+@@ -43,18 +43,18 @@ module Kernel
+     # https://github.com/rubygems/rubygems/pull/1868
+     resolved_path = begin
+       rp = nil
+-      $LOAD_PATH[0...Gem.load_path_insert_index || -1].each do |lp|
+-        safe_lp = lp.dup.tap(&Gem::UNTAINT)
+-        begin
+-          if File.symlink? safe_lp # for backward compatibility
+-            next
++      Gem.suffixes.each do |s|
++        $LOAD_PATH[0...Gem.load_path_insert_index || -1].each do |lp|
++          safe_lp = lp.dup.tap(&Gem::UNTAINT)
++          begin
++            if File.symlink? safe_lp # for backward compatibility
++              next
++            end
++          rescue SecurityError
++            RUBYGEMS_ACTIVATION_MONITOR.exit
++            raise
+           end
+-        rescue SecurityError
+-          RUBYGEMS_ACTIVATION_MONITOR.exit
+-          raise
+-        end
+ 
+-        Gem.suffixes.each do |s|
+           full_path = File.expand_path(File.join(safe_lp, "#{path}#{s}"))
+           if File.file?(full_path)
+             rp = full_path

debian/patches/0006-Fix-priority-order-of-paths-in-I-option.patch

@@ -3,3 +3,4 @@
 0003-Mark-Gemspec-reproducible-change-fixing-784225-too.patch
 0004-Make-gemspecs-reproducible.patch
 0005-exclude-several-tests-unstable-in-Docker.patch
+0006-Fix-priority-order-of-paths-in-I-option.patch

debian/patches/series

@@ -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
@@ -72,11 +75,14 @@ override_dh_auto_configure:
 	./configure $(configure_options)
 
 override_dh_auto_clean:
-	dh_auto_clean
+	$(MAKE) clean || true
+	$(MAKE) distclean-ext || true
 	rm -f tool/config.guess tool/config.sub
 	$(RM) test/excludes/$(DEB_HOST_ARCH)
 	$(RM) -r .ext
 	$(RM) -r doc/capi
+	$(RM) .installed.list GNUmakefile Makefile builtin_binary.inc \
+		config.status enc.mk uncommon.mk verconf.h
 
 override_dh_auto_build-arch:
 	dh_auto_build -- main V=1
@@ -87,6 +93,9 @@ TEST_TARGETS := test test-tool test-all # missing test-spec
 excludes =
 excludes += --excludes-dir=debian/tests/excludes/any/
 excludes += --excludes-dir=debian/tests/excludes/$(DEB_HOST_ARCH)/
+ifneq (,$(DEBIAN_RUBY_EXTRA_TEST_EXCLUDES))
+	excludes += --excludes-dir=debian/tests/excludes/$(DEBIAN_RUBY_EXTRA_TEST_EXCLUDES)/
+endif
 override_dh_auto_test-arch:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	$(MAKE) $(TEST_TARGETS) V=1 RUBY_TESTOPTS="-v -j4" TESTS="$(excludes)" OPENSSL_CONF=/dev/null