mariadb-connector-c: make keg_only

Formula/d/diesel.rb

@@ -1,9 +1,10 @@
 class Diesel < Formula
   desc "Command-line tool for Rust ORM Diesel"
   homepage "https://diesel.rs"
   url "https://github.com/diesel-rs/diesel/archive/refs/tags/v2.2.4.tar.gz"
   sha256 "519e761055dea9abf6172b8ec15c0fd0da53c859e6b6809daeb104bbecd6fe57"
   license any_of: ["Apache-2.0", "MIT"]
+  revision 1
   head "https://github.com/diesel-rs/diesel.git", branch: "master"
 
   bottle do
@@ -20,7 +21,7 @@
 
   depends_on "rust" => [:build, :test]
   depends_on "libpq"
-  depends_on "mysql-client"
+  depends_on "mariadb-connector-c"
 
   uses_from_macos "sqlite"
 

Formula/h/hydra.rb

@@ -1,10 +1,10 @@
 class Hydra < Formula
   desc "Network logon cracker which supports many services"
   homepage "https://github.com/vanhauser-thc/thc-hydra"
   url "https://github.com/vanhauser-thc/thc-hydra/archive/refs/tags/v9.5.tar.gz"
   sha256 "9dd193b011fdb3c52a17b0da61a38a4148ffcad731557696819d4721d1bee76b"
   license "AGPL-3.0-only"
-  revision 4
+  revision 5
   head "https://github.com/vanhauser-thc/thc-hydra.git", branch: "master"
 
   bottle do
@@ -20,9 +20,10 @@
 
   depends_on "pkg-config" => :build
   depends_on "libssh"
-  depends_on "mysql-client"
+  depends_on "mariadb-connector-c"
   depends_on "openssl@3"
   depends_on "pcre2"
+
   uses_from_macos "ncurses"
 
   conflicts_with "ory-hydra", because: "both install `hydra` binaries"
@@ -37,8 +38,8 @@
       s.gsub!(/^CRYPTO_PATH=""$/, "CRYPTO_PATH=#{Formula["openssl@3"].opt_lib}")
       s.gsub!(/^SSH_PATH=""$/, "SSH_PATH=#{Formula["libssh"].opt_lib}")
       s.gsub!(/^SSH_IPATH=""$/, "SSH_IPATH=#{Formula["libssh"].opt_include}")
-      s.gsub!(/^MYSQL_PATH=""$/, "MYSQL_PATH=#{Formula["mysql-client"].opt_lib}")
-      s.gsub!(/^MYSQL_IPATH=""$/, "MYSQL_IPATH=#{Formula["mysql-client"].opt_include}/mysql")
+      s.gsub!(/^MYSQL_PATH=""$/, "MYSQL_PATH=#{Formula["mariadb-connector-c"].opt_lib}")
+      s.gsub!(/^MYSQL_IPATH=""$/, "MYSQL_IPATH=#{Formula["mariadb-connector-c"].opt_include}/mariadb")
       s.gsub!(/^PCRE_PATH=""$/, "PCRE_PATH=#{Formula["pcre2"].opt_lib}")
       s.gsub!(/^PCRE_IPATH=""$/, "PCRE_IPATH=#{Formula["pcre2"].opt_include}")
       if OS.mac?

Formula/i/inspircd.rb

@@ -1,9 +1,10 @@
 class Inspircd < Formula
   desc "Modular C++ Internet Relay Chat daemon"
   homepage "https://www.inspircd.org/"
   url "https://github.com/inspircd/inspircd/archive/refs/tags/v4.4.0.tar.gz"
   sha256 "9f24615b1663ca6ed611f39c3f74da291656fc88df18991ab67f1becbab40aaa"
   license "GPL-2.0-only"
+  revision 1
 
   livecheck do
     url :stable
@@ -23,16 +24,10 @@
   depends_on "argon2"
   depends_on "gnutls"
   depends_on "libpq"
