X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fnagios;h=bbaed79e1bc7153302fec1ddc336a0a26990234f;hp=577451bd260c9ed312df40a72af2c82b6f1426aa;hb=b68117f5eb732adb42167c42f69d05070d099f9e;hpb=f7e2e40068f040973c7df91013587ad00bf432f2

diff --git a/lfs/nagios b/lfs/nagios
index 577451bd26..bbaed79e1b 100644
--- a/lfs/nagios
+++ b/lfs/nagios
@@ -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"
+DEPS       = "glib traceroute libtool"
 
 ###############################################################################
 # 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)
@@ -85,7 +85,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 			--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,20 @@ $(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)
 	cd $(DIR_SRC)/nagios-plugins* && make install
+	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)
 	@$(POSTBUILD)
+
+
+