# HG changeset patch
# User Michael Schloh von Bennewitz <michael@schloh.com>
# Date 1307267013 -7200
# Node ID 10bd406e1c517f42cf6019fefabd628980cea850
# Parent  c403d9dd5e0ef37705cb10fcc07a3d1e4771ac14
Update, correct, and add new config logic including fax and license paths.

diff -r c403d9dd5e0e -r 10bd406e1c51 asterisk/asterisk.patch
--- a/asterisk/asterisk.patch	Sun May 29 17:14:31 2011 +0200
+++ b/asterisk/asterisk.patch	Sun Jun 05 11:43:33 2011 +0200
@@ -1,7 +1,7 @@
 Index: addons/chan_ooh323.c
 diff -Nau addons/chan_ooh323.c.orig addons/chan_ooh323.c
---- addons/chan_ooh323.c.orig	2010-10-09 16:02:26.000000000 +0200
-+++ addons/chan_ooh323.c	2011-03-13 14:03:42.000000000 +0100
+--- addons/chan_ooh323.c.orig	2011-02-18 01:07:20.000000000 +0100
++++ addons/chan_ooh323.c	2011-05-23 17:35:28.331029567 +0200
 @@ -23,6 +23,12 @@
  
  #include "chan_ooh323.h"
@@ -18,7 +18,7 @@
 Index: addons/ooh323c/src/ooCmdChannel.c
 diff -Nau addons/ooh323c/src/ooCmdChannel.c.orig addons/ooh323c/src/ooCmdChannel.c
 --- addons/ooh323c/src/ooCmdChannel.c.orig	2010-03-26 00:38:58.000000000 +0100
-+++ addons/ooh323c/src/ooCmdChannel.c	2011-03-13 14:03:42.000000000 +0100
++++ addons/ooh323c/src/ooCmdChannel.c	2011-05-23 17:35:28.331029567 +0200
 @@ -25,6 +25,10 @@
  #include "ooCalls.h"
  #include "ooCmdChannel.h"
@@ -32,8 +32,8 @@
  extern OOH323EndPoint gH323ep;
 Index: addons/ooh323c/src/ooSocket.c
 diff -Nau addons/ooh323c/src/ooSocket.c.orig addons/ooh323c/src/ooSocket.c
---- addons/ooh323c/src/ooSocket.c.orig	2010-03-25 22:39:04.000000000 +0100
-+++ addons/ooh323c/src/ooSocket.c	2011-03-13 14:03:42.000000000 +0100
+--- addons/ooh323c/src/ooSocket.c.orig	2011-02-16 21:21:17.000000000 +0100
++++ addons/ooh323c/src/ooSocket.c	2011-05-23 17:35:28.331029567 +0200
 @@ -24,6 +24,9 @@
  
  #include "ooSocket.h"
@@ -46,8 +46,8 @@
  #define SEND_FLAGS     0
 Index: addons/ooh323cDriver.c
 diff -Nau addons/ooh323cDriver.c.orig addons/ooh323cDriver.c
---- addons/ooh323cDriver.c.orig	2010-03-26 00:38:58.000000000 +0100
-+++ addons/ooh323cDriver.c	2011-03-13 14:03:42.000000000 +0100
+--- addons/ooh323cDriver.c.orig	2011-02-18 01:07:20.000000000 +0100
++++ addons/ooh323cDriver.c	2011-05-23 17:35:28.338530899 +0200
 @@ -27,6 +27,11 @@
  
  #define SEC_TO_HOLD_THREAD 24
@@ -63,7 +63,7 @@
 Index: apps/app_backticks.c
 diff -Nau apps/app_backticks.c.orig apps/app_backticks.c
 --- apps/app_backticks.c.orig	1970-01-01 01:00:00.000000000 +0100
-+++ apps/app_backticks.c	2011-03-13 14:03:42.000000000 +0100
++++ apps/app_backticks.c	2011-05-23 17:35:28.338530899 +0200
 @@ -0,0 +1,129 @@
 +
 +#include "asterisk.h"
@@ -196,8 +196,8 @@
 +
 Index: apps/app_meetme.c
 diff -Nau apps/app_meetme.c.orig apps/app_meetme.c
---- apps/app_meetme.c.orig	2011-01-07 21:53:02.000000000 +0100
-+++ apps/app_meetme.c	2011-03-13 14:03:42.000000000 +0100
+--- apps/app_meetme.c.orig	2011-01-29 19:09:37.000000000 +0100
++++ apps/app_meetme.c	2011-05-23 17:35:28.338530899 +0200
 @@ -604,6 +604,7 @@
  	CONFFLAG_DURATION_LIMIT = (1 << 30),
  	/*! Do not write any audio to this channel until the state is up. */
@@ -222,7 +222,7 @@
  END_OPTIONS );
  
  static const char * const app = "MeetMe";
