Merge branch 'maint-2.1' into maint-2.2

* maint-2.1:
  Ruby/OpenSSL 2.1.4
  Make GitHub Actions happy on 2.1/2.2 branches
  ignore pkgconfig when any openssl option is specified

Author: rhenium

.github/workflows/test.yml

@@ -39,6 +39,8 @@ jobs:
       matrix:
         os: [ windows-latest ]
         ruby: [ mswin, mingw, "3.0", "2.7", "2.6", "2.5", "2.4", "2.3" ]
+        exclude:
+          - { os: "windows-latest", ruby: "mswin" } # OpenSSL 3.0
     steps:
       - name: repo checkout
         uses: actions/checkout@v2

History.md

@@ -92,6 +92,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
 =============
 

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"

openssl.gemspec

@@ -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"