[Pkg-voip-commits] r8626 - in /asterisk/trunk/debian: changelog patches/parser-mangles-include patches/series

[paravoid at alioth.debian.org]

Author: paravoid
Date: Tue Sep  7 18:55:30 2010
New Revision: 8626

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8626
Log:
parser-mangles-include patch, RC bug #594190

Added:
    asterisk/trunk/debian/patches/parser-mangles-include
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=8626&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Tue Sep  7 18:55:30 2010
@@ -1,13 +1,20 @@
-asterisk (1:1.6.2.9-2) UNRELEASED; urgency=low
-
-  * rtcp_cli_fix: Backport a silly CLI parsing issue (Closes: #589736).
+asterisk (1:1.6.2.9-2) UNRELEASED; urgency=high
+
+  [ Tzafrir Cohen ]
+  * Bump Standards version to 3.9.0 (no change needed).
+  * Patch kfreebsd: Support for GNU/kFreeBSD.
+  * rtcp_cli_fix: Backport a silly CLI parsing issue. (Closes: #589736)
   * Patch typos: fix a few typos in the source.
   * Patch man_hyphen: fix hyphen/minus issues in man pages.
-  * Bump Standards version to 3.9.0 (no change needed).
   * Remove useless binaries aelparse, conf2ael and muted.
-  * Patch kfreebsd: Support for GNU/kFreeBSD.
-
- -- Tzafrir Cohen <tzafrir at debian.org>  Sun, 15 Aug 2010 21:58:42 +0300
+
+  [ Faidon Liambotis ]
+  * Change the way that we read include files, to accommodate for changes
+    in GCC 4.4. Taken from upstream's SVN, thanks to Peter Allgeyer for the
+    patch and Stefan Bauer for preparing an upload. (Closes: #594190)
+  * Set urgency high for a squeeze-targetted RC bug-fixing upload.
+
+ -- Faidon Liambotis <paravoid at debian.org>  Tue, 07 Sep 2010 21:52:54 +0300
 
 asterisk (1:1.6.2.9-1) unstable; urgency=low
 

Added: asterisk/trunk/debian/patches/parser-mangles-include
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/parser-mangles-include?rev=8626&op=file
==============================================================================
--- asterisk/trunk/debian/patches/parser-mangles-include (added)
+++ asterisk/trunk/debian/patches/parser-mangles-include Tue Sep  7 18:55:30 2010
@@ -1,0 +1,51 @@
+Subject: Change the way that we read include files, to accommodate for changes in GCC 4.4 
+Acked-by: Faidon Liambotis <paravoid at debian.org>
+Bug: http://issues.asterisk.org/view.php?id=17472
+Applied-Upstream: 1.6.2.11
+Last-Update: 2010-09-07
+
+--- a/main/config.c
++++ b/main/config.c
+@@ -1023,12 +1023,13 @@
+ 		if (*c) {
+ 			*c = '\0';
+ 			/* Find real argument */
+-			c = ast_skip_blanks(c + 1);
++			c = ast_strip(c + 1);
+ 			if (!(*c)) {
+ 				c = NULL;
+ 			}
+-		} else 
++		} else {
+ 			c = NULL;
++		}
+ 		if (!strcasecmp(cur, "include")) {
+ 			do_include = 1;
+ 		} else if (!strcasecmp(cur, "exec")) {
+@@ -1052,20 +1053,12 @@
+ 
+ 		cur = c;
+ 		/* Strip off leading and trailing "'s and <>'s */
+-		if (*c == '"') {
+-			/* Dequote */
+-			while (*c) {
+-				if (*c == '"') {
+-					strcpy(c, c + 1); /* SAFE */
+-					c--;
+-				} else if (*c == '\\') {
+-					strcpy(c, c + 1); /* SAFE */
+-				}
+-				c++;
+-			}
+-		} else if (*c == '<') {
+-			/* C-style include */
+-			if (*(c + strlen(c) - 1) == '>') {
++               if ((*c == '"') || (*c == '<')) {
++                       char quote_char = *c;
++                       if (quote_char == '<')
++                               quote_char = '>';
++
++                       if (*(c + strlen(c) - 1) == quote_char) {
+ 				cur++;
+ 				*(c + strlen(c) - 1) = '\0';
+ 			}

Modified: asterisk/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/series?rev=8626&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/series (original)
+++ asterisk/trunk/debian/patches/series Tue Sep  7 18:55:30 2010
@@ -1,4 +1,7 @@
-### upstream fixes
+# fixed upstream
+parser-mangles-include
+
+# upstream fixes
 allow-tilde-destdir
 
 hack-multiple-app-voicemail