Skip to content

Commit 731c9b4

Browse files
sorahsorah
committed
Merge branch 'master-2.7' into dist/2.7/buster
2 parents e96ed64 + 01c9073 commit 731c9b4

34 files changed

+2009
-1518
lines changed

‎ChangeLog‎

Lines changed: 257 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,262 @@
11
-*- coding: utf-8 -*-
22

3+
commit a21a3b7d23704a01d34bd79d09dc37897e00922a
4+
Author: Yusuke Endoh <[email protected]>
5+
AuthorDate: 2021-07-07 12:06:44 +0900
6+
Commit: NAKAMURA Usaku <[email protected]>
7+
CommitDate: 2021-07-07 19:48:22 +0900
8+
9+
Fix StartTLS stripping vulnerability
10+
11+
Reported by Alexandr Savca in https://hackerone.com/reports/1178562
12+
13+
Co-authored-by: Shugo Maeda <[email protected]>
14+
15+
commit 3ca1399150ed4eacfd2fe1ee251b966f8d1ee469
16+
Author: Yusuke Endoh <[email protected]>
17+
AuthorDate: 2021-07-07 12:05:44 +0900
18+
Commit: NAKAMURA Usaku <[email protected]>
19+
CommitDate: 2021-07-07 19:47:46 +0900
20+
21+
Ignore IP addresses in PASV responses by default, and add new option use_pasv_ip
22+
23+
This fixes CVE-2021-81810.
24+
Reported by Alexandr Savca.
25+
26+
Co-authored-by: Shugo Maeda <[email protected]>
27+
28+
commit 87d02eacd26d0b2884016315baf2440d100f177e
29+
Author: NAKAMURA Usaku <[email protected]>
30+
AuthorDate: 2021-06-02 01:40:08 +0900
31+
Commit: NAKAMURA Usaku <[email protected]>
32+
CommitDate: 2021-06-02 01:40:08 +0900
33+
34+
merge revision(s) 9edc162583a4f685332239f6249745ad9b518cbe: [Backport #17781]
35+
36+
[ruby/resolv] Fix confusion of received response message
37+
38+
This is a follow up for commit 33fb966197f1 ("Remove sender/message_id
39+
pair after response received in resolv", 2020-09-11).
40+
41+
As the @senders instance variable is also used for tracking transaction
42+
ID allocation, simply removing an entry without releasing the ID would
43+
eventually deplete the ID space and cause
44+
Resolv::DNS.allocate_request_id to hang.
45+
46+
It seems the intention of the code was to check that the received DNS
47+
message is actually the response for the question made within the method
48+
earlier. Let's have it actually do so.
49+
50+
[Bug #12838] https://bugs.ruby-lang.org/issues/12838
51+
[Bug #17748] https://bugs.ruby-lang.org/issues/17748
52+
53+
https://github.com/ruby/resolv/commit/53ca9c9209
54+
---
55+
lib/resolv.rb | 6 +++---
56+
1 file changed, 3 insertions(+), 3 deletions(-)
57+
58+
commit 9e0e99023ddef9c0ea80dfc7f0b6924c1be95d03
59+
Author: NAKAMURA Usaku <[email protected]>
60+
AuthorDate: 2021-05-31 23:47:41 +0900
61+
Commit: NAKAMURA Usaku <[email protected]>
62+
CommitDate: 2021-05-31 23:47:41 +0900
63+
64+
bump the verion of RDoc for previous merge
65+
66+
commit 483f303d02e768b69e476e0b9be4ab2f26389522
67+
Author: NAKAMURA Usaku <[email protected]>
68+
AuthorDate: 2021-05-31 23:44:23 +0900
69+
Commit: NAKAMURA Usaku <[email protected]>
70+
CommitDate: 2021-05-31 23:44:23 +0900
71+
72+
merge revision(s) a7f5d6ab88 c9ab8fe2 [Backport#17877]
73+
74+
a fix of RDoc for CVE-2021-31799
75+
76+
commit d8bbbc308e99635091fe9c6e89ee8d711cc008b9
77+
Author: NAKAMURA Usaku <[email protected]>
78+
AuthorDate: 2021-05-31 23:10:35 +0900
79+
Commit: NAKAMURA Usaku <[email protected]>
80+
CommitDate: 2021-05-31 23:10:35 +0900
81+
82+
bump patchlevel for previous merge commit
83+
84+
commit 29bbad939939c6dceb804aac667ba372fdee4ef5
85+
Author: Nobuyoshi Nakada <[email protected]>
86+
AuthorDate: 2021-05-31 23:04:44 +0900
87+
Commit: GitHub <[email protected]>
88+
CommitDate: 2021-05-31 23:04:44 +0900
89+
90+
Fix 2.7 build (#4359)
91+
92+
* merge revision(s) fcc88da5eb162043adcba552646677d2ab5adf55:
93+
94+
configure.ac: fix for upcoming autoconf-2.70
95+
96+
The failure initially noticed on `autoconf-2.69d` (soon to become 2.70):
97+
98+
```
99+
$ ./configure
100+
./configure: line 8720: syntax error near unexpected token `fi'
101+
./configure: line 8720: `fi'
102+
```
103+
104+
Before the change generated `./configure ` snippet looked like:
105+
106+
```
107+
if ! $CC -E -xc - <<SRC >/dev/null
108+
then :
109+
110+
#if defined __APPLE_CC__ && defined __clang_major__ && __clang_major__ < 3
111+
#error premature clang
112+
#endif
113+
SRC
114+
as_fn_error $? "clang version 3.0 or later is required" "$LINENO" 5
115+
fi
116+
```
117+
118+
Note the newline that breaks here-document syntax.
119+
120+
After the change the snippet does not use here-document.
121+
122+
Signed-off-by: Sergei Trofimovich <[email protected]>
123+
---
124+
configure.ac | 15 ++++++++-------
125+
1 file changed, 8 insertions(+), 7 deletions(-)
126+
127+
* merge revision(s) 0df67a469561fab80b78478b99703ed893c4db07:
128+
129+
Signal handler type should be void
130+
131+
---
132+
configure.ac | 1 -
133+
include/ruby/internal/intern/signal.h | 3 +--
134+
signal.c | 14 +++++++-------
135+
vm_core.h | 2 +-
136+
win32/Makefile.sub | 1 -
137+
5 files changed, 9 insertions(+), 12 deletions(-)
138+
139+
* merge revision(s) 4d2ad8d737c55c3efd4c75131687dd1c8db7441b:
140+
141+
Removed obsolete autoconf checks
142+
143+
Use regular `AC_CHECK_MEMBERS` instead of:
144+
* `AC_STRUCT_ST_BLKSIZE`
145+
* `AC_STRUCT_ST_BLOCKS`
146+
* `AC_STRUCT_ST_RDEV`
147+
---
148+
configure.ac | 6 +++---
149+
missing/fileblocks.c | 1 -
150+
win32/Makefile.sub | 1 -
151+
3 files changed, 3 insertions(+), 5 deletions(-)
152+
delete mode 100644 missing/fileblocks.c
153+
154+
* merge revision(s) 3b7c05ef8dc15371316e5254d33af12928183971:
155+
156+
Fixed RUBY_RM_RECURSIVE when autoconf met the required version
157+
158+
Before 9189cf5793cd527a86b711d15d5fd0633ec082e1 the result of
159+
`m4_version_compare` was compared to -1, however the `$2` of
160+
`m4_version_prereq` has different meaning and is expanded when
161+
the required version met.
162+
---
163+
tool/m4/ruby_rm_recursive.m4 | 4 ++--
164+
1 file changed, 2 insertions(+), 2 deletions(-)
165+
166+
* merge revision(s) c32375883a696fcf8e9e99875f1339ee5474a255,48bb0329eb325bc5b77c222f45b8dc97a208d986:
167+
168+
Update for autoconf 2.70
169+
170+
---
171+
configure.ac | 232 +++++++++++++++++------------------
172+
tool/m4/ruby_check_builtin_setjmp.m4 | 8 +-
173+
tool/m4/ruby_check_printf_prefix.m4 | 9 +-
174+
tool/m4/ruby_check_setjmp.m4 | 6 +-
175+
tool/m4/ruby_check_sysconf.m4 | 6 +-
176+
tool/m4/ruby_cppoutfile.m4 | 4 +-
177+
tool/m4/ruby_decl_attribute.m4 | 4 +-
178+
tool/m4/ruby_dtrace_available.m4 | 2 +-
179+
tool/m4/ruby_dtrace_postprocess.m4 | 2 +-
180+
tool/m4/ruby_mingw32.m4 | 4 +-
181+
tool/m4/ruby_stack_grow_direction.m4 | 4 +-
182+
tool/m4/ruby_try_cflags.m4 | 2 +-
183+
tool/m4/ruby_try_cxxflags.m4 | 2 +-
184+
tool/m4/ruby_try_ldflags.m4 | 2 +-
185+
14 files changed, 143 insertions(+), 144 deletions(-)
186+
187+
Revert AC_PROG_CC_C99 for -std=gnu99 option to gcc 4.8
188+
189+
---
190+
configure.ac | 5 ++++-
191+
1 file changed, 4 insertions(+), 1 deletion(-)
192+
193+
Co-authored-by: Sergei Trofimovich <[email protected]>
194+
195+
commit fd95a1805922d9fbe65e6f4c08609c7eac10b723
196+
Author: NAKAMURA Usaku <[email protected]>
197+
AuthorDate: 2021-05-31 23:01:45 +0900
198+
Commit: NAKAMURA Usaku <[email protected]>
199+
CommitDate: 2021-05-31 23:01:45 +0900
200+
201+
merge revision(s) d8a13e504992a45d52063f7c925408d7aad3595a: [Backport #17780]
202+
203+
[Bug #17780] Fix Method#super_method for module alias
204+
205+
Method#super_method crashes for aliased module methods because they are
206+
not defined on a class. This bug was introduced in
207+
c60aaed1856b2b6f90de0992c34771830019e021 as part of bug #17130.
208+
---
209+
proc.c | 2 +-
210+
test/ruby/test_method.rb | 13 +++++++++++++
211+
2 files changed, 14 insertions(+), 1 deletion(-)
212+
213+
commit 67f1cd20bfb97ff6e5a15d27c8ef06cdb97ed37a
214+
Author: NAKAMURA Usaku <[email protected]>
215+
AuthorDate: 2021-04-16 05:30:08 +0900
216+
Commit: NAKAMURA Usaku <[email protected]>
217+
CommitDate: 2021-04-16 05:30:08 +0900
218+
219+
merge revision(s) fbbc37dc1d5b329777e6d9716118db528ab70730: [Backport #17802]
220+
221+
test/drb/test_drb.rb: Specify the host of DRbServer
222+
223+
to try fixing the following error.
224+
225+
http://rubyci.s3.amazonaws.com/opensuseleap/ruby-master/log/20210407T063004Z.log.html.gz
226+
```
227+
[ 605/21105] DRbTests::TestDRbSSLAry#test_06_next/home/chkbuild/chkbuild/tmp/build/20210407T063004Z/ruby/lib/drb/drb.rb:1138:in `method_missing': undefined method `regist' for [1, 2, "III", 4, "five", 6]:Array (NoMethodError)
228+
from /home/chkbuild/chkbuild/tmp/build/20210407T063004Z/ruby/lib/drb/extserv.rb:21:in `block in initialize'
229+
from /home/chkbuild/chkbuild/tmp/build/20210407T063004Z/ruby/.ext/common/monitor.rb:202:in `synchronize'
230+
from /home/chkbuild/chkbuild/tmp/build/20210407T063004Z/ruby/.ext/common/monitor.rb:202:in `mon_synchronize'
231+
from /home/chkbuild/chkbuild/tmp/build/20210407T063004Z/ruby/lib/drb/extserv.rb:20:in `initialize'
232+
from /home/chkbuild/chkbuild/tmp/build/20210407T063004Z/ruby/test/drb/ut_array_drbssl.rb:35:in `new'
233+
from /home/chkbuild/chkbuild/tmp/build/20210407T063004Z/ruby/test/drb/ut_array_drbssl.rb:35:in `<main>'
234+
= 100.05 s
235+
```
236+
237+
Here is my analysis:
238+
The test of drb used both `druby://:0` and `druby://localhost:0` for
239+
DRbServer. However, the former listens on IPv4, and the latter does on
240+
IPv6, depending on environments. The port 0 is automatically assigned,
241+
but sometimes the same port is used to both because they are different
242+
protocols (IPv4 and IPv6). In this case, their URIs are resolved to the
243+
completely same one (`druby://localhost:port`), which confuses the
244+
method `DRb.here?` which determines the DRbObject is remote or local.
245+
246+
This changeset uses `druby://localhost:0` consistently.
247+
---
248+
test/drb/test_drb.rb | 4 ++--
249+
test/drb/test_drbssl.rb | 2 +-
250+
2 files changed, 3 insertions(+), 3 deletions(-)
251+
252+
commit 06732f8a1cbb69576de6383e55e2ddb976c63b34
253+
Author: nagachika <[email protected]>
254+
AuthorDate: 2021-04-05 23:31:27 +0900
255+
Commit: nagachika <[email protected]>
256+
CommitDate: 2021-04-05 23:31:27 +0900
257+
258+
bump teeny version to 2.7.4.
259+
3260
commit 6847ee089d7655b2a0eea4fee3133aeacd4cc7cc
4261
Author: nagachika <[email protected]>
5262
AuthorDate: 2021-04-05 21:39:38 +0900

0 commit comments

Comments
 (0)