Skip to content

Commit cfe1012

Browse files
author
devkadirselcuk
authored
Merge pull request ruby#32 from ruby/master
[pull] master from ruby:master
2 parents 1aa9fcc + 82e2443 commit cfe1012

Some content is hidden

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

64 files changed

+931
-652
lines changed

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ jobs:
1212
# CodeQL runs on ubuntu-latest and windows-latest
1313
runs-on: ubuntu-latest
1414

15+
env:
16+
enable_install_doc: no
17+
1518
steps:
1619
- name: Install libraries
1720
run: |
@@ -30,6 +33,9 @@ jobs:
3033
with:
3134
config-file: ./.github/codeql/codeql-config.yml
3235

36+
- name: Set ENV
37+
run: echo "GNUMAKEFLAGS=-j$((1 + $(nproc --all)))" >> $GITHUB_ENV
38+
3339
- name: Autobuild
3440
uses: github/codeql-action/autobuild@v1
3541

‎array.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8244,7 +8244,7 @@ rb_ary_deconstruct(VALUE ary)
82448244
* - With string argument +field_separator+, a new string that is equivalent to
82458245
* <tt>join(field_separator)</tt>.
82468246
* #abbrev:: Returns a hash of unambiguous abbreviations for elements.
8247-
* #pack:: Packs the the elements into a binary sequence.
8247+
* #pack:: Packs the elements into a binary sequence.
82488248
* #sum:: Returns a sum of elements according to either <tt>+</tt> or a given block.
82498249
*/
82508250

‎ext/date/date.gemspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# frozen_string_literal: true
22
Gem::Specification.new do |s|
33
s.name = "date"
4-
s.version = '3.1.1'
4+
s.version = '3.2.0'
55
s.summary = "A subclass of Object includes Comparable module for handling dates."
66
s.description = "A subclass of Object includes Comparable module for handling dates."
77

ext/digest/lib/digest/sha2/loader.rb renamed to ext/digest/sha2/lib/sha2/loader.rb

File renamed without changes.

‎ext/etc/etc.c‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -957,11 +957,13 @@ io_pathconf(VALUE io, VALUE arg)
957957
static int
958958
etc_nprocessors_affin(void)
959959
{
960-
cpu_set_t *cpuset;
960+
cpu_set_t *cpuset, cpuset_buff[1024 / sizeof(cpu_set_t)];
961961
size_t size;
962962
int ret;
963963
int n;
964964

965+
CPU_ZERO_S(sizeof(cpuset_buff), cpuset_buff);
966+
965967
/*
966968
* XXX:
967969
* man page says CPU_ALLOC takes number of cpus. But it is not accurate
@@ -980,13 +982,12 @@ etc_nprocessors_affin(void)
980982
*/
981983
for (n=64; n <= 16384; n *= 2) {
982984
size = CPU_ALLOC_SIZE(n);
983-
if (size >= 1024) {
985+
if (size >= sizeof(cpuset_buff)) {
984986
cpuset = xcalloc(1, size);
985987
if (!cpuset)
986988
return -1;
987989
} else {
988-
cpuset = alloca(size);
989-
CPU_ZERO_S(size, cpuset);
990+
cpuset = cpuset_buff;
990991
}
991992

992993
ret = sched_getaffinity(0, size, cpuset);
@@ -995,10 +996,10 @@ etc_nprocessors_affin(void)
995996
ret = CPU_COUNT_S(size, cpuset);
996997
}
997998

998-
if (size >= 1024) {
999+
if (size >= sizeof(cpuset_buff)) {
9991000
xfree(cpuset);
10001001
}
1001-
if (ret > 0) {
1002+
if (ret > 0 || errno != EINVAL) {
10021003
return ret;
10031004
}
10041005
}

‎ext/fcntl/fcntl.gemspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
Gem::Specification.new do |spec|
55
spec.name = "fcntl"
6-
spec.version = "1.0.0"
6+
spec.version = "1.0.1"
77
spec.authors = ["Yukihiro Matsumoto"]
88
spec.email = ["[email protected]"]
99

‎ext/json/VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.5.1
1+
2.6.0

‎ext/nkf/nkf.gemspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Gem::Specification.new do |spec|
22
spec.name = "nkf"
3-
spec.version = "0.1.0"
3+
spec.version = "0.1.1"
44
spec.authors = ["NARUSE Yui"]
55
spec.email = ["[email protected]"]
66

‎ext/openssl/History.md‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
Version 2.2.1
2+
=============
3+
4+
Merged changes in 2.1.3. Additionally, the following issues are fixed by this
5+
release.
6+
7+
Bug fixes
8+
---------
9+
10+
* Fix crash in `OpenSSL::Timestamp::{Request,Response,TokenInfo}.new` when
11+
invalid arguments are given.
12+
[[GitHub #407]](https://github.com/ruby/openssl/pull/407)
13+
* Fix `OpenSSL::Timestamp::Factory#create_timestamp` with LibreSSL on platforms
14+
where `time_t` has a different size from `long`.
15+
[[GitHub #454]](https://github.com/ruby/openssl/pull/454)
16+
17+
118
Version 2.2.0
219
=============
320

@@ -75,6 +92,42 @@ Notable changes
7592
[[GitHub #297]](https://github.com/ruby/openssl/pull/297)
7693

7794

95+
Version 2.1.3
96+
=============
97+
98+
Bug fixes
99+
---------
100+
101+
* Fix deprecation warnings on Ruby 3.0.
102+
* Add ".include" directive support in `OpenSSL::Config`.
103+
[[GitHub #216]](https://github.com/ruby/openssl/pull/216)
104+
* Fix handling of IPv6 address SANs.
105+
[[GitHub #185]](https://github.com/ruby/openssl/pull/185)
106+
* Hostname verification failure with `OpenSSL::SSL::SSLContext#verify_hostname=`
107+
sets a proper error code.
108+
[[GitHub #350]](https://github.com/ruby/openssl/pull/350)
109+
* Fix crash with `OpenSSL::BN.new(nil, 2)`.
110+
[[Bug #15760]](https://bugs.ruby-lang.org/issues/15760)
111+
* `OpenSSL::SSL::SSLSocket#sys{read,write}` prevent internal string buffers from
112+
being modified by another thread.
113+
[[GitHub #453]](https://github.com/ruby/openssl/pull/453)
114+
* Fix misuse of input record separator in `OpenSSL::Buffering` where it was
115+
for output.
116+
* Fix wrong interger casting in `OpenSSL::PKey::EC#dsa_verify_asn1`.
117+
[[GitHub #460]](https://github.com/ruby/openssl/pull/460)
118+
* `extconf.rb` explicitly checks that OpenSSL's version number is 1.0.1 or
119+
newer but also less than 3.0. Ruby/OpenSSL v2.1.x and v2.2.x will not support
120+
OpenSSL 3.0 API.
121+
[[GitHub #458]](https://github.com/ruby/openssl/pull/458)
122+
* Activate `digest` gem correctly. `digest` library could go into an
123+
inconsistent state if there are multiple versions of `digest` is installed
124+
and `openssl` is `require`d before `digest`.
125+
[[GitHub #463]](https://github.com/ruby/openssl/pull/463)
126+
* Fix GC.compact compatibility.
127+
[[GitHub #464]](https://github.com/ruby/openssl/issues/464)
128+
[[GitHub #465]](https://github.com/ruby/openssl/pull/465)
129+
130+
78131
Version 2.1.2
79132
=============
80133

0 commit comments

Comments
 (0)