Update to 0.6.5

8 files changed, 116 insertions, 34 deletions

diff --git a/security/openssl-beta/Makefile b/security/openssl-beta/Makefile
index fea52c630afe..8144447fdfac 100644
--- a/security/openssl-beta/Makefile
+++ b/security/openssl-beta/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	Eric Young's SSL/Crypto Library
-# Version required:	0.6.4
+# Version required:	0.6.5
 # Date created:		1 July 1996
 # Whom:			markm
 #
-# $Id: Makefile,v 1.7 1996/11/17 07:57:44 obrien Exp $
+# $Id: Makefile,v 1.8 1996/12/03 11:32:40 obrien Exp $
 #
 
-DISTNAME=		SSLeay-0.6.4
+DISTNAME=		SSLeay-0.6.5
 CATEGORIES=		devel security
 MASTER_SITES=		ftp://psych.psy.uq.oz.au/pub/Crypto/SSL/
 
diff --git a/security/openssl-beta/files/patch-ab b/security/openssl-beta/files/patch-ab
index 3f135e5ddaa0..433f208d7d49 100644
--- a/security/openssl-beta/files/patch-ab
+++ b/security/openssl-beta/files/patch-ab
@@ -1,6 +1,15 @@
---- util/mk1mf.pl.ORG	Sat Aug 10 15:52:08 1996
-+++ util/mk1mf.pl	Sat Aug 10 15:52:30 1996
-@@ -154,7 +154,7 @@
+--- util/mk1mf.pl.orig	Thu Dec  5 08:25:31 1996
++++ util/mk1mf.pl	Wed Dec 11 22:37:57 1996
+@@ -6,7 +6,7 @@
+ # funny stuff
+ #
+ 
+-$INSTALLTOP="/usr/local/ssl";
++$INSTALLTOP="/usr/local";
+ 
+ $infile="MINFO";
+ 
+@@ -156,7 +156,7 @@
  
  if ($ranlib ne "")
  	{
@@ -9,3 +18,35 @@
  	}
  
  if ($msdos)
+@@ -244,6 +244,7 @@
+ TEST_D=\$(OUT_D)
+ LIB_D=\$(OUT_D)
+ INC_D=\$(OUT_D)
++APPL_D=apps
+ 
+ # INCL_D - local library directory
+ # OBJ_D  - temp object file directory
+@@ -281,14 +282,17 @@
+ exe: \$(T_EXE) \$(BIN_D)$o\$(E_EXE)$exep
+ 
+ install:
+-	\$(MKDIR) \$(INSTALLTOP)
+-	\$(MKDIR) \$(INSTALLTOP)${o}bin
+-	\$(MKDIR) \$(INSTALLTOP)${o}include
+-	\$(MKDIR) \$(INSTALLTOP)${o}lib
++	-\$(MKDIR) \$(INSTALLTOP)
++	-\$(MKDIR) \$(INSTALLTOP)${o}bin
++	-\$(MKDIR) \$(INSTALLTOP)${o}etc
++	-\$(MKDIR) \$(INSTALLTOP)${o}include
++	-\$(MKDIR) \$(INSTALLTOP)${o}lib
+ 	\$(CP) \$(INC_D)${o}*.h \$(INSTALLTOP)${o}include
++	\$(CP) \$(APPL_D)${o}ssleay.cnf \$(INSTALLTOP)${o}etc
+ 	\$(CP) \$(BIN_D)$o\$(E_EXE)$exep \$(INSTALLTOP)${o}bin
+-	\$(CP) \$(LIB_D)$o\$(O_SSL) \$(INSTALLTOP)${o}lib
+-	\$(CP) \$(LIB_D)$o\$(O_CRYPTO) \$(INSTALLTOP)${o}lib
++	\$(CP) \$(O_SSL) \$(INSTALLTOP)${o}lib
++	\$(CP) \$(O_CRYPTO) \$(INSTALLTOP)${o}lib
++	\$(CP) \$(O_RSAGLUE) \$(INSTALLTOP)${o}lib
+ 
+ clean:
+ 	\$(RM) \$(TMP_D)$o*.*
diff --git a/security/openssl-beta/pkg-descr b/security/openssl-beta/pkg-descr
index bb479fbb02d1..d9641e291bc9 100644
--- a/security/openssl-beta/pkg-descr
+++ b/security/openssl-beta/pkg-descr
@@ -15,9 +15,10 @@ libcrypto.a:
 	Diffie-Hellman key-exchange/key generation.  There is no limit
 		on the number of bits.
 	X509 encoding/decoding into/from binary ASN1 and a