-  depends_on "mysql-client"
+  depends_on "mariadb-connector-c"
 
   uses_from_macos "openldap"
 
-  on_macos do
-    depends_on "openssl@3"
-    depends_on "zlib"
-    depends_on "zstd"
-  end
-
   skip_clean "data"
   skip_clean "logs"
 

Formula/k/kitchen-sync.rb

@@ -1,11 +1,11 @@
 class KitchenSync < Formula
   desc "Fast efficiently sync database without dumping & reloading"
   homepage "https://github.com/willbryant/kitchen_sync"
   url "https://github.com/willbryant/kitchen_sync/archive/refs/tags/v2.20.tar.gz"
   sha256 "e79e5dfad48b8345b1d80444a0e992b2f9b9c53f29f6f607647e567292a7d0f2"
   license "MIT"
-  revision 2
-  head "https://github.com/willbryant/kitchen_sync.git", branch: "master"
+  revision 3
+  head "https://github.com/willbryant/kitchen_sync.git", branch: "main"
 
   livecheck do
     url :stable
@@ -25,25 +25,23 @@
 
   depends_on "cmake" => :build
   depends_on "libpq"
-  depends_on "mysql-client"
-
-  fails_with gcc: "5"
+  depends_on "mariadb-connector-c"
 
   def install
-    system "cmake", ".",
-                    "-DMySQL_INCLUDE_DIR=#{Formula["mysql-client"].opt_include}/mysql",
-                    "-DMySQL_LIBRARY_DIR=#{Formula["mysql-client"].opt_lib}",
+    system "cmake", "-S", ".", "-B", "build",
+                    "-DMySQL_INCLUDE_DIR=#{Formula["mariadb-connector-c"].opt_include}/mariadb",
+                    "-DMySQL_LIBRARY_DIR=#{Formula["mariadb-connector-c"].opt_lib}",
                     "-DPostgreSQL_INCLUDE_DIR=#{Formula["libpq"].opt_include}",
                     "-DPostgreSQL_LIBRARY_DIR=#{Formula["libpq"].opt_lib}",
                     *std_cmake_args
-
-    system "make", "install"
+    system "cmake", "--build", "build"
+    system "cmake", "--install", "build"
   end
 
   test do
     output = shell_output("#{bin}/ks --from mysql://b/ --to mysql://d/ 2>&1", 1)
 
-    assert_match "Unknown MySQL server host", output
+    assert_match "Unknown server host", output
     assert_match "Kitchen Syncing failed.", output
   end
 end

Formula/lib/libzdb.rb

@@ -1,10 +1,10 @@
 class Libzdb < Formula
   desc "Database connection pool library"
   homepage "https://tildeslash.com/libzdb/"
   url "https://tildeslash.com/libzdb/dist/libzdb-3.2.3.tar.gz"
   sha256 "a1957826fab7725484fc5b74780a6a7d0d8b7f5e2e54d26e106b399e0a86beb0"
   license "GPL-3.0-only"
-  revision 5
+  revision 6
 
   livecheck do
     url :homepage
@@ -23,15 +23,10 @@
 
   depends_on "libpq"
   depends_on macos: :high_sierra # C++ 17 is required
-  depends_on "mysql-client"
+  depends_on "mariadb-connector-c"
   depends_on "sqlite"
 
-  patch :DATA # Fix build error my mysql-client 8.3.0 https://bitbucket.org/tildeslash/libzdb/issues/67/build-error-with-mysql-83
-
   def install
-    # Reduce linkage on macOS from `mysql-client`
-    ENV.append "LDFLAGS", "-Wl,-dead_strip_dylibs" if OS.mac?
-
     system "./configure", "--disable-silent-rules", "--enable-sqliteunlock", *std_configure_args
     system "make", "install"
     (pkgshare/"test").install Dir["test/*.{c,cpp}"]
@@ -45,22 +40,3 @@
     end
   end
 end
