Updated nagios to 3.0.5.

diff --git a/lfs/nagios b/lfs/nagios
index 2b60af4f7242661e5ef3f3e9436f173cc6dffe38..577451bd260c9ed312df40a72af2c82b6f1426aa 100644 (file)
--- a/lfs/nagios
+++ b/lfs/nagios
@@ -24,7 +24,7 @@
 
 include Config
 
 
 include Config
 

-VER        = 3.0
+VER        = 3.0.5

 
 THISAPP    = nagios-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 
 THISAPP    = nagios-$(VER)
 DL_FILE    = $(THISAPP).tar.gz


@@ -32,19 +32,22 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = nagios
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = nagios

-PAK_VER    = 1
+PAK_VER    = 2

 
 

-DEPS       = "glib"
+DEPS       = "glib traceroute"

 
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 
 
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 

-objects = $(DL_FILE)
+objects = $(DL_FILE) \
+       nagios-plugins-1.4.13.tar.gz

 
 $(DL_FILE) = $(DL_FROM)/$(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 = 2e7b82622d187d88a3b94f48b8549630
+$(DL_FILE)_MD5 = c607ffd5f4574cbea345bdf2e02dc480
+nagios-plugins-1.4.13.tar.gz_MD5 = be6cc7699fff3ee29d1fd4d562377386

 
 install : $(TARGET)
 
 
 install : $(TARGET)
 


@@ -77,18 +80,29 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)

-       cd $(DIR_APP) && ./configure --prefix=/usr \
-                                                                                               --datadir=/usr/share/nagios \
-                                                                                               --sbindir=/usr/share/nagios/cgi-bin \
-                                                                                               --localstatedir=/var \
-                                                                                               --with-nagios-user=nobody \
-                                                                                               --with-nagios-group=nobody \
-                                                                                               --with-command-user=nobody \
-                                                                                               --with-command-group=nobody \
-                                                                                               --enable-embedded-perl \
-                                                                                               --with-perlcache \
-                                                                                               --with-httpd-conf=/etc/httpd/conf/conf.d
+       cd $(DIR_APP) && \
+               ./configure --prefix=/usr \
+                       --sysconfdir=/etc/nagios \
+                       --datadir=/usr/share/nagios \
+                       --sbindir=/usr/share/nagios/cgi-bin \
+                       --localstatedir=/var \
+                       --with-lockfile=/var/lock/nagios.lock \
+                       --with-nagios-user=nobody \
+                       --with-nagios-group=nobody \
+                       --with-command-user=nobody \
+                       --with-command-group=nobody \
+                       --enable-embedded-perl \
+                       --with-perlcache \
+                       --with-httpd-conf=/etc/httpd/conf/conf.d \
+                       --enable-nanosleep

        cd $(DIR_APP) && make all $(MAKETUNING)
        cd $(DIR_APP) && make all $(MAKETUNING)

-       cd $(DIR_APP) && make install
+       cd $(DIR_APP) && make install install-init install-commandmode install-config
+       
+       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

        @rm -rf $(DIR_APP)
        @$(POSTBUILD)
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)