Closing #35283

3 files changed, 23 insertions, 20 deletions

diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index 613488abac5f..920ba4740322 100644
--- a/dev-libs/openssl/ChangeLog
+++ b/dev-libs/openssl/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/openssl
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.62 2003/12/16 07:10:30 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.63 2004/01/03 22:17:18 aliz Exp $
+
+  03 Jan 2004; Daniel Ahlberg <aliz@gentoo.org> openssl-0.9.7c-r1.ebuild:
+  Better filtering of existing cflags to be replaced by our own. Closing #35283.
 
   16 Dec 2003; Joshua Kinard <kumba@gentoo.org> openssl-0.9.7c-r1.ebuild:
   Made a change to the mips detection so we can differentiate betweem mips and
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index d381d5398dc4..b4131172ce6d 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -1,26 +1,26 @@
-MD5 563dd7368da460e12bcf1aec69518bf4 ChangeLog 10793
-MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
+MD5 0c60cc74801f0e02af30f0f83863b126 openssl-0.9.7b-r3.ebuild 4829
+MD5 cad6026de56f3aaae74790092bcf4a5e openssl-0.9.6l.ebuild 3127
+MD5 9e86692a9ae2fb049f12ed1136293925 openssl-0.9.7c.ebuild 4912
 MD5 80d13b0f2af478afe5734984c282ca1a openssl-0.9.6k-r1.ebuild 3141
 MD5 45b370cc497c7366b67fc60dd26508c3 openssl-0.9.6k.ebuild 2675
-MD5 cad6026de56f3aaae74790092bcf4a5e openssl-0.9.6l.ebuild 3127
-MD5 0c60cc74801f0e02af30f0f83863b126 openssl-0.9.7b-r3.ebuild 4829
+MD5 f60a3d129f37b4bc83e510420e5261d6 openssl-0.9.7c-r1.ebuild 5911
+MD5 82656751d29ca0a920791ad37d2a4024 ChangeLog 10948
+MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
 MD5 aecada0dff75d29960c20c1a5978fe78 openssl-0.9.7b.ebuild 3358
-MD5 71124ae4a13fec2c54288197c4f965aa openssl-0.9.7c-r1.ebuild 5750
-MD5 9e86692a9ae2fb049f12ed1136293925 openssl-0.9.7c.ebuild 4912
+MD5 7483d6f0412e857e9063dce4aecf2991 files/openssl-0.9.7c-gentoo.diff 936
+MD5 cebd09d1819c07b0fab14ad90b0da884 files/openssl-0.9.6j-gentoo.diff 1591
+MD5 a5a379391dfaaef98e4fe4198ff2ed2c files/openssl-0.9.6i-blinding.patch 1717
+MD5 cebd09d1819c07b0fab14ad90b0da884 files/openssl-0.9.6k-gentoo.diff 1591
 MD5 e4af813471d470d25fb77231d324ad1c files/digest-openssl-0.9.6k 67
-MD5 e4af813471d470d25fb77231d324ad1c files/digest-openssl-0.9.6k-r1 67
 MD5 05f27ed666e4f0927ce09b79abc606b2 files/digest-openssl-0.9.6l 67
 MD5 ec3ece282da08b6e27d213ee22c00208 files/digest-openssl-0.9.7b 67
-MD5 55db5f2d56b9146b7d7cae1353a0e0c4 files/digest-openssl-0.9.7b-r3 134
 MD5 8ad6215b1b4c9d53c435ceff6b537e35 files/digest-openssl-0.9.7c 134
+MD5 7483d6f0412e857e9063dce4aecf2991 files/openssl-0.9.7a-gentoo.diff 936
+MD5 cebd09d1819c07b0fab14ad90b0da884 files/openssl-0.9.6l-gentoo.diff 1591
+MD5 e4af813471d470d25fb77231d324ad1c files/digest-openssl-0.9.6k-r1 67
+MD5 55db5f2d56b9146b7d7cae1353a0e0c4 files/digest-openssl-0.9.7b-r3 134
 MD5 f8b9ae9e3ed08f964620aa832aec4d0c files/digest-openssl-0.9.7c-r1 134
-MD5 b901850df9952252974316e78775673b files/openssl-0.9.6-mips.diff 1487
-MD5 a5a379391dfaaef98e4fe4198ff2ed2c files/openssl-0.9.6i-blinding.patch 1717
+MD5 7483d6f0412e857e9063dce4aecf2991 files/openssl-0.9.7b-gentoo.diff 936
 MD5 cebd09d1819c07b0fab14ad90b0da884 files/openssl-0.9.6i-gentoo.diff 1591
 MD5 e47009f3748b8b56f2a2859405dc1b41 files/openssl-0.9.6i-klima_pokorny_rosa_attack.patch 2144
-MD5 cebd09d1819c07b0fab14ad90b0da884 files/openssl-0.9.6j-gentoo.diff 1591
-MD5 cebd09d1819c07b0fab14ad90b0da884 files/openssl-0.9.6k-gentoo.diff 1591
-MD5 cebd09d1819c07b0fab14ad90b0da884 files/openssl-0.9.6l-gentoo.diff 1591
-MD5 7483d6f0412e857e9063dce4aecf2991 files/openssl-0.9.7a-gentoo.diff 936
-MD5 7483d6f0412e857e9063dce4aecf2991 files/openssl-0.9.7b-gentoo.diff 936
-MD5 7483d6f0412e857e9063dce4aecf2991 files/openssl-0.9.7c-gentoo.diff 936
+MD5 b901850df9952252974316e78775673b files/openssl-0.9.6-mips.diff 1487
diff --git a/dev-libs/openssl/openssl-0.9.7c-r1.ebuild b/dev-libs/openssl/openssl-0.9.7c-r1.ebuild
index d5bfccf18b4e..f0a2ccf16f91 100644
--- a/dev-libs/openssl/openssl-0.9.7c-r1.ebuild
+++ b/dev-libs/openssl/openssl-0.9.7c-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.7c-r1.ebuild,v 1.9 2003/12/23 23:29:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.7c-r1.ebuild,v 1.10 2004/01/03 22:17:18 aliz Exp $
 
 inherit eutils flag-o-matic gcc
 
@@ -48,7 +48,7 @@ src_unpack() {
 	if [ "$(gcc-version)" == "3.3" ] || [ "$(gcc-version)" == "3.2" ] ; then
 		filter-flags -fprefetch-loop-arrays
 	fi
-	sed -i -e "s/-O3/$CFLAGS/" -e "s/-m486//" Configure
+	sed -i -r -e "s/-O[23]/$CFLAGS/" -e "s/-fomit-frame-pointer//" -e "s/-mcpu=[a-z0-9]+//" -e "s/-m486//" Configure
 
 	# openssl-0.9.6
 	test -f ${ROOT}/usr/lib/libssl.so.0.9.6 && {
@@ -75,7 +75,7 @@ src_unpack() {
 			sed -i -e 's/parisc-\*-linux2/parisc\*-\*-linux2/' config
 		esac
 
-		sed -i -e "s/-O3/$CFLAGS/" -e "s/-m486//" Configure
+		sed -i -e "s/-O[23]/$CFLAGS/" -e "s/-fomit-frame-pointer//" -e -r "s/\-mcpu=[a-z0-9]+//" -e "s/-m486//" Configure
 	}
 }