Merge pull request #203576 from cjdelisle/cjdns-v22.1-tested

cjdns 22.1

Author: BrewTestBot

Formula/c/cjdns.rb

@@ -1,39 +1,27 @@
 class Cjdns < Formula
   desc "Advanced mesh routing system with cryptographic addressing"
   homepage "https://github.com/cjdelisle/cjdns/"
-  url "https://github.com/cjdelisle/cjdns/archive/refs/tags/cjdns-v22.tar.gz"
-  sha256 "21b555f7850f94cc42134f59cb99558baaaa18acf4c5544e8647387d4a5019ec"
+  url "https://github.com/cjdelisle/cjdns/archive/refs/tags/cjdns-v22.1.tar.gz"
+  sha256 "3fcd4dcbfbf8d34457c6b22c1024edb8be4a771eea34391a7e7437af72f52083"
   license all_of: ["GPL-3.0-or-later", "GPL-2.0-or-later", "BSD-3-Clause", "MIT"]
   head "https://github.com/cjdelisle/cjdns.git", branch: "master"
 
   bottle do
-    sha256 cellar: :any_skip_relocation, arm64_sequoia:  "0142ab3b54849f126cdb39c6bd9e61dbde277e9021d608caf6724f795b2c2f54"
-    sha256 cellar: :any_skip_relocation, arm64_sonoma:   "ff8c49f78499d690c7e298220a109e52f0c92da7510409ae18b06ba9063af3f1"
-    sha256 cellar: :any_skip_relocation, arm64_ventura:  "43e9dbce680ded6cbe6b0aabbff2d4a5e06c37a0dfbdd62953b026901230ceab"
-    sha256 cellar: :any_skip_relocation, arm64_monterey: "9936c5967ebb1f708154585ccde1446d36c9eb88c614b59ae42f96c551f3ccd9"
-    sha256 cellar: :any_skip_relocation, arm64_big_sur:  "2fa20c4991e09b7d63ebd478adfd07fc90a7d2e3b8d63fb5b4e5e22e92c6fa52"
-    sha256 cellar: :any_skip_relocation, sonoma:         "9907a47d27a4e9e80a7bdbbb877c9ca37abd0239d3c98143e3978f6a3d8b1b38"
-    sha256 cellar: :any_skip_relocation, ventura:        "021aebe2db8a0b89fca4649612f9d3732c0a83c6f0b3638834289e0802acde33"
-    sha256 cellar: :any_skip_relocation, monterey:       "8deb77907b473f50757c022df865fbea0df3d7e91ced2f35407064c8172fdc87"
-    sha256 cellar: :any_skip_relocation, big_sur:        "60c3c3fc2c2e62759b79f38e29d6eb8a7518e1c3cc6066c1faa25e4a650b98f3"
-    sha256 cellar: :any_skip_relocation, x86_64_linux:   "311f9548b046796d787c72c94a536ca5cf0939319d1a2da502af32d837f2d6c9"
+    sha256 cellar: :any_skip_relocation, arm64_sequoia: "dad7a92383088d864b11ebfbef03b9ea181c3e89d0c38c804d895035de1a9b74"
+    sha256 cellar: :any_skip_relocation, arm64_sonoma:  "b7c7ed9f1030ae11d154c8b56ecbf1960fe592c0b40ea624bd27ac593ffeead3"
+    sha256 cellar: :any_skip_relocation, arm64_ventura: "87f5189b5d62e3cd6ab280ac7b4a36c9010fbe609b430de711f4b3bdc91ff0ab"
+    sha256 cellar: :any_skip_relocation, sonoma:        "2e182079b505d888dd89e0b828adea13b426b51cfdfc54364ef01341671efe43"
+    sha256 cellar: :any_skip_relocation, ventura:       "939b5ef351d3ec8cb836663699f5dcdd572dcde5d9714478d3fc56fdc31b56c7"
+    sha256 cellar: :any_skip_relocation, x86_64_linux:  "d720c9e5a2d4070720a817659ee69b25c14afbd725d772a9018bebb084a4ac75"
   end
 
   depends_on "node" => :build
   depends_on "rust" => :build
 
   def install
-    # Work-around for build issue with Xcode 15.3
-    # upstream PR patch, https://github.com/cjdelisle/cjdns/pull/1263
-    ENV.append_to_cflags "-Wno-incompatible-function-pointer-types" if DevelopmentTools.clang_build_version >= 1500
-
-    # Avoid using -march=native
-    inreplace "node_build/make.js",
-              "var NO_MARCH_FLAG = ['arm', 'ppc', 'ppc64', 'arm64'];",
-              "var NO_MARCH_FLAG = ['x64', 'arm', 'arm64', 'ppc', 'ppc64'];"
-
     system "./do"
     bin.install "cjdroute"
+    bin.install "cjdnstool"
 
     man1.install "doc/man/cjdroute.1"
     man5.install "doc/man/cjdroute.conf.5"
@@ -42,5 +30,8 @@ def install
   test do
     sample_conf = JSON.parse(shell_output("#{bin}/cjdroute --genconf"))
     assert_equal "NONE", sample_conf["admin"]["password"]
+
+    help_output = shell_output("#{bin}/cjdnstool --help")
+    assert_match "cexec", help_output
   end
 end