# HG changeset patch
# User Michael Schloh von Bennewitz <michael@schloh.com>
# Date 1316108420 -7200
# Node ID 7c568c62ffb399a5d1053caff8a20ccf833bf0d4
# Parent  45eaa38991fdf5a0d1e3815cdb257e5c1ff2d3b0
Correct paths and buildconf, add sounds, update version, and refresh patch.

diff -r 45eaa38991fd -r 7c568c62ffb3 asterisk/asterisk.patch
--- a/asterisk/asterisk.patch	Thu Sep 15 19:34:00 2011 +0200
+++ b/asterisk/asterisk.patch	Thu Sep 15 19:40:20 2011 +0200
@@ -1,8 +1,8 @@
 Index: addons/chan_ooh323.c
 diff -Nau addons/chan_ooh323.c.orig addons/chan_ooh323.c
---- 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 @@
+--- addons/chan_ooh323.c.orig	2011-08-09 18:13:09.000000000 +0200
++++ addons/chan_ooh323.c	2011-09-14 14:29:50.740457577 +0200
+@@ -24,6 +24,12 @@
  
  #include "chan_ooh323.h"
  #include <math.h>
@@ -17,8 +17,8 @@
  
 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-05-23 17:35:28.331029567 +0200
+--- addons/ooh323c/src/ooCmdChannel.c.orig	2011-08-04 21:37:16.000000000 +0200
++++ addons/ooh323c/src/ooCmdChannel.c	2011-09-14 14:29:50.740457577 +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	2011-02-16 21:21:17.000000000 +0100
-+++ addons/ooh323c/src/ooSocket.c	2011-05-23 17:35:28.331029567 +0200
+--- addons/ooh323c/src/ooSocket.c.orig	2011-05-04 22:50:18.000000000 +0200
++++ addons/ooh323c/src/ooSocket.c	2011-09-14 14:29:50.740457577 +0200
 @@ -24,6 +24,9 @@
  
  #include "ooSocket.h"
@@ -47,7 +47,7 @@
 Index: addons/ooh323cDriver.c
 diff -Nau addons/ooh323cDriver.c.orig addons/ooh323cDriver.c
 --- addons/ooh323cDriver.c.orig	2011-02-18 01:07:20.000000000 +0100
-+++ addons/ooh323cDriver.c	2011-05-23 17:35:28.338530899 +0200
++++ addons/ooh323cDriver.c	2011-09-14 14:29:50.740457577 +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-05-23 17:35:28.338530899 +0200
++++ apps/app_backticks.c	2011-09-14 14:29:50.740457577 +0200
 @@ -0,0 +1,129 @@
 +
 +#include "asterisk.h"
@@ -196,9 +196,9 @@
 +
 Index: apps/app_meetme.c
 diff -Nau apps/app_meetme.c.orig apps/app_meetme.c
---- 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 @@
+--- apps/app_meetme.c.orig	2011-07-19 17:43:32.000000000 +0200
++++ apps/app_meetme.c	2011-09-14 14:29:50.747960016 +0200
+@@ -606,6 +606,7 @@
  	CONFFLAG_DURATION_LIMIT = (1 << 30),
  	/*! Do not write any audio to this channel until the state is up. */
  	CONFFLAG_NO_AUDIO_UNTIL_UP = (1 << 31),
@@ -206,7 +206,7 @@
  };
  
  /* !If set play an intro announcement at start of conference */
-@@ -617,6 +618,7 @@
+@@ -619,6 +620,7 @@
  	OPT_ARG_MOH_CLASS = 4,
  	OPT_ARG_INTROMSG = 5,
  	OPT_ARG_ARRAY_SIZE = 6,
@@ -214,7 +214,7 @@
  };
  
  AST_APP_OPTIONS(meetme_opts, BEGIN_OPTIONS
-@@ -650,6 +652,7 @@
+@@ -652,6 +654,7 @@
  	AST_APP_OPTION('1', CONFFLAG_NOONLYPERSON ),
   	AST_APP_OPTION_ARG('S', CONFFLAG_DURATION_STOP, OPT_ARG_DURATION_STOP),
  	AST_APP_OPTION_ARG('L', CONFFLAG_DURATION_LIMIT, OPT_ARG_DURATION_LIMIT),
@@ -222,7 +222,7 @@
  END_OPTIONS );
  
  static const char * const app = "MeetMe";
-@@ -2437,6 +2440,12 @@
+@@ -2447,6 +2450,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) {
-@@ -2453,6 +2462,7 @@
+@@ -2463,6 +2472,7 @@
  			res = ast_record_review(chan, "vm-rec-name", user->namerecloc, 10, "sln", &duration, NULL);
  		if (res == -1)
  			goto outrun;
@@ -245,9 +245,9 @@
  	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-02-08 20:41:42.000000000 +0100
-+++ apps/app_voicemail.c	2011-05-23 17:35:28.348531751 +0200
-@@ -366,6 +366,7 @@
+--- apps/app_voicemail.c.orig	2011-07-26 16:04:55.000000000 +0200
++++ apps/app_voicemail.c	2011-09-14 14:29:50.747960016 +0200
+@@ -373,6 +373,7 @@
  static char imapport[8];
  static char imapflags[128];
  static char imapfolder[64];
@@ -255,7 +255,7 @@
  static char imapparentfolder[64] = "\0";
  static char greetingfolder[64];
  static char authuser[32];
-@@ -2464,7 +2465,7 @@
+@@ -2504,7 +2505,7 @@
  	}
  
  	/* Build up server information */
@@ -264,7 +264,7 @@
  
  	/* Add authentication user if present */
  	if (!ast_strlen_zero(authuser))
-@@ -6073,6 +6074,7 @@
+@@ -6161,6 +6162,7 @@
  	/* simple. huh? */
  	char sequence[10];
  	char mailbox[256];
@@ -272,7 +272,7 @@
  	int res;
  
  	/* get the real IMAP message number for this message */
-@@ -6088,10 +6090,24 @@
+@@ -6176,10 +6178,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);
-@@ -10264,6 +10280,10 @@
+@@ -10383,6 +10399,10 @@
  #ifndef IMAP_STORAGE
  				} else if (!cmd) {
  					vms.deleted[vms.curmsg] = 1;
@@ -310,7 +310,7 @@
  #endif
  				} else {
  					vms.deleted[vms.curmsg] = 0;
-@@ -11731,6 +11751,15 @@
+@@ -11874,6 +11894,15 @@
  		} else {
  			ast_copy_string(imapfolder, "INBOX", sizeof(imapfolder));
  		}