-
-__END__
-diff --git a/src/db/mysql/MysqlConnection.c b/src/db/mysql/MysqlConnection.c
-index 45ae896..7b6c1e3 100644
---- a/src/db/mysql/MysqlConnection.c
-+++ b/src/db/mysql/MysqlConnection.c
-@@ -96,8 +96,10 @@ static MYSQL *_doConnect(Connection_T delegator, char **error) {
-         // Options
-         if (IS(URL_getParameter(url, "compress"), "true"))
-                 clientFlags |= CLIENT_COMPRESS;
--        if (IS(URL_getParameter(url, "use-ssl"), "true"))
--                mysql_ssl_set(db, 0,0,0,0,0);
-+        if (IS(URL_getParameter(url, "use-ssl"), "true")) {
-+                enum mysql_ssl_mode ssl_mode = SSL_MODE_REQUIRED;
-+                mysql_options(db, MYSQL_OPT_SSL_MODE, &ssl_mode);
-+        }
- #if MYSQL_VERSION_ID < 80000
-         if (IS(URL_getParameter(url, "secure-auth"), "true"))
-                 mysql_options(db, MYSQL_SECURE_AUTH, (const char*)&yes);

Formula/m/manticoresearch.rb

@@ -1,4 +1,4 @@
 class Manticoresearch < Formula
   desc "Open source text search engine"
   homepage "https://manticoresearch.com"
   url "https://github.com/manticoresoftware/manticoresearch/archive/refs/tags/6.3.6.tar.gz"
@@ -9,7 +9,7 @@
     { "GPL-2.0-only" => { with: "x11vnc-openssl-exception" } }, # galera
     { any_of: ["Unlicense", "MIT"] }, # uni-algo (our formula is too new)
   ]
-  revision 2
+  revision 3
   version_scheme 1
   head "https://github.com/manticoresoftware/manticoresearch.git", branch: "master"
 
@@ -33,33 +33,31 @@
   depends_on "nlohmann-json" => :build
   depends_on "snowball" => :build # for libstemmer.a
 
-  # NOTE: `libpq`, `mysql-client`, `unixodbc` and `zstd` are dynamically loaded rather than linked
+  # NOTE: `libpq`, `mariadb-connector-c`, `unixodbc` and `zstd` are dynamically loaded rather than linked
   depends_on "cctz"
   depends_on "icu4c@76"
   depends_on "libpq"
-  depends_on "mysql-client"
+  depends_on "mariadb-connector-c"
   depends_on "openssl@3"
   depends_on "re2"
   depends_on "unixodbc"
   depends_on "xxhash"
-  depends_on "zlib" # due to `mysql-client`
   depends_on "zstd"
 
   uses_from_macos "bison" => :build
   uses_from_macos "flex" => :build
+  uses_from_macos "expat"
   uses_from_macos "libxml2"
-
-  fails_with gcc: "5"
+  uses_from_macos "zlib"
 
   def install
     # Work around error when building with GCC
     # Issue ref: https://github.com/manticoresoftware/manticoresearch/issues/2393
     ENV.append_to_cflags "-fpermissive" if OS.linux?
 
-    icu4c = deps.map(&:to_formula).find { |f| f.name.match?(/^icu4c@\d+$/) }
-    ENV["ICU_ROOT"] = icu4c.opt_prefix.to_s
+    ENV["ICU_ROOT"] = deps.find { |dep| dep.name.match?(/^icu4c(@\d+)?$/) }
+                          .to_formula.opt_prefix.to_s
     ENV["OPENSSL_ROOT_DIR"] = Formula["openssl@3"].opt_prefix.to_s
