changeset
Update, correct, and add new config logic including fax and license paths.
Sun, 05 Jun 2011 11:43:33 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Sun, 05 Jun 2011 11:43:33 +0200
- changeset 347
- 10bd406e1c51
- parent 346
- c403d9dd5e0e
- child 348
- 062212fbda04
Update, correct, and add new config logic including fax and license paths.
1.1 --- a/asterisk/asterisk.patch Sun May 29 17:14:31 2011 +0200 1.2 +++ b/asterisk/asterisk.patch Sun Jun 05 11:43:33 2011 +0200 1.3 @@ -1,7 +1,7 @@ 1.4 Index: addons/chan_ooh323.c 1.5 diff -Nau addons/chan_ooh323.c.orig addons/chan_ooh323.c 1.6 ---- addons/chan_ooh323.c.orig 2010-10-09 16:02:26.000000000 +0200 1.7 -+++ addons/chan_ooh323.c 2011-03-13 14:03:42.000000000 +0100 1.8 +--- addons/chan_ooh323.c.orig 2011-02-18 01:07:20.000000000 +0100 1.9 ++++ addons/chan_ooh323.c 2011-05-23 17:35:28.331029567 +0200 1.10 @@ -23,6 +23,12 @@ 1.11 1.12 #include "chan_ooh323.h" 1.13 @@ -18,7 +18,7 @@ 1.14 Index: addons/ooh323c/src/ooCmdChannel.c 1.15 diff -Nau addons/ooh323c/src/ooCmdChannel.c.orig addons/ooh323c/src/ooCmdChannel.c 1.16 --- addons/ooh323c/src/ooCmdChannel.c.orig 2010-03-26 00:38:58.000000000 +0100 1.17 -+++ addons/ooh323c/src/ooCmdChannel.c 2011-03-13 14:03:42.000000000 +0100 1.18 ++++ addons/ooh323c/src/ooCmdChannel.c 2011-05-23 17:35:28.331029567 +0200 1.19 @@ -25,6 +25,10 @@ 1.20 #include "ooCalls.h" 1.21 #include "ooCmdChannel.h" 1.22 @@ -32,8 +32,8 @@ 1.23 extern OOH323EndPoint gH323ep; 1.24 Index: addons/ooh323c/src/ooSocket.c 1.25 diff -Nau addons/ooh323c/src/ooSocket.c.orig addons/ooh323c/src/ooSocket.c 1.26 ---- addons/ooh323c/src/ooSocket.c.orig 2010-03-25 22:39:04.000000000 +0100 1.27 -+++ addons/ooh323c/src/ooSocket.c 2011-03-13 14:03:42.000000000 +0100 1.28 +--- addons/ooh323c/src/ooSocket.c.orig 2011-02-16 21:21:17.000000000 +0100 1.29 ++++ addons/ooh323c/src/ooSocket.c 2011-05-23 17:35:28.331029567 +0200 1.30 @@ -24,6 +24,9 @@ 1.31 1.32 #include "ooSocket.h" 1.33 @@ -46,8 +46,8 @@ 1.34 #define SEND_FLAGS 0 1.35 Index: addons/ooh323cDriver.c 1.36 diff -Nau addons/ooh323cDriver.c.orig addons/ooh323cDriver.c 1.37 ---- addons/ooh323cDriver.c.orig 2010-03-26 00:38:58.000000000 +0100 1.38 -+++ addons/ooh323cDriver.c 2011-03-13 14:03:42.000000000 +0100 1.39 +--- addons/ooh323cDriver.c.orig 2011-02-18 01:07:20.000000000 +0100 1.40 ++++ addons/ooh323cDriver.c 2011-05-23 17:35:28.338530899 +0200 1.41 @@ -27,6 +27,11 @@ 1.42 1.43 #define SEC_TO_HOLD_THREAD 24 1.44 @@ -63,7 +63,7 @@ 1.45 Index: apps/app_backticks.c 1.46 diff -Nau apps/app_backticks.c.orig apps/app_backticks.c 1.47 --- apps/app_backticks.c.orig 1970-01-01 01:00:00.000000000 +0100 1.48 -+++ apps/app_backticks.c 2011-03-13 14:03:42.000000000 +0100 1.49 ++++ apps/app_backticks.c 2011-05-23 17:35:28.338530899 +0200 1.50 @@ -0,0 +1,129 @@ 1.51 + 1.52 +#include "asterisk.h" 1.53 @@ -196,8 +196,8 @@ 1.54 + 1.55 Index: apps/app_meetme.c 1.56 diff -Nau apps/app_meetme.c.orig apps/app_meetme.c 1.57 ---- apps/app_meetme.c.orig 2011-01-07 21:53:02.000000000 +0100 1.58 -+++ apps/app_meetme.c 2011-03-13 14:03:42.000000000 +0100 1.59 +--- apps/app_meetme.c.orig 2011-01-29 19:09:37.000000000 +0100 1.60 ++++ apps/app_meetme.c 2011-05-23 17:35:28.338530899 +0200 1.61 @@ -604,6 +604,7 @@ 1.62 CONFFLAG_DURATION_LIMIT = (1 << 30), 1.63 /*! Do not write any audio to this channel until the state is up. */ 1.64 @@ -222,7 +222,7 @@ 1.65 END_OPTIONS ); 1.66 1.67 static const char * const app = "MeetMe"; 1.68 -@@ -2429,6 +2432,12 @@ 1.69 +@@ -2437,6 +2440,12 @@ 1.70 ast_test_flag64(confflags, CONFFLAG_INTROUSERNOREVIEW))) { 1.71 char destdir[PATH_MAX]; 1.72 1.73 @@ -235,7 +235,7 @@ 1.74 snprintf(destdir, sizeof(destdir), "%s/meetme", ast_config_AST_SPOOL_DIR); 1.75 1.76 if (ast_mkdir(destdir, 0777) != 0) { 1.77 -@@ -2445,6 +2454,7 @@ 1.78 +@@ -2453,6 +2462,7 @@ 1.79 res = ast_record_review(chan, "vm-rec-name", user->namerecloc, 10, "sln", &duration, NULL); 1.80 if (res == -1) 1.81 goto outrun; 1.82 @@ -245,8 +245,8 @@ 1.83 ast_mutex_lock(&conf->playlock); 1.84 Index: apps/app_voicemail.c 1.85 diff -Nau apps/app_voicemail.c.orig apps/app_voicemail.c 1.86 ---- apps/app_voicemail.c.orig 2011-01-07 20:58:30.000000000 +0100 1.87 -+++ apps/app_voicemail.c 2011-03-13 14:03:42.000000000 +0100 1.88 +--- apps/app_voicemail.c.orig 2011-02-08 20:41:42.000000000 +0100 1.89 ++++ apps/app_voicemail.c 2011-05-23 17:35:28.348531751 +0200 1.90 @@ -366,6 +366,7 @@ 1.91 static char imapport[8]; 1.92 static char imapflags[128]; 1.93 @@ -264,7 +264,7 @@ 1.94 1.95 /* Add authentication user if present */ 1.96 if (!ast_strlen_zero(authuser)) 1.97 -@@ -6035,6 +6036,7 @@ 1.98 +@@ -6073,6 +6074,7 @@ 1.99 /* simple. huh? */ 1.100 char sequence[10]; 1.101 char mailbox[256]; 1.102 @@ -272,7 +272,7 @@ 1.103 int res; 1.104 1.105 /* get the real IMAP message number for this message */ 1.106 -@@ -6050,10 +6052,24 @@ 1.107 +@@ -6088,10 +6090,24 @@ 1.108 mail_setflag(vms->mailstream, sequence, "\\Unseen"); 1.109 mail_clearflag(vms->mailstream, sequence, "\\Seen"); 1.110 } 1.111 @@ -299,7 +299,7 @@ 1.112 /* Create the folder if it don't exist */ 1.113 imap_mailbox_name(mailbox, sizeof(mailbox), vms, box, 1); /* Get the full mailbox name */ 1.114 ast_debug(5, "Checking if folder exists: %s\n", mailbox); 1.115 -@@ -10221,6 +10237,10 @@ 1.116 +@@ -10264,6 +10280,10 @@ 1.117 #ifndef IMAP_STORAGE 1.118 } else if (!cmd) { 1.119 vms.deleted[vms.curmsg] = 1; 1.120 @@ -310,7 +310,7 @@ 1.121 #endif 1.122 } else { 1.123 vms.deleted[vms.curmsg] = 0; 1.124 -@@ -11688,6 +11708,15 @@ 1.125 +@@ -11731,6 +11751,15 @@ 1.126 } else { 1.127 ast_copy_string(imapfolder, "INBOX", sizeof(imapfolder)); 1.128 } 1.129 @@ -328,8 +328,8 @@ 1.130 } 1.131 Index: apps/.moduleinfo 1.132 diff -Nau apps/.moduleinfo.orig apps/.moduleinfo 1.133 ---- apps/.moduleinfo.orig 2011-02-22 23:50:32.000000000 +0100 1.134 -+++ apps/.moduleinfo 2011-03-13 14:03:42.000000000 +0100 1.135 +--- apps/.moduleinfo.orig 2011-05-09 22:22:47.000000000 +0200 1.136 ++++ apps/.moduleinfo 2011-05-23 17:35:28.348531751 +0200 1.137 @@ -72,7 +72,7 @@ 1.138 <member name="app_image" displayname="Image Transmission Application" remove_on_change="apps/app_image.o apps/app_image.so"> 1.139 </member> 1.140 @@ -355,7 +355,7 @@ 1.141 Index: build_tools/cflags.xml 1.142 diff -Nau build_tools/cflags.xml.orig build_tools/cflags.xml 1.143 --- build_tools/cflags.xml.orig 2010-02-16 16:36:53.000000000 +0100 1.144 -+++ build_tools/cflags.xml 2011-03-13 14:03:42.000000000 +0100 1.145 ++++ build_tools/cflags.xml 2011-05-23 17:35:28.348531751 +0200 1.146 @@ -26,10 +26,11 @@ 1.147 <member name="RADIO_RELAX" displayname="Relax DTMF for Radio Applications"> 1.148 </member> 1.149 @@ -372,7 +372,7 @@ 1.150 Index: chan_capi-1.1.5.919/chan_capi20.h 1.151 diff -Nau chan_capi-1.1.5.919/chan_capi20.h.orig chan_capi-1.1.5.919/chan_capi20.h 1.152 --- chan_capi-1.1.5.919/chan_capi20.h.orig 2011-01-07 02:29:32.000000000 +0100 1.153 -+++ chan_capi-1.1.5.919/chan_capi20.h 2011-03-13 14:03:42.000000000 +0100 1.154 ++++ chan_capi-1.1.5.919/chan_capi20.h 2011-05-23 17:35:28.348531751 +0200 1.155 @@ -4,10 +4,13 @@ 1.156 * first. Else the checks below will fail. 1.157 */ 1.158 @@ -399,7 +399,7 @@ 1.159 Index: chan_capi-1.1.5.919/chan_capi_utils.c 1.160 diff -Nau chan_capi-1.1.5.919/chan_capi_utils.c.orig chan_capi-1.1.5.919/chan_capi_utils.c 1.161 --- chan_capi-1.1.5.919/chan_capi_utils.c.orig 2011-01-07 02:29:32.000000000 +0100 1.162 -+++ chan_capi-1.1.5.919/chan_capi_utils.c 2011-03-13 14:03:42.000000000 +0100 1.163 ++++ chan_capi-1.1.5.919/chan_capi_utils.c 2011-05-23 17:35:28.348531751 +0200 1.164 @@ -1155,6 +1155,9 @@ 1.165 { 1.166 MESSAGE_EXCHANGE_ERROR error; 1.167 @@ -413,7 +413,7 @@ 1.168 Index: chan_capi-1.1.5.919/libcapi20/capi20.c 1.169 diff -Nau chan_capi-1.1.5.919/libcapi20/capi20.c.orig chan_capi-1.1.5.919/libcapi20/capi20.c 1.170 --- chan_capi-1.1.5.919/libcapi20/capi20.c.orig 2011-01-07 02:29:31.000000000 +0100 1.171 -+++ chan_capi-1.1.5.919/libcapi20/capi20.c 2011-03-13 14:03:42.000000000 +0100 1.172 ++++ chan_capi-1.1.5.919/libcapi20/capi20.c 2011-05-23 17:35:28.348531751 +0200 1.173 @@ -19,8 +19,10 @@ 1.174 #include <stdio.h> 1.175 #include <ctype.h> 1.176 @@ -710,7 +710,7 @@ 1.177 Index: chan_capi-1.1.5.919/libcapi20/convert.c 1.178 diff -Nau chan_capi-1.1.5.919/libcapi20/convert.c.orig chan_capi-1.1.5.919/libcapi20/convert.c 1.179 --- chan_capi-1.1.5.919/libcapi20/convert.c.orig 2011-01-07 02:29:31.000000000 +0100 1.180 -+++ chan_capi-1.1.5.919/libcapi20/convert.c 2011-03-13 14:03:42.000000000 +0100 1.181 ++++ chan_capi-1.1.5.919/libcapi20/convert.c 2011-05-23 17:35:28.348531751 +0200 1.182 @@ -11,7 +11,14 @@ 1.183 #include <stddef.h> 1.184 #include <time.h> 1.185 @@ -729,7 +729,7 @@ 1.186 Index: chan_capi-1.1.5.919/Makefile 1.187 diff -Nau chan_capi-1.1.5.919/Makefile.orig chan_capi-1.1.5.919/Makefile 1.188 --- chan_capi-1.1.5.919/Makefile.orig 2011-01-07 02:29:32.000000000 +0100 1.189 -+++ chan_capi-1.1.5.919/Makefile 2011-03-13 14:03:42.000000000 +0100 1.190 ++++ chan_capi-1.1.5.919/Makefile 2011-05-23 17:35:28.348531751 +0200 1.191 @@ -111,6 +111,9 @@ 1.192 CFLAGS+=-O2 1.193 CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) 1.194 @@ -742,9 +742,9 @@ 1.195 endif 1.196 Index: channels/chan_sip.c 1.197 diff -Nau channels/chan_sip.c.orig channels/chan_sip.c 1.198 ---- channels/chan_sip.c.orig 2011-01-14 18:32:52.000000000 +0100 1.199 -+++ channels/chan_sip.c 2011-03-13 14:03:42.000000000 +0100 1.200 -@@ -11210,7 +11210,16 @@ 1.201 +--- channels/chan_sip.c.orig 2011-04-25 17:11:30.000000000 +0200 1.202 ++++ channels/chan_sip.c 2011-05-23 17:35:28.358543497 +0200 1.203 +@@ -11458,7 +11458,16 @@ 1.204 } else { 1.205 if (sipmethod == SIP_NOTIFY && !ast_strlen_zero(p->theirtag)) { 1.206 /* If this is a NOTIFY, use the From: tag in the subscribe (RFC 3265) */ 1.207 @@ -765,7 +765,7 @@ 1.208 Index: channels/console_video.h 1.209 diff -Nau channels/console_video.h.orig channels/console_video.h 1.210 --- channels/console_video.h.orig 2008-06-30 17:45:15.000000000 +0200 1.211 -+++ channels/console_video.h 2011-03-13 14:03:42.000000000 +0100 1.212 ++++ channels/console_video.h 2011-05-23 17:35:28.358543497 +0200 1.213 @@ -28,10 +28,7 @@ 1.214 "console {device}" 1.215 #else 1.216 @@ -780,21 +780,21 @@ 1.217 "console {videodevice|videocodec" \ 1.218 Index: configure 1.219 diff -Nau configure.orig configure 1.220 ---- configure.orig 2011-01-09 22:40:34.000000000 +0100 1.221 -+++ configure 2011-03-13 14:14:50.000000000 +0100 1.222 -@@ -4700,11 +4700,6 @@ 1.223 +--- configure.orig 2011-01-27 18:03:01.000000000 +0100 1.224 ++++ configure 2011-05-23 17:41:08.331029717 +0200 1.225 +@@ -4704,11 +4704,6 @@ 1.226 esac 1.227 1.228 case "${host_os}" in 1.229 - freebsd*) 1.230 -- 1.231 +- ac_default_prefix=/usr/local 1.232 - CPPFLAGS=-I/usr/local/include 1.233 - LDFLAGS=-L/usr/local/lib 1.234 - ;; 1.235 openbsd*) 1.236 - 1.237 + ac_default_prefix=/usr/local 1.238 if test ${prefix} = '/usr/local' || test ${prefix} = 'NONE'; then 1.239 -@@ -18227,8 +18222,8 @@ 1.240 +@@ -18203,8 +18198,8 @@ 1.241 if test -f "${IMAP_TK_DIR}/c-client/LDFLAGS"; then 1.242 imap_ldflags=`cat ${IMAP_TK_DIR}/c-client/LDFLAGS` 1.243 fi 1.244 @@ -805,26 +805,7 @@ 1.245 CPPFLAGS="${CPPFLAGS} ${imap_include}" 1.246 LIBS="${LIBS} ${imap_libs} "`echo ${imap_ldflags}` 1.247 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 1.248 -@@ -25461,14 +25456,14 @@ 1.249 - else 1.250 - ast_ext_lib_check_save_CFLAGS="${CFLAGS}" 1.251 - CFLAGS="${CFLAGS} " 1.252 -- as_ac_Lib=`$as_echo "ac_cv_lib_lua5.1_${pbxfuncname}" | $as_tr_sh` 1.253 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -llua5.1" >&5 1.254 --$as_echo_n "checking for ${pbxfuncname} in -llua5.1... " >&6; } 1.255 -+ as_ac_Lib=`$as_echo "ac_cv_lib_lua_${pbxfuncname}" | $as_tr_sh` 1.256 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -llua" >&5 1.257 -+$as_echo_n "checking for ${pbxfuncname} in -llua... " >&6; } 1.258 - if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : 1.259 - $as_echo_n "(cached) " >&6 1.260 - else 1.261 - ac_check_lib_save_LIBS=$LIBS 1.262 --LIBS="-llua5.1 ${pbxlibdir} -lm $LIBS" 1.263 -+LIBS="-llua ${pbxlibdir} -lm $LIBS" 1.264 - cat confdefs.h - <<_ACEOF >conftest.$ac_ext 1.265 - /* end confdefs.h. */ 1.266 - 1.267 -@@ -25511,19 +25506,19 @@ 1.268 +@@ -25436,19 +25431,19 @@ 1.269 1.270 # now check for the header. 1.271 if test "${AST_LUA_FOUND}" = "yes"; then 1.272 @@ -848,7 +829,7 @@ 1.273 LUA_HEADER_FOUND=1 1.274 else 1.275 LUA_HEADER_FOUND=0 1.276 -@@ -25551,9 +25546,9 @@ 1.277 +@@ -25476,9 +25471,9 @@ 1.278 1.279 if test "x${PBX_LUA}" = "x1" ; then 1.280 if test x"${LUA_DIR}" = x; then 1.281 @@ -860,7 +841,7 @@ 1.282 fi 1.283 fi 1.284 1.285 -@@ -26238,7 +26233,7 @@ 1.286 +@@ -26157,7 +26152,7 @@ 1.287 pbxlibdir="-L${SQLITE_DIR}" 1.288 fi 1.289 fi 1.290 @@ -869,7 +850,7 @@ 1.291 if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers 1.292 AST_SQLITE_FOUND=yes 1.293 else 1.294 -@@ -26953,16 +26948,16 @@ 1.295 +@@ -26867,16 +26862,16 @@ 1.296 if test "x${PBX_GMIME}" != "x1" -a "${USE_GMIME}" != "no"; then 1.297 PBX_GMIME=0 1.298 if test -n "$ac_tool_prefix"; then 1.299 @@ -891,7 +872,7 @@ 1.300 ;; 1.301 *) 1.302 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 1.303 -@@ -26973,7 +26968,7 @@ 1.304 +@@ -26887,7 +26882,7 @@ 1.305 test -z "$as_dir" && as_dir=. 1.306 for ac_exec_ext in '' $ac_executable_extensions; do 1.307 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 1.308 @@ -900,7 +881,7 @@ 1.309 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 1.310 break 2 1.311 fi 1.312 -@@ -26984,10 +26979,10 @@ 1.313 +@@ -26898,10 +26893,10 @@ 1.314 ;; 1.315 esac 1.316 fi 1.317 @@ -915,7 +896,7 @@ 1.318 else 1.319 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 1.320 $as_echo "no" >&6; } 1.321 -@@ -26995,18 +26990,18 @@ 1.322 +@@ -26909,18 +26904,18 @@ 1.323 1.324 1.325 fi 1.326 @@ -941,7 +922,7 @@ 1.327 ;; 1.328 *) 1.329 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 1.330 -@@ -27017,7 +27012,7 @@ 1.331 +@@ -26931,7 +26926,7 @@ 1.332 test -z "$as_dir" && as_dir=. 1.333 for ac_exec_ext in '' $ac_executable_extensions; do 1.334 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 1.335 @@ -950,7 +931,7 @@ 1.336 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 1.337 break 2 1.338 fi 1.339 -@@ -27028,17 +27023,17 @@ 1.340 +@@ -26942,17 +26937,17 @@ 1.341 ;; 1.342 esac 1.343 fi 1.344 @@ -974,7 +955,7 @@ 1.345 else 1.346 case $cross_compiling:$ac_tool_warned in 1.347 yes:) 1.348 -@@ -27046,17 +27041,15 @@ 1.349 +@@ -26960,17 +26955,15 @@ 1.350 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} 1.351 ac_tool_warned=yes ;; 1.352 esac 1.353 @@ -1000,7 +981,7 @@ 1.354 Index: formats/format_pcm.c 1.355 diff -Nau formats/format_pcm.c.orig formats/format_pcm.c 1.356 --- formats/format_pcm.c.orig 2010-07-26 05:27:06.000000000 +0200 1.357 -+++ formats/format_pcm.c 2011-03-13 14:03:42.000000000 +0100 1.358 ++++ formats/format_pcm.c 2011-05-23 17:35:28.368530778 +0200 1.359 @@ -350,6 +350,7 @@ 1.360 ast_log(LOG_WARNING, "Unable to write header\n"); 1.361 return -1; 1.362 @@ -1012,7 +993,7 @@ 1.363 Index: formats/format_wav.c 1.364 diff -Nau formats/format_wav.c.orig formats/format_wav.c 1.365 --- formats/format_wav.c.orig 2010-09-02 18:43:09.000000000 +0200 1.366 -+++ formats/format_wav.c 2011-03-13 14:03:42.000000000 +0100 1.367 ++++ formats/format_wav.c 2011-05-23 17:35:28.368530778 +0200 1.368 @@ -310,6 +310,7 @@ 1.369 ast_log(LOG_WARNING, "Unable to write header\n"); 1.370 return -1; 1.371 @@ -1024,7 +1005,7 @@ 1.372 Index: formats/format_wav_gsm.c 1.373 diff -Nau formats/format_wav_gsm.c.orig formats/format_wav_gsm.c 1.374 --- formats/format_wav_gsm.c.orig 2010-07-26 05:27:06.000000000 +0200 1.375 -+++ formats/format_wav_gsm.c 2011-03-13 14:03:42.000000000 +0100 1.376 ++++ formats/format_wav_gsm.c 2011-05-23 17:35:28.368530778 +0200 1.377 @@ -362,6 +362,7 @@ 1.378 ast_log(LOG_WARNING, "Unable to write header\n"); 1.379 return -1; 1.380 @@ -1036,7 +1017,7 @@ 1.381 Index: main/db1-ast/hash/hash.h 1.382 diff -Nau main/db1-ast/hash/hash.h.orig main/db1-ast/hash/hash.h 1.383 --- main/db1-ast/hash/hash.h.orig 2006-08-21 04:11:39.000000000 +0200 1.384 -+++ main/db1-ast/hash/hash.h 2011-03-13 14:03:42.000000000 +0100 1.385 ++++ main/db1-ast/hash/hash.h 2011-05-23 17:35:28.368530778 +0200 1.386 @@ -36,6 +36,8 @@ 1.387 * @(#)hash.h 8.3 (Berkeley) 5/31/94 1.388 */ 1.389 @@ -1049,7 +1030,7 @@ 1.390 Index: main/db1-ast/hash/ndbm.c 1.391 diff -Nau main/db1-ast/hash/ndbm.c.orig main/db1-ast/hash/ndbm.c 1.392 --- main/db1-ast/hash/ndbm.c.orig 2006-08-21 04:11:39.000000000 +0200 1.393 -+++ main/db1-ast/hash/ndbm.c 2011-03-13 14:03:42.000000000 +0100 1.394 ++++ main/db1-ast/hash/ndbm.c 2011-05-23 17:35:28.368530778 +0200 1.395 @@ -49,7 +49,8 @@ 1.396 #include <string.h> 1.397 #include <stdlib.h> 1.398 @@ -1062,8 +1043,8 @@ 1.399 /* 1.400 Index: main/features.c 1.401 diff -Nau main/features.c.orig main/features.c 1.402 ---- main/features.c.orig 2011-01-20 21:24:36.000000000 +0100 1.403 -+++ main/features.c 2011-03-13 14:03:42.000000000 +0100 1.404 +--- main/features.c.orig 2011-02-09 20:52:51.000000000 +0100 1.405 ++++ main/features.c 2011-05-23 17:35:28.368530778 +0200 1.406 @@ -1658,6 +1658,10 @@ 1.407 snprintf(args, len, "%s,%s,m", S_OR(touch_format, "wav"), touch_filename); 1.408 } 1.409 @@ -1088,8 +1069,8 @@ 1.410 args[x] = '-'; 1.411 Index: main/file.c 1.412 diff -Nau main/file.c.orig main/file.c 1.413 ---- main/file.c.orig 2011-01-12 17:05:12.000000000 +0100 1.414 -+++ main/file.c 2011-03-13 14:03:42.000000000 +0100 1.415 +--- main/file.c.orig 2011-01-26 02:26:26.000000000 +0100 1.416 ++++ main/file.c 2011-05-23 17:35:28.378531576 +0200 1.417 @@ -255,7 +255,7 @@ 1.418 char *fn = NULL; 1.419 1.420 @@ -1102,7 +1083,7 @@ 1.421 Index: main/Makefile 1.422 diff -Nau main/Makefile.orig main/Makefile 1.423 --- main/Makefile.orig 2010-12-18 00:52:04.000000000 +0100 1.424 -+++ main/Makefile 2011-03-13 14:03:42.000000000 +0100 1.425 ++++ main/Makefile 2011-05-23 17:35:28.378531576 +0200 1.426 @@ -69,10 +69,7 @@ 1.427 endif 1.428 1.429 @@ -1117,9 +1098,9 @@ 1.430 ifneq ($(findstring $(OSARCH), mingw32 cygwin ),) 1.431 Index: main/tcptls.c 1.432 diff -Nau main/tcptls.c.orig main/tcptls.c 1.433 ---- main/tcptls.c.orig 2010-07-09 00:08:07.000000000 +0200 1.434 -+++ main/tcptls.c 2011-03-13 14:03:42.000000000 +0100 1.435 -@@ -354,6 +354,7 @@ 1.436 +--- main/tcptls.c.orig 2011-04-25 17:11:30.000000000 +0200 1.437 ++++ main/tcptls.c 2011-05-23 17:35:28.378531576 +0200 1.438 +@@ -353,6 +353,7 @@ 1.439 if (!ast_strlen_zero(cfg->cafile) || !ast_strlen_zero(cfg->capath)) { 1.440 if (SSL_CTX_load_verify_locations(cfg->ssl_ctx, S_OR(cfg->cafile, NULL), S_OR(cfg->capath,NULL)) == 0) 1.441 ast_verb(0, "SSL CA file(%s)/path(%s) error\n", cfg->cafile, cfg->capath); 1.442 @@ -1129,8 +1110,8 @@ 1.443 ast_verb(0, "SSL certificate ok\n"); 1.444 Index: main/udptl.c 1.445 diff -Nau main/udptl.c.orig main/udptl.c 1.446 ---- main/udptl.c.orig 2011-02-22 23:52:11.000000000 +0100 1.447 -+++ main/udptl.c 2011-03-13 14:03:42.000000000 +0100 1.448 +--- main/udptl.c.orig 2011-02-21 16:02:20.000000000 +0100 1.449 ++++ main/udptl.c 2011-05-23 17:35:28.378531576 +0200 1.450 @@ -98,6 +98,18 @@ 1.451 1.452 #define UDPTL_BUF_MASK 15 1.453 @@ -1152,8 +1133,8 @@ 1.454 uint8_t buf[LOCAL_FAX_MAX_DATAGRAM]; 1.455 Index: Makefile 1.456 diff -Nau Makefile.orig Makefile 1.457 ---- Makefile.orig 2011-01-12 16:57:43.000000000 +0100 1.458 -+++ Makefile 2011-03-13 14:03:42.000000000 +0100 1.459 +--- Makefile.orig 2011-02-01 19:02:06.000000000 +0100 1.460 ++++ Makefile 2011-05-23 17:35:28.378531576 +0200 1.461 @@ -230,15 +230,6 @@ 1.462 _ASTCFLAGS+=-fsigned-char 1.463 endif 1.464 @@ -1172,8 +1153,8 @@ 1.465 endif 1.466 Index: menuselect-tree 1.467 diff -Nau menuselect-tree.orig menuselect-tree 1.468 ---- menuselect-tree.orig 2011-02-22 23:50:45.000000000 +0100 1.469 -+++ menuselect-tree 2011-03-13 14:03:42.000000000 +0100 1.470 +--- menuselect-tree.orig 2011-05-09 22:22:55.000000000 +0200 1.471 ++++ menuselect-tree 2011-05-23 17:35:28.378531576 +0200 1.472 @@ -38,6 +38,8 @@ 1.473 </member> 1.474 <member name="app_authenticate" displayname="Authentication Application" remove_on_change="apps/app_authenticate.o apps/app_authenticate.so"> 1.475 @@ -1223,7 +1204,7 @@ 1.476 Index: res/res_http_post.c 1.477 diff -Nau res/res_http_post.c.orig res/res_http_post.c 1.478 --- res/res_http_post.c.orig 2009-10-27 17:48:54.000000000 +0100 1.479 -+++ res/res_http_post.c 2011-03-13 14:03:42.000000000 +0100 1.480 ++++ res/res_http_post.c 2011-05-23 17:35:28.378531576 +0200 1.481 @@ -122,14 +122,8 @@ 1.482 ast_log(LOG_WARNING, "Got unexpected GMIME_IS_MESSAGE_PARTIAL\n"); 1.483 return; 1.484 @@ -1244,7 +1225,7 @@ 1.485 Index: sounds/sounds.xml 1.486 diff -Nau sounds/sounds.xml.orig sounds/sounds.xml 1.487 --- sounds/sounds.xml.orig 2010-10-18 23:51:23.000000000 +0200 1.488 -+++ sounds/sounds.xml 2011-03-13 14:03:42.000000000 +0100 1.489 ++++ sounds/sounds.xml 2011-05-23 17:35:28.378531576 +0200 1.490 @@ -6,11 +6,11 @@ 1.491 <member name="CORE-SOUNDS-EN-ALAW" displayname="English, a-Law format"> 1.492 </member> 1.493 @@ -1285,7 +1266,7 @@ 1.494 Index: cdr/cdr_radius.c 1.495 diff -Nau cdr/cdr_radius.c.orig cdr/cdr_radius.c 1.496 --- cdr/cdr_radius.c.orig 2010-07-20 21:35:02.000000000 +0200 1.497 -+++ cdr/cdr_radius.c 2011-03-22 16:12:11.000000000 +0100 1.498 ++++ cdr/cdr_radius.c 2011-05-23 17:35:28.378531576 +0200 1.499 @@ -105,10 +105,18 @@ 1.500 if (!rc_avpair_add(rh, tosend, PW_AST_SRC, &cdr->src, strlen(cdr->src), VENDOR_CODE)) 1.501 return -1;
2.1 --- a/asterisk/asterisk.patch.proxymwi Sun May 29 17:14:31 2011 +0200 2.2 +++ b/asterisk/asterisk.patch.proxymwi Sun Jun 05 11:43:33 2011 +0200 2.3 @@ -2,7 +2,7 @@ 2.4 diff -Nau channels/chan_sip.c.orig channels/chan_sip.c 2.5 --- channels/chan_sip.c.orig 2011-01-14 18:32:52.000000000 +0100 2.6 +++ channels/chan_sip.c 2011-03-13 14:34:29.000000000 +0100 2.7 -@@ -24267,6 +24267,7 @@ 2.8 +@@ -24506,6 +24506,7 @@ 2.9 /* Called with peerl lock, but releases it */ 2.10 struct sip_pvt *p; 2.11 int newmsgs = 0, oldmsgs = 0; 2.12 @@ -10,7 +10,7 @@ 2.13 2.14 if (ast_test_flag((&peer->flags[1]), SIP_PAGE2_SUBSCRIBEMWIONLY) && !peer->mwipvt) 2.15 return 0; 2.16 -@@ -24307,6 +24308,11 @@ 2.17 +@@ -24546,6 +24547,11 @@ 2.18 } 2.19 /* Recalculate our side, and recalculate Call ID */ 2.20 ast_sip_ouraddrfor(&p->sa, &p->ourip, p);
3.1 --- a/asterisk/asterisk.patch.xfersips Sun May 29 17:14:31 2011 +0200 3.2 +++ b/asterisk/asterisk.patch.xfersips Sun Jun 05 11:43:33 2011 +0200 3.3 @@ -1,8 +1,8 @@ 3.4 Index: channels/chan_sip.c 3.5 diff -Nau channels/chan_sip.c.orig channels/chan_sip.c 3.6 ---- channels/chan_sip.c.orig 2011-01-14 18:32:52.000000000 +0100 3.7 -+++ channels/chan_sip.c 2011-03-13 14:32:58.000000000 +0100 3.8 -@@ -27854,6 +27854,7 @@ 3.9 +--- channels/chan_sip.c.orig 2011-05-23 17:35:28.358543497 +0200 3.10 ++++ channels/chan_sip.c 2011-05-23 17:57:05.948534524 +0200 3.11 +@@ -28144,6 +28144,7 @@ 3.12 \todo Fix this function so that we wait for reply to the REFER and 3.13 react to errors, denials or other issues the other end might have. 3.14 */ 3.15 @@ -10,7 +10,7 @@ 3.16 static int sip_sipredirect(struct sip_pvt *p, const char *dest) 3.17 { 3.18 char *cdest; 3.19 -@@ -27862,7 +27863,7 @@ 3.20 +@@ -28152,7 +28153,7 @@ 3.21 cdest = ast_strdupa(dest); 3.22 3.23 extension = strsep(&cdest, "@"); 3.24 @@ -19,7 +19,7 @@ 3.25 if (ast_strlen_zero(extension)) { 3.26 ast_log(LOG_ERROR, "Missing mandatory argument: extension\n"); 3.27 return 0; 3.28 -@@ -27894,7 +27895,14 @@ 3.29 +@@ -28184,7 +28185,14 @@ 3.30 } 3.31 } 3.32
4.1 --- a/asterisk/asterisk.spec Sun May 29 17:14:31 2011 +0200 4.2 +++ b/asterisk/asterisk.spec Sun Jun 05 11:43:33 2011 +0200 4.3 @@ -22,10 +22,11 @@ 4.4 ## 4.5 4.6 # package version 4.7 -%define V_opkg 1.8.3.2 4.8 -%define V_asterisk 1.8.3.2 4.9 -%define V_asterisk_fax_digium 1.8.0_1.3.0 4.10 -%define V_asterisk_sounds_core 1.4.20 4.11 +%define V_opkg 1.8.4.2 4.12 +%define V_asterisk 1.8.4.2 4.13 +%define V_asterisk_fax_subdir 1.8.4 4.14 +%define V_asterisk_fax_digium 1.8.4_1.3.0 4.15 +%define V_asterisk_sounds_core 1.4.21 4.16 %define V_asterisk_sounds_extra 1.4.11 4.17 %define V_asterisk_sounds_amoogab 1.4 4.18 %define V_asterisk_sounds_amootts current 4.19 @@ -49,7 +50,7 @@ 4.20 Group: VoIP 4.21 License: GPL 4.22 Version: %{V_opkg} 4.23 -Release: 20110316 4.24 +Release: 20110602 4.25 4.26 # package options 4.27 %option with_dahdi no 4.28 @@ -94,8 +95,8 @@ 4.29 Source17: http://files.freeswitch.org/freeswitch-sounds-ru-RU-elena-48000-%{V_fswitch_sounds_ru}.tar.gz 4.30 Source18: http://files.freeswitch.org/freeswitch-sounds-music-48000-%{V_fswitch_music}.tar.gz 4.31 Source19: http://svn.digium.com/svn/thirdparty/mp3/trunk/addons/mp3-%{V_asterisk_addons_mp3dec}.tar.gz 4.32 -Source20: http://downloads.digium.com/pub/telephony/fax/res_fax_digium/asterisk-1.8.0/x86-64/res_fax_digium-%{V_asterisk_fax_digium}-generic_64.tar.gz 4.33 -Source21: http://downloads.digium.com/pub/telephony/fax/res_fax_digium/asterisk-1.8.0/x86-32/res_fax_digium-%{V_asterisk_fax_digium}-generic_32.tar.gz 4.34 +Source20: http://downloads.digium.com/pub/telephony/fax/res_fax_digium/asterisk-%{V_asterisk_fax_subdir}/x86-64/res_fax_digium-%{V_asterisk_fax_digium}-generic_64.tar.gz 4.35 +Source21: http://downloads.digium.com/pub/telephony/fax/res_fax_digium/asterisk-%{V_asterisk_fax_subdir}/x86-32/res_fax_digium-%{V_asterisk_fax_digium}-generic_32.tar.gz 4.36 Source22: ilbc-20110104.tar.gz 4.37 Source23: asterisk.txt 4.38 Source24: rc.asterisk 4.39 @@ -107,7 +108,7 @@ 4.40 # build information 4.41 Prefix: %{l_prefix} 4.42 BuildRoot: %{l_buildroot} 4.43 -BuildPreReq: OpenPKG, openpkg >= 20040130, bison, gcc, make, grep 4.44 +BuildPreReq: OpenPKG, openpkg >= 20040130, bison, gcc, make, grep, pkgconfig 4.45 PreReq: OpenPKG, openpkg >= 20040130, MTA 4.46 BuildPreReq: zlib, curl, openssl, ncurses, speex, sox, popt, gmime, libxml 4.47 PreReq: zlib, curl, openssl, ncurses, speex, sox, popt, gmime, libxml 4.48 @@ -276,8 +277,6 @@ 4.49 -e 's;\(dir=.*{localstatedir}\)/\([^/][^/]*\)/asterisk;\1/asterisk/\2;g' \ 4.50 configure 4.51 %{l_shtool} subst \ 4.52 - -e 's;-llua5\.1;-llua;' \ 4.53 - -e 's;lua5\.1/lua\.h;lua/lua.h;' \ 4.54 -e 's;ffmpeg/avcodec\.h;libavcodec/avcodec.h;' \ 4.55 -e 's;\(sqlite\)\(_exec\);\13\2;g' \ 4.56 -e 's;-lradiusclient-ng;-lradiusclient;g' \ 4.57 @@ -657,6 +656,7 @@ 4.58 mv -f music/48000/* . && rm -rf music 4.59 4.60 # convert freeswitch 48000 and 441000 KHz to 8000 Khz 4.61 + # ffmpeg -i <in> -ar 8000 -ac 1 -acodec pcm_s16le -f s16le <out> 4.62 cd $RPM_BUILD_ROOT%{l_prefix}/share/asterisk 4.63 for highfile in `find . -name '*.wav'`; do 4.64 lowfile=`echo $highfile | sed -e 's;\(.*\)\.wav;\1.sln16;'` 4.65 @@ -691,6 +691,7 @@ 4.66 #mv -f phonetic/de/* de/phonetic/ && rm -rf phonetic/de 4.67 %{l_tar} jxf %{SOURCE astmultisnds-de-sln16-%{V_asterisk_sounds_custom}.tar.bz2} 4.68 %{l_tar} jxf %{SOURCE msvbsnds-sln16-%{V_asterisk_sounds_custom}.tar.bz2} 4.69 + mv msvbsnds-sln16-%{V_asterisk_sounds_custom} msvb 4.70 4.71 # install additional asterisk music on hold 4.72 cd $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/moh 4.73 @@ -733,8 +734,8 @@ 4.74 # create additional directories 4.75 %{l_shtool} mkdir -f -p -m 755 \ 4.76 $RPM_BUILD_ROOT%{l_prefix}/var/asterisk/db \ 4.77 - $RPM_BUILD_ROOT%{l_prefix}/var/asterisk/lib/licenses \ 4.78 - $RPM_BUILD_ROOT%{l_prefix}/var/asterisk/spool/outgoing 4.79 + $RPM_BUILD_ROOT%{l_prefix}/var/asterisk/spool/outgoing \ 4.80 + $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/licenses 4.81 4.82 # postadjust installation 4.83 strip $RPM_BUILD_ROOT%{l_prefix}/sbin/* \ 4.84 @@ -784,7 +785,7 @@ 4.85 # determine installation files 4.86 %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \ 4.87 %{l_files_std} \ 4.88 - '%config %{l_prefix}/var/asterisk/lib/licenses' \ 4.89 + '%config %attr(-,%{l_mgrp},%{l_mgrp}) %{l_prefix}/share/asterisk/licenses' \ 4.90 '%config %attr(640,%{l_mgrp},%{l_rgrp}) %{l_prefix}/etc/asterisk/*' \ 4.91 '%attr(-,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/asterisk' 4.92 4.93 @@ -836,7 +837,7 @@ 4.94 ( echo "Asterisk has been installed with proprietary Digium fax support." 4.95 echo "The responsible module is called res_fax_digium and requires a" 4.96 echo "valid license. The license must be found in the directory" 4.97 - echo "'licenses' which in turn must be found in $prefix/var/asterisk/lib" 4.98 + echo "'licenses' which in turn must be found in $prefix/share/asterisk" 4.99 echo "or wherever astvarlibdir has been configured in 'asterisk.conf'." 4.100 echo "" 4.101 echo "Please see http://downloads.digium.com/pub/telephony/fax/ for information."
5.1 --- a/asterisk/asterisk.txt Sun May 29 17:14:31 2011 +0200 5.2 +++ b/asterisk/asterisk.txt Sun Jun 05 11:43:33 2011 +0200 5.3 @@ -79,10 +79,19 @@ 5.4 webenabled = no 5.5 bindaddr = 127.0.0.1 5.6 port = 5038 5.7 -sslenable = no 5.8 -sslbindaddr = 127.0.0.1 5.9 -sslbindport = 5039 5.10 -sslcert = @l_prefix@/etc/asterisk/asterisk.pem 5.11 + 5.12 +; You can open a TLS connection to this socket with: 5.13 +; 5.14 +; openssl s_client -connect my_host:5039 5.15 +; 5.16 +tlsenable = no 5.17 +tlsbindaddr = 127.0.0.1 5.18 +tlsbindport = 5039 5.19 +tlscertfile = @l_prefix@/etc/asterisk/asterisk.pem 5.20 +; if tlsprivatekey is not specified search tlscertfile for key 5.21 +;tlsprivatekey = @l_prefix@/etc/asterisk/asterkey.pem 5.22 +;tlscipher = ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL 5.23 + 5.24 displayconnects = yes 5.25 allowmultiplelogin = yes 5.26 timestampevents = yes 5.27 @@ -104,10 +113,10 @@ 5.28 enabled = no 5.29 bindaddr = 127.0.0.1 5.30 bindport = 8088 5.31 -sslenable = no 5.32 -sslbindport = 8089 5.33 -sslbindaddr = 127.0.0.1 5.34 -sslcert = @l_prefix@/etc/asterisk/asterisk.pem 5.35 +tlsenable = no 5.36 +tlsbindport = 8089 5.37 +tlsbindaddr = 127.0.0.1 5.38 +tlscertfile = @l_prefix@/etc/asterisk/asterisk.pem 5.39 enablestatic = yes 5.40 prefix = asterisk 5.41 redirect = / /asterisk/static/docs/index.html 5.42 @@ -222,6 +231,30 @@ 5.43 mailbox = 12@internal 5.44 5.45 </file> 5.46 +<file name="iax.conf"> 5.47 +;; 5.48 +;; iax.conf -- Asterisk IAX configuration 5.49 +;; 5.50 + 5.51 +;; This configuration is reread at reload 5.52 +;; or with the CLI command 5.53 +;; reload chan_iax2.so 5.54 +;; 5.55 +;; General settings, like port number to bind to, and 5.56 +;; an option address (the default is to bind to all 5.57 +;; local addresses). 5.58 +;; 5.59 +;[general] 5.60 +;bindport=4569 ; bindport and bindaddr may be specified 5.61 +; ; NOTE: bindport must be specified BEFORE 5.62 +; ; bindaddr or may be specified on a specific 5.63 +; ; bindaddr if followed by colon and port 5.64 +; ; (e.g. bindaddr=192.168.0.1:4569) 5.65 +;bindaddr=127.0.0.1 ; more than once to bind to multiple 5.66 +; ; addresses, but the first will be the 5.67 +; ; default 5.68 + 5.69 +</file> 5.70 <file name="rtp.conf"> 5.71 ;; 5.72 ;; rtp.conf -- Asterisk RTP configuration 5.73 @@ -755,6 +788,59 @@ 5.74 stutter = 425+400 5.75 5.76 </file> 5.77 +<file name="ccss.conf"> 5.78 +;; 5.79 +;; ccss.conf -- Asterisk Call Completion Supplementary Services configuration 5.80 +;; 5.81 + 5.82 +; Warning! The CCSS implementation brings several changes to the 5.83 +; channel components of Asterisk. To use CCSS, specify the number 5.84 +; of maximum requests in this file but do not forget to specify 5.85 +; the new CCSS related channel specific options in other config 5.86 +; files as well! Some are 'cc_offer_timer', 'ccbs_available_timer', 5.87 +; 'cc_agent_policy=never' and many more (in other files.) 5.88 + 5.89 +[general] 5.90 +; There is only a single option that may be defined in this file. 5.91 +; The cc_max_requests option is a global limit on the number of 5.92 +; CC requests that may be in the Asterisk system at any time. 5.93 +; 5.94 +cc_max_requests = 20 5.95 + 5.96 +</file> 5.97 +<file name="res_fax.conf"> 5.98 +;; 5.99 +;; res_fax.conf -- Asterisk fax resource configuration 5.100 +;; 5.101 + 5.102 +[general] 5.103 +; Maximum Transmission Rate 5.104 +; Possible values are { 2400 | 4800 | 7200 | 9600 | 12000 | 14400 } 5.105 +; Set this value to the maximum desired transfer rate. Default: 14400 5.106 +maxrate=14400 5.107 + 5.108 +; Minimum Transmission Rate 5.109 +; Possible values are { 2400 | 4800 | 7200 | 9600 | 12000 | 14400 } 5.110 +; Set this value to the minimum desired transfer rate. Default: 2400 5.111 +minrate=2400 5.112 + 5.113 +; Send Progress/Status events to manager session 5.114 +; Manager events with 'call' class permissions will receive events indicating the 5.115 +; steps to initiate a fax session. Fax completion events are always sent to manager 5.116 +; sessions with 'call' class permissions, regardless of the value of this option. 5.117 +; Default: no 5.118 +statusevents=yes 5.119 + 5.120 +; modem capabilities 5.121 +; Possible values are { v17 | v27 | v29 } 5.122 +; Set this value to modify the default modem options. Default: v17,v27,v29 5.123 +modems=v17,v27,v29 5.124 + 5.125 +; Enable/disable T.30 ECM (error correction mode) by default. 5.126 +; Default: Enabled 5.127 +ecm=yes 5.128 + 5.129 +</file> 5.130 <file name="res_odbc.conf"> 5.131 ;; 5.132 ;; res_odbc.conf -- Asterisk ODBC resource configuration
6.1 --- a/asterisk/rc.asterisk Sun May 29 17:14:31 2011 +0200 6.2 +++ b/asterisk/rc.asterisk Sun Jun 05 11:43:33 2011 +0200 6.3 @@ -31,9 +31,7 @@ 6.4 %stop -u @l_susr@ 6.5 rcService asterisk enable yes || exit 0 6.6 rcService asterisk active no && exit 0 6.7 - ( @l_prefix@/sbin/asterisk -rx "core stop gracefully" & 6.8 - sleep 2 6.9 - @l_prefix@/sbin/asterisk -rx "core stop now" & 6.10 + ( @l_prefix@/sbin/asterisk -rx "core stop now" 6.11 ) >/dev/null 2>&1 || true 6.12 6.13 %restart -u @l_susr@
