X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fmonit;h=3720995cd86f265b3f4566f572c5b99571c0e626;hb=504e72e17317e9b153d5dc6c0198c6df7c5f750a;hp=35bb949a217e539b784dc832673ad4e420326003;hpb=e8cee92b70064358871ce28c1c8d84cc1a297d0c;p=ipfire-2.x.git

diff --git a/lfs/monit b/lfs/monit
index 35bb949a21..3720995cd8 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-2021  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
+VER        = 5.28.0
 
 THISAPP    = monit-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,9 +32,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = monit
-PAK_VER    = 1
+PAK_VER    = 14
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = c6873b0828f872676f9e7fe1476a8dc2
+$(DL_FILE)_MD5 = 778ac383dea002a5cf2330dffcc65660
 
 install : $(TARGET)
 
@@ -77,17 +77,29 @@ $(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
+	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
-	ln -sf ../init.d/pound /etc/rc.d/rc3.d/S60monit
-	ln -sf ../init.d/pound /etc/rc.d/rc0.d/K40monit
-	ln -sf ../init.d/pound /etc/rc.d/rc6.d/K40monit
+		/var/ipfire/backup/addons/includes/monit
+
+	# Install default configuration
+	install -v -m 600 $(DIR_SRC)/config/monit/monitrc /etc
+
+	#install initscripts
+	$(call INSTALL_INITSCRIPT,monit)
 
-	# Remove temporary file.
-	rm -vf /root/.rnd
+	# 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
 
-#	@rm -rf $(DIR_APP)
+	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)