fixes in spades. see changelog

7 files changed, 11 insertions, 79 deletions

diff --git a/dev-libs/openssl/files/digest-openssl-0.9.6b b/dev-libs/openssl/files/digest-openssl-0.9.6b
deleted file mode 100644
index 5c2fc2984118..000000000000
--- a/dev-libs/openssl/files/digest-openssl-0.9.6b
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bd8c4d8c5bafc7a4d55d152989fdb327 openssl-0.9.6b.tar.gz 2132220
diff --git a/dev-libs/openssl/files/digest-openssl-0.9.6b-r1 b/dev-libs/openssl/files/digest-openssl-0.9.6b-r1
deleted file mode 100644
index 5c2fc2984118..000000000000
--- a/dev-libs/openssl/files/digest-openssl-0.9.6b-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bd8c4d8c5bafc7a4d55d152989fdb327 openssl-0.9.6b.tar.gz 2132220
diff --git a/dev-libs/openssl/files/digest-openssl-0.9.6c b/dev-libs/openssl/files/digest-openssl-0.9.6c-r1
index 5765b8e0956a..5765b8e0956a 100644
--- a/dev-libs/openssl/files/digest-openssl-0.9.6c
+++ b/dev-libs/openssl/files/digest-openssl-0.9.6c-r1
diff --git a/dev-libs/openssl/files/openssl-0.9.6a-Makefile.org-gentoo.diff b/dev-libs/openssl/files/openssl-0.9.6a-Makefile.org-gentoo.diff
deleted file mode 100644
index 102d9d985e50..000000000000
--- a/dev-libs/openssl/files/openssl-0.9.6a-Makefile.org-gentoo.diff
+++ /dev/null
@@ -1,37 +0,0 @@
---- Makefile.org.orig	Thu Apr 26 15:39:41 2001
-+++ Makefile.org	Thu Apr 26 15:42:30 2001
-@@ -19,10 +19,12 @@
- # for, say, /usr/ and yet have everything installed to /tmp/somedir/usr/.
- # Normally it is left empty.
- INSTALL_PREFIX=
--INSTALLTOP=/usr/local/ssl
-+#INSTALLTOP=/usr/local/ssl
-+INSTALLTOP=/usr/ssl
- 
- # Do not edit this manually. Use Configure --openssldir=DIR do change this!
--OPENSSLDIR=/usr/local/ssl
-+#OPENSSLDIR=/usr/local/ssl
-+OPENSSLDIR=/usr/ssl
- 
- # RSAref  - Define if we are to link with RSAref.
- # NO_IDEA - Define to build without the IDEA algorithm
-@@ -55,7 +57,8 @@
- 
- CC= gcc
- #CFLAG= -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall -Wuninitialized -DSHA1_ASM -DMD5_ASM -DRMD160_ASM
--CFLAG= -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall -DSHA1_ASM -DMD5_ASM -DRMD160_ASM
-+#CFLAG= -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall -DSHA1_ASM -DMD5_ASM -DRMD160_ASM
-+CFLAG=$(CFLAGS) -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -Wall -DSHA1_ASM -DMD5_ASM -DRMD160_ASM
- DEPFLAG= 
- PEX_LIBS= 
- EX_LIBS= 
-@@ -169,7 +172,8 @@
- MAKEFILE= Makefile.ssl
- MAKE=     make -f Makefile.ssl
- 
--MANDIR=$(OPENSSLDIR)/man
-+#MANDIR=$(OPENSSLDIR)/man
-+MANDIR=$(OPENSSLDIR)/../share/man
- MAN1=1
- MAN3=3
- SHELL=/bin/sh
diff --git a/dev-libs/openssl/files/openssl-0.9.6b-Makefile.org-gentoo.diff b/dev-libs/openssl/files/openssl-0.9.6b-Makefile.org-gentoo.diff
deleted file mode 100644
index db56f706ade8..000000000000
--- a/dev-libs/openssl/files/openssl-0.9.6b-Makefile.org-gentoo.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.org.orig	Fri Jul 13 21:15:54 2001
-+++ Makefile.org	Fri Jul 13 21:17:08 2001
-@@ -55,7 +55,7 @@
- 
- CC= gcc
- #CFLAG= -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall -Wuninitialized -DSHA1_ASM -DMD5_ASM -DRMD160_ASM
--CFLAG= -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall -DSHA1_ASM -DMD5_ASM -DRMD160_ASM
-+CFLAG=$(CFLAGS) -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -Wall -DSHA1_ASM -DMD5_ASM -DRMD160_ASM
- DEPFLAG= 
- PEX_LIBS= 
- EX_LIBS= 
-@@ -169,7 +169,7 @@
- MAKEFILE= Makefile.ssl
- MAKE=     make -f Makefile.ssl
- 
--MANDIR=$(OPENSSLDIR)/man
-+MANDIR=$(OPENSSLDIR)/../share/man
- MAN1=1
- MAN3=3
- SHELL=/bin/sh
diff --git a/dev-libs/openssl/files/openssl-0.9.6c-Makefile.org-gentoo.diff b/dev-libs/openssl/files/openssl-0.9.6c-Makefile.org-gentoo.diff
deleted file mode 100644
index db56f706ade8..000000000000
--- a/dev-libs/openssl/files/openssl-0.9.6c-Makefile.org-gentoo.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.org.orig	Fri Jul 13 21:15:54 2001
-+++ Makefile.org	Fri Jul 13 21:17:08 2001
-@@ -55,7 +55,7 @@
- 
- CC= gcc
- #CFLAG= -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall -Wuninitialized -DSHA1_ASM -DMD5_ASM -DRMD160_ASM
--CFLAG= -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall -DSHA1_ASM -DMD5_ASM -DRMD160_ASM
-+CFLAG=$(CFLAGS) -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -Wall -DSHA1_ASM -DMD5_ASM -DRMD160_ASM
- DEPFLAG= 
- PEX_LIBS= 
- EX_LIBS= 
-@@ -169,7 +169,7 @@
- MAKEFILE= Makefile.ssl
- MAKE=     make -f Makefile.ssl
- 
--MANDIR=$(OPENSSLDIR)/man
-+MANDIR=$(OPENSSLDIR)/../share/man
- MAN1=1
- MAN3=3
- SHELL=/bin/sh
diff --git a/dev-libs/openssl/files/openssl-0.9.6c-gcc3.patch b/dev-libs/openssl/files/openssl-0.9.6c-gcc3.patch
new file mode 100644
index 000000000000..72ac22933b16
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-0.9.6c-gcc3.patch
@@ -0,0 +1,11 @@
+--- crypto/des/des.h.mdk	Thu Mar 29 02:44:50 2001
++++ crypto/des/des.h	Mon Jan 21 16:16:00 2002
+@@ -189,7 +189,7 @@
+ 		  des_cblock *iv);
+ char *des_fcrypt(const char *buf,const char *salt, char *ret);
+ char *des_crypt(const char *buf,const char *salt);
+-#if !defined(PERL5) && !defined(__FreeBSD__) && !defined(NeXT)
++#if !defined(PERL5) && !defined(__FreeBSD__) && !defined(NeXT) && !defined (_XOPEN_SOURCE)
+ char *crypt(const char *buf,const char *salt);
+ #endif
+ void des_ofb_encrypt(const unsigned char *in,unsigned char *out,int numbits,