summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-02-12 22:12:03 +0000
committerMike Frysinger <vapier@gentoo.org>2006-02-12 22:12:03 +0000
commita68783c72583666f38f59db4f4f2f5694ada6932 (patch)
treeae36a4c052e25410fdb349c9506f77c8578cb02f /dev-libs/openssl
parentPatch by Tim Yamin to fix security issues #121605. (diff)
downloadgentoo-2-a68783c72583666f38f59db4f4f2f5694ada6932.tar.gz
gentoo-2-a68783c72583666f38f59db4f4f2f5694ada6932.tar.bz2
gentoo-2-a68783c72583666f38f59db4f4f2f5694ada6932.zip
Run sed in LC_ALL=C in order to fix [a-z] in funky locales #122554 by Erkki Eilonen.
(Portage version: 2.1_pre4-r1)
Diffstat (limited to 'dev-libs/openssl')
-rw-r--r--dev-libs/openssl/ChangeLog7
-rw-r--r--dev-libs/openssl/openssl-0.9.7i.ebuild4
-rw-r--r--dev-libs/openssl/openssl-0.9.8a.ebuild4
3 files changed, 10 insertions, 5 deletions
diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index b92ee185bbe3..892235e95600 100644
--- a/dev-libs/openssl/ChangeLog
+++ b/dev-libs/openssl/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-libs/openssl
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.150 2006/02/09 13:40:52 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.151 2006/02/12 22:12:03 vapier Exp $
+
+ 12 Feb 2006; Mike Frysinger <vapier@gentoo.org> openssl-0.9.7i.ebuild,
+ openssl-0.9.8a.ebuild:
+ Run sed in LC_ALL=C in order to fix [a-z] in funky locales #122554 by Erkki
+ Eilonen.
09 Feb 2006; Simon Stelling <blubb@gentoo.org> openssl-0.9.7e-r2.ebuild,
openssl-0.9.7i.ebuild:
diff --git a/dev-libs/openssl/openssl-0.9.7i.ebuild b/dev-libs/openssl/openssl-0.9.7i.ebuild
index 4939612416e9..de4b4863e3e5 100644
--- a/dev-libs/openssl/openssl-0.9.7i.ebuild
+++ b/dev-libs/openssl/openssl-0.9.7i.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.7i.ebuild,v 1.17 2006/02/09 09:56:07 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.7i.ebuild,v 1.18 2006/02/12 22:12:03 vapier Exp $
inherit eutils flag-o-matic toolchain-funcs
@@ -60,7 +60,7 @@ src_unpack() {
for a in $( grep -n -e "^\"linux-" Configure ); do
LINE=$( echo $a | awk -F: '{print $1}' )
CUR_CFLAGS=$( echo $a | awk -F: '{print $3}' )
- NEW_CFLAGS=$(echo $CUR_CFLAGS | sed -r -e "s|-O[23]||" -e "s:-fomit-frame-pointer::" -e "s:-mcpu=[-a-z0-9]+::" -e "s:-m486::")
+ NEW_CFLAGS=$(echo $CUR_CFLAGS | LC_ALL=C sed -r -e "s|-O[23]||" -e "s:-fomit-frame-pointer::" -e "s:-mcpu=[-a-z0-9]+::" -e "s:-m486::")
# ppc64's current toolchain sucks at optimization and will break this package
[[ $(tc-arch) != "ppc64" ]] && NEW_CFLAGS="${NEW_CFLAGS} ${CFLAGS}"
diff --git a/dev-libs/openssl/openssl-0.9.8a.ebuild b/dev-libs/openssl/openssl-0.9.8a.ebuild
index 24751d606e02..d4df219aca3e 100644
--- a/dev-libs/openssl/openssl-0.9.8a.ebuild
+++ b/dev-libs/openssl/openssl-0.9.8a.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8a.ebuild,v 1.3 2006/01/06 01:06:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8a.ebuild,v 1.4 2006/02/12 22:12:03 vapier Exp $
inherit eutils flag-o-matic toolchain-funcs
@@ -86,7 +86,7 @@ src_compile() {
|| die "Configure failed"
# Clean out hardcoded flags that openssl uses
- local CFLAG=$(grep ^CFLAG= Makefile | sed \
+ local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
-e 's:^CFLAG=::' \
-e 's:-fomit-frame-pointer ::g' \
-e 's:-O[0-9] ::g' \