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 eb5b3f95274ede9058dfd81401f7d3aa602a343d (commit) from 821f9f50ae367a8d353588e74a18661a18d8f576 (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 eb5b3f95274ede9058dfd81401f7d3aa602a343d Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Nov 2 16:44:54 2011 +0100
Asterisk: update to 1.4.42.
removed some addons that works only with zaptel.
-----------------------------------------------------------------------
Summary of changes: config/asterisk/asterisk.makeopts | 5 +++ config/rootfiles/packages/asterisk | 45 ++++++++++++++++++--------- lfs/asterisk | 58 +++++++++++++++--------------------- 3 files changed, 59 insertions(+), 49 deletions(-)
Difference in files: diff --git a/config/asterisk/asterisk.makeopts b/config/asterisk/asterisk.makeopts index 2c5c800..cac9675 100644 --- a/config/asterisk/asterisk.makeopts +++ b/config/asterisk/asterisk.makeopts @@ -6,6 +6,7 @@ MENUSELECT_FORMATS= MENUSELECT_FUNCS=func_odbc MENUSELECT_PBX=pbx_gtkconsole MENUSELECT_RES=res_config_odbc res_config_pgsql res_jabber res_odbc +MENUSELECT_TESTS=test_astobj2 test_expr test_poll test_skel MENUSELECT_OPTS_app_voicemail= MENUSELECT_CFLAGS=LOADABLE_MODULES MENUSELECT_EMBED= @@ -30,3 +31,7 @@ MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_config_odbc MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_config_pgsql MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_jabber MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_odbc +MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_astobj2 +MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_expr +MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_poll +MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_skel diff --git a/config/rootfiles/packages/asterisk b/config/rootfiles/packages/asterisk index 789ec1b..896d900 100644 --- a/config/rootfiles/packages/asterisk +++ b/config/rootfiles/packages/asterisk @@ -75,6 +75,7 @@ etc/rc.d/rc6.d/K30asterisk #usr/include/asterisk/rtp.h #usr/include/asterisk/say.h #usr/include/asterisk/sched.h +#usr/include/asterisk/select.h #usr/include/asterisk/sha1.h #usr/include/asterisk/slinfactory.h #usr/include/asterisk/smdi.h @@ -84,6 +85,7 @@ etc/rc.d/rc6.d/K30asterisk #usr/include/asterisk/strings.h #usr/include/asterisk/tdd.h #usr/include/asterisk/term.h +#usr/include/asterisk/test.h #usr/include/asterisk/threadstorage.h #usr/include/asterisk/time.h #usr/include/asterisk/tonezone_compat.h @@ -110,7 +112,6 @@ usr/lib/asterisk/modules/app_dahdibarge.so usr/lib/asterisk/modules/app_dahdiras.so usr/lib/asterisk/modules/app_dahdiscan.so usr/lib/asterisk/modules/app_db.so -usr/lib/asterisk/modules/app_devstate.so usr/lib/asterisk/modules/app_dial.so usr/lib/asterisk/modules/app_dictate.so usr/lib/asterisk/modules/app_directed_pickup.so @@ -120,7 +121,6 @@ usr/lib/asterisk/modules/app_dumpchan.so usr/lib/asterisk/modules/app_echo.so usr/lib/asterisk/modules/app_exec.so usr/lib/asterisk/modules/app_externalivr.so -usr/lib/asterisk/modules/app_fax.so usr/lib/asterisk/modules/app_festival.so usr/lib/asterisk/modules/app_flash.so usr/lib/asterisk/modules/app_followme.so @@ -139,11 +139,8 @@ usr/lib/asterisk/modules/app_mixmonitor.so usr/lib/asterisk/modules/app_morsecode.so usr/lib/asterisk/modules/app_mp3.so usr/lib/asterisk/modules/app_nbscat.so -usr/lib/asterisk/modules/app_nv_backgrounddetect.so -usr/lib/asterisk/modules/app_nv_faxdetect.so usr/lib/asterisk/modules/app_page.so usr/lib/asterisk/modules/app_parkandannounce.so -usr/lib/asterisk/modules/app_pickup2.so usr/lib/asterisk/modules/app_playback.so usr/lib/asterisk/modules/app_privacy.so usr/lib/asterisk/modules/app_queue.so @@ -171,7 +168,6 @@ usr/lib/asterisk/modules/app_test.so usr/lib/asterisk/modules/app_transfer.so usr/lib/asterisk/modules/app_url.so usr/lib/asterisk/modules/app_userevent.so -usr/lib/asterisk/modules/app_valetparking.so usr/lib/asterisk/modules/app_verbose.so usr/lib/asterisk/modules/app_voicemail.so usr/lib/asterisk/modules/app_waitforring.so @@ -226,7 +222,6 @@ usr/lib/asterisk/modules/func_channel.so usr/lib/asterisk/modules/func_curl.so usr/lib/asterisk/modules/func_cut.so usr/lib/asterisk/modules/func_db.so -usr/lib/asterisk/modules/func_devstate.so usr/lib/asterisk/modules/func_enum.so usr/lib/asterisk/modules/func_env.so usr/lib/asterisk/modules/func_global.so @@ -364,7 +359,7 @@ var/lib/asterisk/images/asterisk-intro.jpg var/lib/asterisk/keys/freeworlddialup.pub var/lib/asterisk/keys/iaxtel.pub #var/lib/asterisk/moh -var/lib/asterisk/moh/.asterisk-moh-opsound-gsm +var/lib/asterisk/moh/.asterisk-moh-opsound-gsm-2.03 var/lib/asterisk/moh/CHANGES-asterisk-moh-opsound-gsm var/lib/asterisk/moh/CREDITS-asterisk-moh-opsound-gsm var/lib/asterisk/moh/LICENSE-asterisk-moh-opsound-gsm @@ -374,14 +369,14 @@ var/lib/asterisk/moh/macroform-the_simplicity.gsm var/lib/asterisk/moh/manolo_camp-morning_coffee.gsm var/lib/asterisk/moh/reno_project-system.gsm #var/lib/asterisk/sounds -var/lib/asterisk/sounds/.asterisk-core-sounds-en-gsm-1.4.16 -var/lib/asterisk/sounds/.asterisk-extra-sounds-en-gsm-1.4.9 +var/lib/asterisk/sounds/.asterisk-core-sounds-en-gsm-1.4.20 +var/lib/asterisk/sounds/.asterisk-extra-sounds-en-gsm-1.4.11 var/lib/asterisk/sounds/1-for-am-2-for-pm.gsm var/lib/asterisk/sounds/1-yes-2-no.gsm -var/lib/asterisk/sounds/CHANGES-asterisk-core-en-1.4.16 -var/lib/asterisk/sounds/CHANGES-asterisk-extra-en-1.4.9 -var/lib/asterisk/sounds/CREDITS-asterisk-core-en-1.4.16 -var/lib/asterisk/sounds/LICENSE-asterisk-core-en-1.4.16 +var/lib/asterisk/sounds/CHANGES-asterisk-core-en-1.4.20 +var/lib/asterisk/sounds/CHANGES-asterisk-extra-en-1.4.11 +var/lib/asterisk/sounds/CREDITS-asterisk-core-en-1.4.20 +var/lib/asterisk/sounds/LICENSE-asterisk-core-en-1.4.20 var/lib/asterisk/sounds/T-changed-to.gsm var/lib/asterisk/sounds/T-is-not-available.gsm var/lib/asterisk/sounds/T-to-disable-ancmnt.gsm @@ -447,6 +442,7 @@ var/lib/asterisk/sounds/are-you-still-there2.gsm var/lib/asterisk/sounds/arizona.gsm var/lib/asterisk/sounds/arkansas.gsm var/lib/asterisk/sounds/arlington.gsm +var/lib/asterisk/sounds/ascending-2tone.gsm var/lib/asterisk/sounds/astcc-account-balance-is.gsm var/lib/asterisk/sounds/astcc-account-number-invalid.gsm var/lib/asterisk/sounds/astcc-balance-of-account-is.gsm @@ -538,7 +534,7 @@ var/lib/asterisk/sounds/carried-away-by-monkeys.gsm var/lib/asterisk/sounds/cause-code.gsm var/lib/asterisk/sounds/cc-amex.gsm var/lib/asterisk/sounds/cc-discover.gsm -var/lib/asterisk/sounds/cc-nastercard.gsm +var/lib/asterisk/sounds/cc-mastercard.gsm var/lib/asterisk/sounds/cc-visa.gsm var/lib/asterisk/sounds/celsius.gsm var/lib/asterisk/sounds/cent.gsm @@ -599,12 +595,16 @@ var/lib/asterisk/sounds/conf-lockednow.gsm var/lib/asterisk/sounds/conf-muted.gsm var/lib/asterisk/sounds/conf-noempty.gsm var/lib/asterisk/sounds/conf-nonextended.gsm +var/lib/asterisk/sounds/conf-now-muted.gsm +var/lib/asterisk/sounds/conf-now-recording.gsm +var/lib/asterisk/sounds/conf-now-unmuted.gsm var/lib/asterisk/sounds/conf-onlyone.gsm var/lib/asterisk/sounds/conf-onlyperson.gsm var/lib/asterisk/sounds/conf-onlypersonleft.gsm var/lib/asterisk/sounds/conf-otherinparty.gsm var/lib/asterisk/sounds/conf-peopleinconf.gsm var/lib/asterisk/sounds/conf-placeintoconf.gsm +var/lib/asterisk/sounds/conf-roll-callcomplete.gsm var/lib/asterisk/sounds/conf-sysop.gsm var/lib/asterisk/sounds/conf-sysopreq.gsm var/lib/asterisk/sounds/conf-sysopreqcancelled.gsm @@ -863,6 +863,7 @@ var/lib/asterisk/sounds/denver.gsm var/lib/asterisk/sounds/department-administrator.gsm var/lib/asterisk/sounds/department.gsm var/lib/asterisk/sounds/deposit.gsm +var/lib/asterisk/sounds/descending-2tone.gsm var/lib/asterisk/sounds/design.gsm var/lib/asterisk/sounds/detroit.gsm var/lib/asterisk/sounds/development.gsm @@ -926,6 +927,7 @@ var/lib/asterisk/sounds/digits/9.gsm var/lib/asterisk/sounds/digits/90.gsm var/lib/asterisk/sounds/digits/a-m.gsm var/lib/asterisk/sounds/digits/at.gsm +var/lib/asterisk/sounds/digits/billion.gsm var/lib/asterisk/sounds/digits/day-0.gsm var/lib/asterisk/sounds/digits/day-1.gsm var/lib/asterisk/sounds/digits/day-2.gsm @@ -1054,11 +1056,21 @@ var/lib/asterisk/sounds/digits/h-20.gsm var/lib/asterisk/sounds/digits/h-3.gsm var/lib/asterisk/sounds/digits/h-30.gsm var/lib/asterisk/sounds/digits/h-4.gsm +var/lib/asterisk/sounds/digits/h-40.gsm var/lib/asterisk/sounds/digits/h-5.gsm +var/lib/asterisk/sounds/digits/h-50.gsm var/lib/asterisk/sounds/digits/h-6.gsm +var/lib/asterisk/sounds/digits/h-60.gsm var/lib/asterisk/sounds/digits/h-7.gsm +var/lib/asterisk/sounds/digits/h-70.gsm var/lib/asterisk/sounds/digits/h-8.gsm +var/lib/asterisk/sounds/digits/h-80.gsm var/lib/asterisk/sounds/digits/h-9.gsm +var/lib/asterisk/sounds/digits/h-90.gsm +var/lib/asterisk/sounds/digits/h-billion.gsm +var/lib/asterisk/sounds/digits/h-hundred.gsm +var/lib/asterisk/sounds/digits/h-million.gsm +var/lib/asterisk/sounds/digits/h-thousand.gsm var/lib/asterisk/sounds/digits/hundred.gsm var/lib/asterisk/sounds/digits/million.gsm var/lib/asterisk/sounds/digits/minus.gsm @@ -1128,6 +1140,7 @@ var/lib/asterisk/sounds/el-paso.gsm var/lib/asterisk/sounds/eleventh.gsm var/lib/asterisk/sounds/email.gsm var/lib/asterisk/sounds/emergency.gsm +var/lib/asterisk/sounds/en_AU var/lib/asterisk/sounds/enabled.gsm var/lib/asterisk/sounds/encode.gsm var/lib/asterisk/sounds/engineering.gsm @@ -1763,6 +1776,7 @@ var/lib/asterisk/sounds/pascal2.gsm var/lib/asterisk/sounds/patchy.gsm var/lib/asterisk/sounds/pbx-invalid.gsm var/lib/asterisk/sounds/pbx-invalidpark.gsm +var/lib/asterisk/sounds/pbx-parkingfailed.gsm var/lib/asterisk/sounds/pbx-transfer.gsm var/lib/asterisk/sounds/pence.gsm var/lib/asterisk/sounds/pennies.gsm @@ -1955,6 +1969,7 @@ var/lib/asterisk/sounds/quarter.gsm var/lib/asterisk/sounds/queue-callswaiting.gsm var/lib/asterisk/sounds/queue-holdtime.gsm var/lib/asterisk/sounds/queue-less-than.gsm +var/lib/asterisk/sounds/queue-minute.gsm var/lib/asterisk/sounds/queue-minutes.gsm var/lib/asterisk/sounds/queue-periodic-announce.gsm var/lib/asterisk/sounds/queue-quantity1.gsm diff --git a/lfs/asterisk b/lfs/asterisk index 496e47e..8b4a02f 100644 --- a/lfs/asterisk +++ b/lfs/asterisk @@ -24,7 +24,7 @@
include Config
-VER = 1.4.28 +VER = 1.4.42
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 = 5 +PAK_VER = 6
CHAN_CAPI = chan_capi-1.1.4
@@ -44,29 +44,26 @@ DEPS = "libpri libtiff libvorbis libogg spandsp netsnmpd"
objects = $(DL_FILE) \ asterisk-1.4-de-prompts.tar.gz \ - asterisk-core-sounds-en-gsm-1.4.16.tar.gz \ - asterisk-extra-sounds-en-gsm-1.4.9.tar.gz \ - asterisk-moh-opsound-gsm.tar.gz \ - asterisk-addons-1.4.9.tar.gz \ - agx-ast-addons-svn65.tgz \ + 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 \ + asterisk-addons-1.4.13.tar.gz \ $(CHAN_CAPI).tar.gz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE) -asterisk-core-sounds-en-gsm-1.4.16.tar.gz = $(URL_IPFIRE)/asterisk-core-sounds-en-gsm-1.4.16.tar.gz -asterisk-extra-sounds-en-gsm-1.4.9.tar.gz = $(URL_IPFIRE)/asterisk-extra-sounds-en-gsm-1.4.9.tar.gz -asterisk-moh-opsound-gsm.tar.gz = $(URL_IPFIRE)/asterisk-moh-opsound-gsm.tar.gz +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 -asterisk-addons-1.4.9.tar.gz = $(URL_IPFIRE)/asterisk-addons-1.4.9.tar.gz -agx-ast-addons-svn65.tgz = $(URL_IPFIRE)/agx-ast-addons-svn65.tgz +asterisk-addons-1.4.13.tar.gz = $(URL_IPFIRE)/asterisk-addons-1.4.13.tar.gz $(CHAN_CAPI).tar.gz = $(URL_IPFIRE)/$(CHAN_CAPI).tar.gz
-$(DL_FILE)_MD5 = e8006ce319e18ce07ce1335ad583330a -asterisk-core-sounds-en-gsm-1.4.16.tar.gz_MD5 = 87145c1775141613d1471864dae12bdd -asterisk-extra-sounds-en-gsm-1.4.9.tar.gz_MD5 = ffa11b9d0128735425c43b9ce445dedf -asterisk-moh-opsound-gsm.tar.gz_MD5 = 1fa8246f532a08ecc359f5e428bd7f60 +$(DL_FILE)_MD5 = 332f2f67e0eefe84b1e55320eab45166 +asterisk-core-sounds-en-gsm-1.4.22.tar.gz_MD5 = 2a99a45c0675135255bc65796b12f7c6 +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 -asterisk-addons-1.4.9.tar.gz_MD5 = 0c0ddf2386a9541e416e122ca082e611 -agx-ast-addons-svn65.tgz_MD5 = 9372d818cc68337658110f793d0fd8e0 +asterisk-addons-1.4.13.tar.gz_MD5 = e59471b6f25901a82e45b9e5e0c73703 $(CHAN_CAPI).tar.gz_MD5 = 18fa835e724b7814deafbfa5b8cb01eb
install : $(TARGET) @@ -110,12 +107,15 @@ $(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.16.tar.gz $(DIR_APP)/sounds/ - cd $(DIR_APP) && cp -fv $(DIR_DL)/asterisk-extra-sounds-en-gsm-1.4.9.tar.gz $(DIR_APP)/sounds/ - cd $(DIR_APP) && cp -fv $(DIR_DL)/asterisk-moh-opsound-gsm.tar.gz $(DIR_APP)/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/
- # Remove wrong cpu optimization (march=armv5tel) - cd $(DIR_APP) && sed -i -e "s|^PROC=.*||g" makeopts + # Fix wrong cpu optimization (march=armv5tel) + cd $(DIR_APP) && sed -i -e "s|^PROC=armv5te.*|PROC=armv5te|g" makeopts + + # Add armv5te to gsm codecs + cd $(DIR_APP) && sed -i -e "s|armv5b |*armv5te |g" codecs/gsm/Makefile
# compile and install cd $(DIR_APP) && make $(MAKETUNING) all @@ -123,7 +123,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && make samples
# extract and configure asterisk-addons - cd $(DIR_SRC) && tar zxf $(DIR_DL)/asterisk-addons-1.4.9.tar.gz + cd $(DIR_SRC) && tar zxf $(DIR_DL)/asterisk-addons-1.4.13.tar.gz cd $(DIR_SRC)/asterisk-addons-* && ./configure --prefix=/usr --sysconfdir=/var/ipfire # enable additional features (--> NOT NEEDED, DEFAULT CONFIG INCLUDES ALL) #cd $(DIR_SRC)/asterisk-addons-* && cp -f $(DIR_SRC)/config/asterisk/addons.makeopts menuselect.makeopts @@ -152,16 +152,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_SRC)/$(CHAN_CAPI) && make install @rm -rf $(DIR_SRC)/$(CHAN_CAPI)
- # build FAX stuff (TODO: get newer version... where to download source?) - cd $(DIR_SRC) && tar zxf $(DIR_DL)/agx-ast-addons-svn65.tgz - # bugfix: disable app_confcall (not supported with dahdi, but we can take meetme) - cd $(DIR_SRC)/agx-ast-addons && echo "project (agx-ast-addons-zaptel)" > ./app-dahdi/CMakeLists.txt - cd $(DIR_SRC)/agx-ast-addons && echo >> ./app-dahdi/CMakeLists.txt - # end bugfix - cd $(DIR_SRC)/agx-ast-addons && ./configure.sh - cd $(DIR_SRC)/agx-ast-addons && ./build.sh - @rm -rf $(DIR_SRC)/agx-ast-addons - # be sure all source is removed @rm -rf $(DIR_APP) $(DIR_SRC)/asterisk-*
hooks/post-receive -- IPFire 2.x development tree