# HG changeset patch
# User Michael Schloh von Bennewitz <michael@schloh.com>
# Date 1326144983 -3600
# Node ID b6420eee9bde23cbb18abed2edcb21be8762a4fd
# Parent  51de80f77aa253018bc89285d163df7668a7d736
Update to new vendor version and adjust patch logic accordingly.

diff -r 51de80f77aa2 -r b6420eee9bde asterisk/asterisk.patch
--- a/asterisk/asterisk.patch	Thu Dec 22 18:08:26 2011 +0100
+++ b/asterisk/asterisk.patch	Mon Jan 09 22:36:23 2012 +0100
@@ -264,7 +264,7 @@
  
  	/* Add authentication user if present */
  	if (!ast_strlen_zero(authuser))
-@@ -6174,6 +6175,7 @@
+@@ -6176,6 +6177,7 @@
  	/* simple. huh? */
  	char sequence[10];
  	char mailbox[256];
@@ -272,7 +272,7 @@
  	int res;
  
  	/* get the real IMAP message number for this message */
-@@ -6189,10 +6191,24 @@
+@@ -6191,10 +6193,24 @@
  		mail_setflag(vms->mailstream, sequence, "\\Unseen");
  		mail_clearflag(vms->mailstream, sequence, "\\Seen");
  	}
@@ -299,7 +299,7 @@
  	/* Create the folder if it don't exist */
  	imap_mailbox_name(mailbox, sizeof(mailbox), vms, box, 1); /* Get the full mailbox name */
  	ast_debug(5, "Checking if folder exists: %s\n", mailbox);
-@@ -10467,6 +10483,10 @@
+@@ -10469,6 +10485,10 @@
  #ifndef IMAP_STORAGE
  				} else if (!cmd) {
  					vms.deleted[vms.curmsg] = 1;
@@ -310,7 +310,7 @@
  #endif
  				} else {
  					vms.deleted[vms.curmsg] = 0;
-@@ -11963,6 +11983,15 @@
+@@ -11965,6 +11985,15 @@
  		} else {
  			ast_copy_string(imapfolder, "INBOX", sizeof(imapfolder));
  		}
@@ -754,7 +754,7 @@
 diff -Nau channels/chan_sip.c.orig channels/chan_sip.c
 --- channels/chan_sip.c.orig	2011-08-10 00:12:59.000000000 +0200
 +++ channels/chan_sip.c	2011-09-14 14:29:50.757959000 +0200
-@@ -11650,7 +11650,16 @@
+@@ -11676,7 +11676,16 @@
   	} else {
   		if (sipmethod == SIP_NOTIFY && !ast_strlen_zero(p->theirtag)) {
   			/* If this is a NOTIFY, use the From: tag in the subscribe (RFC 3265) */
@@ -792,7 +792,7 @@
 diff -Nau configure.orig configure
 --- configure.orig	2011-08-25 21:08:04.000000000 +0200
 +++ configure	2011-09-14 14:29:50.767970949 +0200
-@@ -4244,11 +4244,6 @@
+@@ -4447,11 +4447,6 @@
  esac
  
  case "${host_os}" in
@@ -804,7 +804,7 @@
       openbsd*)
       ac_default_prefix=/usr/local
       if test ${prefix} = '/usr/local' || test ${prefix} = 'NONE'; then
-@@ -29617,8 +29612,8 @@
+@@ -31424,8 +31419,8 @@
  		if test -f "${IMAP_TK_DIR}/c-client/LDFLAGS"; then
        		imap_ldflags=`cat ${IMAP_TK_DIR}/c-client/LDFLAGS`
  		fi
@@ -815,7 +815,7 @@
        	CPPFLAGS="${CPPFLAGS} ${imap_include}"
  	  	LIBS="${LIBS} ${imap_libs} "`echo ${imap_ldflags}`
  	  	cat >conftest.$ac_ext <<_ACEOF
-@@ -47493,7 +47488,7 @@
+@@ -49375,7 +49370,7 @@
        	 pbxlibdir="-L${SQLITE_DIR}"
        fi
     fi
@@ -824,7 +824,7 @@
     if test "x${pbxfuncname}" = "x" ; then   # empty lib, assume only headers
        AST_SQLITE_FOUND=yes
     else
-@@ -49185,16 +49180,16 @@
+@@ -51127,16 +51122,16 @@
      if test "x${PBX_GMIME}" != "x1" -a "${USE_GMIME}" != "no"; then
  	PBX_GMIME=0
  	if test -n "$ac_tool_prefix"; then
@@ -832,11 +832,11 @@
 -set dummy ${ac_tool_prefix}gmime-config; ac_word=$2
 +  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
 -if test "${ac_cv_path_CONFIG_GMIME+set}" = set; then
 +if test "${ac_cv_path_PKGCONFIG+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
 -  case $CONFIG_GMIME in
 +  case $PKGCONFIG in
@@ -846,47 +846,46 @@
    ;;
    *)
    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -49205,7 +49200,7 @@
