tek/contrib-tek
1
0
Fork 0
forked from ports/contrib
Code Pull Requests Activity

asterisk: Updated version 1.4.21.2 -> 1.4.26.2

Browse Source
This commit is contained in:
Alan Mizrahi 2009-10-24 11:07:36 +09:00
parent 626a43e39e
commit 106c458db9
6 changed files with 95 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
asterisk/.footprint
View File

@ -14,6 +14,7 @@ drwxr-xr-x root/root etc/asterisk/
-rw-r--r-- root/root etc/asterisk/cdr_odbc.conf -rw-r--r-- root/root etc/asterisk/cdr_odbc.conf
-rw-r--r-- root/root etc/asterisk/cdr_pgsql.conf -rw-r--r-- root/root etc/asterisk/cdr_pgsql.conf
-rw-r--r-- root/root etc/asterisk/cdr_tds.conf -rw-r--r-- root/root etc/asterisk/cdr_tds.conf
-rw-r--r-- root/root etc/asterisk/chan_dahdi.conf
-rw-r--r-- root/root etc/asterisk/codecs.conf -rw-r--r-- root/root etc/asterisk/codecs.conf
-rw-r--r-- root/root etc/asterisk/dnsmgr.conf -rw-r--r-- root/root etc/asterisk/dnsmgr.conf
-rw-r--r-- root/root etc/asterisk/dundi.conf -rw-r--r-- root/root etc/asterisk/dundi.conf
@ -61,7 +62,6 @@ drwxr-xr-x root/root etc/asterisk/
-rw-r--r-- root/root etc/asterisk/users.conf -rw-r--r-- root/root etc/asterisk/users.conf
-rw-r--r-- root/root etc/asterisk/voicemail.conf -rw-r--r-- root/root etc/asterisk/voicemail.conf
-rw-r--r-- root/root etc/asterisk/vpb.conf -rw-r--r-- root/root etc/asterisk/vpb.conf
-rw-r--r-- root/root etc/asterisk/zapata.conf
drwxr-xr-x root/root etc/rc.d/ drwxr-xr-x root/root etc/rc.d/
-rwxr-xr-x root/root etc/rc.d/asterisk -rwxr-xr-x root/root etc/rc.d/asterisk
drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/
@ -96,9 +96,9 @@ drwxr-xr-x root/root usr/include/asterisk/
-rw-r--r-- root/root usr/include/asterisk/compiler.h -rw-r--r-- root/root usr/include/asterisk/compiler.h
-rw-r--r-- root/root usr/include/asterisk/config.h -rw-r--r-- root/root usr/include/asterisk/config.h
-rw-r--r-- root/root usr/include/asterisk/crypto.h -rw-r--r-- root/root usr/include/asterisk/crypto.h
-rw-r--r-- root/root usr/include/asterisk/dahdi_compat.h
-rw-r--r-- root/root usr/include/asterisk/devicestate.h -rw-r--r-- root/root usr/include/asterisk/devicestate.h
-rw-r--r-- root/root usr/include/asterisk/dial.h -rw-r--r-- root/root usr/include/asterisk/dial.h
-rw-r--r-- root/root usr/include/asterisk/dlfcn-compat.h
-rw-r--r-- root/root usr/include/asterisk/dns.h -rw-r--r-- root/root usr/include/asterisk/dns.h
-rw-r--r-- root/root usr/include/asterisk/dnsmgr.h -rw-r--r-- root/root usr/include/asterisk/dnsmgr.h
-rw-r--r-- root/root usr/include/asterisk/doxyref.h -rw-r--r-- root/root usr/include/asterisk/doxyref.h
@ -149,6 +149,7 @@ drwxr-xr-x root/root usr/include/asterisk/
-rw-r--r-- root/root usr/include/asterisk/term.h -rw-r--r-- root/root usr/include/asterisk/term.h
-rw-r--r-- root/root usr/include/asterisk/threadstorage.h -rw-r--r-- root/root usr/include/asterisk/threadstorage.h
-rw-r--r-- root/root usr/include/asterisk/time.h -rw-r--r-- root/root usr/include/asterisk/time.h
-rw-r--r-- root/root usr/include/asterisk/tonezone_compat.h
-rw-r--r-- root/root usr/include/asterisk/transcap.h -rw-r--r-- root/root usr/include/asterisk/transcap.h
-rw-r--r-- root/root usr/include/asterisk/translate.h -rw-r--r-- root/root usr/include/asterisk/translate.h
-rw-r--r-- root/root usr/include/asterisk/udptl.h -rw-r--r-- root/root usr/include/asterisk/udptl.h
@ -168,6 +169,9 @@ drwxr-xr-x root/root usr/lib/asterisk/modules/
-rwxr-xr-x root/root usr/lib/asterisk/modules/app_channelredirect.so -rwxr-xr-x root/root usr/lib/asterisk/modules/app_channelredirect.so
-rwxr-xr-x root/root usr/lib/asterisk/modules/app_chanspy.so -rwxr-xr-x root/root usr/lib/asterisk/modules/app_chanspy.so
-rwxr-xr-x root/root usr/lib/asterisk/modules/app_controlplayback.so -rwxr-xr-x root/root usr/lib/asterisk/modules/app_controlplayback.so
-rwxr-xr-x root/root usr/lib/asterisk/modules/app_dahdibarge.so
-rwxr-xr-x root/root usr/lib/asterisk/modules/app_dahdiras.so
-rwxr-xr-x root/root usr/lib/asterisk/modules/app_dahdiscan.so
-rwxr-xr-x root/root usr/lib/asterisk/modules/app_db.so -rwxr-xr-x root/root usr/lib/asterisk/modules/app_db.so
-rwxr-xr-x root/root usr/lib/asterisk/modules/app_dial.so -rwxr-xr-x root/root usr/lib/asterisk/modules/app_dial.so
-rwxr-xr-x root/root usr/lib/asterisk/modules/app_dictate.so -rwxr-xr-x root/root usr/lib/asterisk/modules/app_dictate.so
@ -227,15 +231,13 @@ drwxr-xr-x root/root usr/lib/asterisk/modules/
-rwxr-xr-x root/root usr/lib/asterisk/modules/app_waitforsilence.so -rwxr-xr-x root/root usr/lib/asterisk/modules/app_waitforsilence.so
-rwxr-xr-x root/root usr/lib/asterisk/modules/app_while.so -rwxr-xr-x root/root usr/lib/asterisk/modules/app_while.so
-rwxr-xr-x root/root usr/lib/asterisk/modules/app_zapateller.so -rwxr-xr-x root/root usr/lib/asterisk/modules/app_zapateller.so
-rwxr-xr-x root/root usr/lib/asterisk/modules/app_zapbarge.so
-rwxr-xr-x root/root usr/lib/asterisk/modules/app_zapras.so
-rwxr-xr-x root/root usr/lib/asterisk/modules/app_zapscan.so
-rwxr-xr-x root/root usr/lib/asterisk/modules/cdr_csv.so -rwxr-xr-x root/root usr/lib/asterisk/modules/cdr_csv.so
-rwxr-xr-x root/root usr/lib/asterisk/modules/cdr_custom.so -rwxr-xr-x root/root usr/lib/asterisk/modules/cdr_custom.so
-rwxr-xr-x root/root usr/lib/asterisk/modules/cdr_manager.so -rwxr-xr-x root/root usr/lib/asterisk/modules/cdr_manager.so
-rwxr-xr-x root/root usr/lib/asterisk/modules/cdr_sqlite.so -rwxr-xr-x root/root usr/lib/asterisk/modules/cdr_sqlite.so
-rwxr-xr-x root/root usr/lib/asterisk/modules/chan_agent.so -rwxr-xr-x root/root usr/lib/asterisk/modules/chan_agent.so
-rwxr-xr-x root/root usr/lib/asterisk/modules/chan_alsa.so -rwxr-xr-x root/root usr/lib/asterisk/modules/chan_alsa.so
-rwxr-xr-x root/root usr/lib/asterisk/modules/chan_dahdi.so
-rwxr-xr-x root/root usr/lib/asterisk/modules/chan_iax2.so -rwxr-xr-x root/root usr/lib/asterisk/modules/chan_iax2.so
-rwxr-xr-x root/root usr/lib/asterisk/modules/chan_local.so -rwxr-xr-x root/root usr/lib/asterisk/modules/chan_local.so
-rwxr-xr-x root/root usr/lib/asterisk/modules/chan_mgcp.so -rwxr-xr-x root/root usr/lib/asterisk/modules/chan_mgcp.so
@ -243,16 +245,15 @@ drwxr-xr-x root/root usr/lib/asterisk/modules/
-rwxr-xr-x root/root usr/lib/asterisk/modules/chan_phone.so -rwxr-xr-x root/root usr/lib/asterisk/modules/chan_phone.so
-rwxr-xr-x root/root usr/lib/asterisk/modules/chan_sip.so -rwxr-xr-x root/root usr/lib/asterisk/modules/chan_sip.so
-rwxr-xr-x root/root usr/lib/asterisk/modules/chan_skinny.so -rwxr-xr-x root/root usr/lib/asterisk/modules/chan_skinny.so
-rwxr-xr-x root/root usr/lib/asterisk/modules/chan_zap.so
-rwxr-xr-x root/root usr/lib/asterisk/modules/codec_a_mu.so -rwxr-xr-x root/root usr/lib/asterisk/modules/codec_a_mu.so
-rwxr-xr-x root/root usr/lib/asterisk/modules/codec_adpcm.so -rwxr-xr-x root/root usr/lib/asterisk/modules/codec_adpcm.so
-rwxr-xr-x root/root usr/lib/asterisk/modules/codec_alaw.so -rwxr-xr-x root/root usr/lib/asterisk/modules/codec_alaw.so
-rwxr-xr-x root/root usr/lib/asterisk/modules/codec_dahdi.so
-rwxr-xr-x root/root usr/lib/asterisk/modules/codec_g726.so -rwxr-xr-x root/root usr/lib/asterisk/modules/codec_g726.so
-rwxr-xr-x root/root usr/lib/asterisk/modules/codec_gsm.so -rwxr-xr-x root/root usr/lib/asterisk/modules/codec_gsm.so
-rwxr-xr-x root/root usr/lib/asterisk/modules/codec_lpc10.so -rwxr-xr-x root/root usr/lib/asterisk/modules/codec_lpc10.so
-rwxr-xr-x root/root usr/lib/asterisk/modules/codec_speex.so -rwxr-xr-x root/root usr/lib/asterisk/modules/codec_speex.so
-rwxr-xr-x root/root usr/lib/asterisk/modules/codec_ulaw.so -rwxr-xr-x root/root usr/lib/asterisk/modules/codec_ulaw.so
-rwxr-xr-x root/root usr/lib/asterisk/modules/codec_zap.so
-rwxr-xr-x root/root usr/lib/asterisk/modules/format_g723.so -rwxr-xr-x root/root usr/lib/asterisk/modules/format_g723.so
-rwxr-xr-x root/root usr/lib/asterisk/modules/format_g726.so -rwxr-xr-x root/root usr/lib/asterisk/modules/format_g726.so
-rwxr-xr-x root/root usr/lib/asterisk/modules/format_g729.so -rwxr-xr-x root/root usr/lib/asterisk/modules/format_g729.so
@ -267,6 +268,7 @@ drwxr-xr-x root/root usr/lib/asterisk/modules/
-rwxr-xr-x root/root usr/lib/asterisk/modules/format_vox.so -rwxr-xr-x root/root usr/lib/asterisk/modules/format_vox.so
-rwxr-xr-x root/root usr/lib/asterisk/modules/format_wav.so -rwxr-xr-x root/root usr/lib/asterisk/modules/format_wav.so
-rwxr-xr-x root/root usr/lib/asterisk/modules/format_wav_gsm.so -rwxr-xr-x root/root usr/lib/asterisk/modules/format_wav_gsm.so
-rwxr-xr-x root/root usr/lib/asterisk/modules/func_audiohookinherit.so
-rwxr-xr-x root/root usr/lib/asterisk/modules/func_base64.so -rwxr-xr-x root/root usr/lib/asterisk/modules/func_base64.so
-rwxr-xr-x root/root usr/lib/asterisk/modules/func_callerid.so -rwxr-xr-x root/root usr/lib/asterisk/modules/func_callerid.so
-rwxr-xr-x root/root usr/lib/asterisk/modules/func_cdr.so -rwxr-xr-x root/root usr/lib/asterisk/modules/func_cdr.so
@ -342,10 +344,14 @@ drwxr-xr-x asterisk/asterisk var/lib/asterisk/keys/
-rw-r--r-- asterisk/asterisk var/lib/asterisk/keys/iaxtel.pub -rw-r--r-- asterisk/asterisk var/lib/asterisk/keys/iaxtel.pub
drwxr-xr-x asterisk/asterisk var/lib/asterisk/moh/ drwxr-xr-x asterisk/asterisk var/lib/asterisk/moh/
-rw-r--r-- asterisk/asterisk var/lib/asterisk/moh/.asterisk-moh-freeplay-wav (EMPTY) -rw-r--r-- asterisk/asterisk var/lib/asterisk/moh/.asterisk-moh-freeplay-wav (EMPTY)
-rw-r--r-- asterisk/asterisk var/lib/asterisk/moh/LICENSE-asterisk-moh-freeplay-wav -rw-r--r-- asterisk/asterisk var/lib/asterisk/moh/CHANGES-asterisk-moh-opsound-2.01 (EMPTY)
-rw-r--r-- asterisk/asterisk var/lib/asterisk/moh/fpm-calm-river.wav -rw-r--r-- asterisk/asterisk var/lib/asterisk/moh/CREDITS-asterisk-moh-opsound-2.01
-rw-r--r-- asterisk/asterisk var/lib/asterisk/moh/fpm-sunshine.wav -rw-r--r-- asterisk/asterisk var/lib/asterisk/moh/LICENSE-asterisk-moh-opsound-2.01
-rw-r--r-- asterisk/asterisk var/lib/asterisk/moh/fpm-world-mix.wav -rw-r--r-- asterisk/asterisk var/lib/asterisk/moh/macroform-cold_day.wav
-rw-r--r-- asterisk/asterisk var/lib/asterisk/moh/macroform-robot_dity.wav
-rw-r--r-- asterisk/asterisk var/lib/asterisk/moh/macroform-the_simplicity.wav
-rw-r--r-- asterisk/asterisk var/lib/asterisk/moh/manolo_camp-morning_coffee.wav
-rw-r--r-- asterisk/asterisk var/lib/asterisk/moh/reno_project-system.wav
drwxr-xr-x asterisk/asterisk var/lib/asterisk/sounds/ drwxr-xr-x asterisk/asterisk var/lib/asterisk/sounds/
drwxr-xr-x asterisk/asterisk var/lib/asterisk/static-http/ drwxr-xr-x asterisk/asterisk var/lib/asterisk/static-http/
-rw-r--r-- asterisk/asterisk var/lib/asterisk/static-http/ajamdemo.html -rw-r--r-- asterisk/asterisk var/lib/asterisk/static-http/ajamdemo.html

