Skip to content

Commit baa4097

Browse files
committed
Merge branch 'master-2.7' into dist/2.7/bullseye
2 parents 9dd27cb + 73f0942 commit baa4097

File tree

43 files changed

+16744
-13696
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+16744
-13696
lines changed

ChangeLog

Lines changed: 259 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,254 @@
11
-*- coding: utf-8 -*-
22

3+
commit 168ec2b1e5ad0e4688e963d9de019557c78feed9
4+
Author: NAKAMURA Usaku <[email protected]>
5+
AuthorDate: 2022-11-24 21:42:08 +0900
6+
Commit: NAKAMURA Usaku <[email protected]>
7+
CommitDate: 2022-11-24 21:42:08 +0900
8+
9+
Use %printer directive for Bison 3.8 (used release flow)
10+
11+
This is backport of fa05697e4832fbd67a4f91b9bb362471902faab3
12+
13+
commit ee8dc8a2f3ee7983d18339ea31444a981e63a874
14+
Author: NAKAMURA Usaku <[email protected]>
15+
AuthorDate: 2022-11-24 20:43:04 +0900
16+
Commit: NAKAMURA Usaku <[email protected]>
17+
CommitDate: 2022-11-24 20:43:04 +0900
18+
19+
Fix GitHub Actions error
20+
21+
commit 9308e32aa64b3d7da909356c6a225dcc55857bcf
22+
Author: Kazuki Yamaguchi <[email protected]>
23+
AuthorDate: 2022-09-08 23:02:44 +0900
24+
Commit: usa <[email protected]>
25+
CommitDate: 2022-11-24 20:06:00 +0900
26+
27+
Merge openssl-2.1.4
28+
29+
The changes can be found at:
30+
31+
https://github.com/ruby/openssl/compare/v2.1.3...v2.1.4
32+
33+
commit 9eee81bcd0c83594c4c3314b2fec3fc94953322f
34+
Author: NAKAMURA Usaku <[email protected]>
35+
AuthorDate: 2022-11-24 19:42:05 +0900
36+
Commit: NAKAMURA Usaku <[email protected]>
37+
CommitDate: 2022-11-24 19:42:05 +0900
38+
39+
Bump version
40+
41+
commit ca07082a76640af6594af2d1941c8a82f55ade4d
42+
Author: git <[email protected]>
43+
AuthorDate: 2022-11-24 11:21:03 +0900
44+
Commit: git <[email protected]>
45+
CommitDate: 2022-11-24 11:21:03 +0900
46+
47+
* 2022-11-24 [ci skip]
48+
49+
commit fa7fab95b9a2a3d2481ba803c1db31393c940bf7
50+
Author: Nobuyoshi Nakada <[email protected]>
51+
AuthorDate: 2020-04-28 23:36:16 +0900
52+
Commit: usa <[email protected]>
53+
CommitDate: 2022-11-24 11:20:51 +0900
54+
55+
Removed unnecessary RLIMIT_AS
56+
57+
Even without this limit, these assertions almost certainly cause a
58+
NoMemoryError by removing the fix in 72ad8595f20.
59+
60+
commit 233634fbdcb1f2f8979603feb8ba9865ab30c823
61+
Author: nagachika <[email protected]>
62+
AuthorDate: 2022-10-20 20:30:28 +0900
63+
Commit: usa <[email protected]>
64+
CommitDate: 2022-11-24 11:20:51 +0900
65+
66+
merge revision(s) 4f1e0bfacd93c28bff549e2f3603c3b4942429a3:
67+
68+
Followed up CVE-2022-39253 for bundler examples
69+
70+
---
71+
spec/bundler/cache/git_spec.rb | 3 +++
72+
spec/bundler/install/gemfile/git_spec.rb | 9 +++++++++
73+
spec/bundler/update/git_spec.rb | 3 +++
74+
3 files changed, 15 insertions(+)
75+
76+
commit 7f1163e9a564f88075ce53389165d9aef9593e66
77+
Author: Hiroshi SHIBATA <[email protected]>
78+
AuthorDate: 2022-11-23 10:43:44 +0900
79+
Commit: usa <[email protected]>
80+
CommitDate: 2022-11-24 11:20:51 +0900
81+
82+
Use ubuntu-20.04 instead of latest, because Ruby 2.7 didn't support openssl3 on Ubuntu 22.04
83+
84+
commit 39f6a33e2399d8dfe88ae0a1c5b38843ffea9e71
85+
Author: nagachika <[email protected]>
86+
AuthorDate: 2022-11-22 20:55:17 +0900
87+
Commit: usa <[email protected]>
88+
CommitDate: 2022-11-24 11:20:51 +0900
89+
90+
merge revision(s) 36f297e62108072b9377d927321928b994f66a93:
91+
92+
Use valid tokens as cookie names
93+
94+
---
95+
spec/ruby/library/cgi/cookie/name_spec.rb | 12 ++++++------
96+
spec/ruby/library/cgi/cookie/parse_spec.rb | 10 +++++-----
97+
2 files changed, 11 insertions(+), 11 deletions(-)
98+
99+
commit 25df68ae91ce0f6e8b78aa42e840e785e5e191ed
100+
Author: nagachika <[email protected]>
101+
AuthorDate: 2022-10-20 20:30:06 +0900
102+
Commit: usa <[email protected]>
103+
CommitDate: 2022-11-24 11:20:51 +0900
104+
105+
merge revision(s) dae843f6b7502f921a7e66f39e3714a39d860181,86096a91d55f72620e0f8ca8634da5fa342dc35b:
106+
107+
Bypass git submodule add/update with git config
108+
protocol.file.allow=always option.
109+
110+
Co-authored-by: Nobuyoshi Nakada <[email protected]>
111+
---
112+
test/rubygems/test_gem_source_git.rb | 5 +++++
113+
1 file changed, 5 insertions(+)
114+
115+
[rubygems/rubygems] Use [] instead of double-quotes
116+
117+
---
118+
test/rubygems/test_gem_source_git.rb | 2 +-
119+
1 file changed, 1 insertion(+), 1 deletion(-)
120+
121+
commit f33522baac8320883c0acac226d8fab29c9df400
122+
Author: Takashi Kokubun <[email protected]>
123+
AuthorDate: 2022-10-14 08:28:16 +0900
124+
Commit: usa <[email protected]>
125+
CommitDate: 2022-11-24 11:20:51 +0900
126+
127+
Upgrade zlib_version on AppVeyor
128+
129+
They removed https://zlib.net/zlib1212.zip because
130+
https://zlib.net/zlib1213.zip was released :thinking_face:
131+
132+
Fix CI failures like:
133+
https://ci.appveyor.com/project/ruby/ruby/builds/45064876/job/bb9biogolh0u2595
134+
135+
commit 7cf697179dab52b0d024543304f4d3ab5fa5e847
136+
Author: Hiroshi SHIBATA <[email protected]>
137+
AuthorDate: 2022-11-22 13:48:18 +0900
138+
Commit: usa <[email protected]>
139+
CommitDate: 2022-11-24 11:20:51 +0900
140+
141+
Merge CGI-0.1.0.2
142+
143+
commit 7b413c1db3e65909c6899e1d3be4d16c3e76149c
144+
Author: git <[email protected]>
145+
AuthorDate: 2022-10-01 15:59:05 +0900
146+
Commit: git <[email protected]>
147+
CommitDate: 2022-10-01 15:59:05 +0900
148+
149+
* 2022-10-01 [ci skip]
150+
151+
commit 022aefb4500bfb8f6812a5e729d06f3f2fe21cea
152+
Author: Yuta Saito <[email protected]>
153+
AuthorDate: 2022-09-24 03:36:04 +0900
154+
Commit: usa <[email protected]>
155+
CommitDate: 2022-10-01 15:58:54 +0900
156+
157+
Initialize Objective-C classes before fork() for macOS 13
158+
159+
Since macOS 13, CFString family API used in
160+
`rb_str_append_normalized_ospath` may internally use Objective-C classes
161+
(`NSTaggedPointerString` and `NSPlaceholderMutableString`) for small strings.
162+
163+
On the other hand, Objective-C classes should not be used for the first
164+
time in a `fork()`'ed but not `exec()`'ed process. Violations for this rule
165+
can result deadlock during class initialization, so Objective-C runtime
166+
conservatively crashes on such cases by default.
167+
168+
Therefore, we need to use CFString API to initialize Objective-C classes
169+
used internally *before* `fork()`.
170+
171+
For more details, see https://bugs.ruby-lang.org/issues/18912
172+
173+
commit 99735a8b296cfda272f8dce6bd07af50cd97034e
174+
Author: Nobuyoshi Nakada <[email protected]>
175+
AuthorDate: 2022-09-17 12:09:34 +0900
176+
Commit: usa <[email protected]>
177+
CommitDate: 2022-10-01 15:58:54 +0900
178+
179+
[Bug #19005] dynamic_lookup linker option in external libraries
180+
181+
The warning against `-undefined dynamic_lookup` is just a warning yet,
182+
and many gems seem to pay no attention to warnings. Until it fails
183+
actually, keep it as a migration path, except for standard extension
184+
libraries and bundled extension gems.
185+
186+
commit 9188c5dd6d8d8c411ea698fff747643845e92f64
187+
Author: Nobuyoshi Nakada <[email protected]>
188+
AuthorDate: 2022-09-13 23:56:34 +0900
189+
Commit: usa <[email protected]>
190+
CommitDate: 2022-10-01 15:58:54 +0900
191+
192+
-undefined dynamic_lookup is obsolete
193+
194+
commit 6b099328af2ae2d04cbfd06fedc36a19cdecd30d
195+
Author: git <[email protected]>
196+
AuthorDate: 2022-09-20 18:46:48 +0900
197+
Commit: git <[email protected]>
198+
CommitDate: 2022-09-20 18:46:48 +0900
199+
200+
* 2022-09-20 [ci skip]
201+
202+
commit 6ff627e57ee19eeab29ae411f442fa3f6a801a5a
203+
Author: Hiroshi SHIBATA <[email protected]>
204+
AuthorDate: 2022-09-20 17:11:51 +0900
205+
Commit: usa <[email protected]>
206+
CommitDate: 2022-09-20 18:46:34 +0900
207+
208+
update ubuntu 18.04 for github actions
209+
210+
commit 13354c02a6a070bd63443397f7dfed5d7c15d2cb
211+
Author: Hiroshi SHIBATA <[email protected]>
212+
AuthorDate: 2022-09-16 19:40:21 +0900
213+
Commit: usa <[email protected]>
214+
CommitDate: 2022-09-20 18:46:34 +0900
215+
216+
zlib-1.2.11 is removed at zlib.net
217+
218+
commit 302e366800e491009013288e10a96c4866f9900b
219+
Author: Nobuyoshi Nakada <[email protected]>
220+
AuthorDate: 2022-08-17 00:45:27 +0900
221+
Commit: usa <[email protected]>
222+
CommitDate: 2022-09-20 18:46:34 +0900
223+
224+
The tzdata 2022c removed Amsterdam Mean Time
225+
226+
commit 4c7ae840818f995ef776ef99c3ee275d14bd3869
227+
Author: Hiroshi SHIBATA <[email protected]>
228+
AuthorDate: 2022-09-16 18:33:25 +0900
229+
Commit: usa <[email protected]>
230+
CommitDate: 2022-09-20 18:46:34 +0900
231+
232+
Use autoreconf -i instead of autoconf
233+
234+
commit a62cfce75f2617d8e85883be1fdfafea50c1b72c
235+
Author: git <[email protected]>
236+
AuthorDate: 2022-09-16 15:11:21 +0900
237+
Commit: git <[email protected]>
238+
CommitDate: 2022-09-16 15:11:21 +0900
239+
240+
* 2022-09-16 [ci skip]
241+
242+
commit 31bc55dc90aa18222d5ed968e62fea4d46554d8c
243+
Author: Hiroshi SHIBATA <[email protected]>
244+
AuthorDate: 2022-08-29 17:42:49 +0900
245+
Commit: usa <[email protected]>
246+
CommitDate: 2022-09-16 15:11:08 +0900
247+
248+
Backport https://github.com/ruby/ruby/pull/6193
249+
250+
Co-authored-by: Yuta Saito <[email protected]>
251+
3252
commit c9c2245c0a25176072e02db9254f0e0c84c805cd
4253
Author: NAKAMURA Usaku <[email protected]>
5254
AuthorDate: 2022-04-12 20:25:48 +0900
@@ -17217,7 +17466,7 @@ commit b809784817649817c3e53fa000f57504446caef9
1721717466
Commit: Hiroshi SHIBATA <[email protected]>
1721817467
CommitDate: 2019-10-24 19:34:49 +0900
1721917468

17220-
[ruby/fiddle] Remove taint support (#21)
17469+
[ruby/fiddle] Remove taint support (https://github.com/ruby/fiddle/pull/21)
1722117470

1722217471
Ruby 2.7 deprecates taint and it no longer has an effect.
1722317472
The lack of taint support should not cause a problem in
@@ -17230,7 +17479,7 @@ commit ce6caade7c57a505f73086ccd7b33c14f7715f22
1723017479
Commit: Hiroshi SHIBATA <[email protected]>
1723117480
CommitDate: 2019-10-24 19:34:43 +0900
1723217481

17233-
[ruby/fiddle] Use ffi_closure_free by default. (#20)
17482+
[ruby/fiddle] Use ffi_closure_free by default. (https://github.com/ruby/fiddle/pull/20)
1723417483

1723517484
* Use ffi_closure_free unconditionally.
1723617485

@@ -17257,7 +17506,7 @@ commit 30d46966a97968d166f2f1440f227c2b52483780
1725717506
Commit: Hiroshi SHIBATA <[email protected]>
1725817507
CommitDate: 2019-10-24 19:34:36 +0900
1725917508

17260-
[ruby/fiddle] Use RbConfig::SIZEOF (#19)
17509+
[ruby/fiddle] Use RbConfig::SIZEOF (https://github.com/ruby/fiddle/pull/19)
1726117510

1726217511

1726317512
https://github.com/ruby/fiddle/commit/ea06b28db8
@@ -17278,7 +17527,7 @@ commit 5ebb0d50f6560b35bc03deb79341a115c5f782ee
1727817527
Commit: Hiroshi SHIBATA <[email protected]>
1727917528
CommitDate: 2019-10-24 19:34:22 +0900
1728017529

17281-
[ruby/fiddle] Fix a failing test (#13)
17530+
[ruby/fiddle] Fix a failing test (https://github.com/ruby/fiddle/pull/13)
1728217531

1728317532
* Fix a failing test
1728417533

@@ -37019,7 +37268,7 @@ commit f85caf40a69d322bde80a547e4b17568604746ff
3701937268
Commit: Hiroshi SHIBATA <[email protected]>
3702037269
CommitDate: 2019-08-04 11:55:03 +0900
3702137270

37022-
[ruby/rexml] Message less confusing error to human (#16)
37271+
[ruby/rexml] Message less confusing error to human (https://github.com/ruby/rexml/pull/16)
3702337272

3702437273
* Message less confusing error to human
3702537274

@@ -37059,7 +37308,7 @@ commit ee8985ef0e35183d606af3a7360cd4713069e9b2
3705937308
Commit: Hiroshi SHIBATA <[email protected]>
3706037309
CommitDate: 2019-08-04 11:54:50 +0900
3706137310

37062-
[ruby/rexml] Fix crash with nil XPath variables (#13)
37311+
[ruby/rexml] Fix crash with nil XPath variables (https://github.com/ruby/rexml/pull/13)
3706337312

3706437313
Patch by Alyssa Ross. Thanks!!!
3706537314
https://github.com/ruby/rexml/commit/2a53c54f58
@@ -43802,7 +44051,7 @@ commit 8c0edbd79d59789b9543d00322d6bde72f86bfda
4380244051
Commit: Hiroshi SHIBATA <[email protected]>
4380344052
CommitDate: 2019-07-14 23:07:31 +0900
4380444053

43805-
[ruby/csv] add options doc :quote_empty (#89)
44054+
[ruby/csv] add options doc :quote_empty (https://github.com/ruby/csv/pull/89)
4380644055

4380744056

4380844057
https://github.com/ruby/csv/commit/5ca8d79f60
@@ -43813,7 +44062,7 @@ commit 75620c804ea47de040016ccf9766c016f2934df2
4381344062
Commit: Hiroshi SHIBATA <[email protected]>
4381444063
CommitDate: 2019-07-14 23:07:31 +0900
4381544064

43816-
[ruby/csv] Add options doc: :write_converters, :write_nil_value, :write_empty_value (#87)
44065+
[ruby/csv] Add options doc: :write_converters, :write_nil_value, :write_empty_value (https://github.com/ruby/csv/pull/87)
4381744066

4381844067

4381944068
https://github.com/ruby/csv/commit/5923ee08b7
@@ -43824,7 +44073,7 @@ commit fe40841bfb031d278daea5b05fb13084f887fec5
4382444073
Commit: Hiroshi SHIBATA <[email protected]>
4382544074
CommitDate: 2019-07-14 23:07:31 +0900
4382644075

43827-
[ruby/csv] add document of strip (#88)
44076+
[ruby/csv] add document of strip (https://github.com/ruby/csv/pull/88)
4382844077

4382944078
* add document of strip
4383044079

@@ -43862,7 +44111,7 @@ commit 9171f833054cd47842e12fc0fd3cc1df704a9192
4386244111
Commit: Hiroshi SHIBATA <[email protected]>
4386344112
CommitDate: 2019-07-14 23:07:31 +0900
4386444113

43865-
[ruby/csv] Refactor range in delete_suffix (#85)
44114+
[ruby/csv] Refactor range in delete_suffix (https://github.com/ruby/csv/pull/85)
4386644115

4386744116

4386844117
https://github.com/ruby/csv/commit/7ff57a50e8

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ platform:
55
- x64
66
environment:
77
ruby_version: "24-%Platform%"
8-
zlib_version: "1.2.11"
8+
zlib_version: "1.2.13"
99
matrix:
1010
- build: vs
1111
vs: 120

0 commit comments

Comments
 (0)