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
commita0dce828106199621b55baa51141411ef63b365f (patch)
tree4cb462fd537e9438d886b05687b87eacb76145c2 /net-misc/asterisk
parentVersion bump #114058 by Henrik Brix Andersen. (diff)
downloadhistorical-a0dce828106199621b55baa51141411ef63b365f.tar.gz
historical-a0dce828106199621b55baa51141411ef63b365f.tar.bz2
historical-a0dce828106199621b55baa51141411ef63b365f.zip
Added patch for chan_misdn support on asterisk-1.0.x as requested by genstef.
Package-Manager: portage-2.0.51.22-r2
Diffstat (limited to 'net-misc/asterisk')
-rw-r--r--net-misc/asterisk/ChangeLog6
-rw-r--r--net-misc/asterisk/Manifest5
-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
4 files changed, 32 insertions, 4 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/Manifest b/net-misc/asterisk/Manifest
index d5c422a7af2f..0c81ebd6f922 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -4,8 +4,8 @@ MD5 68d5fb7fa17a8adb2fde235305eeb444 asterisk-1.0.5-r3.ebuild 12292
MD5 2bb329f2fddb62b6cc55b6ec95990528 asterisk-1.0.9-r2.ebuild 13817
MD5 60c09319bc8263b96943e15c6af270b7 asterisk-1.0.6-r2.ebuild 14064
MD5 44cf247f04cc83413fcb40ed59d0847a metadata.xml 248
-MD5 0d999c7e56588c263dbe9656ef6a3837 ChangeLog 19282
-MD5 0d549c054422bf451091612108c0155a asterisk-1.0.10.ebuild 14560
+MD5 299f11511be01e9db401af0cbb7ffc4a ChangeLog 19480
+MD5 9322226b2f812f260dd052ee9a8ed6a9 asterisk-1.0.10.ebuild 14631
MD5 74a407d1898d32d28f950b74acdb1925 asterisk-1.2.0.ebuild 8455
MD5 58b3329253168e6dfb4c8ecbb98aeecd files/digest-asterisk-1.0.9-r2 210
MD5 48a3518349e2abfe20fa918a9db5eea2 files/digest-asterisk-1.0.7-r2 210
@@ -26,6 +26,7 @@ MD5 920f8ae54f895cfa46a8a037c865e59a files/1.0.0/asterisk.rc6 517
MD5 d8501003cf3148ae662a03866e734481 files/1.0.0/asterisk-1.0.7-manager-cli-segv.patch 4008
MD5 ab552fbbe803766b5291d61942dbcd9f files/1.0.0/res_perl-1.0.7-bristuff-0.2.0.diff 860
MD5 85e291d6eb70a24fdc82469ed53bfe54 files/1.0.0/asterisk.confd 283
+MD5 88e8cfc364e9767f104159b374eb5bea files/1.0.0/asterisk-1.0.10-misdn.patch 607
MD5 5e1e00b71a830e487787ce48be04ccdc files/1.0.0/asterisk-1.0.8-initgroups.diff 1558
MD5 e993bfc45e54507214329e00b3a66966 files/1.0.0/asterisk-1.0.9-freetds.diff 854
MD5 27bf961621fb1f521bc11293df8b5ec9 files/1.0.0/asterisk-1.0.10-weak-references.diff 8579
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)) {