-@@ -2429,6 +2432,12 @@
+@@ -2437,6 +2440,12 @@
  		ast_test_flag64(confflags, CONFFLAG_INTROUSERNOREVIEW))) {
  		char destdir[PATH_MAX];
  
@@ -235,7 +235,7 @@
  		snprintf(destdir, sizeof(destdir), "%s/meetme", ast_config_AST_SPOOL_DIR);
  
  		if (ast_mkdir(destdir, 0777) != 0) {
-@@ -2445,6 +2454,7 @@
+@@ -2453,6 +2462,7 @@
  			res = ast_record_review(chan, "vm-rec-name", user->namerecloc, 10, "sln", &duration, NULL);
  		if (res == -1)
  			goto outrun;
@@ -245,8 +245,8 @@
  	ast_mutex_lock(&conf->playlock);
 Index: apps/app_voicemail.c
 diff -Nau apps/app_voicemail.c.orig apps/app_voicemail.c
---- apps/app_voicemail.c.orig	2011-01-07 20:58:30.000000000 +0100
-+++ apps/app_voicemail.c	2011-03-13 14:03:42.000000000 +0100
+--- apps/app_voicemail.c.orig	2011-02-08 20:41:42.000000000 +0100
++++ apps/app_voicemail.c	2011-05-23 17:35:28.348531751 +0200
 @@ -366,6 +366,7 @@
  static char imapport[8];
  static char imapflags[128];
@@ -264,7 +264,7 @@
  
  	/* Add authentication user if present */
  	if (!ast_strlen_zero(authuser))
-@@ -6035,6 +6036,7 @@
+@@ -6073,6 +6074,7 @@
  	/* simple. huh? */
  	char sequence[10];
  	char mailbox[256];
@@ -272,7 +272,7 @@
  	int res;
  
  	/* get the real IMAP message number for this message */
-@@ -6050,10 +6052,24 @@
+@@ -6088,10 +6090,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);
-@@ -10221,6 +10237,10 @@
+@@ -10264,6 +10280,10 @@
  #ifndef IMAP_STORAGE
  				} else if (!cmd) {
  					vms.deleted[vms.curmsg] = 1;
@@ -310,7 +310,7 @@
  #endif
  				} else {
  					vms.deleted[vms.curmsg] = 0;
-@@ -11688,6 +11708,15 @@
+@@ -11731,6 +11751,15 @@
  		} else {
  			ast_copy_string(imapfolder, "INBOX", sizeof(imapfolder));
  		}
@@ -328,8 +328,8 @@
  		}
 Index: apps/.moduleinfo
 diff -Nau apps/.moduleinfo.orig apps/.moduleinfo
---- apps/.moduleinfo.orig	2011-02-22 23:50:32.000000000 +0100
-+++ apps/.moduleinfo	2011-03-13 14:03:42.000000000 +0100
+--- apps/.moduleinfo.orig	2011-05-09 22:22:47.000000000 +0200
++++ apps/.moduleinfo	2011-05-23 17:35:28.348531751 +0200
 @@ -72,7 +72,7 @@
  <member name="app_image" displayname="Image Transmission Application" remove_on_change="apps/app_image.o apps/app_image.so">
  </member>
@@ -355,7 +355,7 @@
 Index: build_tools/cflags.xml
 diff -Nau build_tools/cflags.xml.orig build_tools/cflags.xml
 --- build_tools/cflags.xml.orig	2010-02-16 16:36:53.000000000 +0100
-+++ build_tools/cflags.xml	2011-03-13 14:03:42.000000000 +0100
++++ build_tools/cflags.xml	2011-05-23 17:35:28.348531751 +0200
 @@ -26,10 +26,11 @@
  		<member name="RADIO_RELAX" displayname="Relax DTMF for Radio Applications">
  		</member>
@@ -372,7 +372,7 @@
 Index: chan_capi-1.1.5.919/chan_capi20.h
 diff -Nau chan_capi-1.1.5.919/chan_capi20.h.orig chan_capi-1.1.5.919/chan_capi20.h
 --- chan_capi-1.1.5.919/chan_capi20.h.orig	2011-01-07 02:29:32.000000000 +0100
-+++ chan_capi-1.1.5.919/chan_capi20.h	2011-03-13 14:03:42.000000000 +0100
++++ chan_capi-1.1.5.919/chan_capi20.h	2011-05-23 17:35:28.348531751 +0200
 @@ -4,10 +4,13 @@
   * first. Else the checks below will fail.
   */
@@ -399,7 +399,7 @@
 Index: chan_capi-1.1.5.919/chan_capi_utils.c
 diff -Nau chan_capi-1.1.5.919/chan_capi_utils.c.orig chan_capi-1.1.5.919/chan_capi_utils.c
 --- chan_capi-1.1.5.919/chan_capi_utils.c.orig	2011-01-07 02:29:32.000000000 +0100
