captive: One month is only 30 days instead of 210

[ipfire-2.x.git] / lfs / nagios

diff --git a/lfs/nagios b/lfs/nagios
index a59e2a43977e9ff53cbba27217e77a9ad4e5f87a..5ff1499a85cfcbd8704bc740d3d7ccaa01c8c776 100644 (file)
--- 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
@@ -32,9 +32,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = nagios
-PAK_VER    = 2
+PAK_VER    = 3
 
-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,7 +79,7 @@ $(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 \
@@ -102,14 +102,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        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
        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)
+       @rm -rf $(DIR_APP) $(DIR_SRC)/nagios-plugins*
        @$(POSTBUILD)
-
-