Resolve issues detected by brew audit --strict

Author: lucydodo

Formula/sqlb-openssl@3.rb

@@ -1,24 +1,21 @@
 class SqlbOpensslAT3 < Formula
   desc "Cryptography and SSL/TLS Toolkit"
   homepage "https://openssl.org/"
-  version "3.4.1"
-  url "https://github.com/openssl/openssl/releases/download/openssl-#{version}/openssl-#{version}.tar.gz"
-  mirror "https://www.openssl.org/source/openssl-#{version}.tar.gz"
-  mirror "http://fresh-center.net/linux/misc/openssl-#{version}.tar.gz"
+  url "https://github.com/openssl/openssl/releases/download/openssl-3.4.1/openssl-3.4.1.tar.gz"
+  # version "3.4.1"
   sha256 "002a2d6b30b58bf4bea46c43bdd96365aaf8daa6c428782aa4feee06da197df3"
   license "Apache-2.0"
 
-  bottle do
-    root_url "https://nightlies.sqlitebrowser.org/homebrew_bottles"
-    rebuild 1
-    sha256 arm64_sonoma: "e20ffdf75d17960f7cdc715481419e15314136215e800c37a2a572925d2d44fb"
-  end
-
   livecheck do
     url "https://www.openssl.org/source/"
     regex(/href=.*?openssl[._-]v?(\d+(?:\.\d+)+)\.t/i)
   end
 
+  bottle do
+    root_url "https://github.com/lucydodo/homebrew-tap/releases/download/sqlb-openssl@3-3.4.1"
+    sha256 arm64_sonoma: "6da840dda45af0f56f1f2de196ac34617cb16df15b1db2dedaf8661efac52820"
+  end
+
   keg_only :shadowed_by_macos, "macOS provides LibreSSL"
 
   depends_on arch: :arm64
@@ -29,7 +26,7 @@ class SqlbOpensslAT3 < Formula
   # be obvious to everyone, so explicitly state it for now to
   # help debug inevitable breakage.
   def configure_args
