# HG changeset patch # User Michael Schloh von Bennewitz # Date 1322838729 -3600 # Node ID 08f5eb82b58fb4e901d36eee96d6f060e0fa8d9f # Parent c98ae03f426677991a9be26bca5e091d4bef1f02 Correct patch logic and update sound versions including russian. diff -r c98ae03f4266 -r 08f5eb82b58f asterisk/asterisk.patch --- a/asterisk/asterisk.patch Thu Dec 01 13:33:32 2011 +0100 +++ b/asterisk/asterisk.patch Fri Dec 02 16:12:09 2011 +0100 @@ -198,15 +198,15 @@ diff -Nau apps/app_meetme.c.orig apps/app_meetme.c --- 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), -+ CONFFLAG_USERNAME = (1 << 32), - }; +@@ -607,6 +607,7 @@ - /* !If set play an intro announcement at start of conference */ -@@ -619,6 +620,7 @@ + /*! Do not write any audio to this channel until the state is up. */ + #define CONFFLAG_NO_AUDIO_UNTIL_UP (1ULL << 31) ++#define CONFFLAG_USERNAME (1 << 32) + /*! If set play an intro announcement at start of conference */ + #define CONFFLAG_INTROMSG (1ULL << 32) + +@@ -618,6 +619,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 -@@ -652,6 +654,7 @@ +@@ -651,6 +653,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"; -@@ -2447,6 +2450,12 @@ +@@ -2446,6 +2449,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) { -@@ -2463,6 +2472,7 @@ +@@ -2462,6 +2471,7 @@ res = ast_record_review(chan, "vm-rec-name", user->namerecloc, 10, "sln", &duration, NULL); if (res == -1) goto outrun; @@ -255,7 +255,7 @@ static char imapparentfolder[64] = "\0"; static char greetingfolder[64]; static char authuser[32]; -@@ -2504,7 +2505,7 @@ +@@ -2517,7 +2518,7 @@ } /* Build up server information */ @@ -264,7 +264,7 @@ /* Add authentication user if present */ if (!ast_strlen_zero(authuser)) -@@ -6161,6 +6162,7 @@ +@@ -6174,6 +6175,7 @@ /* simple. huh? */ char sequence[10]; char mailbox[256]; @@ -272,7 +272,7 @@ int res; /* get the real IMAP message number for this message */ -@@ -6176,10 +6178,24 @@ +@@ -6189,10 +6191,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); -@@ -10383,6 +10399,10 @@ +@@ -10467,6 +10483,10 @@ #ifndef IMAP_STORAGE } else if (!cmd) { vms.deleted[vms.curmsg] = 1; @@ -310,7 +310,7 @@ #endif } else { vms.deleted[vms.curmsg] = 0; -@@ -11874,6 +11894,15 @@ +@@ -11963,6 +11983,15 @@ } else { ast_copy_string(imapfolder, "INBOX", sizeof(imapfolder)); } @@ -754,7 +754,7 @@ diff -Nau channels/chan_sip.c.orig channels/chan_sip.c --- channels/chan_sip.c.orig 2011-08-10 00:12:59.000000000 +0200 +++ channels/chan_sip.c 2011-09-14 14:29:50.757959000 +0200 -@@ -11647,7 +11647,16 @@ +@@ -11650,7 +11650,16 @@ } else { if (sipmethod == SIP_NOTIFY && !ast_strlen_zero(p->theirtag)) { /* If this is a NOTIFY, use the From: tag in the subscribe (RFC 3265) */ @@ -792,7 +792,7 @@ diff -Nau configure.orig configure --- configure.orig 2011-08-25 21:08:04.000000000 +0200 +++ configure 2011-09-14 14:29:50.767970949 +0200 -@@ -4704,11 +4704,6 @@ +@@ -4244,11 +4244,6 @@ esac case "${host_os}" in @@ -804,7 +804,7 @@ openbsd*) ac_default_prefix=/usr/local if test ${prefix} = '/usr/local' || test ${prefix} = 'NONE'; then -@@ -18308,8 +18303,8 @@ +@@ -29617,8 +29612,8 @@ if test -f "${IMAP_TK_DIR}/c-client/LDFLAGS"; then imap_ldflags=`cat ${IMAP_TK_DIR}/c-client/LDFLAGS` fi @@ -814,44 +814,8 @@ + imap_include="-DUSE_SYSTEM_IMAP -I${IMAP_TK_DIR}/include/imap" CPPFLAGS="${CPPFLAGS} ${imap_include}" LIBS="${LIBS} ${imap_libs} "`echo ${imap_ldflags}` - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -25541,19 +25536,19 @@ - - # now check for the header. - if test "${AST_LUA_FOUND}" = "yes"; then -- LUA_LIB="${pbxlibdir} -llua5.1 -lm" -+ LUA_LIB="${pbxlibdir} -llua -lm" - # if --with-LUA=DIR has been specified, use it. - if test "x${LUA_DIR}" != "x"; then - LUA_INCLUDE="-I${LUA_DIR}/include" - fi - LUA_INCLUDE="${LUA_INCLUDE} " -- if test "xlua5.1/lua.h" = "x" ; then # no header, assume found -+ if test "xlua/lua.h" = "x" ; then # no header, assume found - LUA_HEADER_FOUND="1" - else # check for the header - ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" - CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}" -- ac_fn_c_check_header_mongrel "$LINENO" "lua5.1/lua.h" "ac_cv_header_lua5_1_lua_h" "$ac_includes_default" --if test "x$ac_cv_header_lua5_1_lua_h" = x""yes; then : -+ ac_fn_c_check_header_mongrel "$LINENO" "lua/lua.h" "ac_cv_header_lua_lua_h" "$ac_includes_default" -+if test "x$ac_cv_header_lua_lua_h" = x""yes; then : - LUA_HEADER_FOUND=1 - else - LUA_HEADER_FOUND=0 -@@ -25581,9 +25576,9 @@ - - if test "x${PBX_LUA}" = "x1" ; then - if test x"${LUA_DIR}" = x; then -- LUA_INCLUDE="${LUA_INCLUDE} -I/usr/include/lua5.1" -+ LUA_INCLUDE="${LUA_INCLUDE} -I/usr/include/lua" - else -- LUA_INCLUDE="${LUA_INCLUDE} -I${LUA_DIR}/lua5.1" -+ LUA_INCLUDE="${LUA_INCLUDE} -I${LUA_DIR}/lua" - fi - fi - -@@ -26262,7 +26257,7 @@ + cat >conftest.$ac_ext <<_ACEOF +@@ -47493,7 +47488,7 @@ pbxlibdir="-L${SQLITE_DIR}" fi fi @@ -860,19 +824,19 @@ if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_SQLITE_FOUND=yes else -@@ -26976,16 +26971,16 @@ +@@ -49185,16 +49180,16 @@ if test "x${PBX_GMIME}" != "x1" -a "${USE_GMIME}" != "no"; then PBX_GMIME=0 if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gmime-config", so it can be a program name with args. -set dummy ${ac_tool_prefix}gmime-config; ac_word=$2 -+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. -+ set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_path_CONFIG_GMIME+set}" = set; then : -+if test "${ac_cv_prog_PKGCONFIG+set}" = set; then - $as_echo_n "(cached) " >&6 ++ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. ++set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 + { echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_path_CONFIG_GMIME+set}" = set; then ++if test "${ac_cv_path_PKGCONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - case $CONFIG_GMIME in + case $PKGCONFIG in @@ -882,31 +846,31 @@ ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -@@ -26996,7 +26991,7 @@ +@@ -49205,7 +49200,7 @@ test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_CONFIG_GMIME="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_PKGCONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -27007,10 +27002,10 @@ +@@ -49216,10 +49211,10 @@ ;; esac fi -CONFIG_GMIME=$ac_cv_path_CONFIG_GMIME -if test -n "$CONFIG_GMIME"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CONFIG_GMIME" >&5 --$as_echo "$CONFIG_GMIME" >&6; } +- { echo "$as_me:$LINENO: result: $CONFIG_GMIME" >&5 +-echo "${ECHO_T}$CONFIG_GMIME" >&6; } +PKGCONFIG=$ac_cv_path_PKGCONFIG +if test -n "$PKGCONFIG"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKGCONFIG" >&5 -+$as_echo "$PKGCONFIG" >&6; } ++ { echo "$as_me:$LINENO: result: $PKGCONFIG" >&5 ++echo "${ECHO_T}$PKGCONFIG" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } -@@ -27018,18 +27013,18 @@ + { echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6; } +@@ -49227,18 +49222,18 @@ fi @@ -918,11 +882,11 @@ + ac_pt_PKGCONFIG=$PKGCONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_path_ac_pt_CONFIG_GMIME+set}" = set; then : -+if test "${ac_cv_path_ac_pt_PKGCONFIG+set}" = set; then : - $as_echo_n "(cached) " >&6 + { echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_path_ac_pt_CONFIG_GMIME+set}" = set; then ++if test "${ac_cv_path_ac_pt_PKGCONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - case $ac_pt_CONFIG_GMIME in + case $ac_pt_PKGCONFIG in @@ -932,30 +896,30 @@ ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -@@ -27040,7 +27035,7 @@ +@@ -49249,7 +49244,7 @@ test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_ac_pt_CONFIG_GMIME="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_ac_pt_PKGCONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -27051,17 +27046,17 @@ +@@ -49260,17 +49255,17 @@ ;; esac fi -ac_pt_CONFIG_GMIME=$ac_cv_path_ac_pt_CONFIG_GMIME -if test -n "$ac_pt_CONFIG_GMIME"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_CONFIG_GMIME" >&5 --$as_echo "$ac_pt_CONFIG_GMIME" >&6; } +- { echo "$as_me:$LINENO: result: $ac_pt_CONFIG_GMIME" >&5 +-echo "${ECHO_T}$ac_pt_CONFIG_GMIME" >&6; } +ac_pt_PKGCONFIG=$ac_cv_path_ac_pt_PKGCONFIG +if test -n "$ac_pt_PKGCONFIG"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKGCONFIG" >&5 -+$as_echo "${ECHO_T}$ac_pt_PKGCONFIG" >&6; } ++ { echo "$as_me:$LINENO: result: $ac_pt_PKGCONFIG" >&5 ++echo "${ECHO_T}$ac_pt_PKGCONFIG" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6; } fi - if test "x$ac_pt_CONFIG_GMIME" = x; then @@ -965,8 +929,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -@@ -27069,17 +27064,15 @@ - $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +@@ -49282,22 +49277,17 @@ + configuration is useful to you, please write to autoconf@gnu.org." >&2;} ac_tool_warned=yes ;; esac - CONFIG_GMIME=$ac_pt_CONFIG_GMIME @@ -987,7 +951,12 @@ + GMIME_LIB=$(${PKGCONFIG} gmime-2.4 --libs) if test x"#include " != x ; then saved_cppflags="${CPPFLAGS}" - if test "x${GMIME_DIR}" != "x"; then +- if test "x${GMIME_DIR}" != "x"; then +- GMIME_INCLUDE="-I${GMIME_DIR}/include" +- fi + CPPFLAGS="${CPPFLAGS} ${GMIME_INCLUDE}" + + saved_libs="${LIBS}" Index: formats/format_pcm.c diff -Nau formats/format_pcm.c.orig formats/format_pcm.c --- formats/format_pcm.c.orig 2011-07-14 22:13:06.000000000 +0200 @@ -1055,7 +1024,7 @@ diff -Nau main/features.c.orig main/features.c --- main/features.c.orig 2011-08-10 00:12:59.000000000 +0200 +++ main/features.c 2011-09-14 14:29:50.777958246 +0200 -@@ -1646,6 +1646,10 @@ +@@ -1922,6 +1922,10 @@ snprintf(args, len, "%s,%s,m", S_OR(touch_format, "wav"), touch_filename); } @@ -1066,7 +1035,7 @@ for(x = 0; x < strlen(args); x++) { if (args[x] == '/') args[x] = '-'; -@@ -1762,6 +1766,10 @@ +@@ -2038,6 +2042,10 @@ snprintf(args, len, "%s.%s,b", touch_filename, S_OR(touch_format, "wav")); } diff -r c98ae03f4266 -r 08f5eb82b58f asterisk/asterisk.spec --- a/asterisk/asterisk.spec Thu Dec 01 13:33:32 2011 +0100 +++ b/asterisk/asterisk.spec Fri Dec 02 16:12:09 2011 +0100 @@ -22,11 +22,11 @@ ## # package version -%define V_opkg 1.8.6.0 -%define V_asterisk 1.8.6.0 +%define V_opkg 1.8.7.1 +%define V_asterisk 1.8.7.1 %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_core 1.4.22 %define V_asterisk_sounds_extra 1.4.11 %define V_asterisk_sounds_amoogab 1.4 %define V_asterisk_sounds_amootts current @@ -34,6 +34,7 @@ %define V_asterisk_sounds_mohop 2.03 %define V_asterisk_addons_mp3dec 1 %define V_fswitch_sounds_en 1.0.16 +%define V_fswitch_sounds_fr 1.0.14 %define V_fswitch_sounds_ru 1.0.13 %define V_fswitch_music 1.0.8 %define V_asterisk_codecs_ilbc 20110104 @@ -50,7 +51,7 @@ Group: VoIP License: GPL Version: %{V_opkg} -Release: 20110916 +Release: 20111100 # package options %option with_dahdi no @@ -95,7 +96,6 @@ 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 @@ -103,15 +103,16 @@ 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 +Source25: http://files.freeswitch.org/freeswitch-sounds-fr-ca-june-48000-%{V_fswitch_sounds_fr}.tar.gz +Source26: http://files.freeswitch.org/freeswitch-sounds-ru-RU-elena-48000-%{V_fswitch_sounds_ru}.tar.gz +Source27: http://files.freeswitch.org/freeswitch-sounds-music-48000-%{V_fswitch_music}.tar.gz +Source28: http://svn.digium.com/svn/thirdparty/mp3/trunk/addons/mp3-%{V_asterisk_addons_mp3dec}.tar.gz +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 +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 +Source31: ilbc-20110104.tar.gz +Source32: asterisk.txt +Source33: rc.asterisk +Source34: wakeup.agi Patch0: asterisk.patch Patch1: asterisk.patch.xfersips Patch2: asterisk.patch.proxymwi @@ -292,6 +293,7 @@ -e 's;\(sqlite\)\(_exec\);\13\2;g' \ -e 's;-lradiusclient-ng;-lradiusclient;g' \ -e 's;radiusclient-ng\.h;radiusclient.h;g' \ + -e 's;lua5\.1;lua;g' \ -e 's;-I${IMAP_TK_DIR}/c-client;-DUSE_SYSTEM_IMAP -I${IMAP_TK_DIR}/include/imap;g' \ -e 's;${IMAP_TK_DIR}/c-client/c-client\.a;-limap -lssl -lcrypto -lcrypt;g' \ configure