[Pkg-voip-commits] r8248 - in /asterisk/trunk/debian: changelog patches/followme_prompts patches/series

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Thu Apr  1 21:05:15 2010
New Revision: 8248

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8248
Log:
Patch followme_prompts: set proper vars when reading followme.conf

Added:
    asterisk/trunk/debian/patches/followme_prompts
Modified:
    asterisk/trunk/debian/changelog
    asterisk/trunk/debian/patches/series

Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=8248&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Thu Apr  1 21:05:15 2010
@@ -13,8 +13,9 @@
     items. 
   * Patch dahdi_fxs_false_ringing: Fix having Astribank FXS-s keep ringing if
     answered too soon. 
-
- -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Wed, 31 Mar 2010 12:48:57 +0300
+  * Patch followme_prompts: set proper vars when reading followme.conf
+
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Thu, 01 Apr 2010 23:42:58 +0300
 
 asterisk (1:1.6.2.2-1) unstable; urgency=medium
 

Added: asterisk/trunk/debian/patches/followme_prompts
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/followme_prompts?rev=8248&op=file
==============================================================================
--- asterisk/trunk/debian/patches/followme_prompts (added)
+++ asterisk/trunk/debian/patches/followme_prompts Thu Apr  1 21:05:15 2010
@@ -1,0 +1,59 @@
+Subject: set proper vars when reading followme.conf
+From: Jeff Peeler <jpeeler at digium.com>
+Origin: http://svn.digium.com/svn/asterisk/branches/1.6.2@250980
+Bug: https://issues.asterisk.org/view.php?id=16930
+
+Fix app_followme playing wrong sound files.
+
+Fixes regression introduced in 140167 that uses the wrong variable names.
+
+(closes issue #16930)
+Reported by: ianc
+Patches: fix_reload_followme.diff uploaded by ianc (license 998)
+
+Patch already included in upstream branch 1.6.2 and will be included in
+next 1.6.2 release (1.6.2.7).
+
+---
+ apps/app_followme.c |   14 +++++++-------
+ 1 files changed, 7 insertions(+), 7 deletions(-)
+
+--- a/apps/app_followme.c
++++ b/apps/app_followme.c
+@@ -354,7 +354,7 @@ static int reload_followme(int reload)
+ 	if ((tmpstr = ast_variable_retrieve(cfg, "general", "norecording-prompt")) && !ast_strlen_zero(tmpstr)) {
+ 		ast_copy_string(norecordingprompt, tmpstr, sizeof(norecordingprompt));
+ 	} else if ((tmpstr = ast_variable_retrieve(cfg, "general", "norecording_prompt")) && !ast_strlen_zero(tmpstr)) {
+-		ast_copy_string(callfromprompt, tmpstr, sizeof(callfromprompt));
++		ast_copy_string(norecordingprompt, tmpstr, sizeof(norecordingprompt));
+ 	}
+ 
+ 
+@@ -365,21 +365,21 @@ static int reload_followme(int reload)
+ 	}
+ 
+ 	if ((tmpstr = ast_variable_retrieve(cfg, "general", "pls-hold-prompt")) && !ast_strlen_zero(tmpstr)) {
+-		ast_copy_string(optionsprompt, tmpstr, sizeof(optionsprompt));
++		ast_copy_string(plsholdprompt, tmpstr, sizeof(plsholdprompt));
+ 	} else if ((tmpstr = ast_variable_retrieve(cfg, "general", "pls_hold_prompt")) && !ast_strlen_zero(tmpstr)) {
+-		ast_copy_string(optionsprompt, tmpstr, sizeof(optionsprompt));
++		ast_copy_string(plsholdprompt, tmpstr, sizeof(plsholdprompt));
+ 	}
+ 
+ 	if ((tmpstr = ast_variable_retrieve(cfg, "general", "status-prompt")) && !ast_strlen_zero(tmpstr)) {
+-		ast_copy_string(optionsprompt, tmpstr, sizeof(optionsprompt));
++		ast_copy_string(statusprompt, tmpstr, sizeof(statusprompt));
+ 	} else if ((tmpstr = ast_variable_retrieve(cfg, "general", "status_prompt")) && !ast_strlen_zero(tmpstr)) {
+-		ast_copy_string(optionsprompt, tmpstr, sizeof(optionsprompt));
++		ast_copy_string(statusprompt, tmpstr, sizeof(statusprompt));
+ 	}
+ 
+ 	if ((tmpstr = ast_variable_retrieve(cfg, "general", "sorry-prompt")) && !ast_strlen_zero(tmpstr)) {
+-		ast_copy_string(optionsprompt, tmpstr, sizeof(optionsprompt));
++		ast_copy_string(sorryprompt, tmpstr, sizeof(sorryprompt));
+ 	} else if ((tmpstr = ast_variable_retrieve(cfg, "general", "sorry_prompt")) && !ast_strlen_zero(tmpstr)) {
+-		ast_copy_string(optionsprompt, tmpstr, sizeof(optionsprompt));
++		ast_copy_string(sorryprompt, tmpstr, sizeof(sorryprompt));
+ 	}
+ 
+ 	/* Chug through config file */

Modified: asterisk/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/series?rev=8248&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/series (original)
+++ asterisk/trunk/debian/patches/series Thu Apr  1 21:05:15 2010
@@ -19,3 +19,4 @@
 moh_datadir
 settings_show_dirs
 dahdi_fxs_false_ringing
+followme_prompts