@@ -326,53 +326,63 @@
  		if ((val = ast_variable_retrieve(cfg, "general", "imapparentfolder"))) {
  			ast_copy_string(imapparentfolder, val, sizeof(imapparentfolder));
  		}
-Index: apps/.moduleinfo
-diff -Nau apps/.moduleinfo.orig apps/.moduleinfo
---- 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>
- <member name="app_ivrdemo" displayname="IVR Demo Application" remove_on_change="apps/app_ivrdemo.o apps/app_ivrdemo.so">
--	<defaultenabled>no</defaultenabled>
-+	<defaultenabled>yes</defaultenabled>
- </member>
- <member name="app_jack" displayname="JACK Interface" remove_on_change="apps/app_jack.o apps/app_jack.so">
- 	<depend>jack</depend>
-@@ -127,10 +127,10 @@
- <member name="app_rpt" displayname="Radio Repeater/Remote Base Application" remove_on_change="apps/app_rpt.o apps/app_rpt.so">
- 	<depend>dahdi</depend>
- 	<depend>tonezone</depend>
--	<defaultenabled>no</defaultenabled>
-+	<defaultenabled>yes</defaultenabled>
- </member>
- <member name="app_saycounted" displayname="Decline words according to channel language" remove_on_change="apps/app_saycounted.o apps/app_saycounted.so">
--	<defaultenabled>no</defaultenabled>
-+	<defaultenabled>yes</defaultenabled>
- </member>
- <member name="app_sayunixtime" displayname="Say time" remove_on_change="apps/app_sayunixtime.o apps/app_sayunixtime.so">
- </member>
-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-05-23 17:35:28.348531751 +0200
-@@ -26,10 +26,11 @@
- 		<member name="RADIO_RELAX" displayname="Relax DTMF for Radio Applications">
- 		</member>
- 		<member name="G711_NEW_ALGORITHM" displayname="Use the NEW ulaw/alaw codecs (slower, but cleaner)">
--			<defaultenabled>no</defaultenabled>
-+			<defaultenabled>yes</defaultenabled>
- 		</member>
- 		<member name="G711_REDUCED_BRANCHING" displayname="New ulaw/alaw codec, reduced branching (might help it run faster in some architectures)">
- 			<depend>G711_NEW_ALGORITHM</depend>
-+			<defaultenabled>yes</defaultenabled>
- 		</member>
- 		<member name="TEST_CODING_TABLES" displayname="New ulaw/alaw codec, turn on table tests on init">
- 			<depend>G711_NEW_ALGORITHM</depend>
-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-05-23 17:35:28.348531751 +0200
+Index: cdr/cdr_radius.c
+diff -Nau cdr/cdr_radius.c.orig cdr/cdr_radius.c
+--- cdr/cdr_radius.c.orig	2011-07-14 22:13:06.000000000 +0200
++++ cdr/cdr_radius.c	2011-09-14 14:29:50.777958246 +0200
+@@ -106,10 +106,18 @@
+ 	if (!rc_avpair_add(rh, tosend, PW_AST_SRC, &cdr->src, strlen(cdr->src), VENDOR_CODE))
+ 		return -1;
+ 
++ 	/* RADIUS standard identifier patch */
++	if (!rc_avpair_add(rh, tosend, PW_CALLING_STATION_ID, &cdr->src, strlen(cdr->src), 0))
++		return -1;
++
+  	/* Destination */
+ 	if (!rc_avpair_add(rh, tosend, PW_AST_DST, &cdr->dst, strlen(cdr->dst), VENDOR_CODE))
+ 		return -1;
+ 
++ 	/* RADIUS standard identifier patch */
++	if (!rc_avpair_add(rh, tosend, PW_CALLED_STATION_ID, &cdr->dst, strlen(cdr->dst), 0))
++		return -1;
++
+  	/* Destination context */
+ 	if (!rc_avpair_add(rh, tosend, PW_AST_DST_CTX, &cdr->dcontext, strlen(cdr->dcontext), VENDOR_CODE))
+ 		return -1;
+@@ -164,6 +172,10 @@
+ 	if (!rc_avpair_add(rh, tosend, PW_AST_BILL_SEC, &cdr->billsec, 0, VENDOR_CODE))
+ 		return -1;
+ 
++ 	/* RADIUS standard identifier patch */
++	if (!rc_avpair_add(rh, tosend, PW_ACCT_SESSION_TIME, &cdr->billsec, 0, 0))
++		return -1;
++
+ 	/* Disposition */
+ 	tmp = ast_cdr_disp2str(cdr->disposition);
+ 	if (!rc_avpair_add(rh, tosend, PW_AST_DISPOSITION, tmp, strlen(tmp), VENDOR_CODE))
+@@ -187,10 +199,14 @@
+ 	}
+ 
+ 	/* Setting Acct-Session-Id & User-Name attributes for proper generation
+-	   of Acct-Unique-Session-Id on server side */
+-	/* Channel */
+-	if (!rc_avpair_add(rh, tosend, PW_USER_NAME, &cdr->channel, strlen(cdr->channel), 0))
+-		return -1;
++	   of Acct-Unique-Session-Id on server side Channel */
++	{
++		char szChanuser[PATH_MAX] = {0};
++		strncpy(szChanuser, &cdr->channel, PATH_MAX-1);
++		*(strrchr(szChanuser, '-')) = 0;
++		if (!rc_avpair_add(rh, tosend, PW_USER_NAME, szChanuser, strlen(cdr->channel), 0))
++			return -1;
++	}
+ 
+ 	/* Unique ID */
+ 	if (!rc_avpair_add(rh, tosend, PW_ACCT_SESSION_ID, &cdr->uniqueid, strlen(cdr->uniqueid), 0))
+Index: chan_capi-1.1.5.20110914/chan_capi20.h
+diff -Nau chan_capi-1.1.5.20110914/chan_capi20.h.orig chan_capi-1.1.5.20110914/chan_capi20.h
+--- chan_capi-1.1.5.20110914/chan_capi20.h.orig	2011-01-07 02:29:32.000000000 +0100
++++ chan_capi-1.1.5.20110914/chan_capi20.h	2011-05-23 17:35:28.348531751 +0200
 @@ -4,10 +4,13 @@
   * first. Else the checks below will fail.
   */
