Revert "ncat: Update to 7.91"

[people/pmueller/ipfire-2.x.git] / lfs / nagios-plugins

diff --git a/lfs/nagios-plugins b/lfs/nagios-plugins
index 27a716262b02d078862b338e8e7f9b1d0967abed..cdf1910b08252639c83d3c0ae65c0a840c85f8b4 100644 (file)
--- a/lfs/nagios-plugins
+++ b/lfs/nagios-plugins
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2021  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.2.1
+VER        = 2.3.3
 
 THISAPP    = nagios-plugins-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,9 +32,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = nagios-plugins
-PAK_VER    = 2
+PAK_VER    = 6
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = fb521d5c05897f165b0b1862c1e5cb27
+$(DL_FILE)_MD5 = 3b10db69a7d3658b8e64ac05ef203338
 
 install : $(TARGET)
 
@@ -77,6 +77,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       $(UPDATE_AUTOMAKE)
        cd $(DIR_APP) && \
                ./configure \
                        --prefix=/usr \
@@ -87,4 +88,15 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
+
+       # Prevent Nagios plugins from being owned (and hence writeable) by "nobody"
+       chown root:root -R /usr/lib/nagios/plugins
+
+       # Unfortunately, some of these plugins need the SUID bit to do their work properly
+       chmod +s \
+               /usr/lib/nagios/plugins/check_dhcp \
+               /usr/lib/nagios/plugins/check_icmp \
+               /usr/lib/nagios/plugins/check_ide_smart \
+               /usr/lib/nagios/plugins/check_ping
+
        @$(POSTBUILD)