X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Ficinga;h=08f607af4ab4592bb4f40e25cdd42b3988b37172;hp=ab562f24c94ff378a75f6ecea19a105b1fe89322;hb=fd0b2742bf217cbacacd4725a2bd9ad4ec1b6aaf;hpb=413abba64a7aa6a9f55533e1b2d31a7a88ee0fba

diff --git a/lfs/icinga b/lfs/icinga
index ab562f24c9..08f607af4a 100644
--- a/lfs/icinga
+++ b/lfs/icinga
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2018  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        #
@@ -25,7 +25,6 @@
 include Config
 
 VER        = 1.11.4
-PLUGIN_VER = 2.0.2
 
 THISAPP    = icinga-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -33,24 +32,19 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = icinga
-PAK_VER    = 1
+PAK_VER    = 3
 
-DEPS       = ""
-
-CFLAGS    += -fno-strict-aliasing
+DEPS       = "nagios-plugins"
 
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) nagios-plugins-$(PLUGIN_VER).tar.gz
+objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-nagios-plugins-$(PLUGIN_VER).tar.gz = \
-	$(DL_FROM)/nagios-plugins-$(PLUGIN_VER).tar.gz
 
 $(DL_FILE)_MD5 = cfe64b91ec84f5431e53959e31ff07b5
-nagios-plugins-$(PLUGIN_VER).tar.gz_MD5 = 2f6d9c43adcf9f024175e48a44d099d4
 
 install : $(TARGET)
 
@@ -83,10 +77,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_SRC)/nagios-plugins-$(PLUGIN_VER) && cd $(DIR_SRC) && \
-		tar axf $(DIR_DL)/nagios-plugins-$(PLUGIN_VER).tar.gz
-
-	# Compile core
+	$(UPDATE_AUTOMAKE)
 	cd $(DIR_APP) && \
 		./configure \
 			--prefix=/usr \
@@ -96,7 +87,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 			--sbindir=/usr/share/icinga/cgi-bin \
 			--localstatedir=/var/icinga \
 			--libdir=/usr/lib/icinga \
-			--libexecdir=/usr/lib/icinga/plugins \
+			--libexecdir=/usr/lib/nagios/plugins \
 			--with-lockfile=/var/run/icinga.pid \
 			--with-httpd-conf=/etc/httpd/conf/conf.d \
 			--with-icinga-user=nobody \
@@ -105,18 +96,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 			--enable-embedded-perl \
 			--disable-idoutils
 	cd $(DIR_APP) && make all $(MAKETUNING)
-
-	# Compile plugins
-	cd $(DIR_SRC)/nagios-plugins-$(PLUGIN_VER) && \
-		./configure \
-			--prefix=/usr \
-			--libexecdir=/usr/lib/icinga/plugins \
-			--with-nagios-user=nobody \
-			--with-nagios-group=nobody \
-			--without-ipv6
-	cd $(DIR_SRC)/nagios-plugins-$(PLUGIN_VER) && make $(MAKETUNING)
-
-	# Install core
 	cd $(DIR_APP) && make \
 		install install-init install-commandmode install-config \
 		install-webconf install-eventhandlers
@@ -124,9 +103,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	install -v -m 644 $(DIR_SRC)/config/icinga/icinga.conf \
 		/etc/httpd/conf/vhosts.d/icinga.conf
 
-	# Install plugins
-	cd $(DIR_SRC)/nagios-plugins-$(PLUGIN_VER) && make install
-
 	ln -svf /etc/rc.d/init.d/icinga /etc/rc.d/rc3.d/S67icinga
 	ln -svf /etc/rc.d/init.d/icinga /etc/rc.d/rc0.d/K33icinga
 	ln -svf /etc/rc.d/init.d/icinga /etc/rc.d/rc6.d/K33icinga
@@ -134,5 +110,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	install -v -m 644 $(DIR_SRC)/config/backup/includes/icinga \
 			 /var/ipfire/backup/addons/includes/icinga
 
-	@rm -rf $(DIR_APP) $(DIR_SRC)/nagios-plugins-$(PLUGIN_VER)
+	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)