-		PEM based ascii-binary encoding which supports encryption with
-		a private key.
-        (The DES routines, while a part if this source distribution
-        are not included in the compiled package, as they are part
-        of the base FreeBSD secure/ distribution)
-        (MD2 and MD5 are also not compiled as FreeBSD has its own).
+		PEM based ascii-binary encoding which supports encryption
+		with a private key.
+
+As this is a FreeBSD port, it has been tailored to FreeBSD.  It
+uses the DES, MD2 and MD5 from FreeBSD 2.2+. Earlier versions of
+freebsd have a DES library that is missing bits, and SSLeay will
+not compile properly. The answer is to get the latest secure/ dist.
diff --git a/security/openssl-beta/pkg-plist b/security/openssl-beta/pkg-plist
index c6457f5d61d1..842f7d7f11f1 100644
--- a/security/openssl-beta/pkg-plist
+++ b/security/openssl-beta/pkg-plist
@@ -1,5 +1,5 @@
 bin/ssleay
-etc/ssleay.conf
+etc/ssleay.cnf
 include/asn1.h
 include/txt_db.h
 include/stack.h
@@ -12,7 +12,6 @@ include/rand.h
 include/pkcs7.h
 include/pem.h
 include/objects.h
-include/meth.h
 include/md5.h
 include/md2.h
 include/lhash.h
@@ -21,8 +20,8 @@ include/err.h
 include/envelope.h
 include/dsa.h
 include/dh.h
-include/cryptoall.h
 include/crypto.h
+include/cryptall.h
 include/conf.h
 include/buffer.h
 include/bn.h
@@ -34,15 +33,15 @@ lib/libcrypto.a
 @exec ranlib %D/%F
 lib/libRSAglue.a
 @exec ranlib %D/%F
+share/doc/SSLeay/a_verify.doc
 share/doc/SSLeay/apps.doc
 share/doc/SSLeay/asn1.doc
 share/doc/SSLeay/bio.doc
 share/doc/SSLeay/bn.doc
-share/doc/SSLeay/bss_file.doc
-share/doc/SSLeay/bss_mem.doc
 share/doc/SSLeay/ca.1
 share/doc/SSLeay/callback.doc
 share/doc/SSLeay/cipher.doc
+share/doc/SSLeay/cipher.m
 share/doc/SSLeay/conf.doc
 share/doc/SSLeay/des.doc
 share/doc/SSLeay/digest.doc
diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index fea52c630afe..8144447fdfac 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	Eric Young's SSL/Crypto Library
-# Version required:	0.6.4
+# Version required:	0.6.5
 # Date created:		1 July 1996
 # Whom:			markm
 #
-# $Id: Makefile,v 1.7 1996/11/17 07:57:44 obrien Exp $
+# $Id: Makefile,v 1.8 1996/12/03 11:32:40 obrien Exp $
 #
 
-DISTNAME=		SSLeay-0.6.4
+DISTNAME=		SSLeay-0.6.5
 CATEGORIES=		devel security
 MASTER_SITES=		ftp://psych.psy.uq.oz.au/pub/Crypto/SSL/
 
diff --git a/security/openssl/files/patch-ab b/security/openssl/files/patch-ab
index 3f135e5ddaa0..433f208d7d49 100644
--- a/security/openssl/files/patch-ab
+++ b/security/openssl/files/patch-ab
@@ -1,6 +1,15 @@
---- util/mk1mf.pl.ORG	Sat Aug 10 15:52:08 1996
-+++ util/mk1mf.pl	Sat Aug 10 15:52:30 1996
-@@ -154,7 +154,7 @@
+--- util/mk1mf.pl.orig	Thu Dec  5 08:25:31 1996
++++ util/mk1mf.pl	Wed Dec 11 22:37:57 1996
+@@ -6,7 +6,7 @@
+ # funny stuff
+ #
+ 
+-$INSTALLTOP="/usr/local/ssl";
++$INSTALLTOP="/usr/local";
+ 
+ $infile="MINFO";
+ 
+@@ -156,7 +156,7 @@
  
  if ($ranlib ne "")
  	{
@@ -9,3 +18,35 @@
  	}
  
  if ($msdos)