@@ -396,11 +406,11 @@
  #ifndef HEADER_CID
  #define HEADER_CID(x) ((x)->adr.adrNCCI)
  #endif
-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-05-23 17:35:28.348531751 +0200
-@@ -1155,6 +1155,9 @@
+Index: chan_capi-1.1.5.20110914/chan_capi_utils.c
+diff -Nau chan_capi-1.1.5.20110914/chan_capi_utils.c.orig chan_capi-1.1.5.20110914/chan_capi_utils.c
+--- chan_capi-1.1.5.20110914/chan_capi_utils.c.orig	2011-01-07 02:29:32.000000000 +0100
++++ chan_capi-1.1.5.20110914/chan_capi_utils.c	2011-05-23 17:35:28.348531751 +0200
+@@ -1158,6 +1158,9 @@
  {
  	MESSAGE_EXCHANGE_ERROR error;
  	int waitcount = 50;
@@ -410,10 +420,10 @@
  	unsigned char manbuf[CAPI_MANUFACTURER_LEN];
  	_cmsg CMSG;
  
-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-05-23 17:35:28.348531751 +0200
+Index: chan_capi-1.1.5.20110914/libcapi20/capi20.c
+diff -Nau chan_capi-1.1.5.20110914/libcapi20/capi20.c.orig chan_capi-1.1.5.20110914/libcapi20/capi20.c
+--- chan_capi-1.1.5.20110914/libcapi20/capi20.c.orig	2011-01-07 02:29:31.000000000 +0100
++++ chan_capi-1.1.5.20110914/libcapi20/capi20.c	2011-05-23 17:35:28.348531751 +0200
 @@ -19,8 +19,10 @@
  #include <stdio.h>
  #include <ctype.h>
@@ -707,10 +717,10 @@
  }
  /*
   * functions added to the CAPI2.0 spec
-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-05-23 17:35:28.348531751 +0200
+Index: chan_capi-1.1.5.20110914/libcapi20/convert.c
+diff -Nau chan_capi-1.1.5.20110914/libcapi20/convert.c.orig chan_capi-1.1.5.20110914/libcapi20/convert.c
+--- chan_capi-1.1.5.20110914/libcapi20/convert.c.orig	2011-01-07 02:29:31.000000000 +0100
++++ chan_capi-1.1.5.20110914/libcapi20/convert.c	2011-05-23 17:35:28.348531751 +0200
 @@ -11,7 +11,14 @@
  #include <stddef.h>
  #include <time.h>
@@ -726,11 +736,11 @@
  
  #include "capi20.h"
  
-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-05-23 17:35:28.348531751 +0200
-@@ -111,6 +111,9 @@
+Index: chan_capi-1.1.5.20110914/Makefile
+diff -Nau chan_capi-1.1.5.20110914/Makefile.orig chan_capi-1.1.5.20110914/Makefile
+--- chan_capi-1.1.5.20110914/Makefile.orig	2011-01-07 02:29:32.000000000 +0100
++++ chan_capi-1.1.5.20110914/Makefile	2011-05-23 17:35:28.348531751 +0200
+@@ -114,6 +114,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)
  CFLAGS+=$(shell if uname -m | grep -q "ppc\|arm\|s390"; then echo "-fsigned-char"; fi)
@@ -742,9 +752,9 @@
  endif
 Index: channels/chan_sip.c
 diff -Nau channels/chan_sip.c.orig channels/chan_sip.c
---- 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 @@
+--- 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
+@@ -11647,7 +11647,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 +775,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-05-23 17:35:28.358543497 +0200
++++ channels/console_video.h	2011-09-14 14:29:50.767970949 +0200
 @@ -28,10 +28,7 @@
  		"console {device}"
  #else
@@ -780,8 +790,8 @@
  	"console {videodevice|videocodec"	\
 Index: configure
 diff -Nau configure.orig configure
---- configure.orig	2011-01-27 18:03:01.000000000 +0100
-+++ configure	2011-05-23 17:41:08.331029717 +0200
+--- configure.orig	2011-08-25 21:08:04.000000000 +0200
++++ configure	2011-09-14 14:29:50.767970949 +0200
 @@ -4704,11 +4704,6 @@
  esac
  
@@ -794,7 +804,7 @@
       openbsd*)
       ac_default_prefix=/usr/local
       if test ${prefix} = '/usr/local' || test ${prefix} = 'NONE'; then
-@@ -18203,8 +18198,8 @@
+@@ -18308,8 +18303,8 @@
  		if test -f "${IMAP_TK_DIR}/c-client/LDFLAGS"; then
        		imap_ldflags=`cat ${IMAP_TK_DIR}/c-client/LDFLAGS`
  		fi
@@ -805,7 +815,7 @@
        	CPPFLAGS="${CPPFLAGS} ${imap_include}"
  	  	LIBS="${LIBS} ${imap_libs} "`echo ${imap_ldflags}`
  	  	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -25436,19 +25431,19 @@
+@@ -25541,19 +25536,19 @@
  
     # now check for the header.
     if test "${AST_LUA_FOUND}" = "yes"; then
@@ -829,7 +839,7 @@
    LUA_HEADER_FOUND=1
  else
    LUA_HEADER_FOUND=0
-@@ -25476,9 +25471,9 @@
+@@ -25581,9 +25576,9 @@
  
  if test "x${PBX_LUA}" = "x1" ; then
  	if test x"${LUA_DIR}" = x; then
@@ -841,7 +851,7 @@
  	fi
  fi
  
-@@ -26157,7 +26152,7 @@
+@@ -26262,7 +26257,7 @@
        	 pbxlibdir="-L${SQLITE_DIR}"
        fi
     fi
@@ -850,7 +860,7 @@
     if test "x${pbxfuncname}" = "x" ; then   # empty lib, assume only headers
        AST_SQLITE_FOUND=yes
     else
-@@ -26867,16 +26862,16 @@
+@@ -26976,16 +26971,16 @@
      if test "x${PBX_GMIME}" != "x1" -a "${USE_GMIME}" != "no"; then
  	PBX_GMIME=0
  	if test -n "$ac_tool_prefix"; then
@@ -872,7 +882,7 @@
    ;;
    *)
    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -26887,7 +26882,7 @@
+@@ -26996,7 +26991,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
@@ -881,7 +891,7 @@
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
-@@ -26898,10 +26893,10 @@
+@@ -27007,10 +27002,10 @@
    ;;
  esac
  fi
@@ -896,7 +906,7 @@
  else
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
-@@ -26909,18 +26904,18 @@
+@@ -27018,18 +27013,18 @@
  
  
  fi
@@ -922,7 +932,7 @@
    ;;
    *)
    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -26931,7 +26926,7 @@
+@@ -27040,7 +27035,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
@@ -931,7 +941,7 @@
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
-@@ -26942,17 +26937,17 @@
+@@ -27051,17 +27046,17 @@
    ;;
  esac
  fi
@@ -955,7 +965,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
-@@ -26960,17 +26955,15 @@
+@@ -27069,17 +27064,15 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
@@ -980,9 +990,9 @@
  		if test "x${GMIME_DIR}" != "x"; then
 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-05-23 17:35:28.368530778 +0200
-@@ -350,6 +350,7 @@
+--- formats/format_pcm.c.orig	2011-07-14 22:13:06.000000000 +0200
++++ formats/format_pcm.c	2011-09-14 14:29:50.767970949 +0200
+@@ -354,6 +354,7 @@
  		ast_log(LOG_WARNING, "Unable to write header\n");
  		return -1;
  	}
@@ -992,9 +1002,9 @@
  
 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-05-23 17:35:28.368530778 +0200
-@@ -310,6 +310,7 @@
+--- formats/format_wav.c.orig	2011-07-29 19:18:56.000000000 +0200
++++ formats/format_wav.c	2011-09-14 14:29:50.767970949 +0200
+@@ -308,6 +308,7 @@
  		ast_log(LOG_WARNING, "Unable to write header\n");
  		return -1;
  	}
@@ -1004,9 +1014,9 @@
  
 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-05-23 17:35:28.368530778 +0200
-@@ -362,6 +362,7 @@
+--- formats/format_wav_gsm.c.orig	2011-07-14 22:13:06.000000000 +0200
++++ formats/format_wav_gsm.c	2011-09-14 14:29:50.767970949 +0200
+@@ -366,6 +366,7 @@
  		ast_log(LOG_WARNING, "Unable to write header\n");
  		return -1;
  	}
@@ -1017,7 +1027,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-05-23 17:35:28.368530778 +0200
++++ main/db1-ast/hash/hash.h	2011-09-14 14:29:50.767970949 +0200
 @@ -36,6 +36,8 @@
   *	@(#)hash.h	8.3 (Berkeley) 5/31/94
   */
