X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fnagios;h=1a88989d7ccb074ac910c696f3d2c736706406e7;hb=6a4df2fd3b375c77bbdb99a0bb8b952f7116a3f8;hp=0365b6a7cee98ab0b17939b280a5d955cb7596c4;hpb=b97ae7d966e14627aba735905c4cbdafc1ff5a93;p=ipfire-2.x.git

diff --git a/lfs/nagios b/lfs/nagios
index 0365b6a7ce..1a88989d7c 100644
--- a/lfs/nagios
+++ b/lfs/nagios
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2012  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        = 3.0.5
+VER        = 3.0.6
 
 THISAPP    = nagios-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = nagios
 PAK_VER    = 2
 
-DEPS       = "glib traceroute libtool"
+DEPS       = "traceroute"
 
 ###############################################################################
 # Top-level Rules
@@ -46,7 +46,7 @@ objects = $(DL_FILE) \
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 nagios-plugins-1.4.13.tar.gz = $(DL_FROM)/nagios-plugins-1.4.13.tar.gz
 
-$(DL_FILE)_MD5 = c607ffd5f4574cbea345bdf2e02dc480
+$(DL_FILE)_MD5 = 900e3f4164f4b2a18485420eeaefe812
 nagios-plugins-1.4.13.tar.gz_MD5 = be6cc7699fff3ee29d1fd4d562377386
 
 install : $(TARGET)
@@ -79,13 +79,14 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	@rm -rf $(DIR_APP) $(DIR_SRC)/nagios-plugins* && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && \
 		./configure --prefix=/usr \
 			--sysconfdir=/etc/nagios \
 			--datadir=/usr/share/nagios \
 			--sbindir=/usr/share/nagios/cgi-bin \
-			--localstatedir=/var \
+			--localstatedir=/var/nagios \
+			--libexecdir=/usr/lib/nagios \
 			--with-lockfile=/var/lock/nagios.lock \
 			--with-nagios-user=nobody \
 			--with-nagios-group=nobody \
@@ -96,13 +97,18 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 			--with-httpd-conf=/etc/httpd/conf/conf.d \
 			--enable-nanosleep
 	cd $(DIR_APP) && make all $(MAKETUNING)
-	cd $(DIR_APP) && make install install-init install-commandmode install-config
-	
+	cd $(DIR_APP) && make install install-init install-commandmode install-config install-webconf
+
 	cd $(DIR_SRC) && tar xfz $(DIR_DL)/nagios-plugins-1.4.13.tar.gz
 	cd $(DIR_SRC)/nagios-plugins* && ./configure --prefix=/usr \
 		--libexecdir=/usr/lib/nagios \
-		--with-nagios-user=nobody --with-nagios-group=nobody
-	cd $(DIR_SRC)/nagios-plugins* && make $(MAKETUNING)
+		--with-nagios-user=nobody --with-nagios-group=nobody \
+		--without-ipv6
+	cd $(DIR_SRC)/nagios-plugins* && make
 	cd $(DIR_SRC)/nagios-plugins* && make install
-	@rm -rf $(DIR_APP)
+	chown -R nobody:nobody /var/nagios
+	ln -s /etc/init.d/nagios /etc/rc.d/rc3.d/S67nagios
+	ln -s /etc/init.d/nagios /etc/rc.d/rc0.d/K33nagios
+	ln -s /etc/init.d/nagios /etc/rc.d/rc6.d/K33nagios
+	@rm -rf $(DIR_APP) $(DIR_SRC)/nagios-plugins*
 	@$(POSTBUILD)