+@@ -244,6 +244,7 @@
+ TEST_D=\$(OUT_D)
+ LIB_D=\$(OUT_D)
+ INC_D=\$(OUT_D)
++APPL_D=apps
+ 
+ # INCL_D - local library directory
+ # OBJ_D  - temp object file directory
+@@ -281,14 +282,17 @@
+ exe: \$(T_EXE) \$(BIN_D)$o\$(E_EXE)$exep
+ 
+ install:
+-	\$(MKDIR) \$(INSTALLTOP)
+-	\$(MKDIR) \$(INSTALLTOP)${o}bin
+-	\$(MKDIR) \$(INSTALLTOP)${o}include
+-	\$(MKDIR) \$(INSTALLTOP)${o}lib
++	-\$(MKDIR) \$(INSTALLTOP)
++	-\$(MKDIR) \$(INSTALLTOP)${o}bin
++	-\$(MKDIR) \$(INSTALLTOP)${o}etc
++	-\$(MKDIR) \$(INSTALLTOP)${o}include
++	-\$(MKDIR) \$(INSTALLTOP)${o}lib
+ 	\$(CP) \$(INC_D)${o}*.h \$(INSTALLTOP)${o}include
++	\$(CP) \$(APPL_D)${o}ssleay.cnf \$(INSTALLTOP)${o}etc
+ 	\$(CP) \$(BIN_D)$o\$(E_EXE)$exep \$(INSTALLTOP)${o}bin
+-	\$(CP) \$(LIB_D)$o\$(O_SSL) \$(INSTALLTOP)${o}lib
+-	\$(CP) \$(LIB_D)$o\$(O_CRYPTO) \$(INSTALLTOP)${o}lib
++	\$(CP) \$(O_SSL) \$(INSTALLTOP)${o}lib
++	\$(CP) \$(O_CRYPTO) \$(INSTALLTOP)${o}lib
++	\$(CP) \$(O_RSAGLUE) \$(INSTALLTOP)${o}lib
+ 
+ clean:
+ 	\$(RM) \$(TMP_D)$o*.*
diff --git a/security/openssl/pkg-descr b/security/openssl/pkg-descr
index bb479fbb02d1..d9641e291bc9 100644
--- a/security/openssl/pkg-descr
+++ b/security/openssl/pkg-descr
@@ -15,9 +15,10 @@ libcrypto.a:
 	Diffie-Hellman key-exchange/key generation.  There is no limit
 		on the number of bits.
 	X509 encoding/decoding into/from binary ASN1 and a
-		PEM based ascii-binary encoding which supports encryption with
-		a private key.
-        (The DES routines, while a part if this source distribution
-        are not included in the compiled package, as they are part
-        of the base FreeBSD secure/ distribution)
-        (MD2 and MD5 are also not compiled as FreeBSD has its own).
+		PEM based ascii-binary encoding which supports encryption
+		with a private key.
+
+As this is a FreeBSD port, it has been tailored to FreeBSD.  It
+uses the DES, MD2 and MD5 from FreeBSD 2.2+. Earlier versions of
+freebsd have a DES library that is missing bits, and SSLeay will
+not compile properly. The answer is to get the latest secure/ dist.
diff --git a/security/openssl/pkg-plist b/security/openssl/pkg-plist
index c6457f5d61d1..842f7d7f11f1 100644
--- a/security/openssl/pkg-plist
+++ b/security/openssl/pkg-plist
@@ -1,5 +1,5 @@
 bin/ssleay
-etc/ssleay.conf
+etc/ssleay.cnf
 include/asn1.h
 include/txt_db.h
 include/stack.h
@@ -12,7 +12,6 @@ include/rand.h
 include/pkcs7.h
 include/pem.h
 include/objects.h
-include/meth.h
 include/md5.h
 include/md2.h
 include/lhash.h
@@ -21,8 +20,8 @@ include/err.h
 include/envelope.h
 include/dsa.h
 include/dh.h
-include/cryptoall.h
 include/crypto.h
+include/cryptall.h
 include/conf.h
 include/buffer.h
 include/bn.h
@@ -34,15 +33,15 @@ lib/libcrypto.a
 @exec ranlib %D/%F
 lib/libRSAglue.a
 @exec ranlib %D/%F
+share/doc/SSLeay/a_verify.doc
 share/doc/SSLeay/apps.doc
 share/doc/SSLeay/asn1.doc
 share/doc/SSLeay/bio.doc
 share/doc/SSLeay/bn.doc
-share/doc/SSLeay/bss_file.doc
-share/doc/SSLeay/bss_mem.doc
 share/doc/SSLeay/ca.1
 share/doc/SSLeay/callback.doc
 share/doc/SSLeay/cipher.doc
+share/doc/SSLeay/cipher.m
 share/doc/SSLeay/conf.doc
 share/doc/SSLeay/des.doc
 share/doc/SSLeay/digest.doc