[Pkg-voip-commits] r8574 - in /asterisk/trunk/debian: changelog patches/rtcp_cli_fix patches/series

[tzafrir at alioth.debian.org]

Author: tzafrir
Date: Tue Jul 20 21:50:56 2010
New Revision: 8574

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8574
Log:
rtcp_cli_fix: Backport a silly CLI parsing issue (Closes: #589736)

Added:
    asterisk/trunk/debian/patches/rtcp_cli_fix
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=8574&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Tue Jul 20 21:50:56 2010
@@ -6,8 +6,9 @@
   - Patch fxs_ports_1626 removed: merged upstream.
   * Fix dependencies so we start after named and such (Closes: #433779).
   * Do use libresample (app_jack, codec_resample).
-
- -- Tzafrir Cohen <tzafrir at debian.org>  Tue, 29 Jun 2010 23:53:28 +0300
+  * rtcp_cli_fix: Backport a silly CLI parsing issue (Closes: #589736).
+
+ -- Tzafrir Cohen <tzafrir at debian.org>  Wed, 21 Jul 2010 00:15:57 +0300
 
 asterisk (1:1.6.2.7-1) unstable; urgency=low
 

Added: asterisk/trunk/debian/patches/rtcp_cli_fix
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/rtcp_cli_fix?rev=8574&op=file
==============================================================================
--- asterisk/trunk/debian/patches/rtcp_cli_fix (added)
+++ asterisk/trunk/debian/patches/rtcp_cli_fix Tue Jul 20 21:50:56 2010
@@ -1,0 +1,34 @@
+From: Paul Belanger <paul.belanger at polybeacon.com>
+Subject: Fix rt(c)p set debug ip taking wrong argument
+Origin: http://svn.asterisk.org/svn/asterisk/branches/1.6.2@273234
+Bug: https://issues.asterisk.org/view.php?id=17469
+Applied-Upstream: 1.6.2.10
+
+This patch does not include two extra coding-style fixes included in the
+original upstream commit.
+
+diff --git a/main/rtp.c b/main/rtp.c
+index 016d3b5..6ac4fe7 100644
+--- a/main/rtp.c
++++ b/main/rtp.c
+@@ -4601,7 +4601,7 @@ static char *rtp_do_debug_ip(struct ast_cli_args *a)
+ 	int port = 0;
+ 	char *p, *arg;
+ 
+-	arg = a->argv[3];
++	arg = a->argv[4];
+ 	p = strstr(arg, ":");
+ 	if (p) {
+ 		*p = '\0';
+@@ -4631,7 +4632,7 @@ static char *rtcp_do_debug_ip(struct ast_cli_args *a)
+ 	int port = 0;
+ 	char *p, *arg;
+ 
+-	arg = a->argv[3];
++	arg = a->argv[4];
+ 	p = strstr(arg, ":");
+ 	if (p) {
+ 		*p = '\0';
+-- 
+1.7.1
+

Modified: asterisk/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/series?rev=8574&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/series (original)
+++ asterisk/trunk/debian/patches/series Tue Jul 20 21:50:56 2010
@@ -19,3 +19,4 @@
 moh_datadir
 settings_show_dirs
 h323-extra-target
+rtcp_cli_fix