Merge pull request Homebrew#134234 from carlocab/openssl-3-link

openssl@3: link into `HOMEBREW_PREFIX`
carlocab · Jun 20, 2023 · 18066a8 · 18066a8
2 parents 239dd2b + ea414a2
commit 18066a8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/Formula/openssl@1.1.rb b/Formula/openssl@1.1.rb
@@ -26,7 +26,7 @@ class OpensslAT11 < Formula
  sha256 x86_64_linux: "7f3a1498bdb447b94deec9f9369ce186836c2de58cb1c4c421b1f5ecd901c2c5"
  end
 
- keg_only :shadowed_by_macos, "macOS provides LibreSSL"
+ keg_only :versioned_formula
 
  # See: https://www.openssl.org/policies/releasestrat.html
  deprecate! date: "2023-09-11", because: :unsupported

diff --git a/Formula/openssl@3.rb b/Formula/openssl@3.rb
@@ -25,29 +25,33 @@ class OpensslAT3 < Formula
  sha256 x86_64_linux: "1d2e71765c0e459ba1d465a4ac4ded77f13fbcd446a74bc40d40e444dca56e78"
  end
 
- keg_only :shadowed_by_macos, "macOS provides LibreSSL"
-
  depends_on "ca-certificates"
 
  on_linux do
- keg_only "it conflicts with the `openssl@1.1` formula"
-
  resource "Test::Harness" do
  url "https://cpan.metacpan.org/authors/id/L/LE/LEONT/Test-Harness-3.44.tar.gz"
+ mirror "http://cpan.metacpan.org/authors/id/L/LE/LEONT/Test-Harness-3.44.tar.gz"
  sha256 "7eb591ea6b499ece6745ff3e80e60cee669f0037f9ccbc4e4511425f593e5297"
  end
 
  resource "Test::More" do
  url "https://cpan.metacpan.org/authors/id/E/EX/EXODIST/Test-Simple-1.302195.tar.gz"
+ mirror "http://cpan.metacpan.org/authors/id/E/EX/EXODIST/Test-Simple-1.302195.tar.gz"
  sha256 "b390bb23592e0b946c95adbb3c30b11bc634a286b2847be611ad929c57e39a6c"
  end
 
  resource "ExtUtils::MakeMaker" do
  url "https://cpan.metacpan.org/authors/id/B/BI/BINGOS/ExtUtils-MakeMaker-7.70.tar.gz"
+ mirror "http://cpan.metacpan.org/authors/id/B/BI/BINGOS/ExtUtils-MakeMaker-7.70.tar.gz"
  sha256 "f108bd46420d2f00d242825f865b0f68851084924924f92261d684c49e3e7a74"
  end
  end
 
+ link_overwrite "bin/c_rehash", "bin/openssl", "include/openssl/*"
+ link_overwrite "lib/libcrypto*", "lib/libssl*"
+ link_overwrite "lib/pkgconfig/libcrypto.pc", "lib/pkgconfig/libssl.pc", "lib/pkgconfig/openssl.pc"
+ link_overwrite "share/doc/openssl/*", "share/man/man*/*ssl"
+
  # SSLv2 died with 1.1.0, so no-ssl2 no longer required.
  # SSLv3 & zlib are off by default with 1.1.0 but this may not
  # be obvious to everyone, so explicitly state it for now to