From d28d0ef2a6caafb5f661b0187c9f935cba84dccb Mon Sep 17 00:00:00 2001
From: Kazuki Yamaguchi <k@rhe.jp>
Date: Thu, 8 Sep 2022 23:02:44 +0900
Subject: Merge openssl-2.1.4

The changes can be found at:

  https://github.com/ruby/openssl/compare/v2.1.3...v2.1.4
---
 ext/openssl/History.md      | 10 ++++++++++
 ext/openssl/extconf.rb      |  4 ++--
 ext/openssl/openssl.gemspec |  4 ++--
 ext/openssl/ossl_version.h  |  2 +-
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/ext/openssl/History.md b/ext/openssl/History.md
index 9e7ee53397..99b268182a 100644
--- a/ext/openssl/History.md
+++ b/ext/openssl/History.md
@@ -1,3 +1,13 @@
+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 7e817ae2da..f4212bd450 100644
--- a/ext/openssl/extconf.rb
+++ b/ext/openssl/extconf.rb
@@ -14,7 +14,7 @@
 require "mkmf"
 require File.expand_path('../deprecation', __FILE__)
 
-dir_config("openssl")
+dir_config_given = dir_config("openssl").any?
 dir_config("kerberos")
 
 Logging::message "=== OpenSSL for Ruby configurator ===\n"
@@ -88,7 +88,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/openssl.gemspec b/ext/openssl/openssl.gemspec
index c22eece7d6..82a91f4173 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.1.3"
+  spec.version       = "2.1.4"
   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"
diff --git a/ext/openssl/ossl_version.h b/ext/openssl/ossl_version.h
index edbd8ce3fa..70182a71e7 100644
--- a/ext/openssl/ossl_version.h
+++ b/ext/openssl/ossl_version.h
@@ -10,6 +10,6 @@
 #if !defined(_OSSL_VERSION_H_)
 #define _OSSL_VERSION_H_
 
-#define OSSL_VERSION "2.1.3"
+#define OSSL_VERSION "2.1.4"
 
 #endif /* _OSSL_VERSION_H_ */
-- 
cgit v1.2.3