[Pkg-voip-commits] r5309 - in /asterisk/branches/etch/debian/patches: 00list AST-2008-003.dpatch AST-2008-004.dpatch

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Tue Mar 18 18:44:05 2008
New Revision: 5309

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5309
Log:
The fixes from asterisk 1.2.27 .

Added:
    asterisk/branches/etch/debian/patches/AST-2008-003.dpatch
    asterisk/branches/etch/debian/patches/AST-2008-004.dpatch
Modified:
    asterisk/branches/etch/debian/patches/00list

Modified: asterisk/branches/etch/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/etch/debian/patches/00list?rev=5309&op=diff
==============================================================================
--- asterisk/branches/etch/debian/patches/00list (original)
+++ asterisk/branches/etch/debian/patches/00list Tue Mar 18 18:44:05 2008
@@ -8,6 +8,8 @@
 ASA-2007-015.dpatch
 ASA-2007-016.dpatch
 AST-2007-026.dpatch
+AST-2008-003
+astobj_format_fix
 # ukcid probably conflicts with bristuff
 ukcid
 option_detach

Added: asterisk/branches/etch/debian/patches/AST-2008-003.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/etch/debian/patches/AST-2008-003.dpatch?rev=5309&op=file
==============================================================================
--- asterisk/branches/etch/debian/patches/AST-2008-003.dpatch (added)
+++ asterisk/branches/etch/debian/patches/AST-2008-003.dpatch Tue Mar 18 18:44:05 2008
@@ -1,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## AST-2008-003.dpatch by Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+##
+## DP: Do not return with a successful authentication if the From header
+## DP: ends up empty.
+## DP: See http://downloads.digium.com/pub/asa/AST-2008-003.html .
+## DP: Source: http://svn.digium.com/view/asterisk?view=rev&rev=109391
+
+ at DPATCH@
+Index: channels/chan_sip.c
+===================================================================
+--- a/channels/chan_sip.c	(revision 109390)
++++ b/channels/chan_sip.c	(revision 109391)
+@@ -7308,8 +7308,6 @@
+ 		ast_copy_string(p->cid_num, of, sizeof(p->cid_num));
+ 		ast_shrink_phone_number(p->cid_num);
+ 	}
+-	if (ast_strlen_zero(of))
+-		return 0;
+ 
+ 	if (!mailbox)	/* If it's a mailbox SUBSCRIBE, don't check users */
+ 		user = find_user(of, 1);

Added: asterisk/branches/etch/debian/patches/AST-2008-004.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/etch/debian/patches/AST-2008-004.dpatch?rev=5309&op=file
==============================================================================
--- asterisk/branches/etch/debian/patches/AST-2008-004.dpatch (added)
+++ asterisk/branches/etch/debian/patches/AST-2008-004.dpatch Tue Mar 18 18:44:05 2008
@@ -1,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## AST-2008-004.dpatch by Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+##
+## DP: Fix a format string issue in astobj.h . 
+## DP: This is only exploitable from configuration files.
+## DP: Note that in later versions the same code was used for other
+## DP: things. See http://downloads.digium.com/pub/asa/AST-2008-004.html .
+## DP: Source: http://svn.digium.com/view/asterisk?view=rev&rev=109488
+
+ at DPATCH@
+Index: include/asterisk/astobj.h
+===================================================================
+--- a/include/asterisk/astobj.h	(revision 109487)
++++ b/include/asterisk/astobj.h	(revision 109488)
+@@ -743,7 +743,7 @@
+  * descriptor.
+  */
+ #define ASTOBJ_CONTAINER_DUMP(fd,s,slen,container) \
+-	ASTOBJ_CONTAINER_TRAVERSE(container, 1, do { ASTOBJ_DUMP(s,slen,iterator); ast_cli(fd, s); } while(0))
++	ASTOBJ_CONTAINER_TRAVERSE(container, 1, do { ASTOBJ_DUMP(s,slen,iterator); ast_cli(fd, "%s", s); } while(0))
+ 
+ #if defined(__cplusplus) || defined(c_plusplus)
+ }