1.1 --- a/asterisk/asterisk.patch Thu Dec 22 18:08:26 2011 +0100
1.2 +++ b/asterisk/asterisk.patch Mon Jan 09 22:36:23 2012 +0100
1.3 @@ -264,7 +264,7 @@
1.4
1.5 /* Add authentication user if present */
1.6 if (!ast_strlen_zero(authuser))
1.7 -@@ -6174,6 +6175,7 @@
1.8 +@@ -6176,6 +6177,7 @@
1.9 /* simple. huh? */
1.10 char sequence[10];
1.11 char mailbox[256];
1.12 @@ -272,7 +272,7 @@
1.13 int res;
1.14
1.15 /* get the real IMAP message number for this message */
1.16 -@@ -6189,10 +6191,24 @@
1.17 +@@ -6191,10 +6193,24 @@
1.18 mail_setflag(vms->mailstream, sequence, "\\Unseen");
1.19 mail_clearflag(vms->mailstream, sequence, "\\Seen");
1.20 }
1.21 @@ -299,7 +299,7 @@
1.22 /* Create the folder if it don't exist */
1.23 imap_mailbox_name(mailbox, sizeof(mailbox), vms, box, 1); /* Get the full mailbox name */
1.24 ast_debug(5, "Checking if folder exists: %s\n", mailbox);
1.25 -@@ -10467,6 +10483,10 @@
1.26 +@@ -10469,6 +10485,10 @@
1.27 #ifndef IMAP_STORAGE
1.28 } else if (!cmd) {
1.29 vms.deleted[vms.curmsg] = 1;
1.30 @@ -310,7 +310,7 @@
1.31 #endif
1.32 } else {
1.33 vms.deleted[vms.curmsg] = 0;
1.34 -@@ -11963,6 +11983,15 @@
1.35 +@@ -11965,6 +11985,15 @@
1.36 } else {
1.37 ast_copy_string(imapfolder, "INBOX", sizeof(imapfolder));
1.38 }
1.39 @@ -754,7 +754,7 @@
1.40 diff -Nau channels/chan_sip.c.orig channels/chan_sip.c
1.41 --- channels/chan_sip.c.orig 2011-08-10 00:12:59.000000000 +0200
1.42 +++ channels/chan_sip.c 2011-09-14 14:29:50.757959000 +0200
1.43 -@@ -11650,7 +11650,16 @@
1.44 +@@ -11676,7 +11676,16 @@
1.45 } else {
1.46 if (sipmethod == SIP_NOTIFY && !ast_strlen_zero(p->theirtag)) {
1.47 /* If this is a NOTIFY, use the From: tag in the subscribe (RFC 3265) */
1.48 @@ -792,7 +792,7 @@
1.49 diff -Nau configure.orig configure
1.50 --- configure.orig 2011-08-25 21:08:04.000000000 +0200
1.51 +++ configure 2011-09-14 14:29:50.767970949 +0200
1.52 -@@ -4244,11 +4244,6 @@
1.53 +@@ -4447,11 +4447,6 @@
1.54 esac
1.55
1.56 case "${host_os}" in
1.57 @@ -804,7 +804,7 @@
1.58 openbsd*)
1.59 ac_default_prefix=/usr/local
1.60 if test ${prefix} = '/usr/local' || test ${prefix} = 'NONE'; then
1.61 -@@ -29617,8 +29612,8 @@
1.62 +@@ -31424,8 +31419,8 @@
1.63 if test -f "${IMAP_TK_DIR}/c-client/LDFLAGS"; then
1.64 imap_ldflags=`cat ${IMAP_TK_DIR}/c-client/LDFLAGS`
1.65 fi
1.66 @@ -815,7 +815,7 @@
1.67 CPPFLAGS="${CPPFLAGS} ${imap_include}"
1.68 LIBS="${LIBS} ${imap_libs} "`echo ${imap_ldflags}`
1.69 cat >conftest.$ac_ext <<_ACEOF
1.70 -@@ -47493,7 +47488,7 @@
1.71 +@@ -49375,7 +49370,7 @@
1.72 pbxlibdir="-L${SQLITE_DIR}"
1.73 fi
1.74 fi
1.75 @@ -824,7 +824,7 @@
1.76 if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
1.77 AST_SQLITE_FOUND=yes
1.78 else
1.79 -@@ -49185,16 +49180,16 @@
1.80 +@@ -51127,16 +51122,16 @@
1.81 if test "x${PBX_GMIME}" != "x1" -a "${USE_GMIME}" != "no"; then
1.82 PBX_GMIME=0
1.83 if test -n "$ac_tool_prefix"; then
1.84 @@ -832,11 +832,11 @@
1.85 -set dummy ${ac_tool_prefix}gmime-config; ac_word=$2
1.86 + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
1.87 +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
1.88 - { echo "$as_me:$LINENO: checking for $ac_word" >&5
1.89 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1.90 + { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1.91 + $as_echo_n "checking for $ac_word... " >&6; }
1.92 -if test "${ac_cv_path_CONFIG_GMIME+set}" = set; then
1.93 +if test "${ac_cv_path_PKGCONFIG+set}" = set; then
1.94 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.95 + $as_echo_n "(cached) " >&6
1.96 else
1.97 - case $CONFIG_GMIME in
1.98 + case $PKGCONFIG in
1.99 @@ -846,47 +846,46 @@
1.100 ;;
1.101 *)
1.102 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.103 -@@ -49205,7 +49200,7 @@
1.104 +@@ -51147,7 +51142,7 @@
1.105 test -z "$as_dir" && as_dir=.
1.106 for ac_exec_ext in '' $ac_executable_extensions; do
1.107 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.108 - ac_cv_path_CONFIG_GMIME="$as_dir/$ac_word$ac_exec_ext"
1.109 + ac_cv_path_PKGCONFIG="$as_dir/$ac_word$ac_exec_ext"
1.110 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.111 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.112 break 2
1.113 fi
1.114 -@@ -49216,10 +49211,10 @@
1.115 +@@ -51158,10 +51153,10 @@
1.116 ;;
1.117 esac
1.118 fi
1.119 -CONFIG_GMIME=$ac_cv_path_CONFIG_GMIME
1.120 -if test -n "$CONFIG_GMIME"; then
1.121 -- { echo "$as_me:$LINENO: result: $CONFIG_GMIME" >&5
1.122 --echo "${ECHO_T}$CONFIG_GMIME" >&6; }
1.123 +- { $as_echo "$as_me:$LINENO: result: $CONFIG_GMIME" >&5
1.124 +-$as_echo "$CONFIG_GMIME" >&6; }
1.125 +PKGCONFIG=$ac_cv_path_PKGCONFIG
1.126 +if test -n "$PKGCONFIG"; then
1.127 -+ { echo "$as_me:$LINENO: result: $PKGCONFIG" >&5
1.128 -+echo "${ECHO_T}$PKGCONFIG" >&6; }
1.129 ++ { $as_echo "$as_me:$LINENO: result: $PKGCONFIG" >&5
1.130 ++$as_echo "$PKGCONFIG" >&6; }
1.131 else
1.132 - { echo "$as_me:$LINENO: result: no" >&5
1.133 - echo "${ECHO_T}no" >&6; }
1.134 -@@ -49227,18 +49222,18 @@
1.135 + { $as_echo "$as_me:$LINENO: result: no" >&5
1.136 + $as_echo "no" >&6; }
1.137 +@@ -51169,18 +51164,18 @@
1.138
1.139
1.140 fi
1.141 -if test -z "$ac_cv_path_CONFIG_GMIME"; then
1.142 - ac_pt_CONFIG_GMIME=$CONFIG_GMIME
1.143 -- # Extract the first word of "gmime-config", so it can be a program name with args.
1.144 --set dummy gmime-config; ac_word=$2
1.145 +if test -z "$ac_cv_path_PKGCONFIG"; then
1.146 + ac_pt_PKGCONFIG=$PKGCONFIG
1.147 -+ # Extract the first word of "pkg-config", so it can be a program name with args.
1.148 + # Extract the first word of "gmime-config", so it can be a program name with args.
1.149 +-set dummy gmime-config; ac_word=$2
1.150 +set dummy pkg-config; ac_word=$2
1.151 - { echo "$as_me:$LINENO: checking for $ac_word" >&5
1.152 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1.153 + { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1.154 + $as_echo_n "checking for $ac_word... " >&6; }
1.155 -if test "${ac_cv_path_ac_pt_CONFIG_GMIME+set}" = set; then
1.156 +if test "${ac_cv_path_ac_pt_PKGCONFIG+set}" = set; then
1.157 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.158 + $as_echo_n "(cached) " >&6
1.159 else
1.160 - case $ac_pt_CONFIG_GMIME in
1.161 + case $ac_pt_PKGCONFIG in
1.162 @@ -896,30 +895,30 @@
1.163 ;;
1.164 *)
1.165 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.166 -@@ -49249,7 +49244,7 @@
1.167 +@@ -51191,7 +51186,7 @@
1.168 test -z "$as_dir" && as_dir=.
1.169 for ac_exec_ext in '' $ac_executable_extensions; do
1.170 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.171 - ac_cv_path_ac_pt_CONFIG_GMIME="$as_dir/$ac_word$ac_exec_ext"
1.172 + ac_cv_path_ac_pt_PKGCONFIG="$as_dir/$ac_word$ac_exec_ext"
1.173 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.174 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.175 break 2
1.176 fi
1.177 -@@ -49260,17 +49255,17 @@
1.178 +@@ -51202,17 +51197,17 @@
1.179 ;;
1.180 esac
1.181 fi
1.182 -ac_pt_CONFIG_GMIME=$ac_cv_path_ac_pt_CONFIG_GMIME
1.183 -if test -n "$ac_pt_CONFIG_GMIME"; then
1.184 -- { echo "$as_me:$LINENO: result: $ac_pt_CONFIG_GMIME" >&5
1.185 --echo "${ECHO_T}$ac_pt_CONFIG_GMIME" >&6; }
1.186 +- { $as_echo "$as_me:$LINENO: result: $ac_pt_CONFIG_GMIME" >&5
1.187 +-$as_echo "$ac_pt_CONFIG_GMIME" >&6; }
1.188 +ac_pt_PKGCONFIG=$ac_cv_path_ac_pt_PKGCONFIG
1.189 +if test -n "$ac_pt_PKGCONFIG"; then
1.190 -+ { echo "$as_me:$LINENO: result: $ac_pt_PKGCONFIG" >&5
1.191 -+echo "${ECHO_T}$ac_pt_PKGCONFIG" >&6; }
1.192 ++ { $as_echo "$as_me:$LINENO: result: $ac_pt_PKGCONFIG" >&5
1.193 ++$as_echo "$ac_pt_PKGCONFIG" >&6; }
1.194 else
1.195 - { echo "$as_me:$LINENO: result: no" >&5
1.196 - echo "${ECHO_T}no" >&6; }
1.197 + { $as_echo "$as_me:$LINENO: result: no" >&5
1.198 + $as_echo "no" >&6; }
1.199 fi
1.200
1.201 - if test "x$ac_pt_CONFIG_GMIME" = x; then
1.202 @@ -929,8 +928,8 @@
1.203 else
1.204 case $cross_compiling:$ac_tool_warned in
1.205 yes:)
1.206 -@@ -49282,22 +49277,17 @@
1.207 - configuration is useful to you, please write to autoconf@gnu.org." >&2;}
1.208 +@@ -51220,22 +51215,17 @@
1.209 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
1.210 ac_tool_warned=yes ;;
1.211 esac
1.212 - CONFIG_GMIME=$ac_pt_CONFIG_GMIME
1.213 @@ -1024,7 +1023,7 @@
1.214 diff -Nau main/features.c.orig main/features.c
1.215 --- main/features.c.orig 2011-08-10 00:12:59.000000000 +0200
1.216 +++ main/features.c 2011-09-14 14:29:50.777958246 +0200
1.217 -@@ -1922,6 +1922,10 @@
1.218 +@@ -1928,6 +1928,10 @@
1.219 snprintf(args, len, "%s,%s,m", S_OR(touch_format, "wav"), touch_filename);
1.220 }
1.221
1.222 @@ -1035,7 +1034,7 @@
1.223 for(x = 0; x < strlen(args); x++) {
1.224 if (args[x] == '/')
1.225 args[x] = '-';
1.226 -@@ -2038,6 +2042,10 @@
1.227 +@@ -2044,6 +2048,10 @@
1.228 snprintf(args, len, "%s.%s,b", touch_filename, S_OR(touch_format, "wav"));
1.229 }
1.230