-+++ chan_capi-1.1.5.919/chan_capi_utils.c	2011-03-13 14:03:42.000000000 +0100
++++ chan_capi-1.1.5.919/chan_capi_utils.c	2011-05-23 17:35:28.348531751 +0200
 @@ -1155,6 +1155,9 @@
  {
  	MESSAGE_EXCHANGE_ERROR error;
@@ -413,7 +413,7 @@
 Index: chan_capi-1.1.5.919/libcapi20/capi20.c
 diff -Nau chan_capi-1.1.5.919/libcapi20/capi20.c.orig chan_capi-1.1.5.919/libcapi20/capi20.c
 --- chan_capi-1.1.5.919/libcapi20/capi20.c.orig	2011-01-07 02:29:31.000000000 +0100
-+++ chan_capi-1.1.5.919/libcapi20/capi20.c	2011-03-13 14:03:42.000000000 +0100
++++ chan_capi-1.1.5.919/libcapi20/capi20.c	2011-05-23 17:35:28.348531751 +0200
 @@ -19,8 +19,10 @@
  #include <stdio.h>
  #include <ctype.h>
@@ -710,7 +710,7 @@
 Index: chan_capi-1.1.5.919/libcapi20/convert.c
 diff -Nau chan_capi-1.1.5.919/libcapi20/convert.c.orig chan_capi-1.1.5.919/libcapi20/convert.c
 --- chan_capi-1.1.5.919/libcapi20/convert.c.orig	2011-01-07 02:29:31.000000000 +0100
-+++ chan_capi-1.1.5.919/libcapi20/convert.c	2011-03-13 14:03:42.000000000 +0100
++++ chan_capi-1.1.5.919/libcapi20/convert.c	2011-05-23 17:35:28.348531751 +0200
 @@ -11,7 +11,14 @@
  #include <stddef.h>
  #include <time.h>
@@ -729,7 +729,7 @@
 Index: chan_capi-1.1.5.919/Makefile
 diff -Nau chan_capi-1.1.5.919/Makefile.orig chan_capi-1.1.5.919/Makefile
 --- chan_capi-1.1.5.919/Makefile.orig	2011-01-07 02:29:32.000000000 +0100
-+++ chan_capi-1.1.5.919/Makefile	2011-03-13 14:03:42.000000000 +0100
++++ chan_capi-1.1.5.919/Makefile	2011-05-23 17:35:28.348531751 +0200
 @@ -111,6 +111,9 @@
  CFLAGS+=-O2
  CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
@@ -742,9 +742,9 @@
  endif
 Index: channels/chan_sip.c
 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:03:42.000000000 +0100
-@@ -11210,7 +11210,16 @@
+--- channels/chan_sip.c.orig	2011-04-25 17:11:30.000000000 +0200
++++ channels/chan_sip.c	2011-05-23 17:35:28.358543497 +0200
+@@ -11458,7 +11458,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) */
@@ -765,7 +765,7 @@
 Index: channels/console_video.h
 diff -Nau channels/console_video.h.orig channels/console_video.h
 --- channels/console_video.h.orig	2008-06-30 17:45:15.000000000 +0200
-+++ channels/console_video.h	2011-03-13 14:03:42.000000000 +0100
++++ channels/console_video.h	2011-05-23 17:35:28.358543497 +0200
 @@ -28,10 +28,7 @@
  		"console {device}"
  #else
@@ -780,21 +780,21 @@
  	"console {videodevice|videocodec"	\
 Index: configure
 diff -Nau configure.orig configure
---- configure.orig	2011-01-09 22:40:34.000000000 +0100
-+++ configure	2011-03-13 14:14:50.000000000 +0100
-@@ -4700,11 +4700,6 @@
+--- configure.orig	2011-01-27 18:03:01.000000000 +0100
++++ configure	2011-05-23 17:41:08.331029717 +0200
+@@ -4704,11 +4704,6 @@
  esac
  
  case "${host_os}" in
 -     freebsd*)
--
+-     ac_default_prefix=/usr/local
 -     CPPFLAGS=-I/usr/local/include
 -     LDFLAGS=-L/usr/local/lib
 -     ;;
       openbsd*)
- 
+      ac_default_prefix=/usr/local
       if test ${prefix} = '/usr/local' || test ${prefix} = 'NONE'; then
-@@ -18227,8 +18222,8 @@
+@@ -18203,8 +18198,8 @@
  		if test -f "${IMAP_TK_DIR}/c-client/LDFLAGS"; then
        		imap_ldflags=`cat ${IMAP_TK_DIR}/c-client/LDFLAGS`
  		fi
@@ -805,26 +805,7 @@
        	CPPFLAGS="${CPPFLAGS} ${imap_include}"
  	  	LIBS="${LIBS} ${imap_libs} "`echo ${imap_ldflags}`
  	  	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -25461,14 +25456,14 @@
