Starting and hopefully ending with 5.8.7 we observe stack corruption with the regexp handling in perls DynaLoader code with ssp enabled. This become fatal during compile time so we temporally disable ssp on two regexp files till upstream has a chance to work it out. Bug #97452

(Portage version: 2.0.51.22-r1)

3 files changed, 34 insertions, 27 deletions

diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index 4f0c931ba38b..10dea2d69dc4 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -1,34 +1,25 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
-MD5 f2d6b99bd0307c716bc9f03415b288e9 perl-5.8.7.ebuild 17371
+MD5 9c06e3e76fa64e7d2ba6b5ef2fd51a39 perl-5.8.7.ebuild 17713
 MD5 5d7c3da969ca30862b27913e23af8734 perl-5.8.6-r5.ebuild 17619
 MD5 833076961417fc2b1dcd57f93277de87 ChangeLog 41185
+MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
 MD5 26a1e7c48c7f68f39db4262500f6a1d8 files/perl-5.8.7-tempfiles.patch 1007
+MD5 319b56a7ce715fb7a494fe4d5cb9474c files/perl-picdl.patch 250
 MD5 f98759a75347e0b54190850b8295c2cb files/perl-tempfiles.patch 2023
-MD5 c2612d59f380ad6e0c2de4d941e83dfd files/perl-cleaner 8879
-MD5 ce442db939c59218a16be167f793b817 files/perl-uclibc.patch 573
-MD5 076dcbef37263d6dd7af719b55cfc2de files/perl-noksh.patch 611
-MD5 2bd41aec5e22962224dc9376e27bdde3 files/CAN-2005-0448-rmtree.patch 7629
-MD5 fd8a46de4b22dbf9146a6d0459e812c4 files/perl-5.8.7-CAN-2005-0448-rmtree.patch 6961
-MD5 0a07934d74ccb1133cf0f3650cb94efc files/digest-perl-5.8.6-r5 64
 MD5 f7324a62f22aabde3387b7e8a8b2106e files/perl-reorder-INC.patch 1141
-MD5 319b56a7ce715fb7a494fe4d5cb9474c files/perl-picdl.patch 250
-MD5 01af75daf3d222a668059e90d78a1f9d files/perl-nonblock.patch 400
-MD5 c5cc36940b2488a37c3dc2287f6e672c files/perl-5.8.6-tempfiles.patch 2115
-MD5 0a28eb41f5f12ed54f025004af45c83d files/perl-perldoc-emptydirs.patch 489
 MD5 4e99f7529e149661372283c981cf17ff files/perl-prelink-lpthread.patch 476
-MD5 c10e44e47d7f702efe7d4009064a97ca files/digest-perl-5.8.7 64
+MD5 076dcbef37263d6dd7af719b55cfc2de files/perl-noksh.patch 611
+MD5 01af75daf3d222a668059e90d78a1f9d files/perl-nonblock.patch 400
 MD5 bd75f0242e3b7791803d089c38a3f920 files/CAN-2005-0156-suid.patch 703
-MD5 154013a841cbb251d7b63fb006b4006f files/file_path_rmtree.patch 1068
+MD5 c2612d59f380ad6e0c2de4d941e83dfd files/perl-cleaner 8879
 MD5 5dfd23c2236b382d031a9513bc12f3f1 files/perl-5.8.5-tempfiles.patch 2113
-MD5 44e1f1420947cc552c66fb434ba4c855 files/perl-5.8.4-NDBM-GDBM-compat.patch 428
+MD5 0a28eb41f5f12ed54f025004af45c83d files/perl-perldoc-emptydirs.patch 489
+MD5 c10e44e47d7f702efe7d4009064a97ca files/digest-perl-5.8.7 64
+MD5 fd8a46de4b22dbf9146a6d0459e812c4 files/perl-5.8.7-CAN-2005-0448-rmtree.patch 6961
+MD5 ce442db939c59218a16be167f793b817 files/perl-uclibc.patch 573
+MD5 c5cc36940b2488a37c3dc2287f6e672c files/perl-5.8.6-tempfiles.patch 2115
+MD5 2bd41aec5e22962224dc9376e27bdde3 files/CAN-2005-0448-rmtree.patch 7629
+MD5 0a07934d74ccb1133cf0f3650cb94efc files/digest-perl-5.8.6-r5 64
 MD5 060e9f10466fdc1268c75a7cf4dcbc7c files/perl-h2ph-ansi-header.patch 446
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC7oTDgIKl8Uu19MoRApjKAJ4kyvurznXc970++ksUCzW8pPj7LgCfWmGG
-a0ugsY3XIHT0S3+lXuA1Etc=
-=myVZ
------END PGP SIGNATURE-----
+MD5 ec653227d62631d790aed48ee7ccf3dd files/perl-5.8.7-regexp-nossp.patch 458
+MD5 44e1f1420947cc552c66fb434ba4c855 files/perl-5.8.4-NDBM-GDBM-compat.patch 428
+MD5 154013a841cbb251d7b63fb006b4006f files/file_path_rmtree.patch 1068
diff --git a/dev-lang/perl/files/perl-5.8.7-regexp-nossp.patch b/dev-lang/perl/files/perl-5.8.7-regexp-nossp.patch
new file mode 100644
index 000000000000..f06e9ec93b31
--- /dev/null
+++ b/dev-lang/perl/files/perl-5.8.7-regexp-nossp.patch
@@ -0,0 +1,11 @@
+--- cflags.SH.orig	2005-07-03 23:39:10.000000000 -0400
++++ cflags.SH	2005-07-03 23:39:47.000000000 -0400
+@@ -165,6 +165,8 @@
+ esac
+ 
+     : Can we perhaps use $ansi2knr here
++    [[ $file == regcomp ]] && export ccflags="${ccflags} -fno-stack-protector"
++    [[ $file == regexec ]] && export ccflags="${ccflags} -fno-stack-protector"
+     echo "$cc -c -DPERL_CORE $ccflags $optimize $warn"
+     eval "$also "'"$cc -DPERL_CORE -c $ccflags $optimize $warn"'
+ 
diff --git a/dev-lang/perl/perl-5.8.7.ebuild b/dev-lang/perl/perl-5.8.7.ebuild
index 3e38cf232d0c..3076282fd817 100644
--- a/dev-lang/perl/perl-5.8.7.ebuild
+++ b/dev-lang/perl/perl-5.8.7.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/dev-lang/perl/perl-5.8.7.ebuild,v 1.2 2005/08/01 20:23:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.7.ebuild,v 1.3 2005/08/04 02:51:27 solar Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -115,7 +115,12 @@ src_unpack() {
 
 	epatch ${FILESDIR}/${P}-tempfiles.patch
 
-
+	# Starting and hopefully ending with 5.8.7 we observe stack 
+	# corruption with the regexp handling in perls DynaLoader code 
+	# with ssp enabled. This become fatal during compile time so we 
+	# temporally disable ssp on two regexp files till upstream has a 
+	# chance to work it out. Bug #97452
+	epatch "${FILESDIR}"/${P}-regexp-nossp.patch
 }
 
 src_configure() {