Cleanup and security update

22 files changed, 101 insertions, 644 deletions

diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index bdc7086365a7..6af3c70f4f85 100644
--- a/dev-libs/openssl/ChangeLog
+++ b/dev-libs/openssl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/openssl
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.74 2004/03/01 20:39:49 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.75 2004/03/17 17:19:01 aliz Exp $
+
+*openssl-0.9.6m (17 Mar 2004)
+*openssl-0.9.7d (17 Mar 2004)
+
+  17 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> openssl-0.9.7d.ebuild,
+  openssl-0.9.6m.ebuild:
+  Security update, also removed some old ebuilds.
 
   01 Mar 2004; Tom Gall <tgall@gentoo.org> openssl-0.9.7c-r1.ebuild:
   remove call to make test for ppc64 for now. This is problematic, as
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index a5f8f8a20e0c..ca2503d84e97 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -1,26 +1,14 @@
-MD5 2277ec004aa752edb2d1d837c7ee46d8 ChangeLog 12686
-MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
-MD5 5242f3a3342adc7ff735fe33a3670a02 openssl-0.9.6k-r1.ebuild 3138
-MD5 88db32539344e1dbcb1c7a01b157e42f openssl-0.9.6k.ebuild 2673
-MD5 dd1e5fcf8dc3317e9881b7205fe234d2 openssl-0.9.6l.ebuild 3124
-MD5 a781ba3f700b1adbad5fe120b6f2bdd7 openssl-0.9.7b-r3.ebuild 4868
-MD5 ec7a1eacd02ccf831b65bd76a4faed51 openssl-0.9.7b.ebuild 3358
-MD5 e9606f19854cb22f065be4da763b2590 openssl-0.9.7c-r1.ebuild 7035
+MD5 7522f9b818e85f0a78d8adf6071e64d5 openssl-0.9.7d.ebuild 7039
 MD5 4b52bb928caf7f4d8d7a31248986f556 openssl-0.9.7c.ebuild 4951
-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 0d5072939f27a2860b204f207e799d63 openssl-0.9.7c-r1.ebuild 7039
+MD5 c969aed7ff728189eefa7a302a7e7ab4 ChangeLog 12894
+MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
+MD5 dd1e5fcf8dc3317e9881b7205fe234d2 openssl-0.9.6m.ebuild 3124
+MD5 7483d6f0412e857e9063dce4aecf2991 files/openssl-0.9.7c-gentoo.diff 936
+MD5 7483d6f0412e857e9063dce4aecf2991 files/openssl-0.9.7d-gentoo.diff 936
+MD5 2e6ed24d513a8f2b1b6f03709ab5ba18 files/digest-openssl-0.9.6m 67
 MD5 8ad6215b1b4c9d53c435ceff6b537e35 files/digest-openssl-0.9.7c 134
+MD5 897d293325315cdeeb390745ed5cdd1b files/digest-openssl-0.9.7d 134
 MD5 f8b9ae9e3ed08f964620aa832aec4d0c files/digest-openssl-0.9.7c-r1 134
+MD5 cebd09d1819c07b0fab14ad90b0da884 files/openssl-0.9.6m-gentoo.diff 1591
 MD5 b901850df9952252974316e78775673b files/openssl-0.9.6-mips.diff 1487