@@ -1030,7 +1040,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-05-23 17:35:28.368530778 +0200
++++ main/db1-ast/hash/ndbm.c	2011-09-14 14:29:50.767970949 +0200
 @@ -49,7 +49,8 @@
  #include <string.h>
  #include <stdlib.h>
@@ -1043,9 +1053,9 @@
  /*
 Index: main/features.c
 diff -Nau main/features.c.orig main/features.c
---- 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 @@
+--- main/features.c.orig	2011-08-10 00:12:59.000000000 +0200
++++ main/features.c	2011-09-14 14:29:50.777958246 +0200
+@@ -1646,6 +1646,10 @@
  			snprintf(args, len, "%s,%s,m", S_OR(touch_format, "wav"), touch_filename);
  		}
  
@@ -1056,7 +1066,7 @@
  		for(x = 0; x < strlen(args); x++) {
  			if (args[x] == '/')
  				args[x] = '-';
-@@ -1774,6 +1778,10 @@
+@@ -1762,6 +1766,10 @@
  			snprintf(args, len, "%s.%s,b", touch_filename, S_OR(touch_format, "wav"));
  		}
  
@@ -1069,9 +1079,9 @@
  				args[x] = '-';
 Index: main/file.c
 diff -Nau main/file.c.orig main/file.c
---- 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 @@
+--- main/file.c.orig	2011-07-05 15:23:57.000000000 +0200
++++ main/file.c	2011-09-14 14:29:50.777958246 +0200
+@@ -256,7 +256,7 @@
  	char *fn = NULL;
  
  	if (!strcmp(ext, "wav49"))
@@ -1082,8 +1092,8 @@
  		if (asprintf(&fn, "%s.%s", filename, ext) < 0) {
 Index: main/Makefile
 diff -Nau main/Makefile.orig main/Makefile
---- main/Makefile.orig	2010-12-18 00:52:04.000000000 +0100
-+++ main/Makefile	2011-05-23 17:35:28.378531576 +0200
+--- main/Makefile.orig	2011-08-03 17:14:36.000000000 +0200
++++ main/Makefile	2011-09-14 14:29:50.777958246 +0200
 @@ -69,10 +69,7 @@
  endif
  
@@ -1098,9 +1108,9 @@
  ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
 Index: main/tcptls.c
 diff -Nau main/tcptls.c.orig main/tcptls.c
---- 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 @@
+--- main/tcptls.c.orig	2011-05-23 18:18:33.000000000 +0200
++++ main/tcptls.c	2011-09-14 14:29:50.777958246 +0200
+@@ -357,6 +357,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);
@@ -1110,8 +1120,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-21 16:02:20.000000000 +0100
-+++ main/udptl.c	2011-05-23 17:35:28.378531576 +0200
+--- main/udptl.c.orig	2011-05-03 21:55:49.000000000 +0200
++++ main/udptl.c	2011-09-14 14:29:50.777958246 +0200
 @@ -98,6 +98,18 @@
  
  #define UDPTL_BUF_MASK              15
@@ -1133,8 +1143,8 @@
  	uint8_t buf[LOCAL_FAX_MAX_DATAGRAM];
 Index: Makefile
 diff -Nau Makefile.orig Makefile
---- Makefile.orig	2011-02-01 19:02:06.000000000 +0100
-+++ Makefile	2011-05-23 17:35:28.378531576 +0200
+--- Makefile.orig	2011-08-25 21:08:04.000000000 +0200
++++ Makefile	2011-09-14 14:29:50.777958246 +0200
 @@ -230,15 +230,6 @@
    _ASTCFLAGS+=-fsigned-char
  endif
@@ -1151,168 +1161,3 @@
  ifeq ($(OSARCH),NetBSD)
    _ASTCFLAGS+=-pthread -I/usr/pkg/include
  endif
-Index: menuselect-tree
-diff -Nau menuselect-tree.orig menuselect-tree
---- 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">
- </member>
-+<member name="app_backticks" displayname="BACKTICKS() dialplan function" remove_on_change="apps/app_backticks.o apps/app_backticks.so">
-+</member>
- <member name="app_cdr" displayname="Tell Asterisk to not maintain a CDR for the current call" remove_on_change="apps/app_cdr.o apps/app_cdr.so">
- </member>
- <member name="app_celgenuserevent" displayname="Generate an User-Defined CEL event" remove_on_change="apps/app_celgenuserevent.o apps/app_celgenuserevent.so">
-@@ -937,11 +939,11 @@
- 		<member name="CORE-SOUNDS-EN-ALAW" displayname="English, a-Law format">
- 		</member>
- 		<member name="CORE-SOUNDS-EN-GSM" displayname="English, GSM format" >
--			<defaultenabled>yes</defaultenabled>
- 		</member>
- 		<member name="CORE-SOUNDS-EN-G729" displayname="English, G.729 format">
- 		</member>
- 		<member name="CORE-SOUNDS-EN-G722" displayname="English, G.722 format">
-+			<defaultenabled>yes</defaultenabled>
- 		</member>
- 		<member name="CORE-SOUNDS-EN-SLN16" displayname="English, Signed-linear 16kHz format">
- 		</member>
-@@ -1006,7 +1008,6 @@
- 	</category>
- 	<category name="MENUSELECT_MOH" displayname="Music On Hold File Packages" positive_output="yes">
- 		<member name="MOH-OPSOUND-WAV" displayname="opsound.org Music On Hold Files, WAV format" >
--			<defaultenabled>yes</defaultenabled>
- 		</member>
- 		<member name="MOH-OPSOUND-ULAW" displayname="opsound.org Music On Hold Files, mu-Law format" >
- 		</member>
-@@ -1017,6 +1018,7 @@
- 		<member name="MOH-OPSOUND-G729" displayname="opsound.org Music On Hold Files, G.729 format" >
- 		</member>
- 		<member name="MOH-OPSOUND-G722" displayname="opsound.org Music On Hold Files, G.722 format" >
-+			<defaultenabled>yes</defaultenabled>
- 		</member>
- 		<member name="MOH-OPSOUND-SLN16" displayname="opsound.org Music On Hold Files, Signed-linear 16kHz format" >
- 		</member>
-@@ -1037,6 +1039,7 @@
- 		<member name="EXTRA-SOUNDS-EN-G729" displayname="English, G.729 format">
- 		</member>
- 		<member name="EXTRA-SOUNDS-EN-G722" displayname="English, G.722 format">
-+			<defaultenabled>yes</defaultenabled>
- 		</member>
- 		<member name="EXTRA-SOUNDS-EN-SLN16" displayname="English, Signed-linear 16kHz format">
- 		</member>
-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-05-23 17:35:28.378531576 +0200
-@@ -122,14 +122,8 @@
- 		ast_log(LOG_WARNING, "Got unexpected GMIME_IS_MESSAGE_PARTIAL\n");
- 		return;
- 	} else if (GMIME_IS_MULTIPART(part)) {
--		GList *l;
--		
--		ast_log(LOG_WARNING, "Got unexpected GMIME_IS_MULTIPART, trying to process subparts\n");
--		l = GMIME_MULTIPART(part)->subparts;
--		while (l) {
--			process_message_callback(l->data, cbinfo);
--			l = l->next;
--		}
-+  		ast_log(LOG_WARNING, "Got unexpected GMIME_IS_MULTIPART, trying to process subparts\n");
-+		g_mime_multipart_foreach(GMIME_MULTIPART(part), process_message_callback, cbinfo);
- 	} else if (GMIME_IS_PART(part)) {
- 		const char *filename;
- 
-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-05-23 17:35:28.378531576 +0200
-@@ -6,11 +6,11 @@
- 		<member name="CORE-SOUNDS-EN-ALAW" displayname="English, a-Law format">
- 		</member>
- 		<member name="CORE-SOUNDS-EN-GSM" displayname="English, GSM format" >
--			<defaultenabled>yes</defaultenabled>
- 		</member>
- 		<member name="CORE-SOUNDS-EN-G729" displayname="English, G.729 format">
- 		</member>
- 		<member name="CORE-SOUNDS-EN-G722" displayname="English, G.722 format">
-+			<defaultenabled>yes</defaultenabled>
- 		</member>
- 		<member name="CORE-SOUNDS-EN-SLN16" displayname="English, Signed-linear 16kHz format">
- 		</member>
-@@ -75,7 +75,6 @@
- 	</category>
- 	<category name="MENUSELECT_MOH" displayname="Music On Hold File Packages" positive_output="yes">
- 		<member name="MOH-OPSOUND-WAV" displayname="opsound.org Music On Hold Files, WAV format" >
--			<defaultenabled>yes</defaultenabled>
- 		</member>
- 		<member name="MOH-OPSOUND-ULAW" displayname="opsound.org Music On Hold Files, mu-Law format" >
- 		</member>
-@@ -86,6 +85,7 @@
- 		<member name="MOH-OPSOUND-G729" displayname="opsound.org Music On Hold Files, G.729 format" >
- 		</member>
- 		<member name="MOH-OPSOUND-G722" displayname="opsound.org Music On Hold Files, G.722 format" >
-+			<defaultenabled>yes</defaultenabled>
- 		</member>
- 		<member name="MOH-OPSOUND-SLN16" displayname="opsound.org Music On Hold Files, Signed-linear 16kHz format" >
- 		</member>
-@@ -106,6 +106,7 @@
- 		<member name="EXTRA-SOUNDS-EN-G729" displayname="English, G.729 format">
- 		</member>
- 		<member name="EXTRA-SOUNDS-EN-G722" displayname="English, G.722 format">
-+			<defaultenabled>yes</defaultenabled>
- 		</member>
- 		<member name="EXTRA-SOUNDS-EN-SLN16" displayname="English, Signed-linear 16kHz format">
- 		</member>
-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-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;
- 
-+ 	/* RADIUS standard identifier patch */
-+	if (!rc_avpair_add(rh, tosend, PW_CALLING_STATION_ID, &cdr->src, strlen(cdr->src), 0))
-+		return -1;
-+
-  	/* Destination */
- 	if (!rc_avpair_add(rh, tosend, PW_AST_DST, &cdr->dst, strlen(cdr->dst), VENDOR_CODE))
- 		return -1;
- 
-+ 	/* RADIUS standard identifier patch */
-+	if (!rc_avpair_add(rh, tosend, PW_CALLED_STATION_ID, &cdr->dst, strlen(cdr->dst), 0))
-+		return -1;
-+
-  	/* Destination context */
- 	if (!rc_avpair_add(rh, tosend, PW_AST_DST_CTX, &cdr->dcontext, strlen(cdr->dcontext), VENDOR_CODE))
- 		return -1;
-@@ -163,6 +171,10 @@
- 	if (!rc_avpair_add(rh, tosend, PW_AST_BILL_SEC, &cdr->billsec, 0, VENDOR_CODE))
- 		return -1;
- 
-+ 	/* RADIUS standard identifier patch */
-+	if (!rc_avpair_add(rh, tosend, PW_ACCT_SESSION_TIME, &cdr->billsec, 0, 0))
-+		return -1;
-+
- 	/* Disposition */
- 	tmp = ast_cdr_disp2str(cdr->disposition);
- 	if (!rc_avpair_add(rh, tosend, PW_AST_DISPOSITION, tmp, strlen(tmp), VENDOR_CODE))
-@@ -186,10 +198,14 @@
- 	}
- 
- 	/* Setting Acct-Session-Id & User-Name attributes for proper generation
--	   of Acct-Unique-Session-Id on server side */
--	/* Channel */
--	if (!rc_avpair_add(rh, tosend, PW_USER_NAME, &cdr->channel, strlen(cdr->channel), 0))
--		return -1;
-+	   of Acct-Unique-Session-Id on server side Channel */
-+	{
-+		char szChanuser[PATH_MAX] = {0};
-+		strncpy(szChanuser, &cdr->channel, PATH_MAX-1);
-+		*(strrchr(szChanuser, '-')) = 0;
-+		if (!rc_avpair_add(rh, tosend, PW_USER_NAME, szChanuser, strlen(cdr->channel), 0))
-+			return -1;
-+	}
- 
- 	/* Unique ID */
- 	if (!rc_avpair_add(rh, tosend, PW_ACCT_SESSION_ID, &cdr->uniqueid, strlen(cdr->uniqueid), 0))
diff -r 45eaa38991fd -r 7c568c62ffb3 asterisk/asterisk.spec
--- a/asterisk/asterisk.spec	Thu Sep 15 19:34:00 2011 +0200
+++ b/asterisk/asterisk.spec	Thu Sep 15 19:40:20 2011 +0200
@@ -22,8 +22,8 @@
 ##
 
 #   package version
