Merge pull request #178666 from chenrui333/bump-monitoring-plugins-2.4.0

monitoring-plugins 2.4.0
Homebrew · Jul 28, 2024 · 86ba5a6 · 86ba5a6
2 parents aa25953 + 886918f
commit 86ba5a6
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 50 deletions.
diff --git a/.github/autobump.txt b/.github/autobump.txt
@@ -1677,6 +1677,7 @@ mongodb-atlas-cli
 mongoose
 monika
 monit
+monitoring-plugins
 monolith
 moon
 morpheus

diff --git a/Formula/m/monitoring-plugins.rb b/Formula/m/monitoring-plugins.rb
@@ -1,8 +1,8 @@
 class MonitoringPlugins < Formula
   desc "Plugins for nagios compatible monitoring systems"
   homepage "https://www.monitoring-plugins.org"
-  url "https://www.monitoring-plugins.org/download/monitoring-plugins-2.3.5.tar.gz"
-  sha256 "f3edd79a9254f231a1b46b32d14def806648f5267e133ef0c0d39329587ee38b"
+  url "https://www.monitoring-plugins.org/download/monitoring-plugins-2.4.0.tar.gz"
+  sha256 "e5dfd4ad8fde0a40da50aab3aff6d9a27020b8f283e332bc4da6ef9914f4028c"
   license "GPL-3.0-or-later"
 
   livecheck do
@@ -11,45 +11,37 @@ class MonitoringPlugins < Formula
   end
 
   bottle do
-    sha256 arm64_sonoma:   "8964ad146aab38fc46b9d3794d94607b038e578f807b12df7335cbe747fea689"
-    sha256 arm64_ventura:  "42ace3f93ed42a299e9e055c44f85c62ccdfe120bef31f1ee272c731f5ef8bb0"
-    sha256 arm64_monterey: "38c990c7c13cc49e958997972fb95207aaf35b0071aefd0a1e02d2a007915a14"
-    sha256 sonoma:         "fda974f1768ad4544c67476ddd08a8107131474a51d860f99cdd8982a1f28b83"
-    sha256 ventura:        "8713781f32bed97eccc5f12040b264f942f3709298bb0bef4abcfad9603e2b74"
-    sha256 monterey:       "b07aa720eb6a8dd39fc0f865cae3403e0a51e0cc559d382fa1a30dd195c50635"
-    sha256 x86_64_linux:   "ab67fd985f70e7756cace887a597f7ea4391a019cf0e29ef2ade27fcd1eecc85"
+    sha256 cellar: :any, arm64_sonoma:   "f8eee9b8e4b8300633bd73e365aa6e2daffcca7a58962ef7f20064b1bb378e12"
+    sha256 cellar: :any, arm64_ventura:  "0a6a841f7d31c47c25418a08bcbe3622e95ec5a9cdc31aef8f95c7630c64f3fd"
+    sha256 cellar: :any, arm64_monterey: "a5d15e7a30db8d11d30973cd12985e6fb62f95fa74c73696d960912f52492e40"
+    sha256 cellar: :any, sonoma:         "8e139e077e10f664e33c4dafa4bc404d6bf47bcf1e82bfa5c1a8daa481a85af3"
+    sha256 cellar: :any, ventura:        "3407ba5eda8acc2806ab7eec27af3f339852b857cf935954fca1c7ab38c75bf0"
+    sha256 cellar: :any, monterey:       "6879fa228c284f01e3688078e66b7a0374012e37147183cfa08c5d9ff1b0e47e"
+    sha256               x86_64_linux:   "27b58371aa6e210a9510c9fd0b64ed2f0923425b336eeda2b5c9eb0fd08509ac"
   end
 
-  depends_on "autoconf" => :build
-  depends_on "automake" => :build
-  depends_on "gettext"
   depends_on "openssl@3"
 
+  on_macos do
+    depends_on "gettext"
+  end
+
   on_linux do
     depends_on "bind"
   end
 
   conflicts_with "nagios-plugins", because: "both install their plugins to the same folder"
 
-  # Prevent -lcrypto from showing up in Makefile dependencies
-  # Reported upstream: https://github.com/monitoring-plugins/monitoring-plugins/pull/1970
-  patch :DATA
-
   def install
-    # Fix compile with newer Clang
-    ENV.append_to_cflags "-Wno-implicit-function-declaration" if DevelopmentTools.clang_build_version >= 1403
+    # workaround for Xcode 14.3
+    ENV.append "CFLAGS", "-Wno-implicit-function-declaration" if DevelopmentTools.clang_build_version >= 1403
 
     args = %W[
-      --disable-dependency-tracking
-      --prefix=#{libexec}
       --libexecdir=#{libexec}/sbin
       --with-openssl=#{Formula["openssl@3"].opt_prefix}
     ]
 
-    system "aclocal", "-I", "gl/m4", "-I", "m4"
-    system "autoupdate"
-    system "automake", "--add-missing"
-    system "./configure", *args
+    system "./configure", *args, *std_configure_args
     system "make", "install"
     sbin.write_exec_script Dir["#{libexec}/sbin/*"]
   end
@@ -66,29 +58,3 @@ def caveats
     assert_match "DNS OK", output
   end
 end
-
-__END__
-diff --git a/plugins-root/Makefile.am b/plugins-root/Makefile.am
-index 40aa020..a80229e 100644
---- a/plugins-root/Makefile.am
-+++ b/plugins-root/Makefile.am
-@@ -26,7 +26,7 @@ EXTRA_PROGRAMS = pst3
-
- EXTRA_DIST = t pst3.c
-
--BASEOBJS = ../plugins/utils.o ../lib/libmonitoringplug.a ../gl/libgnu.a $(LIB_CRYPTO)
-+BASEOBJS = ../plugins/utils.o ../lib/libmonitoringplug.a ../gl/libgnu.a
- NETOBJS = ../plugins/netutils.o $(BASEOBJS) $(EXTRA_NETOBJS)
- NETLIBS = $(NETOBJS) $(SOCKETLIBS)
-
-@@ -80,8 +80,8 @@ install-exec-local: $(noinst_PROGRAMS)
-
- ##############################################################################
- # the actual targets
--check_dhcp_LDADD = @LTLIBINTL@ $(NETLIBS)
--check_icmp_LDADD = @LTLIBINTL@ $(NETLIBS) $(SOCKETLIBS)
-+check_dhcp_LDADD = @LTLIBINTL@ $(NETLIBS) $(LIB_CRYPTO)
-+check_icmp_LDADD = @LTLIBINTL@ $(NETLIBS) $(SOCKETLIBS) $(LIB_CRYPTO)
-
- # -m64 needed at compiler and linker phase
- pst3_CFLAGS = @PST3CFLAGS@