Added dialplan callerid matching fix

Package-Manager: portage-2.0.51.22-r1

4 files changed, 34 insertions, 6 deletions

diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index b57bfeca1521..61aeefc33f15 100644
--- a/net-misc/asterisk/ChangeLog
+++ b/net-misc/asterisk/ChangeLog
@@ -1,10 +1,14 @@
 # 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.64 2005/06/25 13:34:13 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.65 2005/06/26 19:57:28 stkn Exp $
+
+  26 Jun 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/1.0.0/asterisk-1.0.8-callerid.patch, asterisk-1.0.8.ebuild:
+  Added dialplan callerid matching fix.
 
   25 Jun 2005; Stefan Knoblich <stkn@gentoo.org> asterisk-1.0.5-r2.ebuild,
   asterisk-1.0.6-r1.ebuild, asterisk-1.0.7-r1.ebuild, asterisk-1.0.8.ebuild:
-  Fixed SRC_URI and a typo
+  Fixed SRC_URI and a typo.
 
   25 Jun 2005; David Holm <dholm@gentoo.org> asterisk-1.0.7-r1.ebuild:
   Added to ~ppc.
@@ -18,7 +22,7 @@
   25 Jun 2005; Stefan Knoblich <stkn@gentoo.org>
   +files/1.0.0/asterisk-1.0.8-hppa.patch,
   +files/1.0.0/asterisk-1.0.8-initgroups.diff, +asterisk-1.0.8.ebuild:
-  Version bump
+  Version bump.
 
   24 Jun 2005; Stefan Knoblich <stkn@gentoo.org> -asterisk-1.0.5-r1.ebuild,
   -asterisk-1.0.5.ebuild, -asterisk-1.0.6.ebuild, -asterisk-1.0.7.ebuild:
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index def1e2c86f99..1cd3d89e7116 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -1,8 +1,8 @@
 MD5 607b973ea5d12b806c5995cafdab8faa asterisk-1.0.6-r1.ebuild 13988
 MD5 060cb1ea5774ed3cce91e8c1a142a190 asterisk-1.0.7-r1.ebuild 13586
-MD5 d6deb7ff1c9eb700c2e5bbec1602d8c9 asterisk-1.0.8.ebuild 13425
+MD5 66d75489669f15e80b9bb8f390f266c2 asterisk-1.0.8.ebuild 13513
 MD5 44cf247f04cc83413fcb40ed59d0847a metadata.xml 248
-MD5 4be93f3355f679f12701bf98bcf249eb ChangeLog 12470
+MD5 3fbc14beba84031deae4e15b8407275a ChangeLog 12631
 MD5 b551ce4bb8eb4a03cb0e551c279ab02c asterisk-0.9.0.ebuild 3161
 MD5 b4de71be03f57c198c5215fdef633bf0 asterisk-1.0.5-r2.ebuild 12254
 MD5 f399592939cd5b43b7851e20744a108e files/digest-asterisk-1.0.6-r1 210
@@ -12,6 +12,7 @@ MD5 48a3518349e2abfe20fa918a9db5eea2 files/digest-asterisk-1.0.7-r1 210
 MD5 97ed00bdccf7c70d5fcbf37580da91c4 files/digest-asterisk-1.0.5-r2 139
 MD5 6a50db2ee46d4139128d0c4225ac071f files/1.0.0/asterisk-uclibc-dns.diff 433
 MD5 d8501003cf3148ae662a03866e734481 files/1.0.0/asterisk-1.0.7-manager-cli-segv.patch 4008
+MD5 18fb1b2e1fbf2f19e8a9a600eab4c5c8 files/1.0.0/asterisk-1.0.8-callerid.patch 631
 MD5 0c31aac944f4fdff2b26b446d0d0eef4 files/1.0.0/asterisk-1.0.7-initgroups.diff 1826
 MD5 f20e5b869d5e221194187dd7f504d38b files/1.0.0/asterisk-1.0.5-astcfg-0.0.2.diff 5829
 MD5 5e1e00b71a830e487787ce48be04ccdc files/1.0.0/asterisk-1.0.8-initgroups.diff 1558
diff --git a/net-misc/asterisk/asterisk-1.0.8.ebuild b/net-misc/asterisk/asterisk-1.0.8.ebuild
index 1180eb36ade1..b2b13e2b2e0e 100644
--- a/net-misc/asterisk/asterisk-1.0.8.ebuild
+++ b/net-misc/asterisk/asterisk-1.0.8.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.8.ebuild,v 1.3 2005/06/25 13:34:13 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.8.ebuild,v 1.4 2005/06/26 19:57:28 stkn Exp $
 
 IUSE="alsa doc gtk mmx mysql pri zaptel debug postgres vmdbmysql vmdbpostgres bri hardened speex resperl"
 
@@ -266,6 +266,9 @@ src_unpack() {
 	# to support supplementary groups for the asterisk
 	# user (start-stop-daemons --chguid breaks realtime priority support)
 	epatch ${FILESDIR}/1.0.0/${PN}-1.0.8-initgroups.diff
+
+	# fix callerid matching bug in dialplan
+	epatch ${FILESDIR}/1.0.0/${P}-callerid.patch
 }
 
 src_compile() {
diff --git a/net-misc/asterisk/files/1.0.0/asterisk-1.0.8-callerid.patch b/net-misc/asterisk/files/1.0.0/asterisk-1.0.8-callerid.patch
new file mode 100644
index 000000000000..a65c760507f1
--- /dev/null
+++ b/net-misc/asterisk/files/1.0.0/asterisk-1.0.8-callerid.patch
@@ -0,0 +1,20 @@
+--- asterisk-1.0.8/pbx/pbx_config.c.orig	2005-06-26 21:45:36.724546872 +0200
++++ asterisk-1.0.8/pbx/pbx_config.c	2005-06-26 21:50:14.119376448 +0200
+@@ -1688,14 +1688,9 @@
+ 									data = "";
+ 							}
+ 							pbx_substitute_variables_helper(NULL, ext, realext, sizeof(realext)-1);	
+-							cidmatch = strchr(ext, '/');
+-							if (cidmatch) {
+-								*cidmatch = '\0';
+-								cidmatch++;
+-							}
+-							stringp=ext;
+-							strsep(&stringp, "/");
+-
++							stringp = realext;
++							ext = strsep(&stringp, "/");
++							cidmatch = stringp;
+ 							if (!data)
+ 								data="";
+ 							while(*appl && (*appl < 33)) appl++;