-%define       V_opkg                     1.8.4.2
-%define       V_asterisk                 1.8.4.2
+%define       V_opkg                     1.8.6.0
+%define       V_asterisk                 1.8.6.0
 %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
@@ -33,11 +33,11 @@
 %define       V_asterisk_sounds_custom   1.0
 %define       V_asterisk_sounds_mohop    2.03
 %define       V_asterisk_addons_mp3dec   1
-%define       V_fswitch_sounds_en        1.0.14
-%define       V_fswitch_sounds_ru        1.0.12
+%define       V_fswitch_sounds_en        1.0.16
+%define       V_fswitch_sounds_ru        1.0.13
 %define       V_fswitch_music            1.0.8
 %define       V_asterisk_codecs_ilbc     20110104
-%define       V_chan_capi                1.1.5.919
+%define       V_chan_capi                1.1.5.20110914
 
 #   package information
 Name:         asterisk
@@ -50,7 +50,7 @@
 Group:        VoIP
 License:      GPL
 Version:      %{V_opkg}
-Release:      20110604
+Release:      20110916
 
 #   package options
 %option       with_dahdi   no
@@ -78,29 +78,40 @@
 Source0:      http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-%{V_asterisk}.tar.gz
 Source1:      ftp://ftp.chan-capi.org/chan-capi/chan_capi-%{V_chan_capi}.tar.gz
 Source2:      ftp://ftp.europalab.com/pub/sfw/machsnds/asterisk-moh-freeplay-sln16.tar.gz