7
asterisk/.md5sum
View File

@ -1,4 +1,5 @@
262781104d7ef2d43adb6d04765d7923 1.4-gsm-gcc4.2.patch 262781104d7ef2d43adb6d04765d7923 1.4-gsm-gcc4.2.patch
46881e1345eca21ea13a7d5b1036fa6e asterisk-1.4.21.2.tar.gz 58181c29d998f883f567dc9757a04167 asterisk-1.4.26.2.tar.gz
41af0109845e1fc844d764c5f8107359 asterisk-mmx.patch 19b6ab4e74bfbe5cfd920338569caebb asterisk-mmx.patch
35ff3ff1fdf0ef0fe92c8f662f4d9f6c asterisk.rc a2a28b4a0d49ff6ea7b52bc18acd0cfa asterisk.rc
7989268cec9053dff54488035fa8927c voicemail.patch

6
asterisk/Pkgfile
View File

@ -4,9 +4,9 @@
# Depends on: openssl, ncurses # Depends on: openssl, ncurses
name=asterisk name=asterisk
version=1.4.21.2 version=1.4.26.2
release=1 release=1
source=(http://downloads.digium.com/pub/$name/releases/$name-$version.tar.gz asterisk.rc asterisk-mmx.patch 1.4-gsm-gcc4.2.patch) source=(http://downloads.digium.com/pub/$name/releases/$name-$version.tar.gz asterisk.rc asterisk-mmx.patch 1.4-gsm-gcc4.2.patch voicemail.patch)
build () { build () {
cd $name-$version cd $name-$version
@ -14,6 +14,8 @@ build () {
# Fixes choppy gsm transcoding when using gcc 4.2 # Fixes choppy gsm transcoding when using gcc 4.2
patch -p1 < $SRC/1.4-gsm-gcc4.2.patch patch -p1 < $SRC/1.4-gsm-gcc4.2.patch
patch -p0 < $SRC/voicemail.patch
# Check if this processor supports MMX instruction set # Check if this processor supports MMX instruction set
if [ -n "`grep '^flags.*mmx' /proc/cpuinfo`" ]; then if [ -n "`grep '^flags.*mmx' /proc/cpuinfo`" ]; then
patch -p1 < $SRC/asterisk-mmx.patch patch -p1 < $SRC/asterisk-mmx.patch

12
asterisk/asterisk-mmx.patch
View File

@ -1,11 +1,11 @@
--- asterisk-1.4.11/Makefile.rules.orig 2007-09-22 14:18:39.308683093 -0400 --- asterisk-1.4.26.2/Makefile.rules.orig 2009-09-09 15:52:34.063291569 -0430
+++ asterisk-1.4.11/Makefile.rules 2007-09-22 14:19:00.370469987 -0400 +++ asterisk-1.4.26.2/Makefile.rules 2009-09-09 15:52:46.814961322 -0430
@@ -30,7 +30,7 @@ @@ -42,7 +42,7 @@
# Uncomment to enable MMXTM optimizations for x86 architecture CPU's # Uncomment to enable MMXTM optimizations for x86 architecture CPU's
# which support MMX instructions. This should be newer pentiums, # which support MMX instructions. This should be newer pentiums,
# ppro's, etc, as well as the AMD K6 and K7. # ppro's, etc, as well as the AMD K6 and K7.
-#K6OPT=-DK6OPT - #K6OPT=-DK6OPT
+K6OPT=-DK6OPT + K6OPT=-DK6OPT
OPTIMIZE?=-O6
ASTCFLAGS+=$(OPTIMIZE) ASTCFLAGS+=$(OPTIMIZE)
endif

5
asterisk/asterisk.rc
View File

@ -10,8 +10,11 @@ case $1 in
start) start)
/usr/sbin/asterisk -G $GROUP -U $USER /usr/sbin/asterisk -G $GROUP -U $USER
;; ;;
startdebug)
/usr/sbin/asterisk -G $GROUP -U $USER -vvv
;;
stop) stop)
kill `cat /var/run/asterisk/asterisk.pid` [ -f /var/run/asterisk/asterisk.pid ] && kill `cat /var/run/asterisk/asterisk.pid`
;; ;;
restart) restart)
$0 stop $0 stop

