Fixed segmentation fault in config parser, thanks to Kugelfang for finding the cause of this, added ~x86 and ~amd64 keywords.

(Portage version: 2.0.51.22-r1)

3 files changed, 40 insertions, 4 deletions

diff --git a/net-misc/asterisk-app_icd/ChangeLog b/net-misc/asterisk-app_icd/ChangeLog
index d126a3dffe19..5c60e7538c8a 100644
--- a/net-misc/asterisk-app_icd/ChangeLog
+++ b/net-misc/asterisk-app_icd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/asterisk-app_icd
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-app_icd/ChangeLog,v 1.2 2005/06/17 00:07:05 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-app_icd/ChangeLog,v 1.3 2005/07/01 19:46:09 stkn Exp $
+
+  01 Jul 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/asterisk-app_icd-1.0.0-configsegv.diff,
+  asterisk-app_icd-1.0.0.ebuild:
+  Fixed segmentation fault in config parser (thanks to Danny van Dyk
+  <Kugelfang@gentoo.org> for finding this), keywording ~x86 and ~amd64
+  (patch sent upstream).
 
   17 Jun 2005; Stefan Knoblich <stkn@gentoo.org>
   asterisk-app_icd-1.0.0.ebuild:
diff --git a/net-misc/asterisk-app_icd/asterisk-app_icd-1.0.0.ebuild b/net-misc/asterisk-app_icd/asterisk-app_icd-1.0.0.ebuild
index 6ca2b2cfe96e..fbbdf20645db 100644
--- a/net-misc/asterisk-app_icd/asterisk-app_icd-1.0.0.ebuild
+++ b/net-misc/asterisk-app_icd/asterisk-app_icd-1.0.0.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-app_icd/asterisk-app_icd-1.0.0.ebuild,v 1.2 2005/06/17 00:07:05 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-app_icd/asterisk-app_icd-1.0.0.ebuild,v 1.3 2005/07/01 19:46:09 stkn Exp $
 
 inherit eutils
 
@@ -14,8 +14,7 @@ IUSE="debug"
 
 LICENSE="GPL-2"
 SLOT="0"
-#KEYWORDS="~x86"
-KEYWORDS="-*"
+KEYWORDS="~x86 ~amd64"
 
 DEPEND="sys-libs/glibc
 	>=net-misc/asterisk-1.0.7-r1
@@ -33,6 +32,9 @@ src_unpack() {
 	if built_with_use net-misc/asterisk bri; then
 		epatch ${FILESDIR}/${P}-bristuff.diff
 	fi
+
+	# fix segfault in config parser (patch sent upstream)
+	epatch ${FILESDIR}/${P}-configsegv.diff
 }
 
 src_compile() {
diff --git a/net-misc/asterisk-app_icd/files/asterisk-app_icd-1.0.0-configsegv.diff b/net-misc/asterisk-app_icd/files/asterisk-app_icd-1.0.0-configsegv.diff
new file mode 100644
index 000000000000..8984cc657d3a
--- /dev/null
+++ b/net-misc/asterisk-app_icd/files/asterisk-app_icd-1.0.0-configsegv.diff
@@ -0,0 +1,27 @@
+--- icd-1.0.0/app_icd.c.orig	2005-07-01 21:22:01.000000000 +0200
++++ icd-1.0.0/app_icd.c	2005-07-01 21:23:31.000000000 +0200
+@@ -1628,9 +1628,8 @@
+         if (strcasecmp(entry, "events") == 0) { 
+             if (strcasecmp(varlist->name, "module_mask") == 0) {
+                 /* iterrate over our modules & see if the module string is in the module_mask */
+-                for (mod = APP_ICD; mod <= ICD_MAX_MODULES; ++mod) {
+-                    if (icd_module_strings[mod] != NULL && 
+-                        icd_instr(varlist->value, icd_module_strings[mod], icd_delimiter) )
++                for (mod = APP_ICD; mod <= ICD_MAX_MODULES && icd_module_strings[mod] != NULL; ++mod) {
++                    if (icd_instr(varlist->value, icd_module_strings[mod], icd_delimiter) )
+                         module_mask[mod]=1;
+                     else
+                         module_mask[mod]=0;
+@@ -1640,9 +1639,9 @@
+             } /*module_mask*/
+             if (strcasecmp(varlist->name, "event_mask") == 0) {
+                 /* iterrate over our events & see if the event string is in the event_mask */
+-                for (event = ICD_EVENT_TEST; event <= ICD_MAX_EVENTS; ++event) {
+-                    if (icd_event_strings[event] != NULL &&
+-                        icd_instr(varlist->value, icd_event_strings[event], icd_delimiter))
++                for (event = ICD_EVENT_TEST; event <= ICD_MAX_EVENTS &&
++		    icd_event_strings[event] != NULL; ++event) {
++                    if (icd_instr(varlist->value, icd_event_strings[event], icd_delimiter))
+                         event_mask[event]=1;
+                     else
+                         event_mask[event]=0;