This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, next has been updated via 32218ed0bab94adc0be85d37ed475869fd5ebccc (commit) via 6b6730a95f8bb7a370203716d7ae568efae74707 (commit) via f94223119075377b14f6c25c573be533f3681013 (commit) via a40a1e25f7d1e6ec648afd10c8873611d139bfd9 (commit) via 9384b26ba9f448783244d238d750293da418ec51 (commit) via 857a15f38b1c48c6eeb8109ae18d1c2ad1fbb95c (commit) via 35817283ac87378350b1149ea466a1c4432449e8 (commit) via 709564103eba30e14e25d4ebda86413dda823354 (commit) via 04ad584f354fde63a04ad5d50b4092ff044186ff (commit) from 2be0bc4410b7d2f5039eae7b464db7b8ee6564db (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 32218ed0bab94adc0be85d37ed475869fd5ebccc Merge: 6b6730a 2be0bc4 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Apr 4 14:17:12 2015 +0200

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

commit 6b6730a95f8bb7a370203716d7ae568efae74707 Merge: f942231 a40a1e2 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Apr 4 14:14:19 2015 +0200

Merge remote-tracking branch 'glotzi/monit' into next

commit f94223119075377b14f6c25c573be533f3681013 Merge: ca6be40 7095641 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Apr 4 14:12:53 2015 +0200

Merge remote-tracking branch 'glotzi/asterisk-update' into next

commit a40a1e25f7d1e6ec648afd10c8873611d139bfd9 Author: Dirk Wagner dirk.wagner@ipfire.org Date: Sun Mar 22 22:33:30 2015 +0100

mont addon: added missing dir /var/lib/monit to distribution

commit 9384b26ba9f448783244d238d750293da418ec51 Merge: 857a15f 3b9b58f Author: Dirk Wagner dirk.wagner@ipfire.org Date: Sun Mar 22 18:39:26 2015 +0100

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

commit 857a15f38b1c48c6eeb8109ae18d1c2ad1fbb95c Author: Dirk Wagner dirk.wagner@ipfire.org Date: Thu Mar 19 13:31:05 2015 +0100

monit addon: update to 5.12.1

commit 35817283ac87378350b1149ea466a1c4432449e8 Merge: 04ad584 3847730 Author: Dirk Wagner dirk.wagner@ipfire.org Date: Wed Mar 18 10:46:29 2015 +0100

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

commit 709564103eba30e14e25d4ebda86413dda823354 Author: Dirk Wagner dirk.wagner@ipfire.org Date: Thu Mar 5 22:54:07 2015 +0100

asterisk addon: update to 11.16.0

commit 04ad584f354fde63a04ad5d50b4092ff044186ff Author: Dirk Wagner dirk.wagner@ipfire.org Date: Thu Mar 5 12:21:05 2015 +0100

monit addon: update to 5.12

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/packages/monit | 1 + lfs/asterisk | 6 +++--- lfs/monit | 8 +++++--- 3 files changed, 9 insertions(+), 6 deletions(-)

Difference in files: diff --git a/config/rootfiles/packages/monit b/config/rootfiles/packages/monit index 049bab3..4477ea3 100644 --- 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 f886225..2c112d0 100755 --- 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 6c35c6c..92e0760 100644 --- 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

hooks/post-receive -- IPFire 2.x development tree