+
 Source3:      http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-sln16-%{V_asterisk_sounds_mohop}.tar.gz
-Source4:      http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-sln16-%{V_asterisk_sounds_core}.tar.gz
-Source5:      http://downloads.asterisk.org/pub/telephony/sounds/asterisk-core-sounds-en_AU-sln16-current.tar.gz
-Source6:      http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-sln16-%{V_asterisk_sounds_core}.tar.gz
-Source7:      http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-sln16-%{V_asterisk_sounds_core}.tar.gz
-Source8:      http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-sln16-%{V_asterisk_sounds_extra}.tar.gz
-Source9:      http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-fr-sln16-%{V_asterisk_sounds_extra}.tar.gz
-Source10:     http://www.amooma.de/asterisk/sprachbausteine/asterisk-%{V_asterisk_sounds_amoogab}-de-prompts.tar.gz
-Source11:     http://www.amooma.de/asterisk/sprachbausteine/asterisk-core-sounds-de-gsm-current.tar.gz
-Source12:     ftp://ftp.europalab.com/pub/sfw/machsnds/de-digits/de-digits-%{V_asterisk_sounds_custom}.tar.bz2
-Source13:     ftp://ftp.europalab.com/pub/sfw/machsnds/de-sounds/astmultisnds-de-sln16-%{V_asterisk_sounds_custom}.tar.bz2
-Source14:     ftp://ftp.europalab.com/pub/sfw/machsnds/msvbsnds-sln16-%{V_asterisk_sounds_custom}.tar.bz2
-Source15:     http://files.freeswitch.org/freeswitch-sounds-en-us-callie-48000-%{V_fswitch_sounds_en}.tar.gz
-Source16:     http://files.freeswitch.org/freeswitch-sounds-es-mx-maria-44100.tar.gz
-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-%{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
-Source25:     wakeup.agi
+Source4:      http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-sln16-%{V_asterisk_sounds_mohop}.tar.gz.sha1
+Source5:      http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-sln16-%{V_asterisk_sounds_core}.tar.gz
+Source6:      http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-sln16-%{V_asterisk_sounds_core}.tar.gz.sha1
+Source7:      http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-sln16-%{V_asterisk_sounds_core}.tar.gz
+Source8:      http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-sln16-%{V_asterisk_sounds_core}.tar.gz.sha1
+Source9:      http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en_AU-sln16-%{V_asterisk_sounds_core}.tar.gz
+Source10:     http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en_AU-sln16-%{V_asterisk_sounds_core}.tar.gz.sha1
+Source11:     http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-sln16-%{V_asterisk_sounds_core}.tar.gz
+Source12:     http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-sln16-%{V_asterisk_sounds_core}.tar.gz.sha1
+Source13:     http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-sln16-%{V_asterisk_sounds_core}.tar.gz
+Source14:     http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-sln16-%{V_asterisk_sounds_core}.tar.gz.sha1
+Source15:     http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-sln16-%{V_asterisk_sounds_extra}.tar.gz
+Source16:     http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-sln16-%{V_asterisk_sounds_extra}.tar.gz.sha1
+Source16:     http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-fr-sln16-%{V_asterisk_sounds_extra}.tar.gz
+Source17:     http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-fr-sln16-%{V_asterisk_sounds_extra}.tar.gz.sha1
+
+Source18:     http://www.amooma.de/asterisk/sprachbausteine/asterisk-%{V_asterisk_sounds_amoogab}-de-prompts.tar.gz
+Source19:     http://www.amooma.de/asterisk/sprachbausteine/asterisk-core-sounds-de-gsm-current.tar.gz
+Source20:     ftp://ftp.europalab.com/pub/sfw/machsnds/de-digits/de-digits-%{V_asterisk_sounds_custom}.tar.bz2
+Source21:     ftp://ftp.europalab.com/pub/sfw/machsnds/de-sounds/astmultisnds-de-sln16-%{V_asterisk_sounds_custom}.tar.bz2
+Source22:     ftp://ftp.europalab.com/pub/sfw/machsnds/msvbsnds-sln16-%{V_asterisk_sounds_custom}.tar.bz2
+Source23:     http://files.freeswitch.org/freeswitch-sounds-en-us-callie-48000-%{V_fswitch_sounds_en}.tar.gz
+Source24:     http://files.freeswitch.org/freeswitch-sounds-es-mx-maria-44100.tar.gz
+Source25:     http://files.freeswitch.org/freeswitch-sounds-ru-RU-elena-48000-%{V_fswitch_sounds_ru}.tar.gz
+Source26:     http://files.freeswitch.org/freeswitch-sounds-music-48000-%{V_fswitch_music}.tar.gz
+Source27:     http://svn.digium.com/svn/thirdparty/mp3/trunk/addons/mp3-%{V_asterisk_addons_mp3dec}.tar.gz
+Source28:     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
+Source29:     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
+Source30:     ilbc-20110104.tar.gz
+Source31:     asterisk.txt
+Source32:     rc.asterisk
+Source33:     wakeup.agi
 Patch0:       asterisk.patch
 Patch1:       asterisk.patch.xfersips
 Patch2:       asterisk.patch.proxymwi
@@ -253,8 +264,8 @@
     %setup -q -n asterisk-%{V_asterisk} -D -T -a 1
     %setup -q -n asterisk-%{V_asterisk} -D -T -a 2
 %if "%{with_fax}" == "yes"
-    %setup -q -n asterisk-%{V_asterisk} -D -T -a 20
-    %setup -q -n asterisk-%{V_asterisk} -D -T -a 21
+    %setup -q -n asterisk-%{V_asterisk} -D -T -a 28
+    %setup -q -n asterisk-%{V_asterisk} -D -T -a 29
 %endif
     ( cd addons
       %{l_tar} zxf %{_sourcedir}/mp3-%{V_asterisk_addons_mp3dec}.tar.gz
@@ -291,6 +302,7 @@
         -e 's;^\(#define DEFAULT_DB .*\${ASTDBDIR}\)/astdb;\1/asterisk.db;' \
         build_tools/make_defaults_h
     %{l_shtool} subst \
+        -e 's;^\(_all:.* *\)cleantest *;\1;' \
         -e 's; *-I/usr/local/ssl/include;;g' \
         -e 's;/opt/ssl/include;%{l_prefix}/include;g' \
         -e 's;/usr/local;%{l_prefix};g' \
@@ -309,17 +321,12 @@
         main/Makefile
     %{l_shtool} subst \
         -e 's;\(<defaultenabled>\)no\(</defaultenabled>\);\1yes\2;g' \
-        addons/.*.moduleinfo \
-        apps/.app_ivrdemo.moduleinfo \
-        apps/.app_saycounted.moduleinfo \
-        apps/.app_rpt.moduleinfo \
-        codecs/.moduleinfo \
+        apps/app_ivrdemo.c \
+        apps/app_saycounted.c \
+        apps/app_rpt.c \
         utils/utils.xml \
         agi/agi.xml
     %{l_shtool} subst \
-        -e 's;check_expr2;check_expr;g' \
-        utils/utils.xml
-    %{l_shtool} subst \
         -e 's;\(-DSOLARIS\);\1 -D__EXTENSIONS__=1;g' \
         main/editline/Makefile.in \
         main/db1-ast/Makefile
@@ -333,10 +340,6 @@
         -e 's;if \(((tmp = strchr(name\);while \1;g' \
         main/abstract_jb.c
     %{l_shtool} subst \
-        -e 's;\(CORE_SOUNDS_VERSION\):=.*$;\1:=%{V_asterisk_sounds_core};' \
-        -e 's;\(EXTRA_SOUNDS_VERSION\):=.*$;\1:=%{V_asterisk_sounds_extra};' \
-        sounds/Makefile
-    %{l_shtool} subst \
         -e 's;\(/etc/radiusclient-ng/radiusclient.conf\);%{l_prefix}\1;g' \
         -e 's;\(radiusclient\)-ng;\1;g' \
         cdr/cdr_radius.c \
@@ -433,7 +436,7 @@
         --localstatedir=%{l_prefix}/var \
         --datarootdir=%{l_prefix}/share/asterisk \
         --with-crypto=%{l_prefix} \
-        --with-curl=%{l_prefix} \
+        --with-libcurl=%{l_prefix} \
         --with-ncurses=%{l_prefix} \
         --with-gsm="internal" \
         --with-popt=%{l_prefix} \
@@ -502,17 +505,18 @@
 %else
         --without-imap \
 %endif
+        --without-iodbc \
 %if "%{with_odbc}" == "yes"
-        --with-odbc=%{l_prefix} \
+        --with-unixodbc=%{l_prefix} \
 %else
-        --without-odbc \
+        --without-unixodbc \
 %endif
 %if "%{with_libpri}" == "yes"
         --with-pri=%{l_prefix} \
 %else
         --without-pri \
 %endif
-        --with-sounds-cache=no \
+        --with-sounds-cache=%_sourcedir \
         --without-netsnmp \
         --without-isdnnet \
         --without-misdn \
@@ -527,35 +531,31 @@
         --without-vpb \
         --without-sdl \
         --without-x11 \
-        --without-gtk \
         --without-gtk2
 
     #   build menuselect
     %{l_make} %{l_mflags -O} menuselect.makeopts
-    %{l_shtool} subst \
-        -e 's;\(MENUSELECT_MOH=\).*;\1;' \
-        -e 's;\(MENUSELECT_CORE_SOUNDS=\).*;\1;' \
-        -e 's;\(MENUSELECT_EXTRA_SOUNDS=\).*;\1;' \
+    menuselect/menuselect \
+        --enable format_mp3 --enable app_fax --enable codec_ilbc \
+        --enable RADIO_RELAX --enable G711_NEW_ALGORITHM \
+        --enable G711_REDUCED_BRANCHING --enable CORE-SOUNDS-EN-SLN16 \
+        --enable CORE-SOUNDS-ES-SLN16 --enable CORE-SOUNDS-FR-SLN16 \
+        --enable CORE-SOUNDS-EN_AU-SLN16 --enable CORE-SOUNDS-RU-SLN16 \
+        --enable MOH-OPSOUND-SLN16 --enable EXTRA-SOUNDS-EN-SLN16 \
+        --enable EXTRA-SOUNDS-FR-SLN16 \
+        menuselect.makeopts
+    menuselect/menuselect \
+        --disable CORE-SOUNDS-EN-GSM \
+        --disable MOH-OPSOUND-WAV \
         menuselect.makeopts
 %if "%{with_imap}" == "yes"
-    %{l_shtool} subst \
-        -e 's;\(MENUSELECT_OPTS_app_voicemail=\).*;\1IMAP_STORAGE;' \
-        menuselect.makeopts
+    menuselect/menuselect --enable IMAP_STORAGE menuselect.makeopts
 %endif
 
     #   build program
     %{l_make} %{l_mflags -O} \
         CC="%{l_cc} $cflags -I../include -I../../include $cppflags" NOISY_BUILD=yes
 
-    #   build addon modules
-    ( cd addons
-      %{l_make} %{l_mflags -O} \
-          CC="%{l_cc} %{l_cflags -O} -I../../include %{l_cppflags ncurses}" NOISY_BUILD=yes ASTTOPDIR=..
-    ) || exit $?
-
-    #   build agi programs
-    ( cd agi && %{l_make} %{l_mflags -O}) || exit $?
-
 %if "%{with_capi}" == "yes"
     #   build capi channel
     ( cd chan_capi-*
@@ -574,14 +574,6 @@
         DESTDIR=$RPM_BUILD_ROOT \
         INSTALL_PREFIX=%{l_prefix}
 
-    #   install addon modules
-    ( cd addons
-      %{l_make} %{l_mflags} install \
-          ASTTOPDIR=.. \
-          DESTDIR=$RPM_BUILD_ROOT \
-          INSTALL_PREFIX=%{l_prefix}
-    ) || exit $?
-
 %if "%{with_capi}" == "yes"
     #   install capi channel
     ( cd chan_capi-*
@@ -726,15 +718,19 @@
     rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man8/autosupport.8 >/dev/null 2>&1 || true
     rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man8/safe_asterisk.8 >/dev/null 2>&1 || true
     rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/images >/dev/null 2>&1 || true
+    rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/moh/.asterisk* >/dev/null 2>&1 || true
     rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/moh/CREDIT* >/dev/null 2>&1 || true
     rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/moh/CHANGES* >/dev/null 2>&1 || true
+    rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/moh/LICENSE* >/dev/null 2>&1 || true
     rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/sounds/*/CREDIT* >/dev/null 2>&1 || true
     rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/sounds/*/CHANGES* >/dev/null 2>&1 || true
+    rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/sounds/*/.asterisk* >/dev/null 2>&1 || true
 
     #   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/spool/facsimile \
+        $RPM_BUILD_ROOT%{l_prefix}/var/asterisk/spool/facsimile/rx \
+        $RPM_BUILD_ROOT%{l_prefix}/var/asterisk/spool/facsimile/tx \
         $RPM_BUILD_ROOT%{l_prefix}/var/asterisk/spool/outgoing \
         $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/licenses
 
@@ -786,8 +782,9 @@
     #   determine installation files
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
         %{l_files_std} \
+        '%config %attr(640,%{l_mgrp},%{l_rgrp}) %{l_prefix}/etc/asterisk/*' \
         '%config %attr(-,%{l_mgrp},%{l_mgrp}) %{l_prefix}/share/asterisk/licenses' \
-        '%config %attr(640,%{l_mgrp},%{l_rgrp}) %{l_prefix}/etc/asterisk/*' \
+        '%attr(750,%{l_rgrp},%{l_rgrp}) %{l_prefix}/var/asterisk/spool/facsimile' \
         '%attr(-,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/asterisk'
 
 #        '%attr(-,%{l_rusr},%{l_rgrp}) %{l_prefix}/share/asterisk/sounds/es/vm-Voicemail.sln16' \
@@ -838,7 +835,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/share/asterisk"
+      echo "'licenses' which in turn must be found in %{l_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."