diff options
author | Michael Cummings <mcummings@gentoo.org> | 2005-12-14 11:18:04 +0000 |
---|---|---|
committer | Michael Cummings <mcummings@gentoo.org> | 2005-12-14 11:18:04 +0000 |
commit | 20a4c735cd41e867eace9af4c74728b12e0a6ffb (patch) | |
tree | 06fbce2896b37162748a5aa7de246c1c3d96e7cc /dev-lang | |
parent | fix digest (diff) | |
download | historical-20a4c735cd41e867eace9af4c74728b12e0a6ffb.tar.gz historical-20a4c735cd41e867eace9af4c74728b12e0a6ffb.tar.bz2 historical-20a4c735cd41e867eace9af4c74728b12e0a6ffb.zip |
Bug 115503, better if-clause for nossp patch
Package-Manager: portage-2.0.53
Diffstat (limited to 'dev-lang')
-rw-r--r-- | dev-lang/perl/ChangeLog | 5 | ||||
-rw-r--r-- | dev-lang/perl/Manifest | 10 | ||||
-rw-r--r-- | dev-lang/perl/perl-5.8.7-r3.ebuild | 5 |
3 files changed, 12 insertions, 8 deletions
diff --git a/dev-lang/perl/ChangeLog b/dev-lang/perl/ChangeLog index b101c6bce9e2..fcd52e0a3b15 100644 --- a/dev-lang/perl/ChangeLog +++ b/dev-lang/perl/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-lang/perl # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.180 2005/12/07 04:23:35 weeve Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.181 2005/12/14 11:18:04 mcummings Exp $ + + 14 Dec 2005; <mcumming@gentoo.org> perl-5.8.7-r3.ebuild: + Bug 115503, better if-clause for nossp patch 07 Dec 2005; Jason Wever <weeve@gentoo.org> perl-5.8.7-r3.ebuild: Stable on SPARC wrt bug #114113. diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest index e27133f9c91c..0ddef8be42b8 100644 --- a/dev-lang/perl/Manifest +++ b/dev-lang/perl/Manifest @@ -1,7 +1,7 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 7caba75f5e2cf41d6716e482de87c9fb ChangeLog 46384 +MD5 0a27636161224312efdf8683bc7ff1b9 ChangeLog 46495 MD5 bd75f0242e3b7791803d089c38a3f920 files/CAN-2005-0156-suid.patch 703 MD5 2bd41aec5e22962224dc9376e27bdde3 files/CAN-2005-0448-rmtree.patch 7629 MD5 0a07934d74ccb1133cf0f3650cb94efc files/digest-perl-5.8.6-r5 64 @@ -38,12 +38,12 @@ MD5 45b2cc80281b071a098c2ec40818e19e perl-5.8.6-r7.ebuild 18104 MD5 c965af8e48a9c22189eba01ffdbb391d perl-5.8.6-r8.ebuild 18101 MD5 36f0bd0344966231663c7d99c94d3997 perl-5.8.7-r1.ebuild 19456 MD5 3f172d664435893f2cfaaf21865c6cb7 perl-5.8.7-r2.ebuild 19525 -MD5 0de183d7ca120aa0607591e33b1c7450 perl-5.8.7-r3.ebuild 19520 +MD5 c8f911c2825c07a2bf16bbd835bb8283 perl-5.8.7-r3.ebuild 19552 MD5 8617318edb0a9de62024383369894fd2 perl-5.8.7.ebuild 19224 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFDmuxzgIKl8Uu19MoRAiRPAJ44CIUhOhLIHxP92RMWtE1StQSUVACdF2Zy -PuZ7UMKSHnFdRUTy2IxlDKk= -=Q4oO +iD8DBQFDn/91tG5z4I8BtQoRArP+AJ9MLqkEy9VhvhO7tapaAibE8ZKaogCfePq8 +xR+fzQ1ozYFByKfeeHRkGyo= +=pzoM -----END PGP SIGNATURE----- diff --git a/dev-lang/perl/perl-5.8.7-r3.ebuild b/dev-lang/perl/perl-5.8.7-r3.ebuild index d5b38b476707..26ec968f239b 100644 --- a/dev-lang/perl/perl-5.8.7-r3.ebuild +++ b/dev-lang/perl/perl-5.8.7-r3.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-r3.ebuild,v 1.5 2005/12/07 04:23:35 weeve Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.7-r3.ebuild,v 1.6 2005/12/14 11:18:04 mcummings Exp $ inherit eutils flag-o-matic toolchain-funcs multilib @@ -126,7 +126,8 @@ src_unpack() { # 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 - use userland_Darwin || epatch "${FILESDIR}"/${P}-regexp-nossp.patch + [[ -n $(test-flags -fno-stack-protector) ]] && \ + epatch "${FILESDIR}"/${P}-regexp-nossp.patch # Bug 114113 cd ${S}; epatch ${FILESDIR}/perl-exp_intwrap.patch |