Fix segfault on amd64 caused by wrong data-type in pointer arithmetic (#105762),...

Package-Manager: portage-2.0.51.22-r2

diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index 73c58e5a899432cfbcc4be1711d8ec91ded19dd7..af9ab55561b31c88aa02d76e7fc7354c2638b961 100644 (file)
--- 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 ab97f9254ca5fe97c9312295c5ec82eaaf06706a..c06fcee019cf7b8598606dbd612b5ab0f8ce32dc 100644 (file)
--- 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 932bd0b2726a321a714f96f4d1f0719f6ed41c59..079f11fd443df944a125b631e08b3a6551e8dd06 100644 (file)
--- 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 05273341fa5e1b466101ab0d16ce85594dd63143..9efcdf18af96f93acf9ea8e963e2ab488efa8850 100644 (file)
--- 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 779a155c4a235f396b1684ade7cc45c2c50e6f59..190c89c8c992febe1b869d848adb5285abfd25a0 100644 (file)
--- 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 d2c5054291a512a510b0b2c93c5593f4843c65f3..f20052bc36e112d489d9b3f71f464346f1472fb5 100644 (file)
--- 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 38799009f4d40b19dec3117e5cf5070d0bc776c7..d07be0796d024adeb6b86c11981d43afa7fce19f 100644 (file)
--- 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 (file)
index 0000000..424421d
--- /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;
+               }