X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fmonit;h=96fe6b1a653bf37da64a1c45bc630b533c7548ee;hb=063de1600bbad5566764f6bc88f15260e2fe1288;hp=c736a14edfacf5c50f99efc170b82f8ea519ee6a;hpb=a1f23a84c7c5b60bf87b30a19451214e59793b9a;p=ipfire-2.x.git

diff --git a/lfs/monit b/lfs/monit
index c736a14edf..96fe6b1a65 100644
--- a/lfs/monit
+++ b/lfs/monit
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2009  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2017  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        = 5.8.1
+VER        = 5.23.0
 
 THISAPP    = monit-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = monit
-PAK_VER    = 2
+PAK_VER    = 10
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 9467328f1da0b644a766a387443db2ea
+$(DL_FILE)_MD5 = 5fbaf7746a233f31ad0aed416ca1d0f9
 
 install : $(TARGET)
 
@@ -54,7 +54,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
-dist: 
+dist:
 	@$(PAK)
 
 ###############################################################################
@@ -77,17 +77,26 @@ $(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 --sysconfdir=/etc --localstatedir=/var 
+	cd $(DIR_APP) && ./configure \
+	--prefix=/usr \
+	--sysconfdir=/etc \
+	--localstatedir=/var
+
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 
+	mkdir -p /var/lib/monit
+
 	install -v -m 644 $(DIR_SRC)/config/backup/includes/monit \
-			 /var/ipfire/backup/addons/includes/monit
+		/var/ipfire/backup/addons/includes/monit
+
+	# Install default configuration
+	install -v -m 600 $(DIR_SRC)/config/monit/monitrc /etc
 
-	# Install default configuration                                                                                       
-	install -v -m 644 $(DIR_SRC)/config/monit/monitrc /etc                                                                              
+	#install initscripts
+	$(call INSTALL_INITSCRIPT,monit)
 
-	# Install start links and backup include file. 
+	# Install start links and backup include file.
 	ln -sf ../init.d/monit /etc/rc.d/rc3.d/S60monit
 	ln -sf ../init.d/monit /etc/rc.d/rc0.d/K40monit
 	ln -sf ../init.d/monit /etc/rc.d/rc6.d/K40monit