[Pkg-voip-commits] r1070 - in asterisk/trunk/debian: . patches

[Mark Purcell]

Author: msp
Date: 2005-12-06 00:11:02 +0000 (Tue, 06 Dec 2005)
New Revision: 1070

Added:
   asterisk/trunk/debian/patches/sip-1.914.dpatch
Modified:
   asterisk/trunk/debian/changelog
   asterisk/trunk/debian/patches/00list
Log:
releasing version 1:1.2.0.dfsg-6

Modified: asterisk/trunk/debian/changelog
===================================================================
--- asterisk/trunk/debian/changelog	2005-12-05 23:40:26 UTC (rev 1069)
+++ asterisk/trunk/debian/changelog	2005-12-06 00:11:02 UTC (rev 1070)
@@ -8,8 +8,9 @@
   * disable chan_zap building (in channels makefile) against old
     libmfcr2 (Closes: #342139)
   * seperate api docs and configuration samples (Closes: #341395)
+  * Add sip-1.913.dpatch; SIP error 400 on outgoing calls (Closes: #340574)
 
- -- Mark Purcell <msp at debian.org>  Mon,  5 Dec 2005 23:40:05 +0000
+ -- Mark Purcell <msp at debian.org>  Mon,  5 Dec 2005 23:49:40 +0000
 
 asterisk (1:1.2.0.dfsg-5) unstable; urgency=low
 

Modified: asterisk/trunk/debian/patches/00list
===================================================================
--- asterisk/trunk/debian/patches/00list	2005-12-05 23:40:26 UTC (rev 1069)
+++ asterisk/trunk/debian/patches/00list	2005-12-06 00:11:02 UTC (rev 1070)
@@ -19,3 +19,5 @@
 pubkey_jnctn
 nomarch
 nooptimize
+chanzap_disable_r2.dpatch
+sip-1.914.dpatch

Added: asterisk/trunk/debian/patches/sip-1.914.dpatch
===================================================================
--- asterisk/trunk/debian/patches/sip-1.914.dpatch	2005-12-05 23:40:26 UTC (rev 1069)
+++ asterisk/trunk/debian/patches/sip-1.914.dpatch	2005-12-06 00:11:02 UTC (rev 1070)
@@ -0,0 +1,44 @@
+#! /bin/sh -e
+##
+## All lines beginning with `## DP:' are a description of the patch.
+
+if [ $# -lt 1 ]; then
+    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+    -patch) patch -p1 ${patch_opts} < $0;;
+    -unpatch) patch -R -p1 ${patch_opts} < $0;;
+    *)
+        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+        exit 1;;
+esac
+
+exit 0
+
+ at DPATCH@
+diff -urNad asterisk-1.2.0.dfsg~/channels/chan_sip.c asterisk-1.2.0.dfsg/channels/chan_sip.c
+--- asterisk-1.2.0.dfsg~/channels/chan_sip.c	2005-12-05 23:57:46.000000000 +0000
++++ asterisk-1.2.0.dfsg/channels/chan_sip.c	2005-12-05 23:59:49.000000000 +0000
+@@ -50,7 +50,7 @@
+ 
+ #include "asterisk.h"
+ 
+-ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.913 $")
++ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.914 $")
+ 
+ #include "asterisk/lock.h"
+ #include "asterisk/channel.h"
+@@ -4267,7 +4267,7 @@
+ 			 sample_rate);
+ 	if (codec == AST_FORMAT_G729A)
+ 		/* Indicate that we don't support VAD (G.729 annex B) */
+-		ast_build_string(a_buf, a_size, "a=fmtp:%d annexb=no", rtp_code);
++		ast_build_string(a_buf, a_size, "a=fmtp:%d annexb=no\r\n", rtp_code);
+ }
+ 
+ static void add_noncodec_to_sdp(const struct sip_pvt *p, int format, int sample_rate,