[Pkg-voip-commits] r4710 - in /asterisk/trunk/debian: changelog patches/keep-fileformat-abi patches/series

paravoid at alioth.debian.org paravoid at alioth.debian.org
Wed Oct 10 02:12:24 UTC 2007


Author: paravoid
Date: Wed Oct 10 02:12:23 2007
New Revision: 4710

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=4710
Log:
* Patch upstream source to not break the ABI on externally compiled format
  modules. Fixes a crash of format_mp3.

Added:
    asterisk/trunk/debian/patches/keep-fileformat-abi
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=4710&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Wed Oct 10 02:12:23 2007
@@ -26,8 +26,10 @@
   * Build with -O1 on hppa to workaround gcc-4.2 ICE (#445336).
   * Zaptel package added support for Voicetronix OpenPCI cards, mention it on
     asterisk's description.
-
- -- Faidon Liambotis <paravoid at debian.org>  Tue, 09 Oct 2007 07:02:12 +0300
+  * Patch upstream source to not break the ABI on externally compiled format
+    modules. Fixes a crash of format_mp3.
+
+ -- Faidon Liambotis <paravoid at debian.org>  Wed, 10 Oct 2007 05:11:26 +0300
 
 asterisk (1:1.4.11~dfsg-4) unstable; urgency=low
 

Added: asterisk/trunk/debian/patches/keep-fileformat-abi
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/keep-fileformat-abi?rev=4710&op=file
==============================================================================
--- asterisk/trunk/debian/patches/keep-fileformat-abi (added)
+++ asterisk/trunk/debian/patches/keep-fileformat-abi Wed Oct 10 02:12:23 2007
@@ -1,0 +1,25 @@
+Upstream r81599 broke added a field in the middle of struct ast_filestream.
+This resulted in breaking the ABI and having crashes on plugins compiled with
+older versions of asterisk-dev (e.g. format_mp3)
+
+This moves the new field in the end of the struct.
+
+Should be forwarded upstream, if not too late.
+
+ -- Faidon Liambotis <paravoid at debian.org>
+
+--- asterisk-1.4.12.1~dfsg.orig/include/asterisk/file.h
++++ asterisk-1.4.12.1~dfsg/include/asterisk/file.h
+@@ -129,11 +129,11 @@ struct ast_filestream {
+ 	int lastwriteformat;
+ 	int lasttimeout;
+ 	struct ast_channel *owner;
+-	const char *orig_chan_name;
+ 	FILE *f;
+ 	struct ast_frame fr;	/* frame produced by read, typically */
+ 	char *buf;		/* buffer pointed to by ast_frame; */
+ 	void *private;	/* pointer to private buffer */
++	const char *orig_chan_name;
+ };
+ 
+ #define SEEK_FORCECUR	10

Modified: asterisk/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/series?rev=4710&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/series (original)
+++ asterisk/trunk/debian/patches/series Wed Oct 10 02:12:23 2007
@@ -2,6 +2,7 @@
 configure-libc-client
 hack-multiple-app-voicemail
 astvarrundir
+keep-fileformat-abi
 make-clean-fixes
 safe_asterisk-nobg
 h323-no-deps-on-asterisk




More information about the Pkg-voip-commits mailing list