[Pkg-voip-commits] r4240 - asterisk/branches/sarge/debian/patches

paravoid at alioth.debian.org paravoid at alioth.debian.org
Thu Aug 23 01:31:18 UTC 2007


Author: paravoid
Date: 2007-08-23 01:31:18 +0000 (Thu, 23 Aug 2007)
New Revision: 4240

Modified:
   asterisk/branches/sarge/debian/patches/00list
   asterisk/branches/sarge/debian/patches/99_ASA-2007-012.dpatch
   asterisk/branches/sarge/debian/patches/99_ASA-2007-014.dpatch
Log:
Don't be an idiot and actually enable the patches

Modified: asterisk/branches/sarge/debian/patches/00list
===================================================================
--- asterisk/branches/sarge/debian/patches/00list	2007-08-23 01:02:16 UTC (rev 4239)
+++ asterisk/branches/sarge/debian/patches/00list	2007-08-23 01:31:18 UTC (rev 4240)
@@ -17,4 +17,8 @@
 99_CVE-2006-1827.dpatch
 99_CVE-2006-2898.dpatch
 99_CVE-2006-5444.dpatch
-
+99_ASA-2007-011.dpatch
+99_ASA-2007-012.dpatch
+99_ASA-2007-014.dpatch
+99_CVE-2007-2488.dpatch
+99_ASA-2007-015.dpatch

Modified: asterisk/branches/sarge/debian/patches/99_ASA-2007-012.dpatch
===================================================================
--- asterisk/branches/sarge/debian/patches/99_ASA-2007-012.dpatch	2007-08-23 01:02:16 UTC (rev 4239)
+++ asterisk/branches/sarge/debian/patches/99_ASA-2007-012.dpatch	2007-08-23 01:31:18 UTC (rev 4240)
@@ -18,7 +18,7 @@
  				if (!strcasecmp(authtype, "MD5")) {
 -					if (key && !ast_strlen_zero(key) && s->challenge) {
 +					if (key && !ast_strlen_zero(key) &&
-+					    s->challenge && !ast_strlen_zero(challenge) &&
++					    s->challenge && !ast_strlen_zero(s->challenge) &&
 +					    password && !ast_strlen_zero(password)) {
  						int x;
  						int len=0;

Modified: asterisk/branches/sarge/debian/patches/99_ASA-2007-014.dpatch
===================================================================
--- asterisk/branches/sarge/debian/patches/99_ASA-2007-014.dpatch	2007-08-23 01:02:16 UTC (rev 4239)
+++ asterisk/branches/sarge/debian/patches/99_ASA-2007-014.dpatch	2007-08-23 01:31:18 UTC (rev 4240)
@@ -11,9 +11,9 @@
 
 @DPATCH@
 diff -urNad asterisk-1.0.7.dfsg.1~/channels/chan_iax2.c asterisk-1.0.7.dfsg.1/channels/chan_iax2.c
---- asterisk-1.0.7.dfsg.1~/channels/chan_iax2.c	2007-08-23 03:07:58.000000000 +0300
-+++ asterisk-1.0.7.dfsg.1/channels/chan_iax2.c	2007-08-23 03:13:19.000000000 +0300
-@@ -3082,7 +3082,9 @@
+--- asterisk-1.0.7.dfsg.1~/channels/chan_iax2.c	2007-08-23 04:26:27.000000000 +0300
++++ asterisk-1.0.7.dfsg.1/channels/chan_iax2.c	2007-08-23 04:26:27.000000000 +0300
+@@ -3090,7 +3090,9 @@
  	int sendmini=0;
  	unsigned int lastsent;
  	unsigned int fts;
@@ -24,7 +24,7 @@
  	if (!pvt) {
  		ast_log(LOG_WARNING, "No private structure for packet?\n");
  		return -1;
-@@ -5043,6 +5045,7 @@
+@@ -5051,6 +5053,7 @@
  
  	dblbuf[0] = 0;	/* Keep GCC from whining */
  	fr.callno = 0;
@@ -33,9 +33,9 @@
  	res = recvfrom(netsocket, buf, sizeof(buf), 0,(struct sockaddr *) &sin, &len);
  	if (res < 0) {
 diff -urNad asterisk-1.0.7.dfsg.1~/channels/iax2-parser.c asterisk-1.0.7.dfsg.1/channels/iax2-parser.c
---- asterisk-1.0.7.dfsg.1~/channels/iax2-parser.c	2004-10-25 20:57:25.000000000 +0300
-+++ asterisk-1.0.7.dfsg.1/channels/iax2-parser.c	2007-08-23 03:11:16.000000000 +0300
-@@ -688,8 +688,14 @@
+--- asterisk-1.0.7.dfsg.1~/channels/iax2-parser.c	2007-08-23 04:26:17.000000000 +0300
++++ asterisk-1.0.7.dfsg.1/channels/iax2-parser.c	2007-08-23 04:27:18.000000000 +0300
+@@ -688,8 +688,13 @@
  	fr->af.delivery.tv_sec = 0;
  	fr->af.delivery.tv_usec = 0;
  	fr->af.data = fr->afdata;
@@ -43,16 +43,15 @@
 -		memcpy(fr->af.data, f->data, fr->af.datalen);
 +	if (fr->af.datalen) {
 +		size_t copy_len = fr->af.datalen;
-+		if (copy_len > fr->afdatalen) {
-+			ast_log(LOG_ERROR, "Losing frame data because destination buffer size '%d' bytes not big enough for '%d' bytes in the frame\n",
-+				(int) fr->afdatalen, (int) fr->af.datalen);
++		if (copy_len > fr->afdatalen)
 +			copy_len = fr->afdatalen;
-+		}
++
 +		memcpy(fr->af.data, f->data, copy_len);
++	}
  }
  
  struct iax_frame *iax_frame_new(int direction, int datalen)
-@@ -697,6 +703,7 @@
+@@ -697,6 +702,7 @@
  	struct iax_frame *fr;
  	fr = malloc((int)sizeof(struct iax_frame) + datalen);
  	if (fr) {
@@ -61,8 +60,8 @@
  		fr->retrans = -1;
  		frames++;
 diff -urNad asterisk-1.0.7.dfsg.1~/channels/iax2-parser.h asterisk-1.0.7.dfsg.1/channels/iax2-parser.h
---- asterisk-1.0.7.dfsg.1~/channels/iax2-parser.h	2004-07-07 12:34:01.000000000 +0300
-+++ asterisk-1.0.7.dfsg.1/channels/iax2-parser.h	2007-08-23 03:08:31.000000000 +0300
+--- asterisk-1.0.7.dfsg.1~/channels/iax2-parser.h	2007-08-23 04:26:17.000000000 +0300
++++ asterisk-1.0.7.dfsg.1/channels/iax2-parser.h	2007-08-23 04:26:27.000000000 +0300
 @@ -98,6 +98,8 @@
  	struct iax_frame *prev;
  	/* Actual, isolated frame header */




More information about the Pkg-voip-commits mailing list