+@@ -51147,7 +51142,7 @@
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 -    ac_cv_path_CONFIG_GMIME="$as_dir/$ac_word$ac_exec_ext"
 +    ac_cv_path_PKGCONFIG="$as_dir/$ac_word$ac_exec_ext"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
-@@ -49216,10 +49211,10 @@
+@@ -51158,10 +51153,10 @@
    ;;
  esac
  fi
 -CONFIG_GMIME=$ac_cv_path_CONFIG_GMIME
 -if test -n "$CONFIG_GMIME"; then
--  { echo "$as_me:$LINENO: result: $CONFIG_GMIME" >&5
--echo "${ECHO_T}$CONFIG_GMIME" >&6; }
+-  { $as_echo "$as_me:$LINENO: result: $CONFIG_GMIME" >&5
+-$as_echo "$CONFIG_GMIME" >&6; }
 +PKGCONFIG=$ac_cv_path_PKGCONFIG
 +if test -n "$PKGCONFIG"; then
-+  { echo "$as_me:$LINENO: result: $PKGCONFIG" >&5
-+echo "${ECHO_T}$PKGCONFIG" >&6; }
++  { $as_echo "$as_me:$LINENO: result: $PKGCONFIG" >&5
++$as_echo "$PKGCONFIG" >&6; }
  else
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
-@@ -49227,18 +49222,18 @@
+   { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -51169,18 +51164,18 @@
  
  
  fi
 -if test -z "$ac_cv_path_CONFIG_GMIME"; then
 -  ac_pt_CONFIG_GMIME=$CONFIG_GMIME
--  # Extract the first word of "gmime-config", so it can be a program name with args.
--set dummy gmime-config; ac_word=$2
 +if test -z "$ac_cv_path_PKGCONFIG"; then
 +  ac_pt_PKGCONFIG=$PKGCONFIG
-+  # Extract the first word of "pkg-config", so it can be a program name with args.
+   # Extract the first word of "gmime-config", so it can be a program name with args.
+-set dummy gmime-config; ac_word=$2
 +set dummy pkg-config; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
 -if test "${ac_cv_path_ac_pt_CONFIG_GMIME+set}" = set; then
 +if test "${ac_cv_path_ac_pt_PKGCONFIG+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
 -  case $ac_pt_CONFIG_GMIME in
 +  case $ac_pt_PKGCONFIG in
@@ -896,30 +895,30 @@
    ;;
    *)
    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -49249,7 +49244,7 @@
+@@ -51191,7 +51186,7 @@
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 -    ac_cv_path_ac_pt_CONFIG_GMIME="$as_dir/$ac_word$ac_exec_ext"
 +    ac_cv_path_ac_pt_PKGCONFIG="$as_dir/$ac_word$ac_exec_ext"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
-@@ -49260,17 +49255,17 @@
+@@ -51202,17 +51197,17 @@
    ;;
  esac
  fi
 -ac_pt_CONFIG_GMIME=$ac_cv_path_ac_pt_CONFIG_GMIME
 -if test -n "$ac_pt_CONFIG_GMIME"; then
--  { echo "$as_me:$LINENO: result: $ac_pt_CONFIG_GMIME" >&5
--echo "${ECHO_T}$ac_pt_CONFIG_GMIME" >&6; }
+-  { $as_echo "$as_me:$LINENO: result: $ac_pt_CONFIG_GMIME" >&5
+-$as_echo "$ac_pt_CONFIG_GMIME" >&6; }
 +ac_pt_PKGCONFIG=$ac_cv_path_ac_pt_PKGCONFIG
 +if test -n "$ac_pt_PKGCONFIG"; then
-+  { echo "$as_me:$LINENO: result: $ac_pt_PKGCONFIG" >&5
-+echo "${ECHO_T}$ac_pt_PKGCONFIG" >&6; }
++  { $as_echo "$as_me:$LINENO: result: $ac_pt_PKGCONFIG" >&5
++$as_echo "$ac_pt_PKGCONFIG" >&6; }
  else
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+   { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
  fi
  
 -  if test "x$ac_pt_CONFIG_GMIME" = x; then
@@ -929,8 +928,8 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
-@@ -49282,22 +49277,17 @@
- configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+@@ -51220,22 +51215,17 @@
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
 -    CONFIG_GMIME=$ac_pt_CONFIG_GMIME
@@ -1024,7 +1023,7 @@
 diff -Nau main/features.c.orig main/features.c
 --- main/features.c.orig	2011-08-10 00:12:59.000000000 +0200
 +++ main/features.c	2011-09-14 14:29:50.777958246 +0200
-@@ -1922,6 +1922,10 @@
+@@ -1928,6 +1928,10 @@
  			snprintf(args, len, "%s,%s,m", S_OR(touch_format, "wav"), touch_filename);
  		}
  
