From: Dirk Wagner Date: Tue, 23 Dec 2014 08:02:23 +0000 (+0100) Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into asterisk-update X-Git-Tag: v2.17-core89~83 X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=601f8347ccb1e9c5e3f250ff26d4097ecd698875;hp=405d20bcb33efccd16a7164e318adeb954d7639a Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into asterisk-update --- diff --git a/config/asterisk/asterisk.logrotate b/config/asterisk/asterisk.logrotate new file mode 100644 index 0000000000..887d04a33a --- /dev/null +++ b/config/asterisk/asterisk.logrotate @@ -0,0 +1,9 @@ +/var/log/asterisk/messages /var/log/asterisk/full /var/log/asterisk/security /var/log/asterisk/*_log { + weekly + missingok + rotate 4 + sharedscripts + postrotate + /usr/sbin/asterisk -rx 'logger reload' > /dev/null 2> /dev/null + endscript +} diff --git a/config/asterisk/asterisk.makeopts b/config/asterisk/asterisk.makeopts deleted file mode 100644 index 60a311b0b7..0000000000 --- a/config/asterisk/asterisk.makeopts +++ /dev/null @@ -1,96 +0,0 @@ -MENUSELECT_ADDONS=format_mp3 -MENUSELECT_APPS=app_flash app_meetme app_page app_dahdiras app_fax app_jack app_osplookup app_dahdibarge -MENUSELECT_BRIDGES= -MENUSELECT_CDR=cdr_adaptive_odbc cdr_odbc cdr_pgsql cdr_radius cdr_tds cdr_sqlite -MENUSELECT_CEL=cel_odbc cel_pgsql cel_radius cel_tds -MENUSELECT_CHANNELS=chan_dahdi chan_console chan_gtalk chan_jingle chan_misdn chan_nbs chan_vpb chan_h323 -MENUSELECT_CODECS=codec_dahdi codec_resample codec_speex -MENUSELECT_FORMATS= -MENUSELECT_FUNCS=func_odbc func_speex -MENUSELECT_PBX=pbx_lua -MENUSELECT_RES=res_calendar_caldav res_calendar_ews res_calendar_exchange res_calendar_icalendar res_config_odbc res_http_post res_odbc res_srtp res_timing_dahdi res_ais res_config_pgsql res_config_sqlite res_jabber res_timing_kqueue -MENUSELECT_TESTS=test_acl test_amihooks test_aoc test_app test_ast_format_str_reduce test_astobj2 test_config test_db test_devicestate test_dlinklists test_event test_expr test_func_file test_gosub test_heap test_linkedlists test_locale test_logger test_netsock2 test_pbx test_poll test_sched test_security_events test_skel test_stringfields test_strings test_substitution test_time test_utils -MENUSELECT_CFLAGS=LOADABLE_MODULES -MENUSELECT_OPTS_app_voicemail=FILE_STORAGE -MENUSELECT_UTILS=astcanary aelparse astman check_expr check_expr2 conf2ael hashtest hashtest2 muted refcounter smsq stereorize streamplayer -MENUSELECT_AGIS= -MENUSELECT_EMBED= -MENUSELECT_CORE_SOUNDS=CORE-SOUNDS-EN-GSM -MENUSELECT_MOH=MOH-OPSOUND-GSM -MENUSELECT_EXTRA_SOUNDS=EXTRA-SOUNDS-EN-GSM -MENUSELECT_BUILD_DEPS=chan_local app_voicemail res_monitor res_agi res_adsi res_smdi res_crypto res_pktccops res_ael_share res_fax G711_NEW_ALGORITHM -MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_flash -MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_meetme -MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_page -MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_dahdiras -MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_jack -MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_osplookup -MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_dahdibarge -MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_adaptive_odbc -MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_odbc -MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_pgsql -MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_radius -MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_tds -MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_sqlite -MENUSELECT_DEPSFAILED=MENUSELECT_CEL=cel_odbc -MENUSELECT_DEPSFAILED=MENUSELECT_CEL=cel_pgsql -MENUSELECT_DEPSFAILED=MENUSELECT_CEL=cel_radius -MENUSELECT_DEPSFAILED=MENUSELECT_CEL=cel_tds -MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_dahdi -MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_console -MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_gtalk -MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_jingle -MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_misdn -MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_nbs -MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_vpb -MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_h323 -MENUSELECT_DEPSFAILED=MENUSELECT_CODECS=codec_dahdi -MENUSELECT_DEPSFAILED=MENUSELECT_CODECS=codec_resample -MENUSELECT_DEPSFAILED=MENUSELECT_CODECS=codec_speex -MENUSELECT_DEPSFAILED=MENUSELECT_FUNCS=func_odbc -MENUSELECT_DEPSFAILED=MENUSELECT_FUNCS=func_speex -MENUSELECT_DEPSFAILED=MENUSELECT_PBX=pbx_lua -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_calendar_caldav -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_calendar_ews -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_calendar_exchange -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_calendar_icalendar -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_config_odbc -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_http_post -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_odbc -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_srtp -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_timing_dahdi -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_ais -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_config_pgsql -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_config_sqlite -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_jabber -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_timing_kqueue -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_acl -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_amihooks -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_aoc -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_app -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_ast_format_str_reduce -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_astobj2 -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_config -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_db -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_devicestate -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_dlinklists -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_event -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_expr -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_func_file -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_gosub -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_heap -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_linkedlists -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_locale -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_logger -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_netsock2 -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_pbx -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_poll -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_sched -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_security_events -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_skel -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_stringfields -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_strings -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_substitution -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_time -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_utils -MENUSELECT_DEPSFAILED=MENUSELECT_CFLAGS=BUILD_NATIVE diff --git a/config/asterisk/wakeup/source/536.call b/config/asterisk/wakeup/source/536.call deleted file mode 100644 index 6b2862c270..0000000000 --- a/config/asterisk/wakeup/source/536.call +++ /dev/null @@ -1,8 +0,0 @@ -ktiv;Mon;Tue;Wed;Thu;Fri;;;05:00 -Channel: SIP/536 -MaxRetries: 3 -RetryTime: 45 -WaitTime: 30 -Context: service -Extension: 609 -Callerid: WakeUP <536> diff --git a/config/asterisk/wakeup/source/bsp.call.tpl b/config/asterisk/wakeup/source/bsp.call.tpl deleted file mode 100644 index c5b2ab1544..0000000000 --- a/config/asterisk/wakeup/source/bsp.call.tpl +++ /dev/null @@ -1,8 +0,0 @@ -Aktiv;Mon;Tue;Wed;Thu;Fri;Sat;Sun;05:00 -Channel: SIP/536 -MaxRetries: 3 -RetryTime: 45 -WaitTime: 30 -Context: service -Extension: 609 -Callerid: WakeUP <536> diff --git a/config/asterisk/wakeup/wakeup.sh b/config/asterisk/wakeup/wakeup.sh deleted file mode 100644 index 25d7362136..0000000000 --- a/config/asterisk/wakeup/wakeup.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -CALL_P=/var/spool/asterisk/outgoing/ -SOURCE=/var/ipfire/asterisk/wakeup/source/ -TMP=/var/ipfire/asterisk/wakeup/tmp/ -EXT=".call" -DAY=$(/bin/date '+%a') -NOW=$(/bin/date '+%H:%M') - -for f in $(/bin/find ${SOURCE} -type f -name "*${EXT}") -do - if $(/bin/head -1 $f | /bin/egrep -i -q "aktiv") - then - if [ "${1}#" = "debug#" ]; then echo "File Aktiv"; fi - BASEN=$(/usr/bin/basename $f) - if $(/bin/head -1 $f | /bin/egrep -i -q "${DAY}") - then - if [ "${1}#" = "debug#" ]; then echo "Tag vorhanden in ${BASEN}"; fi - NOW2=$(cat $f | head -1 | sed 's/.*;//g' | sed 's/\r//g') - if test "${NOW}#" = "${NOW2}#" - then - if [ "${1}#" = "debug#" ]; then echo "Weckruf wird gestartet"; fi - LAENG=$(wc -l $f) - if [ "${1}#" = "debug#" ]; then echo "/usr/bin/tail -n$(( ${LAENG%% *}-1 )) $f >${TMP}${BASEN}"; else /usr/bin/tail -n$(( ${LAENG%% *}-1 )) $f >${TMP}${BASEN}; fi - if [ "${1}#" = "debug#" ]; then echo /bin/mv ${TMP}${BASEN} ${CALL_P}; else /bin/mv ${TMP}${BASEN} ${CALL_P}; fi - else if [ "${1}#" = "debug#" ]; then echo "Tag ok aber Zeit noch nicht #${NOW}!=${NOW2}#"; fi - fi - else if [ "${1}#" = "debug#" ]; then echo "Tag nicht vorhanden in ${f}"; fi - fi - else if [ "${1}#" = "debug#" ]; then echo "File ${f} nicht aktiv"; fi - fi -done - -# /usr/bin/logger -t ipfire Asterisk Wakeup Run - -# wenn als erster Parameter debug mit gegeben wird, wird alles nur via echo behandelt -# Infos unter: http://www.das-asterisk-buch.de/unstable/call-file.html -# oder: http://www.voip-info.org/wiki-Asterisk+auto-dial+out - -##EOF## diff --git a/config/rootfiles/packages/asterisk b/config/rootfiles/packages/asterisk old mode 100644 new mode 100755 index 1b0eb9d1a5..332c22b96c --- a/config/rootfiles/packages/asterisk +++ b/config/rootfiles/packages/asterisk @@ -1,5 +1,6 @@ +usr/lib/libsrtp.so etc/asterisk -etc/fcron.minutely/wakeup.sh +etc/logrotate.d/asterisk etc/rc.d/rc0.d/K30asterisk etc/rc.d/rc3.d/S30asterisk etc/rc.d/rc6.d/K30asterisk @@ -36,13 +37,16 @@ etc/rc.d/rc6.d/K30asterisk #usr/include/asterisk/ccss.h #usr/include/asterisk/cdr.h #usr/include/asterisk/cel.h +#usr/include/asterisk/celt.h #usr/include/asterisk/channel.h +#usr/include/asterisk/channel_internal.h #usr/include/asterisk/channelstate.h #usr/include/asterisk/chanvars.h #usr/include/asterisk/cli.h #usr/include/asterisk/compat.h #usr/include/asterisk/compiler.h #usr/include/asterisk/config.h +#usr/include/asterisk/config_options.h #usr/include/asterisk/crypto.h #usr/include/asterisk/data.h #usr/include/asterisk/datastore.h @@ -69,6 +73,9 @@ etc/rc.d/rc6.d/K30asterisk #usr/include/asterisk/extconf.h #usr/include/asterisk/features.h #usr/include/asterisk/file.h +#usr/include/asterisk/format.h +#usr/include/asterisk/format_cap.h +#usr/include/asterisk/format_pref.h #usr/include/asterisk/frame.h #usr/include/asterisk/frame_defs.h #usr/include/asterisk/framehook.h @@ -79,6 +86,7 @@ etc/rc.d/rc6.d/K30asterisk #usr/include/asterisk/hashtab.h #usr/include/asterisk/heap.h #usr/include/asterisk/http.h +#usr/include/asterisk/http_websocket.h #usr/include/asterisk/image.h #usr/include/asterisk/indications.h #usr/include/asterisk/inline_api.h @@ -91,6 +99,7 @@ etc/rc.d/rc6.d/K30asterisk #usr/include/asterisk/logger.h #usr/include/asterisk/manager.h #usr/include/asterisk/md5.h +#usr/include/asterisk/message.h #usr/include/asterisk/mod_format.h #usr/include/asterisk/module.h #usr/include/asterisk/monitor.h @@ -105,6 +114,7 @@ etc/rc.d/rc6.d/K30asterisk #usr/include/asterisk/pktccops.h #usr/include/asterisk/plc.h #usr/include/asterisk/poll-compat.h +#usr/include/asterisk/presencestate.h #usr/include/asterisk/privacy.h #usr/include/asterisk/pval.h #usr/include/asterisk/res_fax.h @@ -117,6 +127,8 @@ etc/rc.d/rc6.d/K30asterisk #usr/include/asterisk/security_events_defs.h #usr/include/asterisk/select.h #usr/include/asterisk/sha1.h +#usr/include/asterisk/silk.h +#usr/include/asterisk/sip_api.h #usr/include/asterisk/slin.h #usr/include/asterisk/slinfactory.h #usr/include/asterisk/smdi.h @@ -143,6 +155,39 @@ etc/rc.d/rc6.d/K30asterisk #usr/include/asterisk/version.h #usr/include/asterisk/xml.h #usr/include/asterisk/xmldoc.h +#usr/include/asterisk/xmpp.h +#usr/include/srtp +#usr/include/srtp/aes.h +#usr/include/srtp/aes_cbc.h +#usr/include/srtp/aes_icm.h +#usr/include/srtp/alloc.h +#usr/include/srtp/auth.h +#usr/include/srtp/cipher.h +#usr/include/srtp/config.h +#usr/include/srtp/crypto.h +#usr/include/srtp/crypto_kernel.h +#usr/include/srtp/crypto_math.h +#usr/include/srtp/crypto_types.h +#usr/include/srtp/cryptoalg.h +#usr/include/srtp/datatypes.h +#usr/include/srtp/err.h +#usr/include/srtp/gf2_8.h +#usr/include/srtp/hmac.h +#usr/include/srtp/integers.h +#usr/include/srtp/kernel_compat.h +#usr/include/srtp/key.h +#usr/include/srtp/null_auth.h +#usr/include/srtp/null_cipher.h +#usr/include/srtp/prng.h +#usr/include/srtp/rand_source.h +#usr/include/srtp/rdb.h +#usr/include/srtp/rdbx.h +#usr/include/srtp/rtp.h +#usr/include/srtp/sha1.h +#usr/include/srtp/srtp.h +#usr/include/srtp/stat.h +#usr/include/srtp/ut_sim.h +#usr/include/srtp/xfm.h #usr/lib/asterisk #usr/lib/asterisk/modules usr/lib/asterisk/modules/app_adsiprog.so @@ -172,7 +217,6 @@ usr/lib/asterisk/modules/app_forkcdr.so usr/lib/asterisk/modules/app_getcpeid.so usr/lib/asterisk/modules/app_ices.so usr/lib/asterisk/modules/app_image.so -usr/lib/asterisk/modules/app_ivrdemo.so usr/lib/asterisk/modules/app_macro.so usr/lib/asterisk/modules/app_milliwatt.so usr/lib/asterisk/modules/app_minivm.so @@ -182,6 +226,7 @@ usr/lib/asterisk/modules/app_mp3.so usr/lib/asterisk/modules/app_mysql.so usr/lib/asterisk/modules/app_nbscat.so usr/lib/asterisk/modules/app_originate.so +usr/lib/asterisk/modules/app_page.so usr/lib/asterisk/modules/app_parkandannounce.so usr/lib/asterisk/modules/app_playback.so usr/lib/asterisk/modules/app_playtones.so @@ -189,15 +234,10 @@ usr/lib/asterisk/modules/app_privacy.so usr/lib/asterisk/modules/app_queue.so usr/lib/asterisk/modules/app_read.so usr/lib/asterisk/modules/app_readexten.so -usr/lib/asterisk/modules/app_readfile.so usr/lib/asterisk/modules/app_record.so -usr/lib/asterisk/modules/app_saycounted.so -usr/lib/asterisk/modules/app_saycountpl.so usr/lib/asterisk/modules/app_sayunixtime.so usr/lib/asterisk/modules/app_senddtmf.so usr/lib/asterisk/modules/app_sendtext.so -usr/lib/asterisk/modules/app_setcallerid.so -usr/lib/asterisk/modules/app_skel.so usr/lib/asterisk/modules/app_sms.so usr/lib/asterisk/modules/app_softhangup.so usr/lib/asterisk/modules/app_speech_utils.so @@ -231,14 +271,10 @@ usr/lib/asterisk/modules/cel_sqlite3_custom.so usr/lib/asterisk/modules/chan_agent.so usr/lib/asterisk/modules/chan_alsa.so usr/lib/asterisk/modules/chan_bridge.so -usr/lib/asterisk/modules/chan_capi.so usr/lib/asterisk/modules/chan_iax2.so usr/lib/asterisk/modules/chan_local.so usr/lib/asterisk/modules/chan_mgcp.so -usr/lib/asterisk/modules/chan_mobile.so usr/lib/asterisk/modules/chan_multicast_rtp.so -usr/lib/asterisk/modules/chan_ooh323.so -usr/lib/asterisk/modules/chan_oss.so usr/lib/asterisk/modules/chan_phone.so usr/lib/asterisk/modules/chan_sip.so usr/lib/asterisk/modules/chan_skinny.so @@ -251,6 +287,7 @@ usr/lib/asterisk/modules/codec_g726.so usr/lib/asterisk/modules/codec_gsm.so usr/lib/asterisk/modules/codec_ilbc.so usr/lib/asterisk/modules/codec_lpc10.so +usr/lib/asterisk/modules/codec_resample.so usr/lib/asterisk/modules/codec_ulaw.so usr/lib/asterisk/modules/format_g719.so usr/lib/asterisk/modules/format_g723.so @@ -261,12 +298,11 @@ usr/lib/asterisk/modules/format_h263.so usr/lib/asterisk/modules/format_h264.so usr/lib/asterisk/modules/format_ilbc.so usr/lib/asterisk/modules/format_jpeg.so -usr/lib/asterisk/modules/format_ogg_vorbis.so +#usr/lib/asterisk/modules/format_ogg_vorbis.so usr/lib/asterisk/modules/format_pcm.so usr/lib/asterisk/modules/format_siren14.so usr/lib/asterisk/modules/format_siren7.so usr/lib/asterisk/modules/format_sln.so -usr/lib/asterisk/modules/format_sln16.so usr/lib/asterisk/modules/format_vox.so usr/lib/asterisk/modules/format_wav.so usr/lib/asterisk/modules/format_wav_gsm.so @@ -291,13 +327,16 @@ usr/lib/asterisk/modules/func_extstate.so usr/lib/asterisk/modules/func_frame_trace.so usr/lib/asterisk/modules/func_global.so usr/lib/asterisk/modules/func_groupcount.so +usr/lib/asterisk/modules/func_hangupcause.so usr/lib/asterisk/modules/func_iconv.so +usr/lib/asterisk/modules/func_jitterbuffer.so usr/lib/asterisk/modules/func_lock.so usr/lib/asterisk/modules/func_logic.so usr/lib/asterisk/modules/func_math.so usr/lib/asterisk/modules/func_md5.so usr/lib/asterisk/modules/func_module.so usr/lib/asterisk/modules/func_pitchshift.so +usr/lib/asterisk/modules/func_presencestate.so usr/lib/asterisk/modules/func_rand.so usr/lib/asterisk/modules/func_realtime.so usr/lib/asterisk/modules/func_sha1.so @@ -326,58 +365,59 @@ usr/lib/asterisk/modules/res_clioriginate.so usr/lib/asterisk/modules/res_config_curl.so usr/lib/asterisk/modules/res_config_ldap.so usr/lib/asterisk/modules/res_config_mysql.so +usr/lib/asterisk/modules/res_config_sqlite3.so usr/lib/asterisk/modules/res_convert.so usr/lib/asterisk/modules/res_crypto.so usr/lib/asterisk/modules/res_curl.so usr/lib/asterisk/modules/res_fax.so -usr/lib/asterisk/modules/res_fax_spandsp.so +#usr/lib/asterisk/modules/res_fax_spandsp.so +usr/lib/asterisk/modules/res_format_attr_celt.so +usr/lib/asterisk/modules/res_format_attr_h263.so +usr/lib/asterisk/modules/res_format_attr_h264.so +usr/lib/asterisk/modules/res_format_attr_silk.so +usr/lib/asterisk/modules/res_http_websocket.so usr/lib/asterisk/modules/res_limit.so usr/lib/asterisk/modules/res_monitor.so usr/lib/asterisk/modules/res_musiconhold.so usr/lib/asterisk/modules/res_mutestream.so usr/lib/asterisk/modules/res_phoneprov.so -usr/lib/asterisk/modules/res_pktccops.so usr/lib/asterisk/modules/res_realtime.so usr/lib/asterisk/modules/res_rtp_asterisk.so usr/lib/asterisk/modules/res_rtp_multicast.so usr/lib/asterisk/modules/res_security_log.so usr/lib/asterisk/modules/res_smdi.so -usr/lib/asterisk/modules/res_snmp.so usr/lib/asterisk/modules/res_speech.so +usr/lib/asterisk/modules/res_srtp.so usr/lib/asterisk/modules/res_stun_monitor.so usr/lib/asterisk/modules/res_timing_pthread.so usr/lib/asterisk/modules/res_timing_timerfd.so +usr/lib/libasteriskssl.so +usr/lib/libasteriskssl.so.1 +#usr/lib/libsrtp.a #usr/lib/pkgconfig/asterisk.pc -usr/sbin/aelparse usr/sbin/astcanary +usr/sbin/astdb2bdb +usr/sbin/astdb2sqlite3 usr/sbin/asterisk usr/sbin/astgenkey -usr/sbin/astman usr/sbin/autosupport -usr/sbin/check_expr -usr/sbin/check_expr2 -usr/sbin/conf2ael -usr/sbin/hashtest -usr/sbin/hashtest2 -usr/sbin/muted usr/sbin/rasterisk -usr/sbin/refcounter usr/sbin/safe_asterisk -usr/sbin/smsq -usr/sbin/stereorize -usr/sbin/streamplayer +#usr/share/man/man8/astdb2bdb.8 +#usr/share/man/man8/astdb2sqlite3.8 #usr/share/man/man8/asterisk.8 #usr/share/man/man8/astgenkey.8 #usr/share/man/man8/autosupport.8 #usr/share/man/man8/safe_asterisk.8 #var/ipfire/asterisk +var/ipfire/asterisk/acl.conf var/ipfire/asterisk/adsi.conf var/ipfire/asterisk/agents.conf -var/ipfire/asterisk/ais.conf var/ipfire/asterisk/alarmreceiver.conf var/ipfire/asterisk/alsa.conf var/ipfire/asterisk/amd.conf var/ipfire/asterisk/app_mysql.conf +var/ipfire/asterisk/app_skel.conf var/ipfire/asterisk/asterisk.adsi var/ipfire/asterisk/asterisk.conf #var/ipfire/asterisk/asterisk.makeopts @@ -401,11 +441,12 @@ var/ipfire/asterisk/cel_sqlite3_custom.conf var/ipfire/asterisk/cel_tds.conf var/ipfire/asterisk/chan_dahdi.conf var/ipfire/asterisk/chan_mobile.conf -var/ipfire/asterisk/chan_ooh323.conf var/ipfire/asterisk/cli.conf var/ipfire/asterisk/cli_aliases.conf var/ipfire/asterisk/cli_permissions.conf var/ipfire/asterisk/codecs.conf +var/ipfire/asterisk/confbridge.conf +var/ipfire/asterisk/config_test.conf var/ipfire/asterisk/console.conf var/ipfire/asterisk/dbsep.conf var/ipfire/asterisk/dnsmgr.conf @@ -436,8 +477,10 @@ var/ipfire/asterisk/mgcp.conf var/ipfire/asterisk/minivm.conf var/ipfire/asterisk/misdn.conf var/ipfire/asterisk/modules.conf +var/ipfire/asterisk/motif.conf var/ipfire/asterisk/musiconhold.conf var/ipfire/asterisk/muted.conf +var/ipfire/asterisk/ooh323.conf var/ipfire/asterisk/osp.conf var/ipfire/asterisk/oss.conf var/ipfire/asterisk/phone.conf @@ -446,6 +489,8 @@ var/ipfire/asterisk/queuerules.conf var/ipfire/asterisk/queues.conf var/ipfire/asterisk/res_config_mysql.conf var/ipfire/asterisk/res_config_sqlite.conf +var/ipfire/asterisk/res_config_sqlite3.conf +var/ipfire/asterisk/res_corosync.conf var/ipfire/asterisk/res_curl.conf var/ipfire/asterisk/res_fax.conf var/ipfire/asterisk/res_ldap.conf @@ -467,34 +512,39 @@ var/ipfire/asterisk/unistim.conf var/ipfire/asterisk/users.conf var/ipfire/asterisk/voicemail.conf var/ipfire/asterisk/vpb.conf -#var/ipfire/asterisk/wakeup -#var/ipfire/asterisk/wakeup/source -var/ipfire/asterisk/wakeup/source/536.call -var/ipfire/asterisk/wakeup/source/bsp.call.tpl -var/ipfire/asterisk/wakeup/wakeup.sh +var/ipfire/asterisk/xmpp.conf var/ipfire/backup/addons/includes/asterisk #var/lib/asterisk -#var/lib/asterisk/agi-bin +var/lib/asterisk/agi-bin #var/lib/asterisk/documentation #var/lib/asterisk/documentation/appdocsxml.dtd #var/lib/asterisk/documentation/core-en_US.xml #var/lib/asterisk/documentation/thirdparty #var/lib/asterisk/firmware -#var/lib/asterisk/firmware/iax +var/lib/asterisk/firmware/iax #var/lib/asterisk/images -var/lib/asterisk/images/asterisk-intro.jpg -var/lib/asterisk/images/kpad2.jpg -#var/lib/asterisk/keys +#var/lib/asterisk/images/asterisk-intro.jpg +#var/lib/asterisk/images/kpad2.jpg +var/lib/asterisk/keys #var/lib/asterisk/moh var/lib/asterisk/moh/.asterisk-moh-opsound-gsm-2.03 +var/lib/asterisk/moh/.asterisk-moh-opsound-wav-2.03 var/lib/asterisk/moh/CHANGES-asterisk-moh-opsound-gsm +var/lib/asterisk/moh/CHANGES-asterisk-moh-opsound-wav var/lib/asterisk/moh/CREDITS-asterisk-moh-opsound-gsm +var/lib/asterisk/moh/CREDITS-asterisk-moh-opsound-wav var/lib/asterisk/moh/LICENSE-asterisk-moh-opsound-gsm +var/lib/asterisk/moh/LICENSE-asterisk-moh-opsound-wav var/lib/asterisk/moh/macroform-cold_day.gsm +var/lib/asterisk/moh/macroform-cold_day.wav var/lib/asterisk/moh/macroform-robot_dity.gsm +var/lib/asterisk/moh/macroform-robot_dity.wav var/lib/asterisk/moh/macroform-the_simplicity.gsm +var/lib/asterisk/moh/macroform-the_simplicity.wav var/lib/asterisk/moh/manolo_camp-morning_coffee.gsm +var/lib/asterisk/moh/manolo_camp-morning_coffee.wav var/lib/asterisk/moh/reno_project-system.gsm +var/lib/asterisk/moh/reno_project-system.wav var/lib/asterisk/phoneprov var/lib/asterisk/phoneprov/000000000000-directory.xml var/lib/asterisk/phoneprov/000000000000-phone.cfg @@ -820,14 +870,14 @@ var/lib/asterisk/sounds/digits/de/xh-8x.gsm var/lib/asterisk/sounds/digits/de/xh-9x.gsm var/lib/asterisk/sounds/digits/de/yesterday.gsm var/lib/asterisk/sounds/en -var/lib/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.4.22 -var/lib/asterisk/sounds/en/.asterisk-extra-sounds-en-gsm-1.4.11 +var/lib/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.4.26 +var/lib/asterisk/sounds/en/.asterisk-extra-sounds-en-gsm-1.4.15 var/lib/asterisk/sounds/en/1-for-am-2-for-pm.gsm var/lib/asterisk/sounds/en/1-yes-2-no.gsm -var/lib/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.22 -var/lib/asterisk/sounds/en/CHANGES-asterisk-extra-en-1.4.11 -var/lib/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.22 -var/lib/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.22 +var/lib/asterisk/sounds/en/OfficeSpace.gsm +var/lib/asterisk/sounds/en/Randulo-allison.gsm +var/lib/asterisk/sounds/en/SIP_Test_Failure.gsm +var/lib/asterisk/sounds/en/SIP_Test_Success.gsm var/lib/asterisk/sounds/en/T-changed-to.gsm var/lib/asterisk/sounds/en/T-is-not-available.gsm var/lib/asterisk/sounds/en/T-to-disable-ancmnt.gsm @@ -850,6 +900,7 @@ var/lib/asterisk/sounds/en/access-denied.gsm var/lib/asterisk/sounds/en/access-granted.gsm var/lib/asterisk/sounds/en/accessible-through-system.gsm var/lib/asterisk/sounds/en/account-balance-is.gsm +var/lib/asterisk/sounds/en/account_number.gsm var/lib/asterisk/sounds/en/accounting.gsm var/lib/asterisk/sounds/en/accounts-payable.gsm var/lib/asterisk/sounds/en/accounts-receivable.gsm @@ -860,6 +911,7 @@ var/lib/asterisk/sounds/en/address.gsm var/lib/asterisk/sounds/en/administration.gsm var/lib/asterisk/sounds/en/advised-to-seek-shelter.gsm var/lib/asterisk/sounds/en/after-the-tone.gsm +var/lib/asterisk/sounds/en/after_tone.gsm var/lib/asterisk/sounds/en/afternoon.gsm var/lib/asterisk/sounds/en/agent-alreadyon.gsm var/lib/asterisk/sounds/en/agent-incorrect.gsm @@ -879,12 +931,12 @@ var/lib/asterisk/sounds/en/all-reps-busy.gsm var/lib/asterisk/sounds/en/all-your-base.gsm var/lib/asterisk/sounds/en/altitude.gsm var/lib/asterisk/sounds/en/ampersand.gsm -var/lib/asterisk/sounds/en/an-error-has-occured.gsm var/lib/asterisk/sounds/en/an-error-has-occurred.gsm var/lib/asterisk/sounds/en/and-area-code.gsm var/lib/asterisk/sounds/en/and-or.gsm var/lib/asterisk/sounds/en/and-prs-pound-whn-finished.gsm var/lib/asterisk/sounds/en/and.gsm +var/lib/asterisk/sounds/en/andnowstandby.gsm var/lib/asterisk/sounds/en/another-time.gsm var/lib/asterisk/sounds/en/approaching.gsm var/lib/asterisk/sounds/en/approximately.gsm @@ -911,6 +963,7 @@ var/lib/asterisk/sounds/en/at-customers-request.gsm var/lib/asterisk/sounds/en/at-following-number.gsm var/lib/asterisk/sounds/en/at-sign.gsm var/lib/asterisk/sounds/en/at-tone-time-exactly.gsm +var/lib/asterisk/sounds/en/at_tone.gsm var/lib/asterisk/sounds/en/athletics.gsm var/lib/asterisk/sounds/en/atlanta.gsm var/lib/asterisk/sounds/en/atlantic.gsm @@ -924,6 +977,7 @@ var/lib/asterisk/sounds/en/available.gsm var/lib/asterisk/sounds/en/avg-speed-answer.gsm var/lib/asterisk/sounds/en/away-naughty-boy.gsm var/lib/asterisk/sounds/en/away-naughty-girl.gsm +var/lib/asterisk/sounds/en/awkward.gsm var/lib/asterisk/sounds/en/backslash.gsm var/lib/asterisk/sounds/en/bad.gsm var/lib/asterisk/sounds/en/baltimore.gsm @@ -941,8 +995,10 @@ var/lib/asterisk/sounds/en/believe-its-free.gsm var/lib/asterisk/sounds/en/billing-and-collections.gsm var/lib/asterisk/sounds/en/billing.gsm var/lib/asterisk/sounds/en/billionth.gsm +var/lib/asterisk/sounds/en/binary.gsm var/lib/asterisk/sounds/en/bits.gsm var/lib/asterisk/sounds/en/blue-eyed-polar-bear.gsm +var/lib/asterisk/sounds/en/bombsquad.gsm var/lib/asterisk/sounds/en/bookstore.gsm var/lib/asterisk/sounds/en/boston.gsm var/lib/asterisk/sounds/en/box.gsm @@ -993,6 +1049,7 @@ var/lib/asterisk/sounds/en/central.gsm var/lib/asterisk/sounds/en/cents-per-minute.gsm var/lib/asterisk/sounds/en/cents.gsm var/lib/asterisk/sounds/en/ceo-office.gsm +var/lib/asterisk/sounds/en/challenge_try_again.gsm var/lib/asterisk/sounds/en/chance-of.gsm var/lib/asterisk/sounds/en/changing.gsm var/lib/asterisk/sounds/en/channel-insecure-warn.gsm @@ -1010,12 +1067,14 @@ var/lib/asterisk/sounds/en/clearing.gsm var/lib/asterisk/sounds/en/cleveland.gsm var/lib/asterisk/sounds/en/clli.gsm var/lib/asterisk/sounds/en/close-parenthesis.gsm +var/lib/asterisk/sounds/en/closed.gsm var/lib/asterisk/sounds/en/clouds.gsm var/lib/asterisk/sounds/en/cloudy.gsm var/lib/asterisk/sounds/en/collections.gsm var/lib/asterisk/sounds/en/colorado-springs.gsm var/lib/asterisk/sounds/en/colorado.gsm var/lib/asterisk/sounds/en/columbus.gsm +var/lib/asterisk/sounds/en/comedyclub.gsm var/lib/asterisk/sounds/en/comma.gsm var/lib/asterisk/sounds/en/communications.gsm var/lib/asterisk/sounds/en/company-dir-411.gsm @@ -1024,7 +1083,15 @@ var/lib/asterisk/sounds/en/compliance.gsm var/lib/asterisk/sounds/en/computer-friend1.gsm var/lib/asterisk/sounds/en/computer-friend2.gsm var/lib/asterisk/sounds/en/conditions.gsm +var/lib/asterisk/sounds/en/conf-1-to-list-users.gsm +var/lib/asterisk/sounds/en/conf-2-to-kick-nonadmin.gsm +var/lib/asterisk/sounds/en/conf-3-mute-or-unmute-nonadmin.gsm +var/lib/asterisk/sounds/en/conf-4-to-record-conf.gsm +var/lib/asterisk/sounds/en/conf-8-for-more-options.gsm +var/lib/asterisk/sounds/en/conf-8-to-exit-return-to-conf.gsm var/lib/asterisk/sounds/en/conf-adminmenu-162.gsm +var/lib/asterisk/sounds/en/conf-adminmenu-18.gsm +var/lib/asterisk/sounds/en/conf-adminmenu-menu8.gsm var/lib/asterisk/sounds/en/conf-adminmenu.gsm var/lib/asterisk/sounds/en/conf-banned.gsm var/lib/asterisk/sounds/en/conf-enteringno.gsm @@ -1131,8 +1198,11 @@ var/lib/asterisk/sounds/en/core-sounds-en.txt var/lib/asterisk/sounds/en/could-lose-a-few-pounds.gsm var/lib/asterisk/sounds/en/counseling-services.gsm var/lib/asterisk/sounds/en/count.gsm +var/lib/asterisk/sounds/en/countdown.gsm var/lib/asterisk/sounds/en/crash.gsm +var/lib/asterisk/sounds/en/crashing_conf.gsm var/lib/asterisk/sounds/en/current-time-is.gsm +var/lib/asterisk/sounds/en/current_account_balance.gsm var/lib/asterisk/sounds/en/currently.gsm var/lib/asterisk/sounds/en/customer-accounts.gsm var/lib/asterisk/sounds/en/customer-relations.gsm @@ -1305,6 +1375,8 @@ var/lib/asterisk/sounds/en/divided-by.gsm var/lib/asterisk/sounds/en/dns.gsm var/lib/asterisk/sounds/en/do-not-disturb.gsm var/lib/asterisk/sounds/en/doing-enum-lookup.gsm +var/lib/asterisk/sounds/en/donotcall1.gsm +var/lib/asterisk/sounds/en/donotcall2.gsm var/lib/asterisk/sounds/en/dont-know-who-sent.gsm var/lib/asterisk/sounds/en/doppler-radar.gsm var/lib/asterisk/sounds/en/down.gsm @@ -1321,6 +1393,7 @@ var/lib/asterisk/sounds/en/eighteenth.gsm var/lib/asterisk/sounds/en/eighth.gsm var/lib/asterisk/sounds/en/eightieth.gsm var/lib/asterisk/sounds/en/el-paso.gsm +var/lib/asterisk/sounds/en/eletelephony.gsm var/lib/asterisk/sounds/en/eleventh.gsm var/lib/asterisk/sounds/en/email.gsm var/lib/asterisk/sounds/en/emergency.gsm @@ -1335,11 +1408,13 @@ var/lib/asterisk/sounds/en/enter-ext-of-person.gsm var/lib/asterisk/sounds/en/enter-num-blacklist.gsm var/lib/asterisk/sounds/en/enter-password.gsm var/lib/asterisk/sounds/en/enter-phone-number10.gsm +var/lib/asterisk/sounds/en/enter_account.gsm var/lib/asterisk/sounds/en/entering-conf-number.gsm var/lib/asterisk/sounds/en/entr-num-rmv-blklist.gsm var/lib/asterisk/sounds/en/enum-lookup-failed.gsm var/lib/asterisk/sounds/en/enum-lookup-successful.gsm var/lib/asterisk/sounds/en/error-number.gsm +var/lib/asterisk/sounds/en/error.gsm var/lib/asterisk/sounds/en/est-hold-time-is.gsm var/lib/asterisk/sounds/en/euro.gsm var/lib/asterisk/sounds/en/european.gsm @@ -1355,6 +1430,7 @@ var/lib/asterisk/sounds/en/fahrenheit.gsm var/lib/asterisk/sounds/en/falling.gsm var/lib/asterisk/sounds/en/fast.gsm var/lib/asterisk/sounds/en/feature-not-avail-line.gsm +var/lib/asterisk/sounds/en/feeling_lucky_punk.gsm var/lib/asterisk/sounds/en/feet.gsm var/lib/asterisk/sounds/en/female.gsm var/lib/asterisk/sounds/en/fifteenth.gsm @@ -1370,6 +1446,8 @@ var/lib/asterisk/sounds/en/florida.gsm var/lib/asterisk/sounds/en/fog.gsm var/lib/asterisk/sounds/en/foggy.gsm var/lib/asterisk/sounds/en/followed-by.gsm +var/lib/asterisk/sounds/en/followed_hash.gsm +var/lib/asterisk/sounds/en/followed_pound.gsm var/lib/asterisk/sounds/en/followme var/lib/asterisk/sounds/en/followme/call-from.gsm var/lib/asterisk/sounds/en/followme/no-recording.gsm @@ -1397,6 +1475,7 @@ var/lib/asterisk/sounds/en/for-the-weather.gsm var/lib/asterisk/sounds/en/for-wakeup-call.gsm var/lib/asterisk/sounds/en/for-yes-press.gsm var/lib/asterisk/sounds/en/for.gsm +var/lib/asterisk/sounds/en/forget_about_it.gsm var/lib/asterisk/sounds/en/fort-worth.gsm var/lib/asterisk/sounds/en/fortieth.gsm var/lib/asterisk/sounds/en/fourteenth.gsm @@ -1411,6 +1490,10 @@ var/lib/asterisk/sounds/en/ftp.gsm var/lib/asterisk/sounds/en/gale.gsm var/lib/asterisk/sounds/en/gambling-drunk.gsm var/lib/asterisk/sounds/en/georgia.gsm +var/lib/asterisk/sounds/en/get-in-line-sales-guy.gsm +var/lib/asterisk/sounds/en/get_bleep_outta.gsm +var/lib/asterisk/sounds/en/get_information.gsm +var/lib/asterisk/sounds/en/get_information_first.gsm var/lib/asterisk/sounds/en/gigabits.gsm var/lib/asterisk/sounds/en/gigabytes.gsm var/lib/asterisk/sounds/en/gigahertz.gsm @@ -1423,6 +1506,10 @@ var/lib/asterisk/sounds/en/good-evening.gsm var/lib/asterisk/sounds/en/good-morning.gsm var/lib/asterisk/sounds/en/good.gsm var/lib/asterisk/sounds/en/goodbye.gsm +var/lib/asterisk/sounds/en/goodbye_for_the_best.gsm +var/lib/asterisk/sounds/en/goodbye_love.gsm +var/lib/asterisk/sounds/en/got_kidding.gsm +var/lib/asterisk/sounds/en/grammar.gsm var/lib/asterisk/sounds/en/greater-than.gsm var/lib/asterisk/sounds/en/groovy.gsm var/lib/asterisk/sounds/en/ha @@ -1551,10 +1638,12 @@ var/lib/asterisk/sounds/en/ha/xmas-lights.gsm var/lib/asterisk/sounds/en/ha/xmas-tree.gsm var/lib/asterisk/sounds/en/ha/yard.gsm var/lib/asterisk/sounds/en/hail.gsm +var/lib/asterisk/sounds/en/hal_goodbye.gsm var/lib/asterisk/sounds/en/half.gsm var/lib/asterisk/sounds/en/hang-on-a-second-angry.gsm var/lib/asterisk/sounds/en/hang-on-a-second.gsm var/lib/asterisk/sounds/en/hangup-try-again.gsm +var/lib/asterisk/sounds/en/happy_saved.gsm var/lib/asterisk/sounds/en/has-arrived-at.gsm var/lib/asterisk/sounds/en/has-been-changed-to.gsm var/lib/asterisk/sounds/en/has-been-cleared.gsm @@ -1666,6 +1755,7 @@ var/lib/asterisk/sounds/en/just-kidding-not-upset2.gsm var/lib/asterisk/sounds/en/kansas-city.gsm var/lib/asterisk/sounds/en/kansas.gsm var/lib/asterisk/sounds/en/kentucky.gsm +var/lib/asterisk/sounds/en/keywords_cross_fingers.gsm var/lib/asterisk/sounds/en/kilobits.gsm var/lib/asterisk/sounds/en/kilobytes.gsm var/lib/asterisk/sounds/en/kilohertz.gsm @@ -1748,6 +1838,7 @@ var/lib/asterisk/sounds/en/letters/z.gsm var/lib/asterisk/sounds/en/letters/zed.gsm var/lib/asterisk/sounds/en/library.gsm var/lib/asterisk/sounds/en/lightning.gsm +var/lib/asterisk/sounds/en/like_to_tell_valid_ext.gsm var/lib/asterisk/sounds/en/limit-simul-calls.gsm var/lib/asterisk/sounds/en/lines-complaining-customers.gsm var/lib/asterisk/sounds/en/linux.gsm @@ -1763,6 +1854,7 @@ var/lib/asterisk/sounds/en/loss.gsm var/lib/asterisk/sounds/en/lots-o-monkeys.gsm var/lib/asterisk/sounds/en/louisiana.gsm var/lib/asterisk/sounds/en/low.gsm +var/lib/asterisk/sounds/en/lowercase.gsm var/lib/asterisk/sounds/en/lunch.gsm var/lib/asterisk/sounds/en/lyrics-louie-louie.gsm var/lib/asterisk/sounds/en/machine.gsm @@ -1777,6 +1869,7 @@ var/lib/asterisk/sounds/en/management.gsm var/lib/asterisk/sounds/en/manufacturing.gsm var/lib/asterisk/sounds/en/marketing.gsm var/lib/asterisk/sounds/en/marryme.gsm +var/lib/asterisk/sounds/en/martini.gsm var/lib/asterisk/sounds/en/maryland.gsm var/lib/asterisk/sounds/en/massachusetts.gsm var/lib/asterisk/sounds/en/mathematics.gsm @@ -1790,6 +1883,7 @@ var/lib/asterisk/sounds/en/menu.gsm var/lib/asterisk/sounds/en/mesa.gsm var/lib/asterisk/sounds/en/message-from.gsm var/lib/asterisk/sounds/en/message-number.gsm +var/lib/asterisk/sounds/en/messages_curious.gsm var/lib/asterisk/sounds/en/meter.gsm var/lib/asterisk/sounds/en/meters.gsm var/lib/asterisk/sounds/en/miami.gsm @@ -1802,7 +1896,9 @@ var/lib/asterisk/sounds/en/miles-per-hour.gsm var/lib/asterisk/sounds/en/miles.gsm var/lib/asterisk/sounds/en/millionth.gsm var/lib/asterisk/sounds/en/milwaukee.gsm +var/lib/asterisk/sounds/en/mind_repeating.gsm var/lib/asterisk/sounds/en/minimum.gsm +var/lib/asterisk/sounds/en/minions-not-answering-leave-message.gsm var/lib/asterisk/sounds/en/minneapolis.gsm var/lib/asterisk/sounds/en/minnesota.gsm var/lib/asterisk/sounds/en/minute.gsm @@ -1811,6 +1907,7 @@ var/lib/asterisk/sounds/en/missed.gsm var/lib/asterisk/sounds/en/mississippi.gsm var/lib/asterisk/sounds/en/missouri.gsm var/lib/asterisk/sounds/en/misty.gsm +var/lib/asterisk/sounds/en/mode.gsm var/lib/asterisk/sounds/en/monitored.gsm var/lib/asterisk/sounds/en/montana.gsm var/lib/asterisk/sounds/en/month.gsm @@ -1840,6 +1937,7 @@ var/lib/asterisk/sounds/en/new-jersey.gsm var/lib/asterisk/sounds/en/new-mexico.gsm var/lib/asterisk/sounds/en/new-orleans.gsm var/lib/asterisk/sounds/en/new-york.gsm +var/lib/asterisk/sounds/en/night.gsm var/lib/asterisk/sounds/en/nineteenth.gsm var/lib/asterisk/sounds/en/ninetieth.gsm var/lib/asterisk/sounds/en/ninth.gsm @@ -1852,8 +1950,14 @@ var/lib/asterisk/sounds/en/no-info-about-number.gsm var/lib/asterisk/sounds/en/no-longer-in-service.gsm var/lib/asterisk/sounds/en/no-reply-no-mailbox.gsm var/lib/asterisk/sounds/en/no-route-exists-to-dest.gsm +var/lib/asterisk/sounds/en/no_invite_to_conf.gsm +var/lib/asterisk/sounds/en/no_longer_conf.gsm +var/lib/asterisk/sounds/en/no_problem_help.gsm +var/lib/asterisk/sounds/en/no_worries_try_again.gsm var/lib/asterisk/sounds/en/nobody-but-chickens.gsm var/lib/asterisk/sounds/en/node.gsm +var/lib/asterisk/sounds/en/none_of_my_business1.gsm +var/lib/asterisk/sounds/en/none_of_my_business2.gsm var/lib/asterisk/sounds/en/north-carolina.gsm var/lib/asterisk/sounds/en/north-dakota.gsm var/lib/asterisk/sounds/en/north.gsm @@ -1867,6 +1971,10 @@ var/lib/asterisk/sounds/en/not-rqsted-wakeup.gsm var/lib/asterisk/sounds/en/not-taking-your-call.gsm var/lib/asterisk/sounds/en/not-yet-assigned.gsm var/lib/asterisk/sounds/en/not-yet-connected.gsm +var/lib/asterisk/sounds/en/not_me.gsm +var/lib/asterisk/sounds/en/not_pass.gsm +var/lib/asterisk/sounds/en/not_siri.gsm +var/lib/asterisk/sounds/en/not_you.gsm var/lib/asterisk/sounds/en/nothing-recorded.gsm var/lib/asterisk/sounds/en/now.gsm var/lib/asterisk/sounds/en/num-not-in-db.gsm @@ -1877,9 +1985,11 @@ var/lib/asterisk/sounds/en/number.gsm var/lib/asterisk/sounds/en/oakland.gsm var/lib/asterisk/sounds/en/octothorpe.gsm var/lib/asterisk/sounds/en/off-duty.gsm +var/lib/asterisk/sounds/en/off.gsm var/lib/asterisk/sounds/en/office-code.gsm var/lib/asterisk/sounds/en/office-iguanas.gsm var/lib/asterisk/sounds/en/office.gsm +var/lib/asterisk/sounds/en/ogm_home.gsm var/lib/asterisk/sounds/en/ohio.gsm var/lib/asterisk/sounds/en/oklahoma-city.gsm var/lib/asterisk/sounds/en/oklahoma.gsm @@ -1895,6 +2005,7 @@ var/lib/asterisk/sounds/en/oops1.gsm var/lib/asterisk/sounds/en/oops2.gsm var/lib/asterisk/sounds/en/oops3.gsm var/lib/asterisk/sounds/en/open-parenthesis.gsm +var/lib/asterisk/sounds/en/open.gsm var/lib/asterisk/sounds/en/operations.gsm var/lib/asterisk/sounds/en/option-is-invalid.gsm var/lib/asterisk/sounds/en/option-not-implemented.gsm @@ -1917,6 +2028,7 @@ var/lib/asterisk/sounds/en/partially.gsm var/lib/asterisk/sounds/en/partly.gsm var/lib/asterisk/sounds/en/pascal.gsm var/lib/asterisk/sounds/en/pascal2.gsm +var/lib/asterisk/sounds/en/passwords_not_match.gsm var/lib/asterisk/sounds/en/patchy.gsm var/lib/asterisk/sounds/en/pbx-invalid.gsm var/lib/asterisk/sounds/en/pbx-invalidpark.gsm @@ -1965,6 +2077,7 @@ var/lib/asterisk/sounds/en/phonetic/z_p.gsm var/lib/asterisk/sounds/en/physics.gsm var/lib/asterisk/sounds/en/pin-invalid.gsm var/lib/asterisk/sounds/en/pin-number-accepted.gsm +var/lib/asterisk/sounds/en/pin_number.gsm var/lib/asterisk/sounds/en/ping.gsm var/lib/asterisk/sounds/en/pipe.gsm var/lib/asterisk/sounds/en/planning.gsm @@ -1975,6 +2088,8 @@ var/lib/asterisk/sounds/en/please-enter-the.gsm var/lib/asterisk/sounds/en/please-enter-your.gsm var/lib/asterisk/sounds/en/please-hang-up-and-dial-operator.gsm var/lib/asterisk/sounds/en/please-hang-up-and-try-again.gsm +var/lib/asterisk/sounds/en/please-hold-minion-connect.gsm +var/lib/asterisk/sounds/en/please-hold-while-minion.gsm var/lib/asterisk/sounds/en/please-try-again-later.gsm var/lib/asterisk/sounds/en/please-try-again.gsm var/lib/asterisk/sounds/en/please-try.gsm @@ -1987,6 +2102,7 @@ var/lib/asterisk/sounds/en/pls-entr-num-uwish2-call.gsm var/lib/asterisk/sounds/en/pls-hold-process-tx.gsm var/lib/asterisk/sounds/en/pls-hold-silent30.gsm var/lib/asterisk/sounds/en/pls-hold-while-try.gsm +var/lib/asterisk/sounds/en/pls-listen-options-changed.gsm var/lib/asterisk/sounds/en/pls-lv-msg-will-contact.gsm var/lib/asterisk/sounds/en/pls-rcrd-name-at-tone.gsm var/lib/asterisk/sounds/en/pls-stay-on-line.gsm @@ -2027,6 +2143,16 @@ var/lib/asterisk/sounds/en/press-button-again.gsm var/lib/asterisk/sounds/en/press-enter.gsm var/lib/asterisk/sounds/en/press-escape.gsm var/lib/asterisk/sounds/en/press-hash.gsm +var/lib/asterisk/sounds/en/press-or-say-0.gsm +var/lib/asterisk/sounds/en/press-or-say-1.gsm +var/lib/asterisk/sounds/en/press-or-say-2.gsm +var/lib/asterisk/sounds/en/press-or-say-3.gsm +var/lib/asterisk/sounds/en/press-or-say-4.gsm +var/lib/asterisk/sounds/en/press-or-say-5.gsm +var/lib/asterisk/sounds/en/press-or-say-6.gsm +var/lib/asterisk/sounds/en/press-or-say-7.gsm +var/lib/asterisk/sounds/en/press-or-say-8.gsm +var/lib/asterisk/sounds/en/press-or-say-9.gsm var/lib/asterisk/sounds/en/press-pound-save-changes.gsm var/lib/asterisk/sounds/en/press-pound-to-login-star-to-hangup.gsm var/lib/asterisk/sounds/en/press-pound.gsm @@ -2036,7 +2162,10 @@ var/lib/asterisk/sounds/en/press-star.gsm var/lib/asterisk/sounds/en/press-the-space-bar.gsm var/lib/asterisk/sounds/en/press-tilde.gsm var/lib/asterisk/sounds/en/press.gsm +var/lib/asterisk/sounds/en/press_pound_hash.gsm +var/lib/asterisk/sounds/en/press_pound_hash_key.gsm var/lib/asterisk/sounds/en/pressure.gsm +var/lib/asterisk/sounds/en/prime_number.gsm var/lib/asterisk/sounds/en/printing.gsm var/lib/asterisk/sounds/en/priv-callee-options.gsm var/lib/asterisk/sounds/en/priv-callpending.gsm @@ -2072,6 +2201,7 @@ var/lib/asterisk/sounds/en/privacy-your-callerid-is.gsm var/lib/asterisk/sounds/en/product.gsm var/lib/asterisk/sounds/en/production.gsm var/lib/asterisk/sounds/en/projects.gsm +var/lib/asterisk/sounds/en/prompt-not-found.gsm var/lib/asterisk/sounds/en/protocol.gsm var/lib/asterisk/sounds/en/public-relations.gsm var/lib/asterisk/sounds/en/purchasing.gsm @@ -2080,6 +2210,7 @@ var/lib/asterisk/sounds/en/q-dot-931.gsm var/lib/asterisk/sounds/en/q-dot-9thirty1.gsm var/lib/asterisk/sounds/en/quality-assurance.gsm var/lib/asterisk/sounds/en/quality-control.gsm +var/lib/asterisk/sounds/en/quality_control.gsm var/lib/asterisk/sounds/en/quarter.gsm var/lib/asterisk/sounds/en/queue-callswaiting.gsm var/lib/asterisk/sounds/en/queue-holdtime.gsm @@ -2108,12 +2239,14 @@ var/lib/asterisk/sounds/en/receiving.gsm var/lib/asterisk/sounds/en/reception.gsm var/lib/asterisk/sounds/en/recorded.gsm var/lib/asterisk/sounds/en/registrar.gsm +var/lib/asterisk/sounds/en/regret_not_saved.gsm var/lib/asterisk/sounds/en/remote-already-in-this-mode-2.gsm var/lib/asterisk/sounds/en/remote-already-in-this-mode.gsm var/lib/asterisk/sounds/en/remote-base.gsm var/lib/asterisk/sounds/en/removed.gsm var/lib/asterisk/sounds/en/repair.gsm var/lib/asterisk/sounds/en/repeat-only.gsm +var/lib/asterisk/sounds/en/repeat_pin.gsm var/lib/asterisk/sounds/en/repeater.gsm var/lib/asterisk/sounds/en/research-and-development.gsm var/lib/asterisk/sounds/en/research.gsm @@ -2128,9 +2261,11 @@ var/lib/asterisk/sounds/en/room-service.gsm var/lib/asterisk/sounds/en/route-sip.gsm var/lib/asterisk/sounds/en/rqsted-wakeup-for.gsm var/lib/asterisk/sounds/en/sacramento.gsm +var/lib/asterisk/sounds/en/said_hold_on.gsm var/lib/asterisk/sounds/en/saint-louis.gsm var/lib/asterisk/sounds/en/sales-floor.gsm var/lib/asterisk/sounds/en/sales.gsm +var/lib/asterisk/sounds/en/saleshell.gsm var/lib/asterisk/sounds/en/san-antonio.gsm var/lib/asterisk/sounds/en/san-diego.gsm var/lib/asterisk/sounds/en/san-francisco.gsm @@ -2148,6 +2283,7 @@ var/lib/asterisk/sounds/en/secretary.gsm var/lib/asterisk/sounds/en/security.gsm var/lib/asterisk/sounds/en/self-destruct-in.gsm var/lib/asterisk/sounds/en/self-destruct.gsm +var/lib/asterisk/sounds/en/sendhelp.gsm var/lib/asterisk/sounds/en/server.gsm var/lib/asterisk/sounds/en/service-not-implemented.gsm var/lib/asterisk/sounds/en/service.gsm @@ -2196,6 +2332,13 @@ var/lib/asterisk/sounds/en/sorry-mailbox-full.gsm var/lib/asterisk/sounds/en/sorry-youre-having-problems.gsm var/lib/asterisk/sounds/en/sorry.gsm var/lib/asterisk/sounds/en/sorry2.gsm +var/lib/asterisk/sounds/en/sorry_caller_number.gsm +var/lib/asterisk/sounds/en/sorry_didnt_get.gsm +var/lib/asterisk/sounds/en/sorry_didnt_quite_get.gsm +var/lib/asterisk/sounds/en/sorry_login_incorrect.gsm +var/lib/asterisk/sounds/en/sorry_missed.gsm +var/lib/asterisk/sounds/en/sorry_no_messages.gsm +var/lib/asterisk/sounds/en/sorrydave.gsm var/lib/asterisk/sounds/en/south-carolina.gsm var/lib/asterisk/sounds/en/south-dakota.gsm var/lib/asterisk/sounds/en/south.gsm @@ -2237,20 +2380,24 @@ var/lib/asterisk/sounds/en/station.gsm var/lib/asterisk/sounds/en/status.gsm var/lib/asterisk/sounds/en/step-in-stream.gsm var/lib/asterisk/sounds/en/sterling.gsm +var/lib/asterisk/sounds/en/still_on_phone.gsm var/lib/asterisk/sounds/en/store-accounting.gsm var/lib/asterisk/sounds/en/storm.gsm var/lib/asterisk/sounds/en/sun.gsm var/lib/asterisk/sounds/en/sunny.gsm var/lib/asterisk/sounds/en/support.gsm +var/lib/asterisk/sounds/en/sure_help.gsm var/lib/asterisk/sounds/en/swap.gsm var/lib/asterisk/sounds/en/system-crashed.gsm var/lib/asterisk/sounds/en/system-status-msg.gsm var/lib/asterisk/sounds/en/system.gsm var/lib/asterisk/sounds/en/systems.gsm +var/lib/asterisk/sounds/en/talkin_me.gsm var/lib/asterisk/sounds/en/talking-to-myself.gsm var/lib/asterisk/sounds/en/target-attendant.gsm var/lib/asterisk/sounds/en/tcp.gsm var/lib/asterisk/sounds/en/technical-support.gsm +var/lib/asterisk/sounds/en/telemarketercalling.gsm var/lib/asterisk/sounds/en/telephone-in-your-pocket.gsm var/lib/asterisk/sounds/en/telephone-in-your-pocket2.gsm var/lib/asterisk/sounds/en/telephone-number.gsm @@ -2269,6 +2416,8 @@ var/lib/asterisk/sounds/en/test-tones-follow.gsm var/lib/asterisk/sounds/en/texas.gsm var/lib/asterisk/sounds/en/thank-you-cooperation.gsm var/lib/asterisk/sounds/en/thank-you-for-calling.gsm +var/lib/asterisk/sounds/en/thank_you_calling.gsm +var/lib/asterisk/sounds/en/thanks-annoyance.gsm var/lib/asterisk/sounds/en/thanks-for-calling-today.gsm var/lib/asterisk/sounds/en/thanks-for-using.gsm var/lib/asterisk/sounds/en/that-is-not-rec-phn-num.gsm @@ -2304,6 +2453,7 @@ var/lib/asterisk/sounds/en/thunderstorm.gsm var/lib/asterisk/sounds/en/tide.gsm var/lib/asterisk/sounds/en/time.gsm var/lib/asterisk/sounds/en/times.gsm +var/lib/asterisk/sounds/en/timewarp.gsm var/lib/asterisk/sounds/en/to-accept-recording.gsm var/lib/asterisk/sounds/en/to-be-called-back.gsm var/lib/asterisk/sounds/en/to-blklist-last-caller.gsm @@ -2354,6 +2504,7 @@ var/lib/asterisk/sounds/en/to-send-a-reply.gsm var/lib/asterisk/sounds/en/to-snooze-for.gsm var/lib/asterisk/sounds/en/to-use-def-attendant.gsm var/lib/asterisk/sounds/en/tomorrow-night.gsm +var/lib/asterisk/sounds/en/tone_time.gsm var/lib/asterisk/sounds/en/tones-that-follow-are-for-the-deaf.gsm var/lib/asterisk/sounds/en/tonight.gsm var/lib/asterisk/sounds/en/too-low.gsm @@ -2366,6 +2517,7 @@ var/lib/asterisk/sounds/en/trading-desk.gsm var/lib/asterisk/sounds/en/traffic.gsm var/lib/asterisk/sounds/en/training.gsm var/lib/asterisk/sounds/en/transfer.gsm +var/lib/asterisk/sounds/en/transfer_to_agent.gsm var/lib/asterisk/sounds/en/transportation.gsm var/lib/asterisk/sounds/en/travel.gsm var/lib/asterisk/sounds/en/treasury.gsm @@ -2393,10 +2545,14 @@ var/lib/asterisk/sounds/en/uh-oh2.gsm var/lib/asterisk/sounds/en/uk.gsm var/lib/asterisk/sounds/en/unavailable.gsm var/lib/asterisk/sounds/en/unconditional.gsm +var/lib/asterisk/sounds/en/unicorn_blood.gsm +var/lib/asterisk/sounds/en/unicorn_blood_MIXDOWN.gsm var/lib/asterisk/sounds/en/unidentified-no-callback.gsm var/lib/asterisk/sounds/en/units.gsm var/lib/asterisk/sounds/en/unix.gsm +var/lib/asterisk/sounds/en/unwelcomecall.gsm var/lib/asterisk/sounds/en/up.gsm +var/lib/asterisk/sounds/en/uppercase.gsm var/lib/asterisk/sounds/en/uptime.gsm var/lib/asterisk/sounds/en/user.gsm var/lib/asterisk/sounds/en/users.gsm @@ -2456,6 +2612,7 @@ var/lib/asterisk/sounds/en/vm-message.gsm var/lib/asterisk/sounds/en/vm-messages.gsm var/lib/asterisk/sounds/en/vm-minutes.gsm var/lib/asterisk/sounds/en/vm-mismatch.gsm +var/lib/asterisk/sounds/en/vm-msgforwarded.gsm var/lib/asterisk/sounds/en/vm-msginstruct.gsm var/lib/asterisk/sounds/en/vm-msgsaved.gsm var/lib/asterisk/sounds/en/vm-newpassword.gsm @@ -2536,6 +2693,7 @@ var/lib/asterisk/sounds/en/was.gsm var/lib/asterisk/sounds/en/washington-dc.gsm var/lib/asterisk/sounds/en/washington.gsm var/lib/asterisk/sounds/en/watch.gsm +var/lib/asterisk/sounds/en/watson.gsm var/lib/asterisk/sounds/en/we-apologize.gsm var/lib/asterisk/sounds/en/we-dont-have-tech-support.gsm var/lib/asterisk/sounds/en/weasels-eaten-phonesys.gsm @@ -2553,6 +2711,7 @@ var/lib/asterisk/sounds/en/what-time-it-is.gsm var/lib/asterisk/sounds/en/what-time-it-is2.gsm var/lib/asterisk/sounds/en/when-dialing-this-number.gsm var/lib/asterisk/sounds/en/who-would-you-like-to-call.gsm +var/lib/asterisk/sounds/en/whoareyou.gsm var/lib/asterisk/sounds/en/why-no-answer-mystery.gsm var/lib/asterisk/sounds/en/wichita.gsm var/lib/asterisk/sounds/en/will-apply.gsm @@ -2564,8 +2723,10 @@ var/lib/asterisk/sounds/en/windows.gsm var/lib/asterisk/sounds/en/windy.gsm var/lib/asterisk/sounds/en/wisconsin.gsm var/lib/asterisk/sounds/en/wish-to-continue.gsm +var/lib/asterisk/sounds/en/wish_command_totally.gsm var/lib/asterisk/sounds/en/with.gsm var/lib/asterisk/sounds/en/within.gsm +var/lib/asterisk/sounds/en/woo_hoo_call_first.gsm var/lib/asterisk/sounds/en/work.gsm var/lib/asterisk/sounds/en/wrong-try-again-smarty.gsm var/lib/asterisk/sounds/en/wtng-to-spk-w-rep.gsm @@ -2619,6 +2780,7 @@ var/lib/asterisk/sounds/en/you-must-first-dial.gsm var/lib/asterisk/sounds/en/you-seem-impatient.gsm var/lib/asterisk/sounds/en/you-sound-cute.gsm var/lib/asterisk/sounds/en/you-wish-to-join.gsm +var/lib/asterisk/sounds/en/you_say_yes.gsm var/lib/asterisk/sounds/en/your-account.gsm var/lib/asterisk/sounds/en/your-msg-has-been-saved.gsm var/lib/asterisk/sounds/en/your-msg-is-too-short.gsm @@ -2626,7 +2788,10 @@ var/lib/asterisk/sounds/en/your-notifications.gsm var/lib/asterisk/sounds/en/your-req-notification.gsm var/lib/asterisk/sounds/en/your-temp-greeting.gsm var/lib/asterisk/sounds/en/your.gsm +var/lib/asterisk/sounds/en/yourcallisimportant.gsm +var/lib/asterisk/sounds/en/yourcallisimpotent.gsm var/lib/asterisk/sounds/en/zip-code.gsm +var/lib/asterisk/sounds/en/zombies.gsm #var/lib/asterisk/sounds/letters #var/lib/asterisk/sounds/letters/de var/lib/asterisk/sounds/letters/de/a.gsm @@ -2696,17 +2861,16 @@ var/lib/asterisk/sounds/phonetic/de/x_p.gsm var/lib/asterisk/sounds/phonetic/de/y_p.gsm var/lib/asterisk/sounds/phonetic/de/z_p.gsm #var/lib/asterisk/static-http -var/lib/asterisk/static-http/ajamdemo.html -var/lib/asterisk/static-http/astman.css -var/lib/asterisk/static-http/astman.js -var/lib/asterisk/static-http/core-en_US.xml -var/lib/asterisk/static-http/mantest.html -var/lib/asterisk/static-http/prototype.js +#var/lib/asterisk/static-http/ajamdemo.html +#var/lib/asterisk/static-http/astman.css +#var/lib/asterisk/static-http/astman.js +#var/lib/asterisk/static-http/core-en_US.xml +#var/lib/asterisk/static-http/mantest.html +#var/lib/asterisk/static-http/prototype.js #var/log/asterisk var/log/asterisk/cdr-csv var/log/asterisk/cdr-custom var/log/asterisk/cel-custom -#var/run/asterisk #var/spool/asterisk var/spool/asterisk/dictate var/spool/asterisk/meetme @@ -2721,5 +2885,3 @@ 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 old mode 100644 new mode 100755 index d2b1976cde..6ae43e3aa7 --- a/lfs/asterisk +++ b/lfs/asterisk @@ -18,13 +18,9 @@ # # ############################################################################### -############################################################################### -# Definitions -############################################################################### - include Config -VER = 1.8.19.0 +VER = 11.13.1 THISAPP = asterisk-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,11 +28,9 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = asterisk -PAK_VER = 8 - -CHAN_CAPI = chan_capi-20120614 +PAK_VER = 12 -DEPS = "libpri libtiff libvorbis libogg spandsp netsnmpd" +DEPS = "sqlite" ############################################################################### # Top-level Rules @@ -44,21 +38,18 @@ DEPS = "libpri libtiff libvorbis libogg spandsp netsnmpd" objects = $(DL_FILE) \ asterisk-1.4-de-prompts.tar.gz \ - asterisk-extra-sounds-en-gsm-1.4.11.tar.gz \ - asterisk-moh-opsound-gsm-2.03.tar.gz \ - $(CHAN_CAPI).tgz + asterisk-extra-sounds-en-gsm-1.4.15.tar.gz \ + asterisk-moh-opsound-gsm-2.03.tar.gz $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -asterisk-extra-sounds-en-gsm-1.4.11.tar.gz = $(URL_IPFIRE)/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz +asterisk-extra-sounds-en-gsm-1.4.15.tar.gz = $(URL_IPFIRE)/asterisk-extra-sounds-en-gsm-1.4.15.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 = dc98436846cc2de57100d78747b1bdd1 -asterisk-extra-sounds-en-gsm-1.4.11.tar.gz_MD5 = 5479cb4cb81d678304d96f35e4933a11 +$(DL_FILE)_MD5 = 20995d419dace207f828a3a8463c22e1 +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 -$(CHAN_CAPI).tgz_MD5 = c190f44eb362bf258b27f92c3458e4bf install : $(TARGET) @@ -92,16 +83,35 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) # remove old directories and extract asterisk - @rm -rf $(DIR_APP) $(DIR_SRC)/asterisk-* $(DIR_SRC)/$(CHAN_CAPI) $(DIR_SRC)/agx-ast-addons && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - - # confiure asterisk - cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/var/ipfire + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + # patch asterisk + cd $(DIR_APP) && patch -p4 < $(DIR_SRC)/src/patches/asterisk-no-ffmpeg.patch + + # configure asterisk + cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/var/ipfire \ + --without-oss \ + --without-sdl \ + --without-SDL_image \ + --without-netsnmp \ + --without-avcodec \ + --without-vorbis \ + --without-ogg \ + --without-spandsp \ + --disable-xmldoc # enable additional features (include following sound-tars) - cd $(DIR_APP) && cp -fv $(DIR_SRC)/config/asterisk/asterisk.makeopts menuselect.makeopts + cd $(DIR_APP) && make menuselect.makeopts && menuselect/menuselect \ + --enable res_srtp \ + --enable app_mysql \ + --enable cdr_mysql \ + --enable res_config_mysql \ + --enable EXTRA-SOUNDS-EN-GSM \ + --enable MOH-OPSOUND-GSM \ + menuselect.makeopts # add additional 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-extra-sounds-en-gsm-1.4.15.tar.gz $(DIR_APP)/sounds/ cd $(DIR_APP) && cp -fv $(DIR_DL)/asterisk-moh-opsound-gsm-2.03.tar.gz $(DIR_APP)/sounds/ # Fix wrong cpu optimization (march=armv5tel) @@ -127,21 +137,18 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cp -vrf $(DIR_SRC)/config/asterisk/* /var/ipfire/asterisk/ chmod o+w /var/ipfire/asterisk chown nobody:nobody -R /var/ipfire/asterisk - ln -f -s /var/ipfire/asterisk/wakeup/wakeup.sh /etc/fcron.minutely/wakeup.sh - - # build and install chan capi (needed for isdn) - cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(CHAN_CAPI).tgz - cd $(DIR_SRC)/chan-capi-HEAD && sed -i -e 's/^CFLAGS+=-Wno-unused-but-set-variable$$//' Makefile - cd $(DIR_SRC)/chan-capi-HEAD && make $(MAKETUNING) - cd $(DIR_SRC)/chan-capi-HEAD && make install - @rm -rf $(DIR_SRC)/chan-capi-HEAD + chown nobody:nobody -R /var/lib/asterisk - # be sure all source is removed - @rm -rf $(DIR_APP) $(DIR_SRC)/asterisk-* +# be sure all source is removed + @rm -rf $(DIR_APP) $(DIR_SRC)/asterisk-* $(DIR_SRC)/libsrtp* # remember backup-location install -v -m 644 $(DIR_SRC)/config/backup/includes/asterisk /var/ipfire/backup/addons/includes/asterisk + # Logrotate + mkdir -pv /etc/logrotate.d + install -v -m 644 $(DIR_SRC)/config/asterisk/asterisk.logrotate /etc/logrotate.d/asterisk + # generate softlink (or asterisk will not work properly) ln -sf /var/ipfire/asterisk /etc/asterisk diff --git a/lfs/lcr b/lfs/lcr index 061cde9ce4..321be97ed2 100644 --- a/lfs/lcr +++ b/lfs/lcr @@ -24,7 +24,7 @@ include Config -VER = 20121008 +VER = 20140403 THISAPP = lcr-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = lcr -PAK_VER = 5 +PAK_VER = 6 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 6c5e25329be107e30436b716bafc786f +$(DL_FILE)_MD5 = c81c5862d51720a3efc06fd2c02cd58d install : $(TARGET) @@ -77,8 +77,8 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_SRC)/lcr && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_SRC)/lcr && sed -i -e "s|^EXTENSIONdir=.*|EXTENSIONdir=/var/ipfire/lcr/extensions|g" \ - Makefile.am + cd $(DIR_SRC)/lcr && sed -i -e "s|^EXTENSIONdir=.*|EXTENSIONdir=/var/ipfire/lcr/extensions|g" Makefile.am + cd $(DIR_SRC)/lcr && sed -i -e "s|-D_GNU_SOURCE|-D_GNU_SOURCE -DASTERISK_VERSION_NUM=110000|g" Makefile.am cd $(DIR_SRC)/lcr && ./autogen.sh cd $(DIR_SRC)/lcr && ./configure --prefix=/usr \ --sysconfdir=/var/ipfire \ diff --git a/lfs/libsrtp b/lfs/libsrtp new file mode 100644 index 0000000000..fa0475fc62 --- /dev/null +++ b/lfs/libsrtp @@ -0,0 +1,77 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# # +# 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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see . # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.5.0 +THISAPP = libsrtp-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = ec49ba558b4fd056114df2c76935aa8e + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && ./configure --prefix=/usr + cd $(DIR_APP) && make uninstall && make $(MAKETUNING) libsrtp.so + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 766499fce7..575380dbe1 100755 --- a/make.sh +++ b/make.sh @@ -731,6 +731,7 @@ buildipfire() { ipfiremake nut ipfiremake watchdog ipfiremake libpri + ipfiremake libsrtp ipfiremake asterisk ipfiremake lcr ipfiremake usb_modeswitch diff --git a/src/initscripts/init.d/asterisk b/src/initscripts/init.d/asterisk index aac9a637ef..ef5b5f9d5d 100644 --- a/src/initscripts/init.d/asterisk +++ b/src/initscripts/init.d/asterisk @@ -18,7 +18,7 @@ case "${1}" in start) boot_mesg "Starting Asterisk PBX..." - loadproc /usr/sbin/asterisk -p + loadproc /usr/sbin/asterisk -p ;; stop) diff --git a/src/patches/asterisk-no-ffmpeg.patch b/src/patches/asterisk-no-ffmpeg.patch new file mode 100644 index 0000000000..7bc2e841ff --- /dev/null +++ b/src/patches/asterisk-no-ffmpeg.patch @@ -0,0 +1,11 @@ +--- build/usr/src/asterisk-11.9.0/res/Makefile.orig 2014-04-28 20:30:50.500877461 +0200 ++++ build/usr/src/asterisk-11.9.0/res/Makefile 2014-04-28 20:31:39.357034757 +0200 +@@ -75,7 +75,7 @@ + rm -f pjproject/build.mak + + pjproject/build.mak: pjproject/aconfigure +- (cd pjproject && CFLAGS="-fPIC" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --disable-floating-point --disable-sound --disable-oss --disable-speex-aec --disable-l16-codec --disable-gsm-codec --disable-g722-codec --disable-g7221-codec --disable-speex-codec --disable-ilbc-codec --disable-g711-codec) ++ (cd pjproject && CFLAGS="-fPIC" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --disable-floating-point --disable-sound --disable-oss --disable-speex-aec --disable-l16-codec --disable-gsm-codec --disable-g722-codec --disable-g7221-codec --disable-speex-codec --disable-ilbc-codec --disable-g711-codec --disable-opencore-amrnb --disable-video --disable-sdl --disable-ffmpeg --disable-v4l2) + + ifneq ($(findstring $(MAKECMDGOALS),all),) + -include pjproject/build.mak diff --git a/src/patches/asterisk-ssl-reader-should-block.patch b/src/patches/asterisk-ssl-reader-should-block.patch new file mode 100644 index 0000000000..3b2f0ed545 --- /dev/null +++ b/src/patches/asterisk-ssl-reader-should-block.patch @@ -0,0 +1,28 @@ +Upstream issue 18345 +Link: https://issues.asterisk.org/jira/browse/ASTERISK-18345 +Patch-By: Filip Jenicek + +Submitted upstream: 2012-05-31 09:12 +For Asterisk version: 1.8.4 + +The HOOK_T ssl_read function should behave the same way as the system read function +by blocking and waiting for (more) data from the SSL subsystem. Failure to do this +will drop data on the floor and ultimately disconnect SSL clients. + +--- asterisk/main/tcptls.c ++++ asterisk/main/tcptls.c +@@ -55,6 +55,14 @@ + static HOOK_T ssl_read(void *cookie, char *buf, LEN_T len) + { + int i = SSL_read(cookie, buf, len-1); ++ ++ /* ssl_read should block and wait for the SSL layer to provide all data */ ++ while (i < 0 && SSL_get_error(cookie, i) == SSL_ERROR_WANT_READ) { ++ ast_debug(1, "SSL_read - data not ready.\n"); ++ if (ast_wait_for_input(SSL_get_fd(cookie), 5000) <= 0) return 0; ++ i = SSL_read(cookie, buf, len-1); ++ } ++ + #if 0 + if (i >= 0) + buf[i] = '\0';