IPFire-SCM January 2013

ipfire-scm@lists.ipfire.org

1 participants
62 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. a161b1f112da5659de501edcbb77096723792edd
by git＠ipfire.org 02 Jan '13

02 Jan '13

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 a161b1f112da5659de501edcbb77096723792edd (commit) from 11b5b85cb8c4e937137e84efceefbef3373a47f8 (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 a161b1f112da5659de501edcbb77096723792edd Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Jan 2 12:44:54 2013 +0100 acpid: test if acpi is present. ----------------------------------------------------------------------- Summary of changes: src/initscripts/init.d/acpid | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) Difference in files: diff --git a/src/initscripts/init.d/acpid b/src/initscripts/init.d/acpid index 53fa7c6..bca69c2 100644 --- a/src/initscripts/init.d/acpid +++ b/src/initscripts/init.d/acpid @@ -9,14 +9,10 @@ . /etc/sysconfig/rc . ${rc_functions} -# ACPI daemon is only support on Intel architectures. -case "$(uname -m)" in - i?86) - ;; - *) - exit 0 - ;; -esac +# Test if ACPI is present +if [ ! -d /proc/acpi ]; then + exit 0 +fi case "${1}" in start) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 11b5b85cb8c4e937137e84efceefbef3373a47f8
by git＠ipfire.org 02 Jan '13

02 Jan '13

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 11b5b85cb8c4e937137e84efceefbef3373a47f8 (commit) via 8cd1b3b02123782f49373d2ab6b874469dac89f0 (commit) from 5c313dec7d860d47b51c69923a3d91c8f2334df5 (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 11b5b85cb8c4e937137e84efceefbef3373a47f8 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Jan 2 10:18:25 2013 +0100 asterisk: update to 1.8.19.0. commit 8cd1b3b02123782f49373d2ab6b874469dac89f0 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jan 1 21:13:59 2013 +0100 asterisk: fix rootfile. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/asterisk | 3 +++ lfs/asterisk | 12 ++++-------- 2 files changed, 7 insertions(+), 8 deletions(-) Difference in files: diff --git a/config/rootfiles/packages/asterisk b/config/rootfiles/packages/asterisk index 7a02653..f7b6cde 100644 --- a/config/rootfiles/packages/asterisk +++ b/config/rootfiles/packages/asterisk @@ -2720,3 +2720,6 @@ var/spool/asterisk/voicemail/default/1234/INBOX var/spool/asterisk/voicemail/default/1234/en var/spool/asterisk/voicemail/default/1234/en/busy.gsm var/spool/asterisk/voicemail/default/1234/en/unavail.gsm +etc/rc.d/init.d/asterisk +srv/web/ipfire/cgi-bin/asterisk +var/ipfire/menu.d/EX-asterisk.menu diff --git a/lfs/asterisk b/lfs/asterisk index afc95f5..d2b1976 100644 --- a/lfs/asterisk +++ b/lfs/asterisk @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2012 IPFire Team <info(a)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 = 1.8.13.0 +VER = 1.8.19.0 THISAPP = asterisk-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = asterisk -PAK_VER = 7 +PAK_VER = 8 CHAN_CAPI = chan_capi-20120614 @@ -44,20 +44,17 @@ DEPS = "libpri libtiff libvorbis libogg spandsp netsnmpd" objects = $(DL_FILE) \ asterisk-1.4-de-prompts.tar.gz \ - asterisk-core-sounds-en-gsm-1.4.22.tar.gz \ asterisk-extra-sounds-en-gsm-1.4.11.tar.gz \ asterisk-moh-opsound-gsm-2.03.tar.gz \ $(CHAN_CAPI).tgz $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -asterisk-core-sounds-en-gsm-1.4.22.tar.gz = $(URL_IPFIRE)/asterisk-core-sounds-en-gsm-1.4.22.tar.gz asterisk-extra-sounds-en-gsm-1.4.11.tar.gz = $(URL_IPFIRE)/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz 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 $(CHAN_CAPI).tgz = $(URL_IPFIRE)/$(CHAN_CAPI).tgz -$(DL_FILE)_MD5 = e7f2cb19068c1211c907062f9e96c47a -asterisk-core-sounds-en-gsm-1.4.22.tar.gz_MD5 = 2a99a45c0675135255bc65796b12f7c6 +$(DL_FILE)_MD5 = dc98436846cc2de57100d78747b1bdd1 asterisk-extra-sounds-en-gsm-1.4.11.tar.gz_MD5 = 5479cb4cb81d678304d96f35e4933a11 asterisk-moh-opsound-gsm-2.03.tar.gz_MD5 = 09066f55f1358f298bc1a6e4678a3ddf asterisk-1.4-de-prompts.tar.gz_MD5 = 626a2b95071a5505851e43874dfbfd5c @@ -104,7 +101,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && cp -fv $(DIR_SRC)/config/asterisk/asterisk.makeopts menuselect.makeopts # add additional sounds - cd $(DIR_APP) && cp -fv $(DIR_DL)/asterisk-core-sounds-en-gsm-1.4.22.tar.gz $(DIR_APP)/sounds/ cd $(DIR_APP) && cp -fv $(DIR_DL)/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz $(DIR_APP)/sounds/ cd $(DIR_APP) && cp -fv $(DIR_DL)/asterisk-moh-opsound-gsm-2.03.tar.gz $(DIR_APP)/sounds/ hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM January 2013