X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;ds=sidebyside;f=lfs%2Fnagios-plugins;h=fcd7aa15e5bf8bbf0cb719c574aa8109b6cbb911;hb=HEAD;hp=2f33a09f2d471ba0520a49807ea087d8e8373b9c;hpb=302dba205bf58b3def6163b85b4decfce4538fac;p=ipfire-2.x.git

diff --git a/lfs/nagios-plugins b/lfs/nagios-plugins
index 2f33a09f2d..31e880d6d9 100644
--- 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-2023  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,9 @@
 
 include Config
 
-VER        = 2.2.1
+SUMMARY    = The Nagios Plug-Ins
+
+VER        = 2.4.11
 
 THISAPP    = nagios-plugins-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,9 +34,11 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = nagios-plugins
-PAK_VER    = 3
+PAK_VER    = 10
+
+DEPS       =
 
-DEPS       = ""
+SERVICES   =
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = fb521d5c05897f165b0b1862c1e5cb27
+$(DL_FILE)_BLAKE2 = 385a14c9cbc85781d85123664e59d59d8a280bddffbf22753f4ee00bb3f47c8a90ce73f1ed13fc61eb3c1c7caeb268f0fde5fb1d6c43df166e0edab9bb2475e1
 
 install : $(TARGET)
 
@@ -52,13 +56,13 @@ check : $(patsubst %,$(DIR_CHK)/%,$(objects))
 
 download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
-md5 : $(subst %,%_MD5,$(objects))
+b2 : $(subst %,%_BLAKE2,$(objects))
 
-dist: 
+dist:
 	@$(PAK)
 
 ###############################################################################
-# Downloading, checking, md5sum
+# Downloading, checking, b2sum
 ###############################################################################
 
 $(patsubst %,$(DIR_CHK)/%,$(objects)) :
@@ -67,8 +71,8 @@ $(patsubst %,$(DIR_CHK)/%,$(objects)) :
 $(patsubst %,$(DIR_DL)/%,$(objects)) :
 	@$(LOAD)
 
-$(subst %,%_MD5,$(objects)) :
-	@$(MD5)
+$(subst %,%_BLAKE2,$(objects)) :
+	@$(B2SUM)
 
 ###############################################################################
 # Installation Details
@@ -77,6 +81,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 +92,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)