-    else
-       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
-       CFLAGS="${CFLAGS} "
--      as_ac_Lib=`$as_echo "ac_cv_lib_lua5.1_${pbxfuncname}" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -llua5.1" >&5
--$as_echo_n "checking for ${pbxfuncname} in -llua5.1... " >&6; }
-+      as_ac_Lib=`$as_echo "ac_cv_lib_lua_${pbxfuncname}" | $as_tr_sh`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -llua" >&5
-+$as_echo_n "checking for ${pbxfuncname} in -llua... " >&6; }
- if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-llua5.1 ${pbxlibdir} -lm $LIBS"
-+LIBS="-llua ${pbxlibdir} -lm $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -25511,19 +25506,19 @@
+@@ -25436,19 +25431,19 @@
  
     # now check for the header.
     if test "${AST_LUA_FOUND}" = "yes"; then
@@ -848,7 +829,7 @@
    LUA_HEADER_FOUND=1
  else
    LUA_HEADER_FOUND=0
-@@ -25551,9 +25546,9 @@
+@@ -25476,9 +25471,9 @@
  
  if test "x${PBX_LUA}" = "x1" ; then
  	if test x"${LUA_DIR}" = x; then
@@ -860,7 +841,7 @@
  	fi
  fi
  
-@@ -26238,7 +26233,7 @@
+@@ -26157,7 +26152,7 @@
        	 pbxlibdir="-L${SQLITE_DIR}"
        fi
     fi
@@ -869,7 +850,7 @@
     if test "x${pbxfuncname}" = "x" ; then   # empty lib, assume only headers
        AST_SQLITE_FOUND=yes
     else
-@@ -26953,16 +26948,16 @@
+@@ -26867,16 +26862,16 @@
      if test "x${PBX_GMIME}" != "x1" -a "${USE_GMIME}" != "no"; then
  	PBX_GMIME=0
  	if test -n "$ac_tool_prefix"; then
@@ -891,7 +872,7 @@
    ;;
    *)
    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -26973,7 +26968,7 @@
+@@ -26887,7 +26882,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
@@ -900,7 +881,7 @@
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
-@@ -26984,10 +26979,10 @@
+@@ -26898,10 +26893,10 @@
    ;;
  esac
  fi
@@ -915,7 +896,7 @@
  else
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
-@@ -26995,18 +26990,18 @@
+@@ -26909,18 +26904,18 @@
  
  
  fi
@@ -941,7 +922,7 @@
    ;;
    *)
    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -27017,7 +27012,7 @@
+@@ -26931,7 +26926,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
@@ -950,7 +931,7 @@
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
-@@ -27028,17 +27023,17 @@
+@@ -26942,17 +26937,17 @@
    ;;
  esac
  fi
@@ -974,7 +955,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
-@@ -27046,17 +27041,15 @@
+@@ -26960,17 +26955,15 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
@@ -1000,7 +981,7 @@
 Index: formats/format_pcm.c
 diff -Nau formats/format_pcm.c.orig formats/format_pcm.c
 --- formats/format_pcm.c.orig	2010-07-26 05:27:06.000000000 +0200
-+++ formats/format_pcm.c	2011-03-13 14:03:42.000000000 +0100
++++ formats/format_pcm.c	2011-05-23 17:35:28.368530778 +0200
 @@ -350,6 +350,7 @@
  		ast_log(LOG_WARNING, "Unable to write header\n");
  		return -1;
@@ -1012,7 +993,7 @@
 Index: formats/format_wav.c
 diff -Nau formats/format_wav.c.orig formats/format_wav.c
 --- formats/format_wav.c.orig	2010-09-02 18:43:09.000000000 +0200
-+++ formats/format_wav.c	2011-03-13 14:03:42.000000000 +0100
++++ formats/format_wav.c	2011-05-23 17:35:28.368530778 +0200
 @@ -310,6 +310,7 @@
  		ast_log(LOG_WARNING, "Unable to write header\n");
  		return -1;
@@ -1024,7 +1005,7 @@
 Index: formats/format_wav_gsm.c
 diff -Nau formats/format_wav_gsm.c.orig formats/format_wav_gsm.c
 --- formats/format_wav_gsm.c.orig	2010-07-26 05:27:06.000000000 +0200
-+++ formats/format_wav_gsm.c	2011-03-13 14:03:42.000000000 +0100
++++ formats/format_wav_gsm.c	2011-05-23 17:35:28.368530778 +0200
 @@ -362,6 +362,7 @@
  		ast_log(LOG_WARNING, "Unable to write header\n");
  		return -1;
@@ -1036,7 +1017,7 @@
 Index: main/db1-ast/hash/hash.h
 diff -Nau main/db1-ast/hash/hash.h.orig main/db1-ast/hash/hash.h
 --- main/db1-ast/hash/hash.h.orig	2006-08-21 04:11:39.000000000 +0200
-+++ main/db1-ast/hash/hash.h	2011-03-13 14:03:42.000000000 +0100
++++ main/db1-ast/hash/hash.h	2011-05-23 17:35:28.368530778 +0200
 @@ -36,6 +36,8 @@
   *	@(#)hash.h	8.3 (Berkeley) 5/31/94
   */
@@ -1049,7 +1030,7 @@
 Index: main/db1-ast/hash/ndbm.c
 diff -Nau main/db1-ast/hash/ndbm.c.orig main/db1-ast/hash/ndbm.c
 --- main/db1-ast/hash/ndbm.c.orig	2006-08-21 04:11:39.000000000 +0200
-+++ main/db1-ast/hash/ndbm.c	2011-03-13 14:03:42.000000000 +0100
++++ main/db1-ast/hash/ndbm.c	2011-05-23 17:35:28.368530778 +0200
 @@ -49,7 +49,8 @@
  #include <string.h>
  #include <stdlib.h>
@@ -1062,8 +1043,8 @@
  /*
 Index: main/features.c
 diff -Nau main/features.c.orig main/features.c
---- main/features.c.orig	2011-01-20 21:24:36.000000000 +0100
-+++ main/features.c	2011-03-13 14:03:42.000000000 +0100
+--- main/features.c.orig	2011-02-09 20:52:51.000000000 +0100
++++ main/features.c	2011-05-23 17:35:28.368530778 +0200
 @@ -1658,6 +1658,10 @@
  			snprintf(args, len, "%s,%s,m", S_OR(touch_format, "wav"), touch_filename);
  		}
@@ -1088,8 +1069,8 @@
  				args[x] = '-';
 Index: main/file.c
 diff -Nau main/file.c.orig main/file.c
---- main/file.c.orig	2011-01-12 17:05:12.000000000 +0100
-+++ main/file.c	2011-03-13 14:03:42.000000000 +0100
+--- main/file.c.orig	2011-01-26 02:26:26.000000000 +0100
++++ main/file.c	2011-05-23 17:35:28.378531576 +0200
 @@ -255,7 +255,7 @@
  	char *fn = NULL;
  
@@ -1102,7 +1083,7 @@
 Index: main/Makefile
 diff -Nau main/Makefile.orig main/Makefile
 --- main/Makefile.orig	2010-12-18 00:52:04.000000000 +0100
-+++ main/Makefile	2011-03-13 14:03:42.000000000 +0100
++++ main/Makefile	2011-05-23 17:35:28.378531576 +0200
 @@ -69,10 +69,7 @@
  endif
  
@@ -1117,9 +1098,9 @@
  ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
 Index: main/tcptls.c
 diff -Nau main/tcptls.c.orig main/tcptls.c
---- main/tcptls.c.orig	2010-07-09 00:08:07.000000000 +0200
-+++ main/tcptls.c	2011-03-13 14:03:42.000000000 +0100
-@@ -354,6 +354,7 @@
+--- main/tcptls.c.orig	2011-04-25 17:11:30.000000000 +0200
++++ main/tcptls.c	2011-05-23 17:35:28.378531576 +0200
+@@ -353,6 +353,7 @@
  	if (!ast_strlen_zero(cfg->cafile) || !ast_strlen_zero(cfg->capath)) {
  		if (SSL_CTX_load_verify_locations(cfg->ssl_ctx, S_OR(cfg->cafile, NULL), S_OR(cfg->capath,NULL)) == 0)
  			ast_verb(0, "SSL CA file(%s)/path(%s) error\n", cfg->cafile, cfg->capath);
@@ -1129,8 +1110,8 @@
  	ast_verb(0, "SSL certificate ok\n");
 Index: main/udptl.c
 diff -Nau main/udptl.c.orig main/udptl.c
---- main/udptl.c.orig	2011-02-22 23:52:11.000000000 +0100
-+++ main/udptl.c	2011-03-13 14:03:42.000000000 +0100
+--- main/udptl.c.orig	2011-02-21 16:02:20.000000000 +0100
++++ main/udptl.c	2011-05-23 17:35:28.378531576 +0200
 @@ -98,6 +98,18 @@
  
  #define UDPTL_BUF_MASK              15
@@ -1152,8 +1133,8 @@
  	uint8_t buf[LOCAL_FAX_MAX_DATAGRAM];
 Index: Makefile
 diff -Nau Makefile.orig Makefile
---- Makefile.orig	2011-01-12 16:57:43.000000000 +0100
-+++ Makefile	2011-03-13 14:03:42.000000000 +0100
+--- Makefile.orig	2011-02-01 19:02:06.000000000 +0100
++++ Makefile	2011-05-23 17:35:28.378531576 +0200
 @@ -230,15 +230,6 @@
    _ASTCFLAGS+=-fsigned-char
  endif
@@ -1172,8 +1153,8 @@
  endif
 Index: menuselect-tree
 diff -Nau menuselect-tree.orig menuselect-tree
---- menuselect-tree.orig	2011-02-22 23:50:45.000000000 +0100
-+++ menuselect-tree	2011-03-13 14:03:42.000000000 +0100
+--- menuselect-tree.orig	2011-05-09 22:22:55.000000000 +0200
++++ menuselect-tree	2011-05-23 17:35:28.378531576 +0200
 @@ -38,6 +38,8 @@
  </member>
  <member name="app_authenticate" displayname="Authentication Application" remove_on_change="apps/app_authenticate.o apps/app_authenticate.so">
@@ -1223,7 +1204,7 @@
 Index: res/res_http_post.c
 diff -Nau res/res_http_post.c.orig res/res_http_post.c
 --- res/res_http_post.c.orig	2009-10-27 17:48:54.000000000 +0100
-+++ res/res_http_post.c	2011-03-13 14:03:42.000000000 +0100
++++ res/res_http_post.c	2011-05-23 17:35:28.378531576 +0200
 @@ -122,14 +122,8 @@
  		ast_log(LOG_WARNING, "Got unexpected GMIME_IS_MESSAGE_PARTIAL\n");
  		return;
@@ -1244,7 +1225,7 @@
 Index: sounds/sounds.xml
 diff -Nau sounds/sounds.xml.orig sounds/sounds.xml
 --- sounds/sounds.xml.orig	2010-10-18 23:51:23.000000000 +0200
-+++ sounds/sounds.xml	2011-03-13 14:03:42.000000000 +0100
++++ sounds/sounds.xml	2011-05-23 17:35:28.378531576 +0200
 @@ -6,11 +6,11 @@
  		<member name="CORE-SOUNDS-EN-ALAW" displayname="English, a-Law format">
  		</member>
@@ -1285,7 +1266,7 @@
 Index: cdr/cdr_radius.c
 diff -Nau cdr/cdr_radius.c.orig cdr/cdr_radius.c
 --- cdr/cdr_radius.c.orig	2010-07-20 21:35:02.000000000 +0200
-+++ cdr/cdr_radius.c	2011-03-22 16:12:11.000000000 +0100
++++ cdr/cdr_radius.c	2011-05-23 17:35:28.378531576 +0200
 @@ -105,10 +105,18 @@
  	if (!rc_avpair_add(rh, tosend, PW_AST_SRC, &cdr->src, strlen(cdr->src), VENDOR_CODE))
  		return -1;
diff -r c403d9dd5e0e -r 10bd406e1c51 asterisk/asterisk.patch.proxymwi
--- a/asterisk/asterisk.patch.proxymwi	Sun May 29 17:14:31 2011 +0200
+++ b/asterisk/asterisk.patch.proxymwi	Sun Jun 05 11:43:33 2011 +0200
@@ -2,7 +2,7 @@
 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
-@@ -24267,6 +24267,7 @@
+@@ -24506,6 +24506,7 @@
  	/* Called with peerl lock, but releases it */
  	struct sip_pvt *p;
  	int newmsgs = 0, oldmsgs = 0;
@@ -10,7 +10,7 @@
  
  	if (ast_test_flag((&peer->flags[1]), SIP_PAGE2_SUBSCRIBEMWIONLY) && !peer->mwipvt)
  		return 0;
-@@ -24307,6 +24308,11 @@
+@@ -24546,6 +24547,11 @@
  		}
  		/* Recalculate our side, and recalculate Call ID */
  		ast_sip_ouraddrfor(&p->sa, &p->ourip, p);
diff -r c403d9dd5e0e -r 10bd406e1c51 asterisk/asterisk.patch.xfersips
--- a/asterisk/asterisk.patch.xfersips	Sun May 29 17:14:31 2011 +0200
+++ b/asterisk/asterisk.patch.xfersips	Sun Jun 05 11:43:33 2011 +0200
@@ -1,8 +1,8 @@
 Index: channels/chan_sip.c
 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:32:58.000000000 +0100
-@@ -27854,6 +27854,7 @@
+--- 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 @@
  \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;
-@@ -27862,7 +27863,7 @@
+@@ -28152,7 +28153,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;
-@@ -27894,7 +27895,14 @@
+@@ -28184,7 +28185,14 @@
  		}
  	}
  
diff -r c403d9dd5e0e -r 10bd406e1c51 asterisk/asterisk.spec
--- a/asterisk/asterisk.spec	Sun May 29 17:14:31 2011 +0200
+++ b/asterisk/asterisk.spec	Sun Jun 05 11:43:33 2011 +0200
@@ -22,10 +22,11 @@
 ##
 
 #   package version
-%define       V_opkg                     1.8.3.2
-%define       V_asterisk                 1.8.3.2
-%define       V_asterisk_fax_digium      1.8.0_1.3.0
-%define       V_asterisk_sounds_core     1.4.20
+%define       V_opkg                     1.8.4.2
+%define       V_asterisk                 1.8.4.2
+%define       V_asterisk_fax_subdir      1.8.4
+%define       V_asterisk_fax_digium      1.8.4_1.3.0
+%define       V_asterisk_sounds_core     1.4.21
 %define       V_asterisk_sounds_extra    1.4.11
 %define       V_asterisk_sounds_amoogab  1.4
 %define       V_asterisk_sounds_amootts  current
@@ -49,7 +50,7 @@
 Group:        VoIP
 License:      GPL
 Version:      %{V_opkg}
-Release:      20110316
+Release:      20110602
 
 #   package options
 %option       with_dahdi   no
@@ -94,8 +95,8 @@
 Source17:     http://files.freeswitch.org/freeswitch-sounds-ru-RU-elena-48000-%{V_fswitch_sounds_ru}.tar.gz
 Source18:     http://files.freeswitch.org/freeswitch-sounds-music-48000-%{V_fswitch_music}.tar.gz
 Source19:     http://svn.digium.com/svn/thirdparty/mp3/trunk/addons/mp3-%{V_asterisk_addons_mp3dec}.tar.gz
-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
-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
+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
+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
 Source22:     ilbc-20110104.tar.gz
 Source23:     asterisk.txt
 Source24:     rc.asterisk
@@ -107,7 +108,7 @@
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20040130, bison, gcc, make, grep
+BuildPreReq:  OpenPKG, openpkg >= 20040130, bison, gcc, make, grep, pkgconfig
 PreReq:       OpenPKG, openpkg >= 20040130, MTA
 BuildPreReq:  zlib, curl, openssl, ncurses, speex, sox, popt, gmime, libxml
 PreReq:       zlib, curl, openssl, ncurses, speex, sox, popt, gmime, libxml
@@ -276,8 +277,6 @@
         -e 's;\(dir=.*{localstatedir}\)/\([^/][^/]*\)/asterisk;\1/asterisk/\2;g' \
         configure
     %{l_shtool} subst \
-        -e 's;-llua5\.1;-llua;' \
-        -e 's;lua5\.1/lua\.h;lua/lua.h;' \
         -e 's;ffmpeg/avcodec\.h;libavcodec/avcodec.h;' \
         -e 's;\(sqlite\)\(_exec\);\13\2;g' \
         -e 's;-lradiusclient-ng;-lradiusclient;g' \
@@ -657,6 +656,7 @@
       mv -f music/48000/* . && rm -rf music
 
       #   convert freeswitch 48000 and 441000 KHz to 8000 Khz
+      #   ffmpeg -i <in> -ar 8000 -ac 1 -acodec pcm_s16le -f s16le <out>
       cd $RPM_BUILD_ROOT%{l_prefix}/share/asterisk
       for highfile in `find . -name '*.wav'`; do
           lowfile=`echo $highfile | sed -e 's;\(.*\)\.wav;\1.sln16;'`
@@ -691,6 +691,7 @@
       #mv -f phonetic/de/* de/phonetic/ && rm -rf phonetic/de
       %{l_tar} jxf %{SOURCE astmultisnds-de-sln16-%{V_asterisk_sounds_custom}.tar.bz2}
       %{l_tar} jxf %{SOURCE msvbsnds-sln16-%{V_asterisk_sounds_custom}.tar.bz2}
+      mv msvbsnds-sln16-%{V_asterisk_sounds_custom} msvb
 
       #   install additional asterisk music on hold
       cd $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/moh
@@ -733,8 +734,8 @@
     #   create additional directories
     %{l_shtool} mkdir -f -p -m 755 \
         $RPM_BUILD_ROOT%{l_prefix}/var/asterisk/db \
-        $RPM_BUILD_ROOT%{l_prefix}/var/asterisk/lib/licenses \
-        $RPM_BUILD_ROOT%{l_prefix}/var/asterisk/spool/outgoing
+        $RPM_BUILD_ROOT%{l_prefix}/var/asterisk/spool/outgoing \
+        $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/licenses
 
     #   postadjust installation
     strip $RPM_BUILD_ROOT%{l_prefix}/sbin/* \
@@ -784,7 +785,7 @@
     #   determine installation files
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
         %{l_files_std} \
-        '%config %{l_prefix}/var/asterisk/lib/licenses' \
+        '%config %attr(-,%{l_mgrp},%{l_mgrp}) %{l_prefix}/share/asterisk/licenses' \
         '%config %attr(640,%{l_mgrp},%{l_rgrp}) %{l_prefix}/etc/asterisk/*' \
         '%attr(-,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/asterisk'
 
@@ -836,7 +837,7 @@
     ( echo "Asterisk has been installed with proprietary Digium fax support."
       echo "The responsible module is called res_fax_digium and requires a"
       echo "valid license. The license must be found in the directory"
-      echo "'licenses' which in turn must be found in $prefix/var/asterisk/lib"
+      echo "'licenses' which in turn must be found in $prefix/share/asterisk"
       echo "or wherever astvarlibdir has been configured in 'asterisk.conf'."
       echo ""
       echo "Please see http://downloads.digium.com/pub/telephony/fax/ for information."
diff -r c403d9dd5e0e -r 10bd406e1c51 asterisk/asterisk.txt
--- a/asterisk/asterisk.txt	Sun May 29 17:14:31 2011 +0200
+++ b/asterisk/asterisk.txt	Sun Jun 05 11:43:33 2011 +0200
@@ -79,10 +79,19 @@
 webenabled         = no
 bindaddr           = 127.0.0.1
 port               = 5038
-sslenable          = no
-sslbindaddr        = 127.0.0.1
-sslbindport        = 5039
-sslcert            = @l_prefix@/etc/asterisk/asterisk.pem
+
+; You can open a TLS connection to this socket with:
+;
+;	openssl s_client -connect my_host:5039
+;
+tlsenable          = no
+tlsbindaddr        = 127.0.0.1
+tlsbindport        = 5039
+tlscertfile        = @l_prefix@/etc/asterisk/asterisk.pem
+; if tlsprivatekey is not specified search tlscertfile for key
+;tlsprivatekey      = @l_prefix@/etc/asterisk/asterkey.pem
+;tlscipher         = ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL
+
 displayconnects    = yes
 allowmultiplelogin = yes
 timestampevents    = yes
@@ -104,10 +113,10 @@
 enabled            = no
 bindaddr           = 127.0.0.1
 bindport           = 8088
-sslenable          = no
-sslbindport        = 8089
-sslbindaddr        = 127.0.0.1
-sslcert            = @l_prefix@/etc/asterisk/asterisk.pem
+tlsenable          = no
+tlsbindport        = 8089
+tlsbindaddr        = 127.0.0.1
+tlscertfile        = @l_prefix@/etc/asterisk/asterisk.pem
 enablestatic       = yes
 prefix             = asterisk
 redirect           = / /asterisk/static/docs/index.html
@@ -222,6 +231,30 @@
 mailbox            = 12@internal
 
 </file>
+<file name="iax.conf">
+;;
+;;  iax.conf -- Asterisk IAX configuration
+;;
+
+;; This configuration is reread at reload
+;; or with the CLI command
+;; 	reload chan_iax2.so
+;;
+;; General settings, like port number to bind to, and
+;; an option address (the default is to bind to all
+;; local addresses).
+;;
+;[general]
+;bindport=4569       ; bindport and bindaddr may be specified
+;                    ; NOTE: bindport must be specified BEFORE
+;                    ; bindaddr or may be specified on a specific
+;                    ; bindaddr if followed by colon and port
+;                    ; (e.g. bindaddr=192.168.0.1:4569)
+;bindaddr=127.0.0.1  ; more than once to bind to multiple
+;                    ; addresses, but the first will be the 
+;                    ; default
+
+</file>
 <file name="rtp.conf">
 ;;
 ;;  rtp.conf -- Asterisk RTP configuration
@@ -755,6 +788,59 @@
 stutter            = 425+400
 
 </file>
+<file name="ccss.conf">
+;;
+;;  ccss.conf -- Asterisk Call Completion Supplementary Services configuration
+;;
+
+; Warning! The CCSS implementation brings several changes to the
+; channel components of Asterisk. To use CCSS, specify the number
+; of maximum requests in this file but do not forget to specify
+; the new CCSS related channel specific options in other config
+; files as well! Some are 'cc_offer_timer', 'ccbs_available_timer',
+; 'cc_agent_policy=never' and many more (in other files.)
+
+[general]
+; There is only a single option that may be defined in this file.
+; The cc_max_requests option is a global limit on the number of
+; CC requests that may be in the Asterisk system at any time.
+;
+cc_max_requests = 20
+
+</file>
+<file name="res_fax.conf">
+;;
+;;  res_fax.conf -- Asterisk fax resource configuration
+;;
+
+[general]
+; Maximum Transmission Rate
+; Possible values are { 2400 | 4800 | 7200 | 9600 | 12000 | 14400 }
+; Set this value to the maximum desired transfer rate.  Default: 14400
+maxrate=14400
+
+; Minimum Transmission Rate
+; Possible values are { 2400 | 4800 | 7200 | 9600 | 12000 | 14400 }
+; Set this value to the minimum desired transfer rate.  Default: 2400
+minrate=2400
+
+; Send Progress/Status events to manager session
+; Manager events with 'call' class permissions will receive events indicating the
+; steps to initiate a fax session.  Fax completion events are always sent to manager
+; sessions with 'call' class permissions, regardless of the value of this option.
+; Default: no
+statusevents=yes
+
+; modem capabilities
+; Possible values are { v17 | v27 | v29 }
+; Set this value to modify the default modem options.  Default: v17,v27,v29
+modems=v17,v27,v29
+
+; Enable/disable T.30 ECM (error correction mode) by default.
+; Default: Enabled
+ecm=yes
+
+</file>
 <file name="res_odbc.conf">
 ;;
 ;;  res_odbc.conf -- Asterisk ODBC resource configuration
diff -r c403d9dd5e0e -r 10bd406e1c51 asterisk/rc.asterisk
--- a/asterisk/rc.asterisk	Sun May 29 17:14:31 2011 +0200
+++ b/asterisk/rc.asterisk	Sun Jun 05 11:43:33 2011 +0200
@@ -31,9 +31,7 @@
 %stop -u @l_susr@
     rcService asterisk enable yes || exit 0
     rcService asterisk active no  && exit 0
-    ( @l_prefix@/sbin/asterisk -rx "core stop gracefully" &
-      sleep 2
-      @l_prefix@/sbin/asterisk -rx "core stop now" &
+    ( @l_prefix@/sbin/asterisk -rx "core stop now"
     ) >/dev/null 2>&1 || true
 
 %restart -u @l_susr@