-    ENV["MYSQL_ROOT_DIR"] = Formula["mysql-client"].opt_prefix.to_s
     ENV["PostgreSQL_ROOT"] = Formula["libpq"].opt_prefix.to_s
 
     args = %W[
@@ -72,6 +70,7 @@
       -DCMAKE_REQUIRE_FIND_PACKAGE_re2=ON
       -DCMAKE_REQUIRE_FIND_PACKAGE_stemmer=ON
       -DCMAKE_REQUIRE_FIND_PACKAGE_xxHash=ON
+      -DMYSQL_CONFIG_EXECUTABLE=#{Formula["mariadb-connector-c"].opt_bin}/mariadb_config
       -DRE2_LIBRARY=#{Formula["re2"].opt_lib/shared_library("libre2")}
       -DWITH_ICU_FORCE_STATIC=OFF
       -DWITH_RE2_FORCE_STATIC=OFF

Formula/m/mariadb-connector-c.rb

@@ -1,11 +1,13 @@
 class MariadbConnectorC < Formula
   desc "MariaDB database connector for C applications"
   homepage "https://mariadb.org/download/?tab=connector&prod=connector-c"
+  # TODO: Remove backward compatibility library symlinks on breaking version bump
   url "https://archive.mariadb.org/connector-c-3.4.1/mariadb-connector-c-3.4.1-src.tar.gz"
   mirror "https://fossies.org/linux/misc/mariadb-connector-c-3.4.1-src.tar.gz/"
   sha256 "0a7f2522a44a7369c1dda89676e43485037596a7b1534898448175178aedeb4d"
   license "LGPL-2.1-or-later"
-  head "https://github.com/mariadb-corporation/mariadb-connector-c.git", branch: "3.3"
+  revision 1
+  head "https://github.com/mariadb-corporation/mariadb-connector-c.git", branch: "3.4"
 
   # The REST API may omit the newest major/minor versions unless the
   # `olderReleases` parameter is set to `true`.
@@ -33,29 +35,47 @@
     sha256 x86_64_linux:   "13cdebe984f4f9e6344d552fda0bd4fb304099becaf1e7918140220d87de8b45"
   end
 
+  keg_only "it conflicts with mariadb"
+
   depends_on "cmake" => :build
   depends_on "openssl@3"
+  depends_on "zstd"
 
   uses_from_macos "curl"
   uses_from_macos "krb5"
   uses_from_macos "zlib"
 
-  on_linux do
-    depends_on "zstd"
-  end
-
+  # TODO: Remove in syntax-only PR
   conflicts_with "mariadb", because: "both install `mariadb_config`"
 
   def install
-    args = std_cmake_args
-    args << "-DWITH_OPENSSL=On"
-    args << "-DWITH_EXTERNAL_ZLIB=On"
-    args << "-DOPENSSL_INCLUDE_DIR=#{Formula["openssl@3"].opt_include}"
-    args << "-DINSTALL_MANDIR=#{share}"
-    args << "-DCOMPILATION_COMMENT=Homebrew"
+    rm_r "external"
+
+    args = %W[
+      -DINSTALL_LIBDIR=#{lib}
+      -DINSTALL_MANDIR=#{man}
+      -DWITH_EXTERNAL_ZLIB=ON
+      -DWITH_MYSQLCOMPAT=ON
+      -DWITH_UNIT_TESTS=OFF
+    ]
+
+    system "cmake", "-S", ".", "-B", "build", *args, *std_cmake_args
+    system "cmake", "--build", "build"
+    system "cmake", "--install", "build"
+
+    # Add mysql_config symlink for compatibility which simplifies building
+    # some dependents. This is done in the full `mariadb` installation[^1]
+    # but not in the standalone `mariadb-connector-c`.
+    #
+    # [^1]: https://github.com/MariaDB/server/blob/main/cmake/symlinks.cmake
+    bin.install_symlink "mariadb_config" => "mysql_config"
+
+    # Temporary symlinks for backwards compatibility.
+    # TODO: Remove in future version update.
+    lib.glob(shared_library("*")) { |f| (lib/"mariadb").install_symlink f }
 
-    system "cmake", ".", *args
-    system "make", "install"
+    # TODO: Automatically compress manpages in brew
+    Utils::Gzip.compress(*man3.glob("*.3"))
   end
 
   test do

Formula/m/mydumper.rb

@@ -1,9 +1,10 @@
 class Mydumper < Formula
   desc "How MySQL DBA & support engineer would imagine 'mysqldump' ;-)"
   homepage "https://launchpad.net/mydumper"
   url "https://github.com/mydumper/mydumper/archive/refs/tags/v0.16.7-5.tar.gz"
   sha256 "f554552fe96c40a47b82018eb067168bcb267a96fd288ddf8523c9e472340f2e"
   license "GPL-3.0-or-later"
+  revision 1
 
   livecheck do
     url :stable
@@ -24,31 +25,19 @@
   depends_on "pkg-config" => :build
   depends_on "sphinx-doc" => :build
   depends_on "glib"
-  depends_on "mysql-client"
+  depends_on "mariadb-connector-c"
   depends_on "pcre"
-  depends_on "zlib"
-
-  fails_with gcc: "5"
 
   def install
     # Avoid installing config into /etc
     inreplace "CMakeLists.txt", "/etc", etc
 
     # Override location of mysql-client
-    args = std_cmake_args + %W[
-      -DMYSQL_CONFIG_PREFER_PATH=#{Formula["mysql-client"].opt_bin}
-      -DMYSQL_LIBRARIES=#{Formula["mysql-client"].opt_lib/shared_library("libmysqlclient")}
-    ]
-    # find_package(ZLIB) has trouble on Big Sur since physical libz.dylib
-    # doesn't exist on the filesystem.  Instead provide details ourselves:
-    if OS.mac?
-      args << "-DCMAKE_DISABLE_FIND_PACKAGE_ZLIB=1"
-      args << "-DZLIB_INCLUDE_DIRS=/usr/include"
-      args << "-DZLIB_LIBRARIES=-lz"
-    end
+    args = ["-DMYSQL_CONFIG_PREFER_PATH=#{Formula["mariadb-connector-c"].opt_bin}"]
 
-    system "cmake", ".", *args
-    system "make", "install"
+    system "cmake", "-S", ".", "-B", "build", *args, *std_cmake_args
+    system "cmake", "--build", "build"
+    system "cmake", "--install", "build"
   end
 
   test do

Formula/m/mysql++.rb

@@ -1,10 +1,10 @@
 class Mysqlxx < Formula
   desc "C++ wrapper for MySQL's C API"
   homepage "https://tangentsoft.com/mysqlpp/home"
   url "https://tangentsoft.com/mysqlpp/releases/mysql++-3.3.0.tar.gz"
   sha256 "449cbc46556cc2cc9f9d6736904169a8df6415f6960528ee658998f96ca0e7cf"
   license "LGPL-2.1-or-later"
-  revision 3
+  revision 4
 
   livecheck do
     url "https://tangentsoft.com/mysqlpp/releases/"
@@ -23,15 +23,12 @@
     sha256 cellar: :any_skip_relocation, x86_64_linux:   "243beca649ebb4da087364acf8a7a10005d2e595e7513828e7397a45ffdc8ec5"
   end
 
-  depends_on "mysql-client"
-
-  fails_with gcc: "5"
+  depends_on "mariadb-connector-c"
 
   def install
-    mysql = Formula["mysql-client"]
+    mariadb = Formula["mariadb-connector-c"]
     system "./configure", "--with-field-limit=40",
-                          "--with-mysql-lib=#{mysql.opt_lib}",
-                          "--with-mysql-include=#{mysql.opt_include}/mysql",
+                          "--with-mysql=#{mariadb.opt_prefix}",
                           *std_configure_args
 
     # Delete "version" file incorrectly included as C++20 <version> header
@@ -53,7 +50,7 @@
         return 0;
       }
     CPP
-    system ENV.cxx, "test.cpp", "-I#{Formula["mysql-client"].opt_include}/mysql",
+    system ENV.cxx, "test.cpp", "-I#{Formula["mariadb-connector-c"].opt_include}/mariadb",
                     "-L#{lib}", "-lmysqlpp", "-o", "test"
     system "./test", "-u", "foo", "-p", "bar"
   end