Added a patch for mips

4 files changed, 72 insertions, 50 deletions

diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index 32764a7d282f..b589c84d58f5 100644
--- a/dev-libs/openssl/ChangeLog
+++ b/dev-libs/openssl/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for dev-libs/openssl
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.23 2003/02/08 23:15:35 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.24 2003/02/09 14:14:02 tuxus Exp $
 
   09 Feb 2003; Guy Martin <gmsoft@gentoo.org> :
   Added hppa to keywords.
@@ -38,6 +38,9 @@
 
 *opessl-0.9.6g (29 Aug 2002)
 
+  09 Feb 2003; Jan Seidel <tuxus@gentoo.org> :
+  Added a patch for mips (apache2 with openssl) 
+
   19 Jan 2003; Jan Seidel <tuxus@gentoo.org> :
   Added mips to keywords
 
diff --git a/dev-libs/openssl/files/openssl-0.9.6g-gentoo.diff b/dev-libs/openssl/files/openssl-0.9.6g-gentoo.diff
index 4a1632f50a4f..52ce504989f4 100644
--- a/dev-libs/openssl/files/openssl-0.9.6g-gentoo.diff
+++ b/dev-libs/openssl/files/openssl-0.9.6g-gentoo.diff
@@ -1,48 +1,49 @@
-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 -ur openssl-0.9.6g-orig/Configure openssl-0.9.6g/Configure
+--- openssl-0.9.6g-orig/Configure	2002-08-08 23:12:40.000000000 +0200
++++ openssl-0.9.6g/Configure	2003-02-04 15:15:02.000000000 +0100
+@@ -341,7 +341,7 @@
+ "debug-linux-elf-noefence","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -m486 -Wall::-D_REENTRANT:-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn",
+ "linux-aout",	"gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}",
+ "linux-mipsel",   "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::(unknown)::BN_LLONG:::",
+-"linux-mips",   "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::(unknown)::BN_LLONG:::",
++"linux-mips",	"gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-ppc",	"gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-m68k",   "gcc:-DB_ENDIAN -DTERMIO -O2 -fomit-frame-pointer -Wall::-D_REENTRANT::BN_LLONG::",
+ "linux-s390",	"gcc:-DB_ENDIAN -DTERMIO -DNO_ASM -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR),\$(SHLIB_MINOR)",
+Only in openssl-0.9.6g: Configure~
+diff -ur 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	2002-01-08 10:19:55.000000000 +0100
++++ openssl-0.9.6g/crypto/des/fcrypt.c	2003-02-04 15:14:14.000000000 +0100
+@@ -61,7 +61,7 @@
+ void fcrypt_body(DES_LONG *out,des_key_schedule ks,
+ 	DES_LONG Eswap0, DES_LONG Eswap1);
+ 
+-#if !defined(PERL5) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(_DARWIN)
++#if !defined(PERL5) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(_DARWIN) && !defined(__GLIBC__)
+ char *crypt(const char *buf, const char *salt)
+ 	{
+ 	return(des_crypt(buf, salt));
+diff -ur openssl-0.9.6g-orig/test/Makefile openssl-0.9.6g/test/Makefile
+--- openssl-0.9.6g-orig/test/Makefile	2002-08-08 23:18:13.000000000 +0200
++++ openssl-0.9.6g/test/Makefile	2003-02-04 15:14:14.000000000 +0100
+@@ -27,7 +27,7 @@
+ 
+ DLIBCRYPTO= ../libcrypto.a
+ DLIBSSL= ../libssl.a
+-LIBCRYPTO= -L.. -lcrypto
++LIBCRYPTO= -L.. -lcrypto -lcrypt
+ LIBSSL= -L.. -lssl
+ 
+ BNTEST=		bntest
+diff -ur openssl-0.9.6g-orig/test/Makefile.ssl openssl-0.9.6g/test/Makefile.ssl
+--- openssl-0.9.6g-orig/test/Makefile.ssl	2002-08-08 23:18:13.000000000 +0200
++++ openssl-0.9.6g/test/Makefile.ssl	2003-02-04 15:14:14.000000000 +0100
+@@ -27,7 +27,7 @@
+ 
+ DLIBCRYPTO= ../libcrypto.a
+ DLIBSSL= ../libssl.a
+-LIBCRYPTO= -L.. -lcrypto
++LIBCRYPTO= -L.. -lcrypto -lcrypt
+ LIBSSL= -L.. -lssl
+ 
+ BNTEST=		bntest
diff --git a/dev-libs/openssl/files/openssl-0.9.6g-mips.diff b/dev-libs/openssl/files/openssl-0.9.6g-mips.diff
new file mode 100644
index 000000000000..d42871005923
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-0.9.6g-mips.diff
@@ -0,0 +1,12 @@
+diff -ur openssl-0.9.6g-orig/Configure openssl-0.9.6g/Configure
+--- openssl-0.9.6g-orig/Configure	2002-08-08 23:12:40.000000000 +0200
++++ openssl-0.9.6g/Configure	2003-02-04 15:15:02.000000000 +0100
+@@ -341,7 +341,7 @@
+ "debug-linux-elf-noefence","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -m486 -Wall::-D_REENTRANT:-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn",
+ "linux-aout",	"gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}",
+ "linux-mipsel",   "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::(unknown)::BN_LLONG:::",
+-"linux-mips",   "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::(unknown)::BN_LLONG:::",
++"linux-mips",	"gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-ppc",	"gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-m68k",   "gcc:-DB_ENDIAN -DTERMIO -O2 -fomit-frame-pointer -Wall::-D_REENTRANT::BN_LLONG::",
+ "linux-s390",	"gcc:-DB_ENDIAN -DTERMIO -DNO_ASM -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR),\$(SHLIB_MINOR)",
diff --git a/dev-libs/openssl/openssl-0.9.6g.ebuild b/dev-libs/openssl/openssl-0.9.6g.ebuild
index 8725bb2807d4..d40d687e463b 100644
--- a/dev-libs/openssl/openssl-0.9.6g.ebuild
+++ b/dev-libs/openssl/openssl-0.9.6g.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 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.6g.ebuild,v 1.9 2003/02/08 23:15:35 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.6g.ebuild,v 1.10 2003/02/09 14:14:02 tuxus Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Toolkit for SSL v2/v3 and TLS v1"
@@ -18,6 +18,12 @@ src_unpack() {
 
 	patch -p1 < ${FILESDIR}/${PF}-gentoo.diff
 
+	if [ "${ARCH}" = "mips" ]
+            then
+    	cd ${S}
+    	patch -p1 < ${FILESDIR}/${P}-mips.diff || die
+    	fi
+
 	cp Configure Configure.orig
 	sed -e "s/-O3/$CFLAGS/" -e "s/-m486//" Configure.orig > Configure
 }