X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fnagios;h=bede588494f179c7c91ca5b56a8456033211e9c2;hb=3e2f1a1d05011f1c7598b9bce798ac527082a89d;hp=c64e5ef15fc069a9747214c51cab2ce0396d22ad;hpb=2ae94d2d1ed08fceedcbaf58dd42398908548a43;p=people%2Fteissler%2Fipfire-2.x.git

diff --git a/lfs/nagios b/lfs/nagios
index c64e5ef15..bede58849 100644
--- a/lfs/nagios
+++ b/lfs/nagios
@@ -1,22 +1,20 @@
 ###############################################################################
-# This file is part of the IPCop Firewall.                                    #
 #                                                                             #
-# IPCop is free software; you can redistribute it and/or modify               #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# 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        #
-# the Free Software Foundation; either version 2 of the License, or           #
+# the Free Software Foundation, either version 3 of the License, or           #
 # (at your option) any later version.                                         #
 #                                                                             #
-# IPCop is distributed in the hope that it will be useful,                    #
+# This program is distributed in the hope that it will be useful,             #
 # but WITHOUT ANY WARRANTY; without even the implied warranty of              #
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
 # GNU General Public License for more details.                                #
 #                                                                             #
 # You should have received a copy of the GNU General Public License           #
-# along with IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -26,7 +24,7 @@
 
 include Config
 
-VER        = 2.5
+VER        = 3.0.5
 
 THISAPP    = nagios-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -34,20 +32,22 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = nagios
-PAK_VER    = 1
+PAK_VER    = 2
+
+DEPS       = "glib traceroute libtool"
 
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 
 objects = $(DL_FILE) \
-	nagios-plugins-1.4.3.tar.gz
+	nagios-plugins-1.4.13.tar.gz
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-nagios-plugins-1.4.3.tar.gz = $(URL_IPFIRE)/nagios-plugins-1.4.3.tar.gz
+nagios-plugins-1.4.13.tar.gz = $(DL_FROM)/nagios-plugins-1.4.13.tar.gz
 
-$(DL_FILE)_MD5 = 1a77528f6797bd3c0320da5e4fae2b1a
-nagios-plugins-1.4.3.tar.gz_MD5 = 2c40fc69d51cc979e85150870a1daa93
+$(DL_FILE)_MD5 = c607ffd5f4574cbea345bdf2e02dc480
+nagios-plugins-1.4.13.tar.gz_MD5 = be6cc7699fff3ee29d1fd4d562377386
 
 install : $(TARGET)
 
@@ -80,15 +80,32 @@ $(subst %,%_MD5,$(objects)) :
 $(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/nagios --with-cgiurl=/nagios/cgi-bin \
-				--with-htmurl=/nagios --with-nagios-user=nobody \
-				--with-nagios-group=nobody
-	cd $(DIR_APP) && make all
-	cd $(DIR_APP) && make install
-	### Plugins
-	cd $(DIR_SRC) && tar zxf $(DIR_DL)/nagios-plugins-1.4.3.tar.gz
-	cd $(DIR_SRC)/nagios-plugins-1.4.3 && ./configure --prefix=/usr/nagios --with-ping-command="-n %s -c %d"
-	cd $(DIR_SRC)/nagios-plugins-1.4.3 && make
-	cd $(DIR_SRC)/nagios-plugins-1.4.3 && make install
+	cd $(DIR_APP) && \
+		./configure --prefix=/usr \
+			--sysconfdir=/etc/nagios \
+			--datadir=/usr/share/nagios \
+			--sbindir=/usr/share/nagios/cgi-bin \
+			--localstatedir=/var/nagios \
+			--libexecdir=/usr/lib/nagios \
+			--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 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
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
+