Correct patch logic and update sound versions including russian.

Fri, 02 Dec 2011 16:12:09 +0100

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Fri, 02 Dec 2011 16:12:09 +0100
changeset 398
08f5eb82b58f
parent 397
c98ae03f4266
child 399
9360a38b5c9f

Correct patch logic and update sound versions including russian.

asterisk/asterisk.patch file | annotate | diff | comparison | revisions
asterisk/asterisk.spec file | annotate | diff | comparison | revisions
     1.1 --- a/asterisk/asterisk.patch	Thu Dec 01 13:33:32 2011 +0100
     1.2 +++ b/asterisk/asterisk.patch	Fri Dec 02 16:12:09 2011 +0100
     1.3 @@ -198,15 +198,15 @@
     1.4  diff -Nau apps/app_meetme.c.orig apps/app_meetme.c
     1.5  --- apps/app_meetme.c.orig	2011-07-19 17:43:32.000000000 +0200
     1.6  +++ apps/app_meetme.c	2011-09-14 14:29:50.747960016 +0200
     1.7 -@@ -606,6 +606,7 @@
     1.8 - 	CONFFLAG_DURATION_LIMIT = (1 << 30),
     1.9 - 	/*! Do not write any audio to this channel until the state is up. */
    1.10 - 	CONFFLAG_NO_AUDIO_UNTIL_UP = (1 << 31),
    1.11 -+	CONFFLAG_USERNAME = (1 << 32),
    1.12 - };
    1.13 +@@ -607,6 +607,7 @@
    1.14   
    1.15 - /* !If set play an intro announcement at start of conference */
    1.16 -@@ -619,6 +620,7 @@
    1.17 + /*! Do not write any audio to this channel until the state is up. */
    1.18 + #define CONFFLAG_NO_AUDIO_UNTIL_UP  (1ULL << 31)
    1.19 ++#define CONFFLAG_USERNAME (1 << 32)
    1.20 + /*! If set play an intro announcement at start of conference */
    1.21 + #define CONFFLAG_INTROMSG           (1ULL << 32)
    1.22 + 
    1.23 +@@ -618,6 +619,7 @@
    1.24   	OPT_ARG_MOH_CLASS = 4,
    1.25   	OPT_ARG_INTROMSG = 5,
    1.26   	OPT_ARG_ARRAY_SIZE = 6,
    1.27 @@ -214,7 +214,7 @@
    1.28   };
    1.29   
    1.30   AST_APP_OPTIONS(meetme_opts, BEGIN_OPTIONS
    1.31 -@@ -652,6 +654,7 @@
    1.32 +@@ -651,6 +653,7 @@
    1.33   	AST_APP_OPTION('1', CONFFLAG_NOONLYPERSON ),
    1.34    	AST_APP_OPTION_ARG('S', CONFFLAG_DURATION_STOP, OPT_ARG_DURATION_STOP),
    1.35   	AST_APP_OPTION_ARG('L', CONFFLAG_DURATION_LIMIT, OPT_ARG_DURATION_LIMIT),
    1.36 @@ -222,7 +222,7 @@
    1.37   END_OPTIONS );
    1.38   
    1.39   static const char * const app = "MeetMe";
    1.40 -@@ -2447,6 +2450,12 @@
    1.41 +@@ -2446,6 +2449,12 @@
    1.42   		ast_test_flag64(confflags, CONFFLAG_INTROUSERNOREVIEW))) {
    1.43   		char destdir[PATH_MAX];
    1.44   
    1.45 @@ -235,7 +235,7 @@
    1.46   		snprintf(destdir, sizeof(destdir), "%s/meetme", ast_config_AST_SPOOL_DIR);
    1.47   
    1.48   		if (ast_mkdir(destdir, 0777) != 0) {
    1.49 -@@ -2463,6 +2472,7 @@
    1.50 +@@ -2462,6 +2471,7 @@
    1.51   			res = ast_record_review(chan, "vm-rec-name", user->namerecloc, 10, "sln", &duration, NULL);
    1.52   		if (res == -1)
    1.53   			goto outrun;
    1.54 @@ -255,7 +255,7 @@
    1.55   static char imapparentfolder[64] = "\0";
    1.56   static char greetingfolder[64];
    1.57   static char authuser[32];
    1.58 -@@ -2504,7 +2505,7 @@
    1.59 +@@ -2517,7 +2518,7 @@
    1.60   	}
    1.61   
    1.62   	/* Build up server information */
    1.63 @@ -264,7 +264,7 @@
    1.64   
    1.65   	/* Add authentication user if present */
    1.66   	if (!ast_strlen_zero(authuser))
    1.67 -@@ -6161,6 +6162,7 @@
    1.68 +@@ -6174,6 +6175,7 @@
    1.69   	/* simple. huh? */
    1.70   	char sequence[10];
    1.71   	char mailbox[256];
    1.72 @@ -272,7 +272,7 @@
    1.73   	int res;
    1.74   
    1.75   	/* get the real IMAP message number for this message */
    1.76 -@@ -6176,10 +6178,24 @@
    1.77 +@@ -6189,10 +6191,24 @@
    1.78   		mail_setflag(vms->mailstream, sequence, "\\Unseen");
    1.79   		mail_clearflag(vms->mailstream, sequence, "\\Seen");
    1.80   	}
    1.81 @@ -299,7 +299,7 @@
    1.82   	/* Create the folder if it don't exist */
    1.83   	imap_mailbox_name(mailbox, sizeof(mailbox), vms, box, 1); /* Get the full mailbox name */
    1.84   	ast_debug(5, "Checking if folder exists: %s\n", mailbox);
    1.85 -@@ -10383,6 +10399,10 @@
    1.86 +@@ -10467,6 +10483,10 @@
    1.87   #ifndef IMAP_STORAGE
    1.88   				} else if (!cmd) {
    1.89   					vms.deleted[vms.curmsg] = 1;
    1.90 @@ -310,7 +310,7 @@
    1.91   #endif
    1.92   				} else {
    1.93   					vms.deleted[vms.curmsg] = 0;
    1.94 -@@ -11874,6 +11894,15 @@
    1.95 +@@ -11963,6 +11983,15 @@
    1.96   		} else {
    1.97   			ast_copy_string(imapfolder, "INBOX", sizeof(imapfolder));
    1.98   		}
    1.99 @@ -754,7 +754,7 @@
   1.100  diff -Nau channels/chan_sip.c.orig channels/chan_sip.c
   1.101  --- channels/chan_sip.c.orig	2011-08-10 00:12:59.000000000 +0200
   1.102  +++ channels/chan_sip.c	2011-09-14 14:29:50.757959000 +0200
   1.103 -@@ -11647,7 +11647,16 @@
   1.104 +@@ -11650,7 +11650,16 @@
   1.105    	} else {
   1.106    		if (sipmethod == SIP_NOTIFY && !ast_strlen_zero(p->theirtag)) {
   1.107    			/* If this is a NOTIFY, use the From: tag in the subscribe (RFC 3265) */
   1.108 @@ -792,7 +792,7 @@
   1.109  diff -Nau configure.orig configure
   1.110  --- configure.orig	2011-08-25 21:08:04.000000000 +0200
   1.111  +++ configure	2011-09-14 14:29:50.767970949 +0200
   1.112 -@@ -4704,11 +4704,6 @@
   1.113 +@@ -4244,11 +4244,6 @@
   1.114   esac
   1.115   
   1.116   case "${host_os}" in
   1.117 @@ -804,7 +804,7 @@
   1.118        openbsd*)
   1.119        ac_default_prefix=/usr/local
   1.120        if test ${prefix} = '/usr/local' || test ${prefix} = 'NONE'; then
   1.121 -@@ -18308,8 +18303,8 @@
   1.122 +@@ -29617,8 +29612,8 @@
   1.123   		if test -f "${IMAP_TK_DIR}/c-client/LDFLAGS"; then
   1.124         		imap_ldflags=`cat ${IMAP_TK_DIR}/c-client/LDFLAGS`
   1.125   		fi
   1.126 @@ -814,44 +814,8 @@
   1.127  +	  	imap_include="-DUSE_SYSTEM_IMAP -I${IMAP_TK_DIR}/include/imap"
   1.128         	CPPFLAGS="${CPPFLAGS} ${imap_include}"
   1.129   	  	LIBS="${LIBS} ${imap_libs} "`echo ${imap_ldflags}`
   1.130 - 	  	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   1.131 -@@ -25541,19 +25536,19 @@
   1.132 - 
   1.133 -    # now check for the header.
   1.134 -    if test "${AST_LUA_FOUND}" = "yes"; then
   1.135 --      LUA_LIB="${pbxlibdir} -llua5.1 -lm"
   1.136 -+      LUA_LIB="${pbxlibdir} -llua -lm"
   1.137 -       # if --with-LUA=DIR has been specified, use it.
   1.138 -       if test "x${LUA_DIR}" != "x"; then
   1.139 -          LUA_INCLUDE="-I${LUA_DIR}/include"
   1.140 -       fi
   1.141 -       LUA_INCLUDE="${LUA_INCLUDE} "
   1.142 --      if test "xlua5.1/lua.h" = "x" ; then	# no header, assume found
   1.143 -+      if test "xlua/lua.h" = "x" ; then	# no header, assume found
   1.144 -          LUA_HEADER_FOUND="1"
   1.145 -       else				# check for the header
   1.146 -          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
   1.147 -          CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}"
   1.148 --         ac_fn_c_check_header_mongrel "$LINENO" "lua5.1/lua.h" "ac_cv_header_lua5_1_lua_h" "$ac_includes_default"
   1.149 --if test "x$ac_cv_header_lua5_1_lua_h" = x""yes; then :
   1.150 -+         ac_fn_c_check_header_mongrel "$LINENO" "lua/lua.h" "ac_cv_header_lua_lua_h" "$ac_includes_default"
   1.151 -+if test "x$ac_cv_header_lua_lua_h" = x""yes; then :
   1.152 -   LUA_HEADER_FOUND=1
   1.153 - else
   1.154 -   LUA_HEADER_FOUND=0
   1.155 -@@ -25581,9 +25576,9 @@
   1.156 - 
   1.157 - if test "x${PBX_LUA}" = "x1" ; then
   1.158 - 	if test x"${LUA_DIR}" = x; then
   1.159 --		LUA_INCLUDE="${LUA_INCLUDE} -I/usr/include/lua5.1"
   1.160 -+		LUA_INCLUDE="${LUA_INCLUDE} -I/usr/include/lua"
   1.161 - 	else
   1.162 --		LUA_INCLUDE="${LUA_INCLUDE} -I${LUA_DIR}/lua5.1"
   1.163 -+		LUA_INCLUDE="${LUA_INCLUDE} -I${LUA_DIR}/lua"
   1.164 - 	fi
   1.165 - fi
   1.166 - 
   1.167 -@@ -26262,7 +26257,7 @@
   1.168 + 	  	cat >conftest.$ac_ext <<_ACEOF
   1.169 +@@ -47493,7 +47488,7 @@
   1.170         	 pbxlibdir="-L${SQLITE_DIR}"
   1.171         fi
   1.172      fi
   1.173 @@ -860,19 +824,19 @@
   1.174      if test "x${pbxfuncname}" = "x" ; then   # empty lib, assume only headers
   1.175         AST_SQLITE_FOUND=yes
   1.176      else
   1.177 -@@ -26976,16 +26971,16 @@
   1.178 +@@ -49185,16 +49180,16 @@
   1.179       if test "x${PBX_GMIME}" != "x1" -a "${USE_GMIME}" != "no"; then
   1.180   	PBX_GMIME=0
   1.181   	if test -n "$ac_tool_prefix"; then
   1.182  -  # Extract the first word of "${ac_tool_prefix}gmime-config", so it can be a program name with args.
   1.183  -set dummy ${ac_tool_prefix}gmime-config; ac_word=$2
   1.184 -+   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
   1.185 -+ set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
   1.186 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.187 - $as_echo_n "checking for $ac_word... " >&6; }
   1.188 --if test "${ac_cv_path_CONFIG_GMIME+set}" = set; then :
   1.189 -+if test "${ac_cv_prog_PKGCONFIG+set}" = set; then
   1.190 -   $as_echo_n "(cached) " >&6
   1.191 ++  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
   1.192 ++set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
   1.193 + { echo "$as_me:$LINENO: checking for $ac_word" >&5
   1.194 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
   1.195 +-if test "${ac_cv_path_CONFIG_GMIME+set}" = set; then
   1.196 ++if test "${ac_cv_path_PKGCONFIG+set}" = set; then
   1.197 +   echo $ECHO_N "(cached) $ECHO_C" >&6
   1.198   else
   1.199  -  case $CONFIG_GMIME in
   1.200  +  case $PKGCONFIG in
   1.201 @@ -882,31 +846,31 @@
   1.202     ;;
   1.203     *)
   1.204     as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
   1.205 -@@ -26996,7 +26991,7 @@
   1.206 +@@ -49205,7 +49200,7 @@
   1.207     test -z "$as_dir" && as_dir=.
   1.208 -     for ac_exec_ext in '' $ac_executable_extensions; do
   1.209 +   for ac_exec_ext in '' $ac_executable_extensions; do
   1.210     if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
   1.211  -    ac_cv_path_CONFIG_GMIME="$as_dir/$ac_word$ac_exec_ext"
   1.212  +    ac_cv_path_PKGCONFIG="$as_dir/$ac_word$ac_exec_ext"
   1.213 -     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
   1.214 +     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
   1.215       break 2
   1.216     fi
   1.217 -@@ -27007,10 +27002,10 @@
   1.218 +@@ -49216,10 +49211,10 @@
   1.219     ;;
   1.220   esac
   1.221   fi
   1.222  -CONFIG_GMIME=$ac_cv_path_CONFIG_GMIME
   1.223  -if test -n "$CONFIG_GMIME"; then
   1.224 --  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CONFIG_GMIME" >&5
   1.225 --$as_echo "$CONFIG_GMIME" >&6; }
   1.226 +-  { echo "$as_me:$LINENO: result: $CONFIG_GMIME" >&5
   1.227 +-echo "${ECHO_T}$CONFIG_GMIME" >&6; }
   1.228  +PKGCONFIG=$ac_cv_path_PKGCONFIG
   1.229  +if test -n "$PKGCONFIG"; then
   1.230 -+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKGCONFIG" >&5
   1.231 -+$as_echo "$PKGCONFIG" >&6; }
   1.232 ++  { echo "$as_me:$LINENO: result: $PKGCONFIG" >&5
   1.233 ++echo "${ECHO_T}$PKGCONFIG" >&6; }
   1.234   else
   1.235 -   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
   1.236 - $as_echo "no" >&6; }
   1.237 -@@ -27018,18 +27013,18 @@
   1.238 +   { echo "$as_me:$LINENO: result: no" >&5
   1.239 + echo "${ECHO_T}no" >&6; }
   1.240 +@@ -49227,18 +49222,18 @@
   1.241   
   1.242   
   1.243   fi
   1.244 @@ -918,11 +882,11 @@
   1.245  +  ac_pt_PKGCONFIG=$PKGCONFIG
   1.246  +  # Extract the first word of "pkg-config", so it can be a program name with args.
   1.247  +set dummy pkg-config; ac_word=$2
   1.248 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.249 - $as_echo_n "checking for $ac_word... " >&6; }
   1.250 --if test "${ac_cv_path_ac_pt_CONFIG_GMIME+set}" = set; then :
   1.251 -+if test "${ac_cv_path_ac_pt_PKGCONFIG+set}" = set; then :
   1.252 -   $as_echo_n "(cached) " >&6
   1.253 + { echo "$as_me:$LINENO: checking for $ac_word" >&5
   1.254 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
   1.255 +-if test "${ac_cv_path_ac_pt_CONFIG_GMIME+set}" = set; then
   1.256 ++if test "${ac_cv_path_ac_pt_PKGCONFIG+set}" = set; then
   1.257 +   echo $ECHO_N "(cached) $ECHO_C" >&6
   1.258   else
   1.259  -  case $ac_pt_CONFIG_GMIME in
   1.260  +  case $ac_pt_PKGCONFIG in
   1.261 @@ -932,30 +896,30 @@
   1.262     ;;
   1.263     *)
   1.264     as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
   1.265 -@@ -27040,7 +27035,7 @@
   1.266 +@@ -49249,7 +49244,7 @@
   1.267     test -z "$as_dir" && as_dir=.
   1.268 -     for ac_exec_ext in '' $ac_executable_extensions; do
   1.269 +   for ac_exec_ext in '' $ac_executable_extensions; do
   1.270     if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
   1.271  -    ac_cv_path_ac_pt_CONFIG_GMIME="$as_dir/$ac_word$ac_exec_ext"
   1.272  +    ac_cv_path_ac_pt_PKGCONFIG="$as_dir/$ac_word$ac_exec_ext"
   1.273 -     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
   1.274 +     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
   1.275       break 2
   1.276     fi
   1.277 -@@ -27051,17 +27046,17 @@
   1.278 +@@ -49260,17 +49255,17 @@
   1.279     ;;
   1.280   esac
   1.281   fi
   1.282  -ac_pt_CONFIG_GMIME=$ac_cv_path_ac_pt_CONFIG_GMIME
   1.283  -if test -n "$ac_pt_CONFIG_GMIME"; then
   1.284 --  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_CONFIG_GMIME" >&5
   1.285 --$as_echo "$ac_pt_CONFIG_GMIME" >&6; }
   1.286 +-  { echo "$as_me:$LINENO: result: $ac_pt_CONFIG_GMIME" >&5
   1.287 +-echo "${ECHO_T}$ac_pt_CONFIG_GMIME" >&6; }
   1.288  +ac_pt_PKGCONFIG=$ac_cv_path_ac_pt_PKGCONFIG
   1.289  +if test -n "$ac_pt_PKGCONFIG"; then
   1.290 -+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKGCONFIG" >&5
   1.291 -+$as_echo "${ECHO_T}$ac_pt_PKGCONFIG" >&6; }
   1.292 ++  { echo "$as_me:$LINENO: result: $ac_pt_PKGCONFIG" >&5
   1.293 ++echo "${ECHO_T}$ac_pt_PKGCONFIG" >&6; }
   1.294   else
   1.295 -   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
   1.296 - $as_echo "no" >&6; }
   1.297 +   { echo "$as_me:$LINENO: result: no" >&5
   1.298 + echo "${ECHO_T}no" >&6; }
   1.299   fi
   1.300   
   1.301  -  if test "x$ac_pt_CONFIG_GMIME" = x; then
   1.302 @@ -965,8 +929,8 @@
   1.303     else
   1.304       case $cross_compiling:$ac_tool_warned in
   1.305   yes:)
   1.306 -@@ -27069,17 +27064,15 @@
   1.307 - $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
   1.308 +@@ -49282,22 +49277,17 @@
   1.309 + configuration is useful to you, please write to autoconf@gnu.org." >&2;}
   1.310   ac_tool_warned=yes ;;
   1.311   esac
   1.312  -    CONFIG_GMIME=$ac_pt_CONFIG_GMIME
   1.313 @@ -987,7 +951,12 @@
   1.314  +	    GMIME_LIB=$(${PKGCONFIG} gmime-2.4 --libs)
   1.315   	    if test x"#include <gmime/gmime.h>" != x ; then
   1.316   		saved_cppflags="${CPPFLAGS}"
   1.317 - 		if test "x${GMIME_DIR}" != "x"; then
   1.318 +-		if test "x${GMIME_DIR}" != "x"; then
   1.319 +-		    GMIME_INCLUDE="-I${GMIME_DIR}/include"
   1.320 +-		fi
   1.321 + 		CPPFLAGS="${CPPFLAGS} ${GMIME_INCLUDE}"
   1.322 + 
   1.323 + 		saved_libs="${LIBS}"
   1.324  Index: formats/format_pcm.c
   1.325  diff -Nau formats/format_pcm.c.orig formats/format_pcm.c
   1.326  --- formats/format_pcm.c.orig	2011-07-14 22:13:06.000000000 +0200
   1.327 @@ -1055,7 +1024,7 @@
   1.328  diff -Nau main/features.c.orig main/features.c
   1.329  --- main/features.c.orig	2011-08-10 00:12:59.000000000 +0200
   1.330  +++ main/features.c	2011-09-14 14:29:50.777958246 +0200
   1.331 -@@ -1646,6 +1646,10 @@
   1.332 +@@ -1922,6 +1922,10 @@
   1.333   			snprintf(args, len, "%s,%s,m", S_OR(touch_format, "wav"), touch_filename);
   1.334   		}
   1.335   
   1.336 @@ -1066,7 +1035,7 @@
   1.337   		for(x = 0; x < strlen(args); x++) {
   1.338   			if (args[x] == '/')
   1.339   				args[x] = '-';
   1.340 -@@ -1762,6 +1766,10 @@
   1.341 +@@ -2038,6 +2042,10 @@
   1.342   			snprintf(args, len, "%s.%s,b", touch_filename, S_OR(touch_format, "wav"));
   1.343   		}
   1.344   
     2.1 --- a/asterisk/asterisk.spec	Thu Dec 01 13:33:32 2011 +0100
     2.2 +++ b/asterisk/asterisk.spec	Fri Dec 02 16:12:09 2011 +0100
     2.3 @@ -22,11 +22,11 @@
     2.4  ##
     2.5  
     2.6  #   package version
     2.7 -%define       V_opkg                     1.8.6.0
     2.8 -%define       V_asterisk                 1.8.6.0
     2.9 +%define       V_opkg                     1.8.7.1
    2.10 +%define       V_asterisk                 1.8.7.1
    2.11  %define       V_asterisk_fax_subdir      1.8.4
    2.12  %define       V_asterisk_fax_digium      1.8.4_1.3.0
    2.13 -%define       V_asterisk_sounds_core     1.4.21
    2.14 +%define       V_asterisk_sounds_core     1.4.22
    2.15  %define       V_asterisk_sounds_extra    1.4.11
    2.16  %define       V_asterisk_sounds_amoogab  1.4
    2.17  %define       V_asterisk_sounds_amootts  current
    2.18 @@ -34,6 +34,7 @@
    2.19  %define       V_asterisk_sounds_mohop    2.03
    2.20  %define       V_asterisk_addons_mp3dec   1
    2.21  %define       V_fswitch_sounds_en        1.0.16
    2.22 +%define       V_fswitch_sounds_fr        1.0.14
    2.23  %define       V_fswitch_sounds_ru        1.0.13
    2.24  %define       V_fswitch_music            1.0.8
    2.25  %define       V_asterisk_codecs_ilbc     20110104
    2.26 @@ -50,7 +51,7 @@
    2.27  Group:        VoIP
    2.28  License:      GPL
    2.29  Version:      %{V_opkg}
    2.30 -Release:      20110916
    2.31 +Release:      20111100
    2.32  
    2.33  #   package options
    2.34  %option       with_dahdi   no
    2.35 @@ -95,7 +96,6 @@
    2.36  Source16:     http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-sln16-%{V_asterisk_sounds_extra}.tar.gz.sha1
    2.37  Source16:     http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-fr-sln16-%{V_asterisk_sounds_extra}.tar.gz
    2.38  Source17:     http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-fr-sln16-%{V_asterisk_sounds_extra}.tar.gz.sha1
    2.39 -
    2.40  Source18:     http://www.amooma.de/asterisk/sprachbausteine/asterisk-%{V_asterisk_sounds_amoogab}-de-prompts.tar.gz
    2.41  Source19:     http://www.amooma.de/asterisk/sprachbausteine/asterisk-core-sounds-de-gsm-current.tar.gz
    2.42  Source20:     ftp://ftp.europalab.com/pub/sfw/machsnds/de-digits/de-digits-%{V_asterisk_sounds_custom}.tar.bz2
    2.43 @@ -103,15 +103,16 @@
    2.44  Source22:     ftp://ftp.europalab.com/pub/sfw/machsnds/msvbsnds-sln16-%{V_asterisk_sounds_custom}.tar.bz2
    2.45  Source23:     http://files.freeswitch.org/freeswitch-sounds-en-us-callie-48000-%{V_fswitch_sounds_en}.tar.gz
    2.46  Source24:     http://files.freeswitch.org/freeswitch-sounds-es-mx-maria-44100.tar.gz
    2.47 -Source25:     http://files.freeswitch.org/freeswitch-sounds-ru-RU-elena-48000-%{V_fswitch_sounds_ru}.tar.gz
    2.48 -Source26:     http://files.freeswitch.org/freeswitch-sounds-music-48000-%{V_fswitch_music}.tar.gz
    2.49 -Source27:     http://svn.digium.com/svn/thirdparty/mp3/trunk/addons/mp3-%{V_asterisk_addons_mp3dec}.tar.gz
    2.50 -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
    2.51 -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
    2.52 -Source30:     ilbc-20110104.tar.gz
    2.53 -Source31:     asterisk.txt
    2.54 -Source32:     rc.asterisk
    2.55 -Source33:     wakeup.agi
    2.56 +Source25:     http://files.freeswitch.org/freeswitch-sounds-fr-ca-june-48000-%{V_fswitch_sounds_fr}.tar.gz
    2.57 +Source26:     http://files.freeswitch.org/freeswitch-sounds-ru-RU-elena-48000-%{V_fswitch_sounds_ru}.tar.gz
    2.58 +Source27:     http://files.freeswitch.org/freeswitch-sounds-music-48000-%{V_fswitch_music}.tar.gz
    2.59 +Source28:     http://svn.digium.com/svn/thirdparty/mp3/trunk/addons/mp3-%{V_asterisk_addons_mp3dec}.tar.gz
    2.60 +Source29:     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
    2.61 +Source30:     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
    2.62 +Source31:     ilbc-20110104.tar.gz
    2.63 +Source32:     asterisk.txt
    2.64 +Source33:     rc.asterisk
    2.65 +Source34:     wakeup.agi
    2.66  Patch0:       asterisk.patch
    2.67  Patch1:       asterisk.patch.xfersips
    2.68  Patch2:       asterisk.patch.proxymwi
    2.69 @@ -292,6 +293,7 @@
    2.70          -e 's;\(sqlite\)\(_exec\);\13\2;g' \
    2.71          -e 's;-lradiusclient-ng;-lradiusclient;g' \
    2.72          -e 's;radiusclient-ng\.h;radiusclient.h;g' \
    2.73 +        -e 's;lua5\.1;lua;g' \
    2.74          -e 's;-I${IMAP_TK_DIR}/c-client;-DUSE_SYSTEM_IMAP -I${IMAP_TK_DIR}/include/imap;g' \
    2.75          -e 's;${IMAP_TK_DIR}/c-client/c-client\.a;-limap -lssl -lcrypto -lcrypt;g' \
    2.76          configure

mercurial