merge revision(s) 4250d7c910fd67c0da07c6213901009330e3cd51,83f96642d2d74569cc38319d02d5922fac8f66b8,447feb0aa08e20cc5eeb8b3a6f881de261a2c9a2,1d80d703141f01383604022f9e8e53e10865197c,e271a3d4afc47e812b50fc9c50f6bf34d2d723a6,366e88e508de7c59d69906ad948cccd7979e932b,d825e34962540d345eb3c5a70eb264b415e915a5,4250d7c910fd67c0da07c6213901009330e3cd51,f9e43782995b1f77e7b10c79941bbbda15620e2a: [Backport #17723]

autogen.sh: Added

	Currently it just runs "autoreconf --install"
	---
	 aclocal.m4 | 4 ++--
	 autogen.sh | 3 +++
	 2 files changed, 5 insertions(+), 2 deletions(-)
	 create mode 100755 autogen.sh

	autogen.sh: Allow AUTORECONF envvar to specify the autoreconf
	 executable

	---
	 autogen.sh | 2 +-
	 1 file changed, 1 insertion(+), 1 deletion(-)

	Improved autogen.sh

	* update in the source directory
	* make symbolic links instead of copies
	* forward the arguments to autoreconf as-is
	---
	 autogen.sh | 8 +++++++-
	 1 file changed, 7 insertions(+), 1 deletion(-)

	autogen.sh: Make it work with sh (not bash)

	---
	 autogen.sh | 2 +-
	 1 file changed, 1 insertion(+), 1 deletion(-)

	[DOC] Update README files to use autoreconf [ci skip]

	---
	 README.ja.md | 3 +--
	 README.md    | 3 +--
	 2 files changed, 2 insertions(+), 4 deletions(-)

	[DOC] Update README [ci skip]

	* Use `autogen.sh`.
	* The subversion repository is only for old versions, and
	  secondary now.
	* Moved long links to footnotes.
	---
	 README.ja.md | 22 +++++++++-------------
	 README.md    | 11 +++++++----
	 2 files changed, 16 insertions(+), 17 deletions(-)

	Use autogen.sh

	---
	 .github/workflows/baseruby.yml           | 2 +-
	 .github/workflows/check_dependencies.yml | 2 +-
	 .github/workflows/compilers.yml          | 2 +-
	 .github/workflows/macos.yml              | 2 +-
	 .github/workflows/mjit.yml               | 2 +-
	 .github/workflows/ubuntu.yml             | 2 +-
	 6 files changed, 6 insertions(+), 6 deletions(-)

	autogen.sh: Added

	Currently it just runs "autoreconf --install"
	---
	 aclocal.m4 | 4 ++--
	 autogen.sh | 3 +++
	 2 files changed, 5 insertions(+), 2 deletions(-)
	 create mode 100755 autogen.sh

	get rid of aclocal (#4280)

	---
	 aclocal.m4   | 47 -----------------------------------------------
	 configure.ac | 35 ++++++++++++++++++++++++++++++++++-
	 2 files changed, 34 insertions(+), 48 deletions(-)

.github/workflows/baseruby.yml

@@ -25,7 +25,7 @@ jobs:
           bundler: none
       - run: echo "make=make -sj$((1 + $(nproc --all)))" >> $GITHUB_ENV
       - run: sudo apt-get install build-essential autoconf bison
-      - run: autoconf
+      - run: ./autogen.sh
       - run: ./configure --disable-install-doc
       - run: $make update-unicode
       - run: $make common-srcs

.github/workflows/check_dependencies.yml

@@ -24,7 +24,7 @@ jobs:
         run: |
           git config --global advice.detachedHead 0
       - uses: actions/checkout@v2
-      - run: autoconf
+      - run: ./autogen.sh
       - name: Run configure
         run: ./configure -C --disable-install-doc --disable-rubygems --with-gcc 'optflags=-O0' 'debugflags=-save-temps=obj -g'
       - run: make all golf

.github/workflows/compilers.yml

@@ -167,7 +167,7 @@ jobs:
       - uses: actions/checkout@v2
         with:
           path: src
-      - run: autoconf
+      - run: ./autogen.sh
         working-directory: src
       - name: Run configure
         run: |

.github/workflows/macos.yml

@@ -32,7 +32,7 @@ jobs:
       - name: Set ENV
         run: |
           echo "JOBS=-j$((1 + $(sysctl -n hw.activecpu)))" >> $GITHUB_ENV
-      - run: autoconf
+      - run: ./autogen.sh
         working-directory: src
       - name: Run configure
         run: ../src/configure -C --disable-install-doc --with-openssl-dir=$(brew --prefix openssl@1.1) --with-readline-dir=$(brew --prefix readline)

.github/workflows/mjit.yml

@@ -35,7 +35,7 @@ jobs:
       - name: Set ENV
         run: |
           echo "JOBS=-j$((1 + $(nproc --all)))" >> $GITHUB_ENV
-      - run: autoconf
+      - run: ./autogen.sh
         working-directory: src
       - name: Run configure
         run: ../src/configure -C --disable-install-doc

.github/workflows/ubuntu.yml

@@ -53,7 +53,7 @@ jobs:
       - name: Set ENV
         run: |
           echo "JOBS=-j$((1 + $(nproc --all)))" >> $GITHUB_ENV
-      - run: autoconf
+      - run: ./autogen.sh
         working-directory: src
       - name: Run configure
         run: ../src/configure -C --disable-install-doc cppflags=${{ matrix.debug }}

README.ja.md

@@ -52,11 +52,11 @@ Rubyリポジトリの本来のmasterは https://git.ruby-lang.org/ruby.git に
 
 ### Subversion
 
-古いRubyのバージョンのソースコードは次のコマンドで取得できます．
+古いRubyのバージョンのソースコードは次のコマンドでも取得できます．
 
     $ svn co https://svn.ruby-lang.org/repos/ruby/branches/ruby_2_6/ ruby
 
-他に開発中のブランチの一覧は次のコマンドで見られます．
+他のブランチの一覧は次のコマンドで見られます．
 
     $ svn ls https://svn.ruby-lang.org/repos/ruby/branches/
 
@@ -71,31 +71,26 @@ https://www.ruby-lang.org/
 
 ## メーリングリスト
 
-Rubyのメーリングリストがあります．参加希望の方は
+Rubyのメーリングリストがあります．参加希望の方は [ruby-list-request@ruby-lang.org] まで本文に
-
-mailto:ruby-list-request@ruby-lang.org
-
-まで本文に
 
     subscribe
 
 と書いて送って下さい．
 
-Ruby開発者向けメーリングリストもあります．こちらではrubyのバグ，将来の仕様拡張など実装上の問題について議論されています． 参加希望の方は
+Ruby開発者向けメーリングリストもあります．こちらではrubyのバグ，将来の仕様拡張など実装上の問題について議論されています．
-
+参加希望の方は [ruby-dev-request@ruby-lang.org] までruby-listと同様の方法でメールしてください．
-mailto:ruby-dev-request@ruby-lang.org
-
-までruby-listと同様の方法でメールしてください．
 
 Ruby拡張モジュールについて話し合うruby-extメーリングリストと数学関係の話題について話し合うruby-mathメーリングリストと
 英語でrubyについて話し合うruby-talkメーリングリストもあります．参加方法はどれも同じです．
 
+[ruby-list-request@ruby-lang.org]: mailto:ruby-list-request@ruby-lang.org?subject=Join%20Ruby%20Mailing%20List&body=subscribe
+[ruby-dev-request@ruby-lang.org]: mailto:ruby-dev-request@ruby-lang.org?subject=Join%20Ruby%20Mailing%20List&body=subscribe
+
 ## コンパイル・インストール
 
 以下の手順で行ってください．
 
-1.  もし `configure` ファイルが見つからない，もしくは `configure.ac` より古いようなら， `autoconf` を実行して
+1.  (Gitリポジトリから取得したソースをビルドする場合) `./autogen.sh` を実行して新しく `configure` を生成する
-    新しく `configure` を生成する
 
 2.  `configure` を実行して `Makefile` などを生成する
 

README.md

@@ -51,7 +51,8 @@ if you are a committer.
 
 ### Subversion
 
-Stable branches for older Ruby versions can be checked out with the following command:
+Stable branches for older Ruby versions can be checked out with also the
+following command:
 
     $ svn co https://svn.ruby-lang.org/repos/ruby/branches/ruby_2_6/ ruby
 
@@ -71,16 +72,17 @@ send the following phrase:
 
     subscribe
 
-in the mail body (not subject) to the address
+in the mail body (not subject) to the address [ruby-talk-request@ruby-lang.org].
-[ruby-talk-request@ruby-lang.org](mailto:ruby-talk-request@ruby-lang.org?subject=Join%20Ruby%20Mailing%20List&body=subscribe).
+
+[ruby-talk-request@ruby-lang.org]: mailto:ruby-talk-request@ruby-lang.org?subject=Join%20Ruby%20Mailing%20List&body=subscribe
 
 ## How to compile and install
 
 1.  If you want to use Microsoft Visual C++ to compile Ruby, read
     [win32/README.win32](win32/README.win32) instead of this document.
 
-2.  If `./configure` does not exist or is older than `configure.ac`, run
+2.  Run `./autogen.sh` to generate configure, when you build the source checked
-    `autoconf` to (re)generate configure.
+    out from the Git repository.
 
 3.  Run `./configure`, which will generate `config.h` and `Makefile`.
 

aclocal.m4

@@ -1,48 +0,0 @@
-# generated automatically by aclocal 1.16.2 -*- Autoconf -*-
-
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
-
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
-m4_include([tool/m4/_colorize_result_prepare.m4])
-m4_include([tool/m4/ac_msg_result.m4])
-m4_include([tool/m4/colorize_result.m4])
-m4_include([tool/m4/ruby_append_option.m4])
-m4_include([tool/m4/ruby_append_options.m4])
-m4_include([tool/m4/ruby_check_builtin_func.m4])
-m4_include([tool/m4/ruby_check_builtin_setjmp.m4])
-m4_include([tool/m4/ruby_check_printf_prefix.m4])
-m4_include([tool/m4/ruby_check_setjmp.m4])
-m4_include([tool/m4/ruby_check_signedness.m4])
-m4_include([tool/m4/ruby_check_sizeof.m4])
-m4_include([tool/m4/ruby_check_sysconf.m4])
-m4_include([tool/m4/ruby_cppoutfile.m4])
-m4_include([tool/m4/ruby_decl_attribute.m4])
-m4_include([tool/m4/ruby_default_arch.m4])
-m4_include([tool/m4/ruby_define_if.m4])
-m4_include([tool/m4/ruby_defint.m4])
-m4_include([tool/m4/ruby_dtrace_available.m4])
-m4_include([tool/m4/ruby_dtrace_postprocess.m4])
-m4_include([tool/m4/ruby_func_attribute.m4])
-m4_include([tool/m4/ruby_mingw32.m4])
-m4_include([tool/m4/ruby_prepend_option.m4])
-m4_include([tool/m4/ruby_prog_gnu_ld.m4])
-m4_include([tool/m4/ruby_replace_funcs.m4])
-m4_include([tool/m4/ruby_replace_type.m4])
-m4_include([tool/m4/ruby_rm_recursive.m4])
-m4_include([tool/m4/ruby_setjmp_type.m4])
-m4_include([tool/m4/ruby_stack_grow_direction.m4])
-m4_include([tool/m4/ruby_try_cflags.m4])
-m4_include([tool/m4/ruby_try_cxxflags.m4])
-m4_include([tool/m4/ruby_try_ldflags.m4])
-m4_include([tool/m4/ruby_type_attribute.m4])
-m4_include([tool/m4/ruby_universal_arch.m4])
-m4_include([tool/m4/ruby_werror_flag.m4])

autogen.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+PWD=
+case "$0" in
+*/*) srcdir=`dirname $0`;;
+*) srcdir="";;
+esac
+
+exec ${AUTORECONF:-autoreconf} --install --symlink "$@" ${srcdir:+"$srcdir"}

configure.ac

@@ -2,7 +2,6 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT
 {
 AC_CONFIG_AUX_DIR(tool)
-AC_CONFIG_MACRO_DIRS(tool/m4)
 
 AC_PREREQ(2.67)
 
@@ -10,6 +9,40 @@ tooldir="$srcdir/tool"
 
 AC_DISABLE_OPTION_CHECKING
 
+m4_include([tool/m4/_colorize_result_prepare.m4])
+m4_include([tool/m4/ac_msg_result.m4])
+m4_include([tool/m4/colorize_result.m4])
+m4_include([tool/m4/ruby_append_option.m4])
+m4_include([tool/m4/ruby_append_options.m4])
+m4_include([tool/m4/ruby_check_builtin_func.m4])
+m4_include([tool/m4/ruby_check_builtin_setjmp.m4])
+m4_include([tool/m4/ruby_check_printf_prefix.m4])
+m4_include([tool/m4/ruby_check_setjmp.m4])
+m4_include([tool/m4/ruby_check_signedness.m4])
+m4_include([tool/m4/ruby_check_sizeof.m4])
+m4_include([tool/m4/ruby_check_sysconf.m4])
+m4_include([tool/m4/ruby_cppoutfile.m4])
+m4_include([tool/m4/ruby_decl_attribute.m4])
+m4_include([tool/m4/ruby_default_arch.m4])
+m4_include([tool/m4/ruby_define_if.m4])
+m4_include([tool/m4/ruby_defint.m4])
+m4_include([tool/m4/ruby_dtrace_available.m4])
+m4_include([tool/m4/ruby_dtrace_postprocess.m4])
+m4_include([tool/m4/ruby_func_attribute.m4])
+m4_include([tool/m4/ruby_mingw32.m4])
+m4_include([tool/m4/ruby_prepend_option.m4])
+m4_include([tool/m4/ruby_prog_gnu_ld.m4])
+m4_include([tool/m4/ruby_replace_funcs.m4])
+m4_include([tool/m4/ruby_replace_type.m4])
+m4_include([tool/m4/ruby_rm_recursive.m4])
+m4_include([tool/m4/ruby_setjmp_type.m4])
+m4_include([tool/m4/ruby_stack_grow_direction.m4])
+m4_include([tool/m4/ruby_try_cflags.m4])
+m4_include([tool/m4/ruby_try_cxxflags.m4])
+m4_include([tool/m4/ruby_try_ldflags.m4])
+m4_include([tool/m4/ruby_universal_arch.m4])
+m4_include([tool/m4/ruby_werror_flag.m4])
+
 AC_ARG_VAR([cflags], [additional CFLAGS (ignored when CFLAGS is given)])
 AC_ARG_VAR([cppflags], [additional CPPFLAGS (ignored when CPPFLAGS is given)])
 AC_ARG_VAR([cxxflags], [additional CXXFLAGS (ignored when CXXFLAGS is given)])

version.h

@@ -12,7 +12,7 @@
 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
 #define RUBY_VERSION_TEENY 2
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 69
+#define RUBY_PATCHLEVEL 70
 
 #define RUBY_RELEASE_YEAR 2021
 #define RUBY_RELEASE_MONTH 4