From 3ff77ae179db53b01ab85535655f6ee7ba85f6af Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Tue, 24 Sep 2024 18:42:09 +0800 Subject: [PATCH 1/2] cpanminus: regenerate attestations, build `:all` bottle This formula has a bunch of `/usr/local` references that may as well be `HOMEBREW_PREFIX` references. We also build with Homebrew `perl` to ensure that embedded versions refereces in the manpages are the same. Also fixes an attestation verification failure spotted at #191588. --- Formula/c/cpanminus.rb | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/Formula/c/cpanminus.rb b/Formula/c/cpanminus.rb index c81cc602d181..5ffb7e8e1015 100644 --- a/Formula/c/cpanminus.rb +++ b/Formula/c/cpanminus.rb @@ -22,7 +22,7 @@ class Cpanminus < Formula sha256 cellar: :any_skip_relocation, x86_64_linux: "7901d4e2cf8cf79ccd841ec638bfd5450c14efc2abd07ef90ee024e954b93f6d" end - uses_from_macos "perl" + depends_on "perl" => :build def install cd "App-cpanminus" if build.head? @@ -31,15 +31,18 @@ def install "INSTALLSITEMAN1DIR=#{man1}", "INSTALLSITEMAN3DIR=#{man3}" system "make", "install" - end - - def post_install - cpanm_lines = (bin/"cpanm").read.lines - return if cpanm_lines.first.match?(%r{^#!/usr/bin/env perl}) - ohai "Adding `/usr/bin/env perl` shebang to `cpanm`..." - cpanm_lines.unshift "#!/usr/bin/env perl\n" - (bin/"cpanm").atomic_write cpanm_lines.join + inreplace_files = [ + buildpath/"README", + bin/"cpanm", + lib/"perl5/App/cpanminus/fatscript.pm", + lib/"perl5/App/cpanminus.pm", + man3/"App::cpanminus.3", + ] + inreplace inreplace_files, "/usr/local", HOMEBREW_PREFIX, audit_result: build.stable? + + # Needed for dependents that might use Homebrew perl or system perl. + inreplace bin/"cpanm", %r{^#!#{Regexp.escape(Formula["perl"].opt_bin)}/perl$}, "#!/usr/bin/env perl" end test do From 9a9c752c0790831b8633da27378aa0ad71743950 Mon Sep 17 00:00:00 2001 From: BrewTestBot <1589480+BrewTestBot@users.noreply.github.com> Date: Tue, 24 Sep 2024 12:01:34 +0000 Subject: [PATCH 2/2] cpanminus: update 1.7047 bottle. --- Formula/c/cpanminus.rb | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/Formula/c/cpanminus.rb b/Formula/c/cpanminus.rb index 5ffb7e8e1015..3352b7f75f4f 100644 --- a/Formula/c/cpanminus.rb +++ b/Formula/c/cpanminus.rb @@ -10,16 +10,8 @@ class Cpanminus < Formula head "https://github.com/miyagawa/cpanminus.git", branch: "devel" bottle do - sha256 cellar: :any_skip_relocation, arm64_sequoia: "652d0bd77ea57db4b55e836ccd5e095a2b0073b42406bd775fa5b1fec23004d2" - sha256 cellar: :any_skip_relocation, arm64_sonoma: "79c1c6d873f3ea1f5582da2544a9fcbaab6d1303d328b3877a70d63b9a355ca7" - sha256 cellar: :any_skip_relocation, arm64_ventura: "79c1c6d873f3ea1f5582da2544a9fcbaab6d1303d328b3877a70d63b9a355ca7" - sha256 cellar: :any_skip_relocation, arm64_monterey: "79c1c6d873f3ea1f5582da2544a9fcbaab6d1303d328b3877a70d63b9a355ca7" - sha256 cellar: :any_skip_relocation, arm64_big_sur: "c89d41c3b87de4c87a36355ded72110aab1e13b18ab33e2ac50590906e0aac21" - sha256 cellar: :any_skip_relocation, sonoma: "f20737479b4b5d7d2945aa09b8b25e91d09205725b2a0a3858a37c1eeb282f92" - sha256 cellar: :any_skip_relocation, ventura: "f20737479b4b5d7d2945aa09b8b25e91d09205725b2a0a3858a37c1eeb282f92" - sha256 cellar: :any_skip_relocation, monterey: "f20737479b4b5d7d2945aa09b8b25e91d09205725b2a0a3858a37c1eeb282f92" - sha256 cellar: :any_skip_relocation, big_sur: "76af4606a249844bc3f2cc521c3948b4e4e78e022f8d5d676ada9bcc91f4307d" - sha256 cellar: :any_skip_relocation, x86_64_linux: "7901d4e2cf8cf79ccd841ec638bfd5450c14efc2abd07ef90ee024e954b93f6d" + rebuild 1 + sha256 cellar: :any_skip_relocation, all: "37fb79c294b47339574f139986229bc14bf812b7b59a010ed139b13ab2390010" end depends_on "perl" => :build