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;