-    args = %W[
+    %w[
       enable-ec_nistp_64_gcc_128
       no-asm
       no-ssl3
@@ -61,7 +58,7 @@ def install
     ENV.append "CFLAGS", "-arch x86_64"
 
     system "perl", "./Configure", *(configure_args + arch_args)
-    system "arch -x86_64 make"
+    system "arch", "-x86_64", "make"
     system "make", "install", "MANDIR=#{prefix}/darwin64-x86_64-cc/share/man", "MANSUFFIX=ssl"
     # AF_ALG support isn't always enabled (e.g. some containers), which breaks the tests.
     # AF_ALG is a kernel feature and failures are unlikely to be issues with the formula.
@@ -72,29 +69,30 @@ def install
     arch_args += %W[--prefix=#{prefix} --openssldir=#{openssldir} --libdir=lib]
 
     openssldir.mkpath
-    system "make clean"
+    system "make", "clean"
     system "perl", "./Configure", *(configure_args + arch_args)
     system "make"
     system "make", "install", "MANDIR=#{man}", "MANSUFFIX=ssl"
     # # AF_ALG support isn't always enabled (e.g. some containers), which breaks the tests.
     # # AF_ALG is a kernel feature and failures are unlikely to be issues with the formula.
     # system "make", "test", "TESTS=-test_afalg"
 
-    system "lipo", "-create", "-output", "#{lib}/libcrypto.3.dylib", "#{lib}/libcrypto.3.dylib", "#{prefix}/darwin64-x86_64-cc/lib/libcrypto.3.dylib"
-    system "lipo", "-create", "-output", "#{lib}/libcrypto.a", "#{lib}/libcrypto.a", "#{prefix}/darwin64-x86_64-cc/lib/libcrypto.a"
+    mv "#{lib}/libcrypto.3.dylib", "#{lib}/libcrypto.3-arm64.dylib"
+    dylib_arm64 = MachO::MachOFile.new("#{lib}/libcrypto.3-arm64.dylib")
+    dylib_x86_64 = MachO::MachOFile.new("#{prefix}/darwin64-x86_64-cc/lib/libcrypto.3.dylib")
+    fat = MachO::FatFile.new_from_machos(dylib_arm64, dylib_x86_64)
+    fat.write("#{lib}/libcrypto.3.dylib")
+
     rm "#{lib}/libcrypto.dylib"
+    rm_r "#{prefix}/darwin64-x86_64-cc/bin"
+    rm_r "#{prefix}/darwin64-x86_64-cc/lib"
     ln_s "#{lib}/libcrypto.3.dylib", "#{lib}/libcrypto.dylib"
   end
 
   def openssldir
     etc/"sqlb-openssl@3"
   end
 
-  def post_install
-    rm_f openssldir/"cert.pem"
-    openssldir.install_symlink Formula["ca-certificates"].pkgetc/"cert.pem"
-  end
-
   def caveats
     <<~EOS
       A CA file has been bootstrapped using certificates from the system
@@ -108,8 +106,7 @@ def caveats
 
   test do
     # Make sure the necessary .cnf file exists, otherwise OpenSSL gets moody.
-    assert_predicate pkgetc/"openssl.cnf", :exist?,
-            "OpenSSL requires the .cnf file for some functionality"
+    assert_path_exists pkgetc/"openssl.cnf", "OpenSSL requires the .cnf file for some functionality"
 
     # Check OpenSSL itself functions as expected.
     (testpath/"testfile.txt").write("This is a test file")

Formula/sqlb-qt@5.rb

@@ -3,29 +3,27 @@
 class SqlbQtAT5 < Formula
   desc "Cross-platform application and UI framework"
   homepage "https://www.qt.io/"
-  version "5.15.16"
-  # NOTE: Use *.diff for GitLab/KDE patches to avoid their checksums changing.
   url "https://download.qt.io/official_releases/qt/5.15/5.15.16/single/qt-everywhere-opensource-src-5.15.16.tar.xz"
-  mirror "https://mirrors.dotsrc.org/qtproject/archive/qt/5.15/5.15.16/single/qt-everywhere-opensource-src-5.15.16.tar.xz"
-  mirror "https://mirrors.ocf.berkeley.edu/qt/archive/qt/5.15/5.15.16/single/qt-everywhere-opensource-src-5.15.16.tar.xz"
+  # version "5.15.16"
+  # NOTE: Use *.diff for GitLab/KDE patches to avoid their checksums changing.
   sha256 "efa99827027782974356aceff8a52bd3d2a8a93a54dd0db4cca41b5e35f1041c"
   license all_of: ["GFDL-1.3-only", "GPL-2.0-only", "GPL-3.0-only", "LGPL-2.1-only", "LGPL-3.0-only"]
   revision 1
 
-  bottle do
-    root_url "https://nightlies.sqlitebrowser.org/homebrew_bottles"
-    rebuild 1
-    sha256 cellar: :any, arm64_sonoma: "3c66b0d432cc737db11850de9b6ce7c84f20a0dedf54e950d10246cd4808ccdf"
-  end
-
   livecheck do
     url "https://download.qt.io/official_releases/qt/5.15/"
     regex(%r{href=["']?v?(\d+(?:\.\d+)+)/?["' >]}i)
   end
 
-  depends_on arch: :arm64
+  bottle do
+    root_url "https://github.com/lucydodo/homebrew-tap/releases/download/sqlb-qt@5-5.15.16_1"
+    sha256 cellar: :any, arm64_sonoma: "be4927a0d13ae0decd8b1ad449adf3d0290e57b14505d0fcc3e7d4f2895ea2fc"
+  end
+
   keg_only :versioned_formula
 
+  depends_on arch: :arm64
+
   # Fix build with Xcode 14.3.
   # https://bugreports.qt.io/browse/QTBUG-112906
   patch do
@@ -47,7 +45,7 @@ class SqlbQtAT5 < Formula
     directory "qtbase"
   end
 
-    # CVE-2024-25580
+  # CVE-2024-25580
   # Remove with Qt 5.15.17
   patch do
     url "https://download.qt.io/official_releases/qt/5.15/CVE-2024-25580-qtbase-5.15.diff"
@@ -190,8 +188,8 @@ def caveats
 
     system bin/"qmake", testpath/"hello.pro"
     system "make"
-    assert_predicate testpath/"hello", :exist?
-    assert_predicate testpath/"main.o", :exist?
+    assert_path_exists testpath/"hello"
+    assert_path_exists testpath/"main.o"
     system "./hello"
   end
 end

Formula/sqlb-sqlcipher.rb

@@ -1,23 +1,22 @@
 class SqlbSqlcipher < Formula
   desc "SQLite extension providing 256-bit AES encryption"
   homepage "https://www.zetetic.net/sqlcipher/"
-  version "4.6.1"
-  url "https://github.com/sqlcipher/sqlcipher/archive/refs/tags/v#{version}.tar.gz"
+  url "https://github.com/sqlcipher/sqlcipher/archive/refs/tags/v4.6.1.tar.gz"
+  # version "4.6.1"
   sha256 "d8f9afcbc2f4b55e316ca4ada4425daf3d0b4aab25f45e11a802ae422b9f53a3"
   license "BSD-3-Clause"
   head "https://github.com/sqlcipher/sqlcipher.git", branch: "master"
 
-  bottle do
-    root_url "https://nightlies.sqlitebrowser.org/homebrew_bottles"
-    rebuild 1
-    sha256 arm64_sonoma: "ff81df0c7205ada240dfa3ea9fc29e11882b11ed1625b00b4b6cf3853d555084"
-  end
-
   livecheck do
     url :stable
     strategy :github_latest
   end
 
+  bottle do
+    root_url "https://github.com/lucydodo/homebrew-tap/releases/download/sqlb-sqlcipher-4.6.1"
+    sha256 cellar: :any, arm64_sonoma: "1c3b07faf269425e957a21ce0835e00339a4442d9533e89f7e0781e449804da8"
+  end
+
   depends_on arch: :arm64
   depends_on "sqlb-openssl@3"
 
@@ -62,7 +61,7 @@ def install
     args << "CFLAGS=#{cflags}"
 
     system "./configure", *args
-    system "arch -x86_64 make"
+    system "arch", "-x86_64", "make"
     system "make", "install"
 
     ENV.delete("CFLAGS")
@@ -93,14 +92,19 @@ def install
     ].join(" ")
     args << "CFLAGS=#{cflags}"
 
-    system "make clean"
+    system "make", "clean"
     system "./configure", *args
     system "make"
     system "make", "install"
 
-    system "lipo", "-create", "-output", "#{lib}/libsqlcipher.0.dylib", "#{lib}/libsqlcipher.0.dylib", "#{prefix}/darwin64-x86_64-cc/lib/libsqlcipher.0.dylib"
-    system "lipo", "-create", "-output", "#{lib}/libsqlcipher.a", "#{lib}/libsqlcipher.a", "#{prefix}/darwin64-x86_64-cc/lib/libsqlcipher.a"
+    mv "#{lib}/libsqlcipher.0.dylib", "#{lib}/libsqlcipher.0-arm64.dylib"
+    dylib_arm64 = MachO::MachOFile.new("#{lib}/libsqlcipher.0-arm64.dylib")
+    dylib_x86_64 = MachO::MachOFile.new("#{prefix}/darwin64-x86_64-cc/lib/libsqlcipher.0.dylib")
+    fat = MachO::FatFile.new_from_machos(dylib_arm64, dylib_x86_64)
+    fat.write("#{lib}/libsqlcipher.0.dylib")
+
     rm "#{lib}/libsqlcipher.dylib"
+    rm_r "#{prefix}/darwin64-x86_64-cc"
     ln_s "#{lib}/libsqlcipher.0.dylib", "#{lib}/libsqlcipher.dylib"
   end
 

Formula/sqlb-sqlite.rb

@@ -5,13 +5,12 @@ class SqlbSqlite < Formula
   version "3.48.0"
   sha256 "ac992f7fca3989de7ed1fe99c16363f848794c8c32a158dafd4eb927a2e02fd5"
   license "blessing"
-  env :std
 
   bottle do
-    root_url "https://nightlies.sqlitebrowser.org/homebrew_bottles"
-    rebuild 1
-    sha256 cellar: :any, arm64_sonoma: "e6b03a12f5d0392595b99b1564dbbc027f4517fcc578517be2b0641985f4a9e9"
+    root_url "https://github.com/lucydodo/homebrew-tap/releases/download/sqlb-sqlite-3.48.0"
+    sha256 cellar: :any, arm64_sonoma: "90e6a864154e6089ff1cfaacc5e589efae5cc844b47369174a8ebb04039f843b"
   end
+  env :std
 
   livecheck do
     url :homepage
@@ -21,7 +20,7 @@ class SqlbSqlite < Formula
     end
   end
 
-  keg_only :provided_by_macos
+  keg_only :shadowed_by_macos
 
   depends_on arch: :arm64