Fix segfault on amd64 caused by wrong data-type in pointer arithmetic (#105762), thanks to Joseph for reporting this.

(Portage version: 2.0.51.22-r2)

8 files changed, 43 insertions, 7 deletions

diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index 73c58e5a8994..af9ab55561b3 100644
--- a/net-misc/asterisk/ChangeLog
+++ b/net-misc/asterisk/ChangeLog
@@ -1,6 +1,13 @@
 # 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.83 2005/09/11 15:58:34 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.84 2005/09/13 18:31:20 stkn Exp $
+
+  13 Sep 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/1.0.0/asterisk-1.0.8-ptr64fix.diff, asterisk-1.0.5-r2.ebuild,
+  asterisk-1.0.6-r1.ebuild, asterisk-1.0.7-r1.ebuild, asterisk-1.0.8.ebuild,
+  asterisk-1.0.9.ebuild, asterisk-1.0.9-r1.ebuild:
+  Fix segfault on amd64 caused by wrong data-type in pointer arithmetic
+  (#105762), thanks to Joseph for reporting this.
 
   11 Sep 2005; Aron Griffis <agriffis@gentoo.org>
   asterisk-1.2.0_beta1.ebuild:
diff --git a/net-misc/asterisk/asterisk-1.0.5-r2.ebuild b/net-misc/asterisk/asterisk-1.0.5-r2.ebuild
index ab97f9254ca5..c06fcee019cf 100644
--- a/net-misc/asterisk/asterisk-1.0.5-r2.ebuild
+++ b/net-misc/asterisk/asterisk-1.0.5-r2.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.5-r2.ebuild,v 1.8 2005/09/07 23:35:53 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.5-r2.ebuild,v 1.9 2005/09/13 18:31:21 stkn Exp $
 
 inherit eutils perl-module
 
@@ -218,6 +218,9 @@ src_unpack() {
 
 	# security fix (www.portcullis-security.com/advisory/advisory-05-013.txt)
 	epatch ${FILESDIR}/1.0.0/${PN}-1.0.7-manager-cli-segv.patch
+
+	# fix segfault on amd64 and possibly other 64bit systems (#105762)
+	epatch ${FILESDIR}/1.0.0/${PN}-1.0.8-ptr64fix.diff
 }
 
 src_compile() {
diff --git a/net-misc/asterisk/asterisk-1.0.6-r1.ebuild b/net-misc/asterisk/asterisk-1.0.6-r1.ebuild
index 932bd0b2726a..079f11fd443d 100644
--- a/net-misc/asterisk/asterisk-1.0.6-r1.ebuild
+++ b/net-misc/asterisk/asterisk-1.0.6-r1.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.6-r1.ebuild,v 1.10 2005/09/07 23:35:53 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.6-r1.ebuild,v 1.11 2005/09/13 18:31:21 stkn Exp $
 
 inherit eutils perl-module
 
@@ -275,6 +275,9 @@ src_unpack() {
 
 	# security fix (www.portcullis-security.com/advisory/advisory-05-013.txt)
 	epatch ${FILESDIR}/1.0.0/${PN}-1.0.7-manager-cli-segv.patch
+
+	# fix segfault on amd64 and possibly other 64bit systems (#105762)
+	epatch ${FILESDIR}/1.0.0/${PN}-1.0.8-ptr64fix.diff
 }
 
 src_compile() {
diff --git a/net-misc/asterisk/asterisk-1.0.7-r1.ebuild b/net-misc/asterisk/asterisk-1.0.7-r1.ebuild
index 05273341fa5e..9efcdf18af96 100644
--- a/net-misc/asterisk/asterisk-1.0.7-r1.ebuild
+++ b/net-misc/asterisk/asterisk-1.0.7-r1.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.7-r1.ebuild,v 1.18 2005/09/07 23:35:53 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.7-r1.ebuild,v 1.19 2005/09/13 18:31:21 stkn Exp $
 
 inherit eutils perl-module
 
@@ -272,6 +272,9 @@ src_unpack() {
 
 	# security fix (www.portcullis-security.com/advisory/advisory-05-013.txt)
 	epatch ${FILESDIR}/1.0.0/${P}-manager-cli-segv.patch
+
+	# fix segfault on amd64 and possibly other 64bit systems (#105762)
+	epatch ${FILESDIR}/1.0.0/${PN}-1.0.8-ptr64fix.diff
 }
 
 src_compile() {
diff --git a/net-misc/asterisk/asterisk-1.0.8.ebuild b/net-misc/asterisk/asterisk-1.0.8.ebuild
index 779a155c4a23..190c89c8c992 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.14 2005/09/07 23:35:53 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.8.ebuild,v 1.15 2005/09/13 18:31:21 stkn Exp $
 
 inherit eutils perl-module
 
@@ -276,6 +276,9 @@ src_unpack() {
 
 	# fix callerid matching bug in dialplan
 	epatch ${FILESDIR}/1.0.0/${P}-callerid.patch
+
+	# fix segfault on amd64 and possibly other 64bit systems (#105762)
+	epatch ${FILESDIR}/1.0.0/${PN}-1.0.8-ptr64fix.diff
 }
 
 src_compile() {
diff --git a/net-misc/asterisk/asterisk-1.0.9-r1.ebuild b/net-misc/asterisk/asterisk-1.0.9-r1.ebuild
index d2c5054291a5..f20052bc36e1 100644
--- a/net-misc/asterisk/asterisk-1.0.9-r1.ebuild
+++ b/net-misc/asterisk/asterisk-1.0.9-r1.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.9-r1.ebuild,v 1.3 2005/09/07 23:35:53 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.9-r1.ebuild,v 1.4 2005/09/13 18:31:21 stkn Exp $
 
 inherit eutils perl-module
 
@@ -273,6 +273,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 segfault on amd64 and possibly other 64bit systems (#105762)
+	epatch ${FILESDIR}/1.0.0/${PN}-1.0.8-ptr64fix.diff
 }
 
 src_compile() {
diff --git a/net-misc/asterisk/asterisk-1.0.9.ebuild b/net-misc/asterisk/asterisk-1.0.9.ebuild
index 38799009f4d4..d07be0796d02 100644
--- a/net-misc/asterisk/asterisk-1.0.9.ebuild
+++ b/net-misc/asterisk/asterisk-1.0.9.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.9.ebuild,v 1.5 2005/09/07 23:35:53 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.9.ebuild,v 1.6 2005/09/13 18:31:21 stkn Exp $
 
 inherit eutils perl-module
 
@@ -273,6 +273,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 segfault on amd64 and possibly other 64bit systems (#105762)
+	epatch ${FILESDIR}/1.0.0/${PN}-1.0.8-ptr64fix.diff
 }
 
 src_compile() {
diff --git a/net-misc/asterisk/files/1.0.0/asterisk-1.0.8-ptr64fix.diff b/net-misc/asterisk/files/1.0.0/asterisk-1.0.8-ptr64fix.diff
new file mode 100644
index 000000000000..424421d7751d
--- /dev/null
+++ b/net-misc/asterisk/files/1.0.0/asterisk-1.0.8-ptr64fix.diff
@@ -0,0 +1,11 @@
+--- asterisk-1.0.8/utils.c.orig	2005-09-13 20:14:28.000000000 +0000
++++ asterisk-1.0.8/utils.c	2005-09-13 20:14:52.000000000 +0000
+@@ -399,7 +399,7 @@
+ 		offset = strstr(upper(haystack, u1, u1len), upper(needle, u2, u2len));
+ 		if (offset) {
+ 			/* Return the offset into the original string */
+-			return ((char *)((unsigned int)haystack + (unsigned int)(offset - u1)));
++			return ((char *)((unsigned long)haystack + (unsigned long)(offset - u1)));
+ 		} else {
+ 			return NULL;
+ 		}