-MD5 a5a379391dfaaef98e4fe4198ff2ed2c files/openssl-0.9.6i-blinding.patch 1717
-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
diff --git a/dev-libs/openssl/files/digest-openssl-0.9.6k b/dev-libs/openssl/files/digest-openssl-0.9.6k
deleted file mode 100644
index 86e5198e9d5b..000000000000
--- a/dev-libs/openssl/files/digest-openssl-0.9.6k
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dee92f648a02e4a7db0507ab3d0769c6 openssl-0.9.6k.tar.gz 2183608
diff --git a/dev-libs/openssl/files/digest-openssl-0.9.6k-r1 b/dev-libs/openssl/files/digest-openssl-0.9.6k-r1
deleted file mode 100644
index 86e5198e9d5b..000000000000
--- a/dev-libs/openssl/files/digest-openssl-0.9.6k-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dee92f648a02e4a7db0507ab3d0769c6 openssl-0.9.6k.tar.gz 2183608
diff --git a/dev-libs/openssl/files/digest-openssl-0.9.6l b/dev-libs/openssl/files/digest-openssl-0.9.6l
deleted file mode 100644
index dc14d5ce96cf..000000000000
--- a/dev-libs/openssl/files/digest-openssl-0.9.6l
+++ /dev/null
@@ -1 +0,0 @@
-MD5 843a65ddc56634f0e30a4f9474bb5b27 openssl-0.9.6l.tar.gz 2183726
diff --git a/dev-libs/openssl/files/digest-openssl-0.9.6m b/dev-libs/openssl/files/digest-openssl-0.9.6m
new file mode 100644
index 000000000000..85e51dfc6407
--- /dev/null
+++ b/dev-libs/openssl/files/digest-openssl-0.9.6m
@@ -0,0 +1 @@
+MD5 1b63bfdca1c37837dddde9f1623498f9 openssl-0.9.6m.tar.gz 2184918
diff --git a/dev-libs/openssl/files/digest-openssl-0.9.7b b/dev-libs/openssl/files/digest-openssl-0.9.7b
deleted file mode 100644
index 66cf2a4306da..000000000000
--- a/dev-libs/openssl/files/digest-openssl-0.9.7b
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fae4bec090fa78e20f09d76d55b6ccff openssl-0.9.7b.tar.gz 2784331
diff --git a/dev-libs/openssl/files/digest-openssl-0.9.7b-r3 b/dev-libs/openssl/files/digest-openssl-0.9.7b-r3
deleted file mode 100644
index e4517ebe6214..000000000000
--- a/dev-libs/openssl/files/digest-openssl-0.9.7b-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 fae4bec090fa78e20f09d76d55b6ccff openssl-0.9.7b.tar.gz 2784331
-MD5 52ea996e52bcea5120f193f51469bbb1 openssl-0.9.6j.tar.gz 2182643
diff --git a/dev-libs/openssl/files/digest-openssl-0.9.7d b/dev-libs/openssl/files/digest-openssl-0.9.7d
new file mode 100644
index 000000000000..53244e8e53f6
--- /dev/null
+++ b/dev-libs/openssl/files/digest-openssl-0.9.7d
@@ -0,0 +1,2 @@
+MD5 1b49e90fc8a75c3a507c0a624529aca5 openssl-0.9.7d.tar.gz 2798433
+MD5 1b63bfdca1c37837dddde9f1623498f9 openssl-0.9.6m.tar.gz 2184918
diff --git a/dev-libs/openssl/files/openssl-0.9.6i-blinding.patch b/dev-libs/openssl/files/openssl-0.9.6i-blinding.patch
deleted file mode 100644
index 299ba83592fb..000000000000
--- a/dev-libs/openssl/files/openssl-0.9.6i-blinding.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- crypto/rsa/rsa_eay.c	30 Jan 2003 17:37:46 -0000	1.28.2.3
-+++ crypto/rsa/rsa_eay.c	16 Mar 2003 10:34:13 -0000
-@@ -195,6 +195,25 @@
- 	return(r);
- 	}
- 
-+static int rsa_eay_blinding(RSA *rsa, BN_CTX *ctx)
-+	{
-+	int ret = 1;
-+	CRYPTO_w_lock(CRYPTO_LOCK_RSA);
-+	/* Check again inside the lock - the macro's check is racey */
-+	if(rsa->blinding == NULL)
-+		ret = RSA_blinding_on(rsa, ctx);
-+	CRYPTO_w_unlock(CRYPTO_LOCK_RSA);
-+	return ret;
-+	}
-+
-+#define BLINDING_HELPER(rsa, ctx, err_instr) \
-+	do { \
-+		if(((rsa)->flags & RSA_FLAG_BLINDING) && \
-+				((rsa)->blinding == NULL) && \
-+				!rsa_eay_blinding(rsa, ctx)) \
-+			err_instr \
-+	} while(0)
-+
- /* signing */
- static int RSA_eay_private_encrypt(int flen, const unsigned char *from,
- 	     unsigned char *to, RSA *rsa, int padding)
-@@ -239,8 +258,8 @@
- 		goto err;
- 		}
- 
--	if ((rsa->flags & RSA_FLAG_BLINDING) && (rsa->blinding == NULL))
--		RSA_blinding_on(rsa,ctx);
-+	BLINDING_HELPER(rsa, ctx, goto err;);
-+
- 	if (rsa->flags & RSA_FLAG_BLINDING)
- 		if (!BN_BLINDING_convert(&f,rsa->blinding,ctx)) goto err;
- 
-@@ -318,8 +337,8 @@
- 		goto err;
- 		}
- 
--	if ((rsa->flags & RSA_FLAG_BLINDING) && (rsa->blinding == NULL))
--		RSA_blinding_on(rsa,ctx);
-+	BLINDING_HELPER(rsa, ctx, goto err;);
-+
- 	if (rsa->flags & RSA_FLAG_BLINDING)
- 		if (!BN_BLINDING_convert(&f,rsa->blinding,ctx)) goto err;
-
---- crypto/rsa/rsa_lib.c	30 Jan 2003 17:37:46 -0000	1.30.2.2
-+++ crypto/rsa/rsa_lib.c	16 Mar 2003 10:34:13 -0000
-@@ -72,7 +72,13 @@
- 
- RSA *RSA_new(void)
- 	{
--	return(RSA_new_method(NULL));
-+	RSA *r=RSA_new_method(NULL);
-+
-+#ifndef OPENSSL_NO_FORCE_RSA_BLINDING
-+	r->flags|=RSA_FLAG_BLINDING;
-+#endif
-+
-+	return r;
- 	}
- 
- void RSA_set_default_method(const RSA_METHOD *meth)
diff --git a/dev-libs/openssl/files/openssl-0.9.6i-klima_pokorny_rosa_attack.patch b/dev-libs/openssl/files/openssl-0.9.6i-klima_pokorny_rosa_attack.patch
deleted file mode 100644
index d43c9a090a72..000000000000
--- a/dev-libs/openssl/files/openssl-0.9.6i-klima_pokorny_rosa_attack.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- ssl/s3_srvr.c	29 Nov 2002 11:31:51 -0000	1.85.2.14
-+++ ssl/s3_srvr.c	19 Mar 2003 18:00:00 -0000
-@@ -1447,7 +1447,7 @@
- 		if (i != SSL_MAX_MASTER_KEY_LENGTH)
- 			{
- 			al=SSL_AD_DECODE_ERROR;
--			SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_BAD_RSA_DECRYPT);
-+			/* SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_BAD_RSA_DECRYPT); */
- 			}
-
- 		if ((al == -1) && !((p[0] == (s->client_version>>8)) && (p[1] == (s->client_version & 0xff))))
-@@ -1463,30 +1463,29 @@
- 				(p[0] == (s->version>>8)) && (p[1] == (s->version & 0xff))))
- 				{
- 				al=SSL_AD_DECODE_ERROR;
--				SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_BAD_PROTOCOL_VERSION_NUMBER);
--				goto f_err;
-+				/* SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_BAD_PROTOCOL_VERSION_NUMBER); */
-+
-+				/* The Klima-Pokorny-Rosa extension of Bleichenbacher's attack
-+				 * (http://eprint.iacr.org/2003/052/) exploits the version
-+				 * number check as a "bad version oracle" -- an alert would
-+				 * reveal that the plaintext corresponding to some ciphertext
-+				 * made up by the adversary is properly formatted except
-+				 * that the version number is wrong.  To avoid such attacks,
-+				 * we should treat this just like any other decryption error. */
-+				p[0] = (char)(int) "CAN-2003-0131 patch 2003-03-19";
- 				}
- 			}
-
- 		if (al != -1)
- 			{
--#if 0
--			goto f_err;
--#else
- 			/* Some decryption failure -- use random value instead as countermeasure
- 			 * against Bleichenbacher's attack on PKCS #1 v1.5 RSA padding
--			 * (see RFC 2246, section 7.4.7.1).
--			 * But note that due to length and protocol version checking, the
--			 * attack is impractical anyway (see section 5 in D. Bleichenbacher:
--			 * "Chosen Ciphertext Attacks Against Protocols Based on the RSA
--			 * Encryption Standard PKCS #1", CRYPTO '98, LNCS 1462, pp. 1-12).
--			 */
-+			 * (see RFC 2246, section 7.4.7.1). */
- 			ERR_clear_error();
- 			i = SSL_MAX_MASTER_KEY_LENGTH;
- 			p[0] = s->client_version >> 8;
- 			p[1] = s->client_version & 0xff;
- 			RAND_pseudo_bytes(p+2, i-2); /* should be RAND_bytes, but we cannot work around a failure */
--#endif
- 			}
-
- 		s->session->master_key_length=
diff --git a/dev-libs/openssl/files/openssl-0.9.6j-gentoo.diff b/dev-libs/openssl/files/openssl-0.9.6j-gentoo.diff
deleted file mode 100644
index 4a1632f50a4f..000000000000
--- a/dev-libs/openssl/files/openssl-0.9.6j-gentoo.diff
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -r -c -C 2 openssl-0.9.6g-orig/crypto/des/fcrypt.c openssl-0.9.6g/crypto/des/fcrypt.c
-*** openssl-0.9.6g-orig/crypto/des/fcrypt.c	Thu Sep 26 15:20:47 2002
---- openssl-0.9.6g/crypto/des/fcrypt.c	Thu Sep 26 15:21:24 2002
-***************
-*** 62,66 ****
-  	DES_LONG Eswap0, DES_LONG Eswap1);
-  
-! #if !defined(PERL5) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(_DARWIN)
-  char *crypt(const char *buf, const char *salt)
-  	{
---- 62,66 ----
-  	DES_LONG Eswap0, DES_LONG Eswap1);
-  
-! #if !defined(PERL5) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(_DARWIN) && !defined(__GLIBC__)
-  char *crypt(const char *buf, const char *salt)
-  	{
-diff -r -c -C 2 openssl-0.9.6g-orig/test/Makefile openssl-0.9.6g/test/Makefile
-*** openssl-0.9.6g-orig/test/Makefile	Thu Sep 26 15:20:47 2002
---- openssl-0.9.6g/test/Makefile	Thu Sep 26 15:23:26 2002
-***************
-*** 28,32 ****
-  DLIBCRYPTO= ../libcrypto.a
-  DLIBSSL= ../libssl.a
-! LIBCRYPTO= -L.. -lcrypto
-  LIBSSL= -L.. -lssl
-  
---- 28,32 ----
-  DLIBCRYPTO= ../libcrypto.a
-  DLIBSSL= ../libssl.a
-! LIBCRYPTO= -L.. -lcrypto -lcrypt
-  LIBSSL= -L.. -lssl
-  
-diff -r -c -C 2 openssl-0.9.6g-orig/test/Makefile.ssl openssl-0.9.6g/test/Makefile.ssl
-*** openssl-0.9.6g-orig/test/Makefile.ssl	Thu Sep 26 15:20:47 2002
---- openssl-0.9.6g/test/Makefile.ssl	Thu Sep 26 15:23:26 2002
-***************
-*** 28,32 ****
-  DLIBCRYPTO= ../libcrypto.a
-  DLIBSSL= ../libssl.a
-! LIBCRYPTO= -L.. -lcrypto
-  LIBSSL= -L.. -lssl
-  
---- 28,32 ----
-  DLIBCRYPTO= ../libcrypto.a
-  DLIBSSL= ../libssl.a
-! LIBCRYPTO= -L.. -lcrypto -lcrypt
-  LIBSSL= -L.. -lssl
-  
diff --git a/dev-libs/openssl/files/openssl-0.9.6k-gentoo.diff b/dev-libs/openssl/files/openssl-0.9.6k-gentoo.diff
deleted file mode 100644
index 4a1632f50a4f..000000000000
--- a/dev-libs/openssl/files/openssl-0.9.6k-gentoo.diff
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -r -c -C 2 openssl-0.9.6g-orig/crypto/des/fcrypt.c openssl-0.9.6g/crypto/des/fcrypt.c
-*** openssl-0.9.6g-orig/crypto/des/fcrypt.c	Thu Sep 26 15:20:47 2002
---- openssl-0.9.6g/crypto/des/fcrypt.c	Thu Sep 26 15:21:24 2002
-***************
-*** 62,66 ****
-  	DES_LONG Eswap0, DES_LONG Eswap1);
-  
-! #if !defined(PERL5) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(_DARWIN)
-  char *crypt(const char *buf, const char *salt)
-  	{
---- 62,66 ----
-  	DES_LONG Eswap0, DES_LONG Eswap1);
-  
-! #if !defined(PERL5) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(_DARWIN) && !defined(__GLIBC__)
-  char *crypt(const char *buf, const char *salt)
-  	{
-diff -r -c -C 2 openssl-0.9.6g-orig/test/Makefile openssl-0.9.6g/test/Makefile
-*** openssl-0.9.6g-orig/test/Makefile	Thu Sep 26 15:20:47 2002
---- openssl-0.9.6g/test/Makefile	Thu Sep 26 15:23:26 2002
-***************
-*** 28,32 ****
-  DLIBCRYPTO= ../libcrypto.a
-  DLIBSSL= ../libssl.a
-! LIBCRYPTO= -L.. -lcrypto
-  LIBSSL= -L.. -lssl
-  
---- 28,32 ----
-  DLIBCRYPTO= ../libcrypto.a
-  DLIBSSL= ../libssl.a
-! LIBCRYPTO= -L.. -lcrypto -lcrypt
-  LIBSSL= -L.. -lssl
-  
-diff -r -c -C 2 openssl-0.9.6g-orig/test/Makefile.ssl openssl-0.9.6g/test/Makefile.ssl
-*** openssl-0.9.6g-orig/test/Makefile.ssl	Thu Sep 26 15:20:47 2002
---- openssl-0.9.6g/test/Makefile.ssl	Thu Sep 26 15:23:26 2002
-***************
-*** 28,32 ****
-  DLIBCRYPTO= ../libcrypto.a
-  DLIBSSL= ../libssl.a
-! LIBCRYPTO= -L.. -lcrypto
-  LIBSSL= -L.. -lssl
-  
---- 28,32 ----
-  DLIBCRYPTO= ../libcrypto.a
-  DLIBSSL= ../libssl.a
-! LIBCRYPTO= -L.. -lcrypto -lcrypt
-  LIBSSL= -L.. -lssl
-  
diff --git a/dev-libs/openssl/files/openssl-0.9.6l-gentoo.diff b/dev-libs/openssl/files/openssl-0.9.6l-gentoo.diff
deleted file mode 100644
index 4a1632f50a4f..000000000000
--- a/dev-libs/openssl/files/openssl-0.9.6l-gentoo.diff
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -r -c -C 2 openssl-0.9.6g-orig/crypto/des/fcrypt.c openssl-0.9.6g/crypto/des/fcrypt.c
-*** openssl-0.9.6g-orig/crypto/des/fcrypt.c	Thu Sep 26 15:20:47 2002
---- openssl-0.9.6g/crypto/des/fcrypt.c	Thu Sep 26 15:21:24 2002
-***************
-*** 62,66 ****
-  	DES_LONG Eswap0, DES_LONG Eswap1);
-  
-! #if !defined(PERL5) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(_DARWIN)
-  char *crypt(const char *buf, const char *salt)
-  	{
---- 62,66 ----
-  	DES_LONG Eswap0, DES_LONG Eswap1);
-  
-! #if !defined(PERL5) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(_DARWIN) && !defined(__GLIBC__)
-  char *crypt(const char *buf, const char *salt)
-  	{
-diff -r -c -C 2 openssl-0.9.6g-orig/test/Makefile openssl-0.9.6g/test/Makefile
-*** openssl-0.9.6g-orig/test/Makefile	Thu Sep 26 15:20:47 2002
---- openssl-0.9.6g/test/Makefile	Thu Sep 26 15:23:26 2002
-***************
-*** 28,32 ****
-  DLIBCRYPTO= ../libcrypto.a
-  DLIBSSL= ../libssl.a
-! LIBCRYPTO= -L.. -lcrypto
-  LIBSSL= -L.. -lssl
-  
---- 28,32 ----
-  DLIBCRYPTO= ../libcrypto.a
-  DLIBSSL= ../libssl.a
-! LIBCRYPTO= -L.. -lcrypto -lcrypt
-  LIBSSL= -L.. -lssl
-  
-diff -r -c -C 2 openssl-0.9.6g-orig/test/Makefile.ssl openssl-0.9.6g/test/Makefile.ssl
-*** openssl-0.9.6g-orig/test/Makefile.ssl	Thu Sep 26 15:20:47 2002
---- openssl-0.9.6g/test/Makefile.ssl	Thu Sep 26 15:23:26 2002
-***************
-*** 28,32 ****
-  DLIBCRYPTO= ../libcrypto.a
-  DLIBSSL= ../libssl.a
-! LIBCRYPTO= -L.. -lcrypto
-  LIBSSL= -L.. -lssl
-  
---- 28,32 ----
-  DLIBCRYPTO= ../libcrypto.a
-  DLIBSSL= ../libssl.a
-! LIBCRYPTO= -L.. -lcrypto -lcrypt
-  LIBSSL= -L.. -lssl
-  
diff --git a/dev-libs/openssl/files/openssl-0.9.6i-gentoo.diff b/dev-libs/openssl/files/openssl-0.9.6m-gentoo.diff
index 4a1632f50a4f..4a1632f50a4f 100644
--- a/dev-libs/openssl/files/openssl-0.9.6i-gentoo.diff
+++ b/dev-libs/openssl/files/openssl-0.9.6m-gentoo.diff
diff --git a/dev-libs/openssl/files/openssl-0.9.7b-gentoo.diff b/dev-libs/openssl/files/openssl-0.9.7b-gentoo.diff
deleted file mode 100644
index 501a946d7b2c..000000000000
--- a/dev-libs/openssl/files/openssl-0.9.7b-gentoo.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -r -c -C 2 openssl-0.9.6g-orig/test/Makefile openssl-0.9.6g/test/Makefile
-*** openssl-0.9.6g-orig/test/Makefile	Thu Sep 26 15:20:47 2002
---- openssl-0.9.6g/test/Makefile	Thu Sep 26 15:23:26 2002
-***************
-*** 28,32 ****
-  DLIBCRYPTO= ../libcrypto.a
-  DLIBSSL= ../libssl.a
-! LIBCRYPTO= -L.. -lcrypto
-  LIBSSL= -L.. -lssl
-  
---- 28,32 ----
-  DLIBCRYPTO= ../libcrypto.a
-  DLIBSSL= ../libssl.a
-! LIBCRYPTO= -L.. -lcrypto -lcrypt
-  LIBSSL= -L.. -lssl
-  
-diff -r -c -C 2 openssl-0.9.6g-orig/test/Makefile.ssl openssl-0.9.6g/test/Makefile.ssl
-*** openssl-0.9.6g-orig/test/Makefile.ssl	Thu Sep 26 15:20:47 2002
---- openssl-0.9.6g/test/Makefile.ssl	Thu Sep 26 15:23:26 2002
-***************
-*** 28,32 ****
-  DLIBCRYPTO= ../libcrypto.a
-  DLIBSSL= ../libssl.a
-! LIBCRYPTO= -L.. -lcrypto
-  LIBSSL= -L.. -lssl
-  
---- 28,32 ----
-  DLIBCRYPTO= ../libcrypto.a
-  DLIBSSL= ../libssl.a
-! LIBCRYPTO= -L.. -lcrypto -lcrypt
-  LIBSSL= -L.. -lssl
-  
diff --git a/dev-libs/openssl/files/openssl-0.9.7a-gentoo.diff b/dev-libs/openssl/files/openssl-0.9.7d-gentoo.diff
index 501a946d7b2c..501a946d7b2c 100644
--- a/dev-libs/openssl/files/openssl-0.9.7a-gentoo.diff
+++ b/dev-libs/openssl/files/openssl-0.9.7d-gentoo.diff
diff --git a/dev-libs/openssl/openssl-0.9.6k-r1.ebuild b/dev-libs/openssl/openssl-0.9.6k-r1.ebuild
deleted file mode 100644
index 616283422a9a..000000000000
--- a/dev-libs/openssl/openssl-0.9.6k-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2004 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.6k-r1.ebuild,v 1.7 2004/02/22 20:09:09 agriffis Exp $
-
-inherit eutils
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Toolkit for SSL v2/v3 and TLS v1"
-SRC_URI="mirror://openssl/source/${P}.tar.gz"
-HOMEPAGE="http://www.openssl.org/"
-
-RDEPEND="virtual/glibc"
-DEPEND="${RDEPEND} >=dev-lang/perl-5"
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~mips ~hppa -amd64"
-IUSE=""
-
-if [ "$PROFILE_ARCH" = "sparc" -a "`uname -m`" = "sparc64" ]; then
-	SSH_TARGET="linux-sparcv8"
-fi
-
-if [ "`uname -m`" = "parisc" -o  "`uname -m`" = "parisc64" ]; then
-	SSH_TARGET="linux-parisc"
-fi
-
-case $CHOST in
-	alphaev56*|alphaev6*) SSH_TARGET="linux-alpha+bwx-${CC:-gcc}" ;;
-	alpha*)               SSH_TARGET="linux-alpha-${CC:-gcc}" ;;
-esac
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-
-	epatch ${FILESDIR}/${PN}-0.9.6i-gentoo.diff
-
-	if [ "${ARCH}" = "mips" ]
-	then
-		cd ${S}
-		epatch ${FILESDIR}/openssl-0.9.6-mips.diff
-	fi
-
-	if [ "${ARCH}" = "arm" ]; then
-		# patch linker to add -ldl or things linking aginst libcrypto fail
-		sed -e \
-			's!^"linux-elf-arm"\(.*\)::BN\(.*\)!"linux-elf-arm"\1:-ldl:BN\2!' \
-			Configure > Configure.orig
-	elif [ "${ARCH}" = "hppa" ]; then
-		sed -e \
-		's!^"linux-parisc"\(.*\)::BN\(.*\)::!"linux-parisc"\1:-ldl:BN\2::::::::::dlfcn:linux-shared:-fPIC::.so.\\$(SHLIB_MAJOR).\\$(SHLIB_MINOR)!' \
-			Configure > Configure.orig
-	else
-		cp Configure Configure.orig
-	fi
-	sed -e "s/-O3/$CFLAGS/" -e "s/-m486//" Configure.orig > Configure
-}
-
-src_compile() {
-	if [ ${SSH_TARGET} ]; then
-		einfo "Forcing ${SSH_TARGET} compile"
-		./Configure ${SSH_TARGET} --prefix=/usr \
-			--openssldir=/etc/ssl shared threads || die
-	else
-		./config --prefix=/usr --openssldir=/etc/ssl shared threads || die
-	fi
-	# i think parallel make has problems
-	make all || die
-
-}
-
-src_install() {
-	make INSTALL_PREFIX=${D} MANDIR=/usr/share/man install || die
-	dodoc CHANGES* FAQ LICENSE NEWS README
-	dodoc doc/*.txt
-	dohtml doc/*
-	insinto /usr/share/emacs/site-lisp
-	doins doc/c-indentation.el
-
-	# The man pages rand.3 and passwd.1 conflict with other packages
-	# Rename them to ssl-* and also make a symlink from openssl-* to ssl-*
-	cd ${D}/usr/share/man/man1
-	mv passwd.1 ssl-passwd.1
-	ln -sf ssl-passwd.1 openssl-passwd.1
-	cd ${D}/usr/share/man/man3
-	mv rand.3 ssl-rand.3
-	ln -sf ssl-rand.3 openssl-rand.3
-
-	# create the certs directory.  Previous openssl builds
-	# would need to create /usr/lib/ssl/certs but this looks
-	# to be the more FHS compliant setup... -raker
-	dodir /etc/ssl/certs
-
-	fperms a+x /usr/lib/pkgconfig #34088
-}
-
-pkg_postinst() {
-	local BN_H="${ROOT}$(gcc-config -L)/include/openssl/bn.h"
-	# Breaks things one some boxen, bug #13795.  The problem is that
-	# if we have a 'gcc fixed' version in $(gcc-config -L) from 0.9.6,
-	# then breaks as it was defined as 'int BN_mod(...)' and in 0.9.7 it
-	# is a define with BN_div(...) - <azarah@gentoo.org> (24 Sep 2003)
-	if [ -f "${BN_H}" ] && [ -n "$(grep '^int[[:space:]]*BN_mod(' "${BN_H}")" ]
-	then
-		rm -f "${BN_H}"
-	fi
-}
diff --git a/dev-libs/openssl/openssl-0.9.6k.ebuild b/dev-libs/openssl/openssl-0.9.6k.ebuild
deleted file mode 100644
index 7aaf214faf4b..000000000000
--- a/dev-libs/openssl/openssl-0.9.6k.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2004 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.6k.ebuild,v 1.8 2004/02/22 20:09:09 agriffis Exp $
-
-inherit eutils
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Toolkit for SSL v2/v3 and TLS v1"
-SRC_URI="mirror://openssl/source/${P}.tar.gz"
-HOMEPAGE="http://www.openssl.org/"
-
-RDEPEND="virtual/glibc"
-DEPEND="${RDEPEND} >=dev-lang/perl-5"
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="x86 ppc alpha sparc mips hppa -amd64"
-IUSE=""
-
-if [ "$PROFILE_ARCH" = "sparc" -a "`uname -m`" = "sparc64" ]; then
-	SSH_TARGET="linux-sparcv8"
-fi
-
-if [ "`uname -m`" = "parisc" -o "`uname -m`" = "parisc64" ]; then
-	SSH_TARGET="linux-parisc"
-fi
-
-case $CHOST in
-	alphaev56*|alphaev6*) SSH_TARGET="linux-alpha+bwx-${CC:-gcc}" ;;
-	alpha*)               SSH_TARGET="linux-alpha-${CC:-gcc}" ;;
-esac
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-
-	epatch ${FILESDIR}/${PN}-0.9.6i-gentoo.diff
-
-	if [ "${ARCH}" = "mips" ]
-	then
-		cd ${S}
-		epatch ${FILESDIR}/openssl-0.9.6-mips.diff
-	fi
-
-	if [ "${ARCH}" = "arm" ]; then
-		# patch linker to add -ldl or things linking aginst libcrypto fail
-		sed -e \
-			's!^"linux-elf-arm"\(.*\)::BN\(.*\)!"linux-elf-arm"\1:-ldl:BN\2!' \
-			Configure > Configure.orig
-	elif [ "${ARCH}" = "hppa" ]; then
-		sed -e \
-		's!^"linux-parisc"\(.*\)::BN\(.*\)::!"linux-parisc"\1:-ldl:BN\2::::::::::dlfcn:linux-shared:-fPIC::.so.\\$(SHLIB_MAJOR).\\$(SHLIB_MINOR)!' \
-			Configure > Configure.orig
-	else
-		cp Configure Configure.orig
-	fi
-	sed -e "s/-O3/$CFLAGS/" -e "s/-m486//" Configure.orig > Configure
-}
-
-src_compile() {
-	if [ ${SSH_TARGET} ]; then
-		einfo "Forcing ${SSH_TARGET} compile"
-		./Configure ${SSH_TARGET} --prefix=/usr \
-			--openssldir=/etc/ssl shared threads || die
-	else
-		./config --prefix=/usr --openssldir=/etc/ssl shared threads || die
-	fi
-	# i think parallel make has problems
-	make all || die
-
-}
-
-src_install() {
-	make INSTALL_PREFIX=${D} MANDIR=/usr/share/man install || die
-	dodoc CHANGES* FAQ LICENSE NEWS README
-	dodoc doc/*.txt
-	dohtml doc/*
-	insinto /usr/share/emacs/site-lisp
-	doins doc/c-indentation.el
-
-	# The man pages rand.3 and passwd.1 conflict with other packages
-	# Rename them to ssl-* and also make a symlink from openssl-* to ssl-*
-	cd ${D}/usr/share/man/man1
-	mv passwd.1 ssl-passwd.1
-	ln -sf ssl-passwd.1 openssl-passwd.1
-	cd ${D}/usr/share/man/man3
-	mv rand.3 ssl-rand.3
-	ln -sf ssl-rand.3 openssl-rand.3
-
-	# create the certs directory.  Previous openssl builds
-	# would need to create /usr/lib/ssl/certs but this looks
-	# to be the more FHS compliant setup... -raker
-	dodir /etc/ssl/certs
-
-	fperms a+x /usr/lib/pkgconfig #34088
-}
-
diff --git a/dev-libs/openssl/openssl-0.9.6l.ebuild b/dev-libs/openssl/openssl-0.9.6m.ebuild
index bbcd211daa6b..42baaf54d9d8 100644
--- a/dev-libs/openssl/openssl-0.9.6l.ebuild
+++ b/dev-libs/openssl/openssl-0.9.6m.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.6l.ebuild,v 1.6 2004/02/22 20:09:09 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.6m.ebuild,v 1.1 2004/03/17 17:19:01 aliz Exp $
 
 inherit eutils
 
diff --git a/dev-libs/openssl/openssl-0.9.7b.ebuild b/dev-libs/openssl/openssl-0.9.7b.ebuild
deleted file mode 100644
index 944e4d179246..000000000000
--- a/dev-libs/openssl/openssl-0.9.7b.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2004 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.7b.ebuild,v 1.10 2004/01/17 07:26:29 kumba Exp $
-
-inherit eutils
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Toolkit for SSL v2/v3 and TLS v1"
-SRC_URI="mirror://openssl/source/${P}.tar.gz"
-HOMEPAGE="http://www.openssl.org/"
-
-RDEPEND="virtual/glibc"
-DEPEND="${RDEPEND} >=dev-lang/perl-5"
-LICENSE="as-is"
-SLOT="0"
-#amd64 needs this version or later.
-KEYWORDS="amd64"
-
-warning() {
-	ewarn "BIG FAT WARNING!!!"
-	ewarn "You must re-emerge every package that links to openssl after you have merged ${P}"
-	ewarn "This is becuse packages that links against ${PN} links against the full version"
-	ewarn "Also, if you don't have the sources for the packages you need to re-emerge you"
-	ewarn "should download them with emerge -f prior to the installation of ${P}."
-	ewarn "This is becuse wget may be linked against ${PN}."
-	ewarn "To generate a list of packages that links against ${PN} you can download"
-	ewarn "and run the script from http://dev.gentoo.org/~aliz/openssl_update.sh"
-	ewarn "If you are using binary packages you need to rebuild those against the"
-	ewarn "new version of ${PN}"
-	sleep 10
-}
-
-src_unpack() {
-	warning
-	unpack ${A} ; cd ${S}
-
-	epatch ${FILESDIR}/${PN}-0.9.7a-gentoo.diff
-
-	if [ "${ARCH}" = "hppa" ]; then
-	sed -e \
-	's!^"linux-parisc"\(.*\)::BN\(.*\)::!"linux-parisc"\1:-ldl:BN\2::::::::::dlfcn:linux-shared:-fPIC::.so.\\$(SHLIB_MAJOR).\\$(SHLIB_MINOR)!' \
-		Configure > Configure.orig
-	else
-		cp Configure Configure.orig
-	fi
-	if [ "${ARCH}" = "alpha" -a "${CC}" != "ccc" ]; then
-	# ccc compiled openssl will break things linked against
-	# a gcc compiled openssl, the configure will automatically detect 
-	# ccc and use it, so stop that if user hasnt asked for it.
-		sed -e \
-			's!CC=ccc!CC=gcc!' config > config.orig
-		cp config.orig config
-	fi
-
-	sed -e "s/-O3/$CFLAGS/" -e "s/-m486//" Configure.orig > Configure
-}
-
-src_compile() {
-	./config --prefix=/usr --openssldir=/etc/ssl shared threads || die
-	# i think parallel make has problems
-	make all || die
-}
-
-src_install() {
-	make INSTALL_PREFIX=${D} MANDIR=/usr/share/man install || die
-	dodoc CHANGES* FAQ LICENSE NEWS README
-	dodoc doc/*.txt
-	dohtml doc/*
-	insinto /usr/share/emacs/site-lisp
-	doins doc/c-indentation.el
-
-	# The man pages rand.3 and passwd.1 conflict with other packages
-	# Rename them to ssl-* and also make a symlink from openssl-* to ssl-*
-	cd ${D}/usr/share/man/man1
-	mv passwd.1 ssl-passwd.1
-	ln -sf ssl-passwd.1 openssl-passwd.1
-	cd ${D}/usr/share/man/man3
-	mv rand.3 ssl-rand.3
-	ln -sf ssl-rand.3 openssl-rand.3
-
-	# create the certs directory.  Previous openssl builds
-	# would need to create /usr/lib/ssl/certs but this looks
-	# to be the more FHS compliant setup... -raker
-	dodir /etc/ssl/certs
-
-	fperms a+x /usr/lib/pkgconfig #34088
-}
-
-pkg_postinst() {
-	local BN_H="${ROOT}$(gcc-config -L)/include/openssl/bn.h"
-	# Breaks things one some boxen, bug #13795.  The problem is that
-	# if we have a 'gcc fixed' version in $(gcc-config -L) from 0.9.6,
-	# then breaks as it was defined as 'int BN_mod(...)' and in 0.9.7 it
-	# is a define with BN_div(...) - <azarah@gentoo.org> (24 Sep 2003)
-	if [ -f "${BN_H}" ] && [ -n "$(grep '^int[[:space:]]*BN_mod(' "${BN_H}")" ]
-	then
-		rm -f "${BN_H}"
-	fi
-}
-
diff --git a/dev-libs/openssl/openssl-0.9.7b-r3.ebuild b/dev-libs/openssl/openssl-0.9.7d.ebuild
index a4fa63be1a0c..2258e5d88ad3 100644
--- a/dev-libs/openssl/openssl-0.9.7b-r3.ebuild
+++ b/dev-libs/openssl/openssl-0.9.7d.ebuild
@@ -1,15 +1,10 @@
 # Copyright 1999-2004 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.7b-r3.ebuild,v 1.4 2004/02/22 20:09:09 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.7d.ebuild,v 1.1 2004/03/17 17:19:01 aliz Exp $
 
 inherit eutils flag-o-matic
 
-gcc_version=$(gcc -dumpversion | cut -d. -f1,2)
-if [ "${gcc_version}" == "3.3" ]; then
-	filter-flags "-fprefetch-loop-arrays"
-fi
-
-OLD_096_P="${PN}-0.9.6j"
+OLD_096_P="${PN}-0.9.6m"
 
 S="${WORKDIR}"
 DESCRIPTION="Toolkit for SSL v2/v3 and TLS v1"
@@ -24,7 +19,7 @@ DEPEND="${RDEPEND}
 LICENSE="as-is"
 SLOT="0"
 
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~mips ~hppa ia64"
+KEYWORDS="x86 ppc alpha sparc mips hppa amd64 ia64 ppc64 s390"
 
 src_unpack() {
 	unpack ${A}
@@ -35,9 +30,12 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-gentoo.diff
 
 	if [ "${ARCH}" = "hppa" ]; then
-	sed -i -e \
-	's!^"linux-parisc"\(.*\)::BN\(.*\)::!"linux-parisc"\1:-ldl:BN\2::::::::::dlfcn:linux-shared:-fPIC::.so.\\$(SHLIB_MAJOR).\\$(SHLIB_MINOR)!' \
+		# Tells to compile a static version of openssl
+		sed -i -e \
+		's!^"linux-parisc"\(.*\)::BN\(.*\)::!"linux-parisc"\1:-ldl:BN\2::::::::::dlfcn:linux-shared:-fPIC::.so.\\$(SHLIB_MAJOR).\\$(SHLIB_MINOR)!' \
 		Configure
+		# Fix detection of parisc running 64 bit kernel
+		sed -i -e 's/parisc-\*-linux2/parisc\*-\*-linux2/' config
 	fi
 	if [ "${ARCH}" = "alpha" -a "${CC}" != "ccc" ]; then
 	# ccc compiled openssl will break things linked against
@@ -47,7 +45,22 @@ src_unpack() {
 			's!CC=ccc!CC=gcc!' config
 	fi
 
-	sed -i -e "s/-O3/$CFLAGS/" -e "s/-m486//" Configure
+	local gcc_version=$(gcc -dumpversion | cut -d. -f1,2)
+	if [ "${gcc_version}" == "3.3" ] || [ "${gcc_version}" == "3.2" ] ; then
+		filter-flags -fprefetch-loop-arrays -freduce-all-givs
+	fi
+
+	# replace CFLAGS
+	OLDIFS=$IFS
+	IFS="
+"
+	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//" ) $CFLAGS"
+		sed -i "${LINE}s/$CUR_CFLAGS/$NEW_CFLAGS/" Configure
+	done
+	IFS=$OLDIFS
 
 	# openssl-0.9.6
 	test -f ${ROOT}/usr/lib/libssl.so.0.9.6 && {
@@ -66,30 +79,76 @@ src_unpack() {
 				Configure
 		;;
 		hppa)
+			# Tells to compile a static version of openssl
 			sed -i -e \
 				's!^"linux-parisc"\(.*\)::BN\(.*\)::!"linux-parisc"\1:-ldl:BN\2::::::::::dlfcn:linux-shared:-fPIC::.so.\\$(SHLIB_MAJOR).\\$(SHLIB_MINOR)!' \
 				Configure
+			# Fix detection of parisc running 64 bit kernel
+			sed -i -e 's/parisc-\*-linux2/parisc\*-\*-linux2/' config
 		esac
 
-		sed -i -e "s/-O3/$CFLAGS/" -e "s/-m486//" Configure
+		# replace CFLAGS
+		OLDIFS=$IFS
+		IFS="
+"
+		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//" ) $CFLAGS"
+	  		sed -i "${LINE}s/$CUR_CFLAGS/$NEW_CFLAGS/" Configure
+		done
+		IFS=$OLDIFS
 	}
 }
 
 src_compile() {
 	# openssl-0.9.7
 	cd ${WORKDIR}/${P}
-	./config --prefix=/usr --openssldir=/etc/ssl shared threads || die
+
+	# Build correctly for mips, mips64, & mipsel
+	if [ "`use mips`" ]; then
+		if [ "`echo ${CHOST} | grep "mipsel"`" ]; then
+			mipsarch="linux-mipsel"
+		else
+			mipsarch="linux-mips"
+		fi
+
+		./Configure ${mipsarch} --prefix=/usr --openssldir=/etc/ssl \
+			shared threads || die
+	# We have to force the target for hppa because detection
+	# is broken on SMP box
+	elif [ "`uname -m`" = "parisc" -o "`uname -m`" = "parisc64" ]; then
+		./Configure linux-parisc --prefix=/usr --openssldir=/etc/ssl \
+			shared threads || die
+	# force sparcv8 on sparc32 profile
+	elif [ "$PROFILE_ARCH" = "sparc" ]; then
+		./Configure linux-sparcv8 --prefix=/usr --openssldir=/etc/ssl \
+			shared threads || die
+	else
+		./config --prefix=/usr --openssldir=/etc/ssl shared threads || die
+	fi
+
 	einfo "Compiling ${P}"
 	make all || die
+	if [ "`use !ppc64`" ]; then
+		make test || die
+	fi
 
 	# openssl-0.9.6
 	test -f ${ROOT}/usr/lib/libssl.so.0.9.6 && {
 		cd ${WORKDIR}/${OLD_096_P}
 
-		if [ "$PROFILE_ARCH" = "sparc" -a "`uname -m`" = "sparc64" ]; then
+		# force sparcv8 on sparc32 profile
+		if [ "$PROFILE_ARCH" = "sparc" ]; then
 			SSH_TARGET="linux-sparcv8"
-		elif [ "`uname -m`" = "parisc64" ]; then
+		elif [ "`uname -m`" = "parisc" -o "`uname -m`" = "parisc64" ]; then
 			SSH_TARGET="linux-parisc"
+		elif [ "`use mips`" ]; then
+			if [ "`echo ${CHOST} | grep "mipsel"`" ]; then
+				SSH_TARGET="linux-mipsel"
+			else
+				SSH_TARGET="linux-mips"
+			fi
 		fi
 
 		case ${CHOST} in
@@ -110,6 +169,7 @@ src_compile() {
 
 		einfo "Compiling ${OLD_096_P}"
 		make all || die
+		make test || die
 	}
 }
 
@@ -141,8 +201,10 @@ src_install() {
 
 	# openssl-0.9.6
 	test -f ${ROOT}/usr/lib/libssl.so.0.9.6 && {
-		dolib.so ${WORKDIR}/${OLD_096_P}/libcrypto.so.0.9.6
-		dolib.so ${WORKDIR}/${OLD_096_P}/libssl.so.0.9.6
+		cd ${WORKDIR}/${OLD_096_P}
+		make || die
+		dolib.so ${WORKDIR}/${OLD_096_P}/libcrypto.so.0.9.6||die "libcrypto.so.0.9.6 not found"
+		dolib.so ${WORKDIR}/${OLD_096_P}/libssl.so.0.9.6|| die "libssl.so.0.9.6 not found"
 	}
 
 	fperms a+x /usr/lib/pkgconfig #34088