@@ -1035,7 +1034,7 @@
  		for(x = 0; x < strlen(args); x++) {
  			if (args[x] == '/')
  				args[x] = '-';
-@@ -2038,6 +2042,10 @@
+@@ -2044,6 +2048,10 @@
  			snprintf(args, len, "%s.%s,b", touch_filename, S_OR(touch_format, "wav"));
  		}
  
diff -r 51de80f77aa2 -r b6420eee9bde asterisk/asterisk.patch.proxymwi
--- a/asterisk/asterisk.patch.proxymwi	Thu Dec 22 18:08:26 2011 +0100
+++ b/asterisk/asterisk.patch.proxymwi	Mon Jan 09 22:36:23 2012 +0100
@@ -2,15 +2,15 @@
 diff -Nau channels/chan_sip.c.orig channels/chan_sip.c
 --- channels/chan_sip.c.orig	2011-01-14 18:32:52.000000000 +0100
 +++ channels/chan_sip.c	2011-03-13 14:34:29.000000000 +0100
-@@ -24506,6 +24506,7 @@
- 	/* Called with peerl lock, but releases it */
+@@ -25085,6 +25085,7 @@
  	struct sip_pvt *p;
  	int newmsgs = 0, oldmsgs = 0;
+ 	const char *vmexten = NULL;
 +	char *s = NULL;
  
- 	if (ast_test_flag((&peer->flags[1]), SIP_PAGE2_SUBSCRIBEMWIONLY) && !peer->mwipvt)
- 		return 0;
-@@ -24546,6 +24547,11 @@
+ 	ao2_lock(peer);
+ 
+@@ -25138,6 +25139,11 @@
  		}
  		/* Recalculate our side, and recalculate Call ID */
  		ast_sip_ouraddrfor(&p->sa, &p->ourip, p);
diff -r 51de80f77aa2 -r b6420eee9bde asterisk/asterisk.patch.xfersips
--- a/asterisk/asterisk.patch.xfersips	Thu Dec 22 18:08:26 2011 +0100
+++ b/asterisk/asterisk.patch.xfersips	Mon Jan 09 22:36:23 2012 +0100
@@ -2,7 +2,7 @@
 diff -Nau channels/chan_sip.c.orig channels/chan_sip.c
 --- channels/chan_sip.c.orig	2011-05-23 17:35:28.358543497 +0200
 +++ channels/chan_sip.c	2011-05-23 17:57:05.948534524 +0200
-@@ -28144,6 +28144,7 @@
+@@ -28839,6 +28839,7 @@
  \todo	Fix this function so that we wait for reply to the REFER and
  	react to errors, denials or other issues the other end might have.
   */
@@ -10,7 +10,7 @@
  static int sip_sipredirect(struct sip_pvt *p, const char *dest)
  {
  	char *cdest;
-@@ -28152,7 +28153,7 @@
+@@ -28847,7 +28848,7 @@
  	cdest = ast_strdupa(dest);
  	
  	extension = strsep(&cdest, "@");
@@ -19,7 +19,7 @@
  	if (ast_strlen_zero(extension)) {
  		ast_log(LOG_ERROR, "Missing mandatory argument: extension\n");
  		return 0;
-@@ -28184,7 +28185,14 @@
+@@ -28879,7 +28880,14 @@
  		}
  	}
  
diff -r 51de80f77aa2 -r b6420eee9bde asterisk/asterisk.spec
--- a/asterisk/asterisk.spec	Thu Dec 22 18:08:26 2011 +0100
+++ b/asterisk/asterisk.spec	Mon Jan 09 22:36:23 2012 +0100
@@ -22,8 +22,8 @@
 ##
 
 #   package version
-%define       V_opkg                     1.8.7.1
-%define       V_asterisk                 1.8.7.1
+%define       V_opkg                     1.8.8.1
+%define       V_asterisk                 1.8.8.1
 %define       V_asterisk_fax_subdir      1.8.4
 %define       V_asterisk_fax_digium      1.8.4_1.3.0
 %define       V_asterisk_sounds_old      1.4.21
@@ -52,7 +52,7 @@
 Group:        VoIP
 License:      GPL
 Version:      %{V_opkg}
-Release:      20111104
+Release:      20120106
 
 #   package options
 %option       with_dahdi   no