Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

diff --git a/config/rootfiles/packages/monit b/config/rootfiles/packages/monit
index 049bab351a5072defe29994f5c84f16933d27fa2..4477ea3d207c414bded7d4c4a2911a641ba4aeda 100644 (file)
--- a/config/rootfiles/packages/monit
+++ b/config/rootfiles/packages/monit
@@ -1,6 +1,7 @@
 etc/monitrc
 usr/bin/monit
 #usr/share/man/man1/monit.1
+var/lib/monit
 var/ipfire/backup/addons/includes/monit
 etc/rc.d/init.d/monit
 etc/rc.d/rc0.d/K40monit

diff --git a/lfs/asterisk b/lfs/asterisk
index f886225257c6d21e903d7ccb7859e7a4031fd5e9..2c112d0ad2623dc0245190206487e52be2e79d31 100755 (executable)
--- a/lfs/asterisk
+++ b/lfs/asterisk
@@ -20,7 +20,7 @@
 
 include Config
 
-VER        = 11.15.0
+VER        = 11.16.0
 
 THISAPP    = asterisk-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -28,7 +28,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = asterisk
-PAK_VER    = 14
+PAK_VER    = 15
 
 DEPS       = "libsrtp"
 
@@ -46,7 +46,7 @@ asterisk-extra-sounds-en-gsm-1.4.15.tar.gz = $(URL_IPFIRE)/asterisk-extra-sounds
 asterisk-moh-opsound-gsm-2.03.tar.gz = $(URL_IPFIRE)/asterisk-moh-opsound-gsm-2.03.tar.gz
 asterisk-1.4-de-prompts.tar.gz = $(URL_IPFIRE)/asterisk-1.4-de-prompts.tar.gz
 
-$(DL_FILE)_MD5 = 71e8c2e207255f7ef12b81b7f0da30ea
+$(DL_FILE)_MD5 = de06d4ac0d1ba531c4c18805a9d5a18d
 asterisk-extra-sounds-en-gsm-1.4.15.tar.gz_MD5 = 5099fc65f49008e33ba7fb043a4ec995
 asterisk-moh-opsound-gsm-2.03.tar.gz_MD5 = 09066f55f1358f298bc1a6e4678a3ddf
 asterisk-1.4-de-prompts.tar.gz_MD5 = 626a2b95071a5505851e43874dfbfd5c

diff --git a/lfs/monit b/lfs/monit
index 6c35c6ced91f74ad39773a19c3a6c8d8d4204d38..92e0760023b1780efd930dd44220d442e977d2e4 100644 (file)
--- a/lfs/monit
+++ b/lfs/monit
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 5.11
+VER        = 5.12.1
 
 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    = 3
+PAK_VER    = 6
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ff00f39d248ed7068932ed82211da9e6
+$(DL_FILE)_MD5 = 1ffde79207270925f6f7df787d19100a
 
 install : $(TARGET)
 
@@ -81,6 +81,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        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