diff options
| author | Kazuki Yamaguchi <k@rhe.jp> | 2022-09-08 23:00:01 +0900 |
|---|---|---|
| committer | usa <usa@garbagecollect.jp> | 2022-11-24 20:04:56 +0900 |
| commit | ba5cf0f7c52d4d35cc6a173c89eda98ceffa2dcf (patch) | |
| tree | c2a319372cc6f1d7316d11e1263b73e461556465 | |
| parent | 5fb3cf463c2d78a161fba6a4486bd48e0cbd96c9 (diff) | |
| download | ruby-ba5cf0f7c52d4d35cc6a173c89eda98ceffa2dcf.tar.gz | |
Merge openssl-2.2.2v3_0_5
The changes can be found at:
https://github.com/ruby/openssl/compare/v2.2.1...v2.2.2
| -rw-r--r-- | ext/openssl/History.md | 16 | ||||
| -rw-r--r-- | ext/openssl/extconf.rb | 4 | ||||
| -rw-r--r-- | ext/openssl/lib/openssl/version.rb | 2 | ||||
| -rw-r--r-- | ext/openssl/openssl.gemspec | 4 |
4 files changed, 21 insertions, 5 deletions
diff --git a/ext/openssl/History.md b/ext/openssl/History.md index 46435f9be6..60b9dd8825 100644 --- a/ext/openssl/History.md +++ b/ext/openssl/History.md @@ -1,3 +1,9 @@ +Version 2.2.2 +============= + +Merged changes in 2.1.4. + + Version 2.2.1 ============= @@ -92,6 +98,16 @@ Notable changes [[GitHub #297]](https://github.com/ruby/openssl/pull/297) +Version 2.1.4 +============= + +Bug fixes +--------- + +* Do not use pkg-config if --with-openssl-dir option is specified. + [[GitHub #486]](https://github.com/ruby/openssl/pull/486) + + Version 2.1.3 ============= diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb index e13595c7c7..0dc1a5eb43 100644 --- a/ext/openssl/extconf.rb +++ b/ext/openssl/extconf.rb @@ -13,7 +13,7 @@ require "mkmf" -dir_config("openssl") +dir_config_given = dir_config("openssl").any? dir_config("kerberos") Logging::message "=== OpenSSL for Ruby configurator ===\n" @@ -90,7 +90,7 @@ def find_openssl_library end Logging::message "=== Checking for required stuff... ===\n" -pkg_config_found = pkg_config("openssl") && have_header("openssl/ssl.h") +pkg_config_found = !dir_config_given && pkg_config("openssl") && have_header("openssl/ssl.h") if !pkg_config_found && !find_openssl_library Logging::message "=== Checking for required stuff failed. ===\n" diff --git a/ext/openssl/lib/openssl/version.rb b/ext/openssl/lib/openssl/version.rb index d541cbf162..89e052069e 100644 --- a/ext/openssl/lib/openssl/version.rb +++ b/ext/openssl/lib/openssl/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module OpenSSL - VERSION = "2.2.1" + VERSION = "2.2.2" end diff --git a/ext/openssl/openssl.gemspec b/ext/openssl/openssl.gemspec index ebbd0923dd..c8e3cc3fc3 100644 --- a/ext/openssl/openssl.gemspec +++ b/ext/openssl/openssl.gemspec @@ -1,6 +1,6 @@ Gem::Specification.new do |spec| spec.name = "openssl" - spec.version = "2.2.1" + spec.version = "2.2.2" spec.authors = ["Martin Bosslet", "SHIBATA Hiroshi", "Zachary Scott", "Kazuki Yamaguchi"] spec.email = ["ruby-core@ruby-lang.org"] spec.summary = %q{OpenSSL provides SSL, TLS and general purpose cryptography.} @@ -18,7 +18,7 @@ Gem::Specification.new do |spec| spec.required_ruby_version = ">= 2.3.0" spec.add_runtime_dependency "ipaddr" - spec.add_development_dependency "rake" + spec.add_development_dependency "rake", ">= 11.2.0" spec.add_development_dependency "rake-compiler" spec.add_development_dependency "test-unit", "~> 3.0" spec.add_development_dependency "rdoc" |