[Pkg-voip-commits] r6030 - in /asterisk-oh323/trunk/debian: changelog control patches/00list patches/ast-assert.dpatch

paravoid at alioth.debian.org paravoid at alioth.debian.org
Tue Aug 12 15:48:52 UTC 2008


Author: paravoid
Date: Tue Aug 12 15:48:52 2008
New Revision: 6030

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6030
Log:
Fix FTBFS that was caused by an API change of asterisk; also build-depend
on asterisk-dev >= 1.4.21 to account for this. (Closes: #494217)

Added:
    asterisk-oh323/trunk/debian/patches/ast-assert.dpatch   (with props)
Modified:
    asterisk-oh323/trunk/debian/changelog
    asterisk-oh323/trunk/debian/control
    asterisk-oh323/trunk/debian/patches/00list

Modified: asterisk-oh323/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-oh323/trunk/debian/changelog?rev=6030&op=diff
==============================================================================
--- asterisk-oh323/trunk/debian/changelog (original)
+++ asterisk-oh323/trunk/debian/changelog Tue Aug 12 15:48:52 2008
@@ -1,3 +1,10 @@
+asterisk-oh323 (0.7.3+cvs20070811-4) unstable; urgency=medium
+
+  * Fix FTBFS that was caused by an API change of asterisk; also build-depend
+    on asterisk-dev >= 1.4.21 to account for this. (Closes: #494217)
+
+ -- Faidon Liambotis <paravoid at debian.org>  Tue, 12 Aug 2008 18:31:38 +0300
+
 asterisk-oh323 (0.7.3+cvs20070811-3) unstable; urgency=low
 
   [ Kilian Krause ]

Modified: asterisk-oh323/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-oh323/trunk/debian/control?rev=6030&op=diff
==============================================================================
--- asterisk-oh323/trunk/debian/control (original)
+++ asterisk-oh323/trunk/debian/control Tue Aug 12 15:48:52 2008
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Mark Purcell <msp at debian.org>, Kilian Krause <kilian at debian.org>, Faidon Liambotis <paravoid at debian.org>
-Build-Depends: debhelper (>= 5), asterisk-dev (>= 1:1.4), libopenh323-dev (>= 1.15.6), dpatch
+Build-Depends: debhelper (>= 5), asterisk-dev (>= 1:1.4.21), libopenh323-dev (>= 1.15.6), dpatch
 Standards-Version: 3.7.3
 Homepage: http://www.inaccessnetworks.com/ian/projects/asterisk-oh323/
 Vcs-Svn: svn://svn.debian.org/pkg-voip/asterisk-oh323/trunk/

Modified: asterisk-oh323/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-oh323/trunk/debian/patches/00list?rev=6030&op=diff
==============================================================================
--- asterisk-oh323/trunk/debian/patches/00list (original)
+++ asterisk-oh323/trunk/debian/patches/00list Tue Aug 12 15:48:52 2008
@@ -4,3 +4,4 @@
 asterisk-driver_Makefile.dpatch
 wrapper_Makefile.dpatch
 no-wrapper.dpatch
+ast-assert.dpatch

Added: asterisk-oh323/trunk/debian/patches/ast-assert.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-oh323/trunk/debian/patches/ast-assert.dpatch?rev=6030&op=file
==============================================================================
--- asterisk-oh323/trunk/debian/patches/ast-assert.dpatch (added)
+++ asterisk-oh323/trunk/debian/patches/ast-assert.dpatch Tue Aug 12 15:48:52 2008
@@ -1,0 +1,76 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## ast-assert.dpatch by Faidon Liambotis <paravoid at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Asterisk 1.4.21 replaced the CRASH macro with ast_assert
+
+ at DPATCH@
+diff -urNad asterisk-oh323-0.7.3+cvs20070811~/asterisk-driver/chan_oh323.c asterisk-oh323-0.7.3+cvs20070811/asterisk-driver/chan_oh323.c
+--- asterisk-oh323-0.7.3+cvs20070811~/asterisk-driver/chan_oh323.c	2008-08-12 18:39:25.000000000 +0300
++++ asterisk-oh323-0.7.3+cvs20070811/asterisk-driver/chan_oh323.c	2008-08-12 18:40:34.000000000 +0300
+@@ -1347,7 +1347,7 @@
+ 	if (uid_base == 0) {
+ 		if (gettimeofday(&tv, NULL) < 0) {
+ 			ast_log(LOG_ERROR, "Failed to get time.\n");
+-			CRASH;
++			ast_assert(0);
+ 			ast_mutex_unlock(&oh323_uid_lock);
+ 			return(0);
+ 		}
+@@ -1555,7 +1555,7 @@
+ 	OBJLIST_EXTRACT(&(p->exceptl), e);
+ 	if (!e) {
+ 		ast_log(LOG_ERROR, "%s: %s called but exception list is empty!\n", c->name, __FUNCTION__);
+-		CRASH;
++		ast_assert(0);
+ 	}
+ 
+ 	/* -- User input */
+@@ -3064,7 +3064,7 @@
+ {
+ 	if (!cd) {
+ 		ast_log(LOG_WARNING, "Call details struct is NULL!\n");
+-		CRASH;
++		ast_assert(0);
+ 	}
+ 	memset((char*)cd, 0, sizeof(call_details_t));
+ }
+@@ -3398,7 +3398,7 @@
+ 								oh323_tab[i]->recorder_fd[1]);
+  			break;
+ 		default:
+-			CRASH;
++			ast_assert(0);
+ 		}
+ 		needsfdupdate = 1;
+ #endif
+@@ -3634,7 +3634,7 @@
+ 			num++;
+ 			if (num > 80000) {
+ 				ast_log(LOG_WARNING, "Waiting too long for channel lock\n");
+-				CRASH;
++				ast_assert(0);
+ 			}
+ 		}
+ 		if ((oh323_tab[i]) && (oh323_tab[i]->owner)) {
+@@ -4121,7 +4121,7 @@
+ 	if (!e) {
+ 		ast_log(LOG_ERROR, "%s called but request list is empty!\n", __FUNCTION__);
+ 		OBJ_FREE(e);
+-		CRASH;
++		ast_assert(0);
+ 		return(0);
+ 	}
+ 	switch (e->type) {
+diff -urNad asterisk-oh323-0.7.3+cvs20070811~/asterisk-driver/oh323.h asterisk-oh323-0.7.3+cvs20070811/asterisk-driver/oh323.h
+--- asterisk-oh323-0.7.3+cvs20070811~/asterisk-driver/oh323.h	2007-06-04 13:55:27.000000000 +0300
++++ asterisk-oh323-0.7.3+cvs20070811/asterisk-driver/oh323.h	2008-08-12 18:39:25.000000000 +0300
+@@ -190,7 +190,7 @@
+ 		(element) = (type*)malloc(sizeof(type)); \
+ 		if (!(element)) { \
+ 			ast_log(LOG_ERROR, "Malloc failed.\n"); \
+-			CRASH; \
++			ast_assert(0); \
+ 		} else { \
+ 			memset((char *)(element), 0, sizeof(type)); \
+ 		} \

Propchange: asterisk-oh323/trunk/debian/patches/ast-assert.dpatch
------------------------------------------------------------------------------
    svn:executable = *




More information about the Pkg-voip-commits mailing list