56
asterisk/voicemail.patch Normal file
View File

@ -0,0 +1,56 @@
Index: apps/app_voicemail.c
===================================================================
--- apps/app_voicemail.c (revision 188040)
+++ apps/app_voicemail.c (working copy)
@@ -8846,7 +8846,10 @@
{
int res;
char *adsi_loaded = ast_module_helper("", "res_adsi.so", 0, 0, 0, 0);
+ char *smdi_loaded = ast_module_helper("", "res_smdi.so", 0, 0, 0, 0);
free(adsi_loaded);
+ free(smdi_loaded);
+
if (!adsi_loaded) {
/* If embedded, res_adsi may be known as "res_adsi" not "res_adsi.so" */
adsi_loaded = ast_module_helper("", "res_adsi", 0, 0, 0, 0);
@@ -8857,6 +8860,16 @@
}
}
+ if (!smdi_loaded) {
+ /* If embedded, res_smdi may be known as "res_smdi" not "res_smdi.so" */
+ smdi_loaded = ast_module_helper("", "res_smdi", 0, 0, 0, 0);
+ ast_free(smdi_loaded);
+ if (!smdi_loaded) {
+ ast_log(LOG_ERROR, "app_voicemail.so depends upon res_smdi.so\n");
+ return AST_MODULE_LOAD_DECLINE;
+ }
+ }
+
my_umask = umask(0);
umask(my_umask);
res = ast_register_application(app, vm_exec, synopsis_vm, descrip_vm);
Index: res/res_smdi.c
===================================================================
--- res/res_smdi.c (revision 188040)
+++ res/res_smdi.c (working copy)
@@ -1313,6 +1313,8 @@
.read = smdi_msg_read,
};
+static int unload_module(void);
+
static int load_module(void)
{
int res;
@@ -1330,8 +1332,10 @@
/* load the config and start the listener threads*/
res = smdi_load(0);
if (res < 0) {
+ unload_module();
return res;
} else if (res == 1) {
+ unload_module();
ast_log(LOG_WARNING, "No SMDI interfaces are available to listen on, not starting SMDI listener.\n");
return AST_MODULE_LOAD_DECLINE;
}