summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Knoblich <stkn@gentoo.org>2005-12-03 00:24:06 +0000
committerStefan Knoblich <stkn@gentoo.org>2005-12-03 00:24:06 +0000
commit44277b08bbdb0481dba617ab2085e51758a63f72 (patch)
tree97265ef9bf74d907d4fbc412622880ee21c4a7bc /net-misc/asterisk
parentVersion bump #114058 by Henrik Brix Andersen. (diff)
downloadgentoo-2-44277b08bbdb0481dba617ab2085e51758a63f72.tar.gz
gentoo-2-44277b08bbdb0481dba617ab2085e51758a63f72.tar.bz2
gentoo-2-44277b08bbdb0481dba617ab2085e51758a63f72.zip
Added patch for chan_misdn support on asterisk-1.0.x as requested by genstef.
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'net-misc/asterisk')
-rw-r--r--net-misc/asterisk/ChangeLog6
-rw-r--r--net-misc/asterisk/asterisk-1.0.10.ebuild5
-rw-r--r--net-misc/asterisk/files/1.0.0/asterisk-1.0.10-misdn.patch20
3 files changed, 29 insertions, 2 deletions
diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index fc5ab5695ed4..ab12817f586b 100644
--- a/net-misc/asterisk/ChangeLog
+++ b/net-misc/asterisk/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-misc/asterisk
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.95 2005/12/02 03:42:17 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.96 2005/12/03 00:24:05 stkn Exp $
+
+ 03 Dec 2005; Stefan Knoblich <stkn@gentoo.org>
+ +files/1.0.0/asterisk-1.0.10-misdn.patch, asterisk-1.0.10.ebuild:
+ Added patch for chan_misdn support on asterisk-1.0.x as requested by genstef.
*asterisk-1.0.10 (02 Dec 2005)
diff --git a/net-misc/asterisk/asterisk-1.0.10.ebuild b/net-misc/asterisk/asterisk-1.0.10.ebuild
index 1e556bc1fb34..381b0f221e80 100644
--- a/net-misc/asterisk/asterisk-1.0.10.ebuild
+++ b/net-misc/asterisk/asterisk-1.0.10.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.10.ebuild,v 1.1 2005/12/02 03:42:17 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.10.ebuild,v 1.2 2005/12/03 00:24:05 stkn Exp $
inherit eutils perl-app
@@ -308,6 +308,9 @@ src_unpack() {
# security fix, bug #11836
epatch ${FILESDIR}/1.0.0/${PN}-1.0.9-vmail.cgi.patch
+
+ # patch for mISDN
+ epatch ${FILESDIR}/1.0.0/${PN}-1.0.10-misdn.patch
}
src_compile() {
diff --git a/net-misc/asterisk/files/1.0.0/asterisk-1.0.10-misdn.patch b/net-misc/asterisk/files/1.0.0/asterisk-1.0.10-misdn.patch
new file mode 100644
index 000000000000..a11b23dfb895
--- /dev/null
+++ b/net-misc/asterisk/files/1.0.0/asterisk-1.0.10-misdn.patch
@@ -0,0 +1,20 @@
+Index: channel.c
+===================================================================
+RCS file: /usr/cvsroot/asterisk/channel.c,v
+retrieving revision 1.139.2.11
+diff -u -r1.139.2.11 channel.c
+--- channel.c 5 Aug 2005 00:02:09 -0000 1.139.2.11
++++ channel.c 11 Oct 2005 04:20:20 -0000
+@@ -381,6 +381,12 @@
+ }
+ ast_mutex_lock(&chan->lock);
+ prev = NULL;
++
++ if (!chan->pvt ) {
++ ast_log(LOG_WARNING, "chan->pvt == NULL!!");
++ ast_mutex_unlock(&chan->lock);
++ return -1;
++ }
+ cur = chan->pvt->readq;
+ while(cur) {
+ if ((cur->frametype == AST_FRAME_CONTROL) && (cur->subclass == AST_CONTROL_HANGUP)) {