upgrade to 0.9.5a

5 files changed, 182 insertions, 85 deletions

diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index ff5ebde00d4..97e6e3f490e 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2000/02/12 14:08:29 fredb Exp $
+# $NetBSD: Makefile,v 1.13 2000/04/21 02:15:37 explorer Exp $
 #
 
-DISTNAME=		openssl-0.9.4
+DISTNAME=		openssl-0.9.5a
 CATEGORIES=		security
 MASTER_SITES=		ftp://ftp.openssl.org/source/
 
@@ -105,7 +105,20 @@ do-install:
 	done
 #	@cd ${WRKSRC}/perl && ${MAKE} install
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/openssl
-	${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/openssl
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/openssl/apps
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/openssl/crypto
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/openssl/ssl
+	${INSTALL_DATA} ${WRKSRC}/doc/apps/* \
+		${PREFIX}/share/doc/openssl/apps/
+	${INSTALL_DATA} ${WRKSRC}/doc/crypto/* \
+		${PREFIX}/share/doc/openssl/crypto/
+	${INSTALL_DATA} ${WRKSRC}/doc/ssl/* \
+		${PREFIX}/share/doc/openssl/ssl/
+	for file in README c-indentation.el openssl.txt openssl_button.gif \
+	openssl_button.html ssleay.txt ; do \
+		${INSTALL_DATA} ${WRKSRC}/doc/$$file \
+			${PREFIX}/share/doc/openssl/; \
+	done
 	${INSTALL_DATA_DIR} ${PREFIX}/certs ${PREFIX}/private
 	@if [ ! -f ${PREFIX}/etc/openssl.cnf ]; then \
 		${CP} -p ${PREFIX}/etc/openssl.cnf.example ${PREFIX}/etc/openssl.cnf; \
diff --git a/security/openssl/files/md5 b/security/openssl/files/md5
index 7d43b4935e4..79a8bb4e08d 100644
--- a/security/openssl/files/md5
+++ b/security/openssl/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.4 1999/11/25 18:51:47 erh Exp $
+$NetBSD: md5,v 1.5 2000/04/21 02:15:40 explorer Exp $
 
-MD5 (openssl-0.9.4.tar.gz) = ee27fd88986143156920a0da362135fb
+MD5 (openssl-0.9.5a.tar.gz) = 8fcb6a8ba511ec8b54b95f267ef52cf0
diff --git a/security/openssl/files/patch-sum b/security/openssl/files/patch-sum
index 0f0e519d0cf..7c4b873fee2 100644
--- a/security/openssl/files/patch-sum
+++ b/security/openssl/files/patch-sum
@@ -1,7 +1,7 @@
-$NetBSD: patch-sum,v 1.4 2000/03/18 16:52:33 fredb Exp $
+$NetBSD: patch-sum,v 1.5 2000/04/21 02:15:40 explorer Exp $
 
 MD5 (patch-aa) = 680dc7f99217e4bff63d6f7493af35e2
-MD5 (patch-ab) = 1ce74c455bdb8ae7cc4dfb507e2cebad
+MD5 (patch-ab) = f73f5683fed98a1f72f0ac3723b227cd
 MD5 (patch-ac) = d5a887ca7ddc1d41e133adc9a0f7656c
 MD5 (patch-ad) = df1eb0ff26293644a86aeeafc8e1e706
 MD5 (patch-ae) = c9f265f64112b3084724098a9fd067b3
diff --git a/security/openssl/patches/patch-ab b/security/openssl/patches/patch-ab
index cab5df965e7..1b120005a42 100644
--- a/security/openssl/patches/patch-ab
+++ b/security/openssl/patches/patch-ab
@@ -1,29 +1,17 @@
-$NetBSD: patch-ab,v 1.4 2000/02/05 04:41:15 wiz Exp $
---- Configure.orig	Wed Oct 20 18:41:27 1999
-+++ Configure	Thu Oct 21 00:05:25 1999
-@@ -82,8 +82,9 @@
- # -DB_ENDIAN slows things down on a sparc for md5, but helps sha1.
- # So the md5_locl.h file has an undef B_ENDIAN if sun is defined
- 
--#config-string	CC : CFLAGS : LDFLAGS : special header file mods:bn_asm \
--# des_asm:bf_asm
-+#config-string	CC : CFLAGS : unistd : thread cflag : LDFLAGS : \
-+# bn_ops : bn_obj : des_obj : bf_obj : md5_obj : sha1_obj : cast_obj : \
-+# rc4_obj : rmd160_obj : rc5_obj
- my %table=(
- #"b",		"$tcc:$tflags::$tlib:$bits1:$tbn_mul::",
- #"bl-4c-2c",	"$tcc:$tflags::$tlib:${bits1}BN_LLONG RC4_CHAR MD2_CHAR:$tbn_mul::",
-@@ -208,9 +209,6 @@
- "linux-aout",	"gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm",
+diff -ur openssl-0.9.5a/Configure work/openssl-0.9.5a/Configure
+--- Configure.sma	Mon Mar 27 13:28:10 2000
++++ Configure	Wed Apr 19 19:21:36 2000
+@@ -274,9 +274,6 @@
  "linux-mips",   "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::(unknown)::BN_LLONG:::",
- "linux-ppc",    "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::(unknown)::::",
+ "linux-ppc",    "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::BN_LLONG::",
+ "linux-ia64",   "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::(unknown)::SIXTY_FOUR_BIT_LONG::",
 -"NetBSD-sparc",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",
 -"NetBSD-m68",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",
--"NetBSD-x86",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:",
- "FreeBSD-elf",  "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm",
- "FreeBSD",      "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm",
- "bsdi-gcc",     "gcc:-O3 -ffast-math -DL_ENDIAN -DPERL5 -m486::(unknown)::RSA_LLONG $x86_gcc_des $x86_gcc_opts:$x86_bsdi_asm",
-@@ -228,6 +226,20 @@
+-"NetBSD-x86",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:",
+ "FreeBSD-elf",  "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}",
+ "FreeBSD",      "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}",
+ "bsdi-gcc",     "gcc:-O3 -ffast-math -DL_ENDIAN -DPERL5 -m486::(unknown)::RSA_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_bsdi_asm}",
+@@ -297,6 +294,20 @@
  "aix-cc",   "cc:-O -DAIX -DB_ENDIAN::(unknown)::BN_LLONG RC4_CHAR:::",
  "aix-gcc",  "gcc:-O3 -DAIX -DB_ENDIAN::(unknown)::BN_LLONG RC4_CHAR:::",
  
@@ -44,19 +32,20 @@ $NetBSD: patch-ab,v 1.4 2000/02/05 04:41:15 wiz Exp $
  #
  # Cray T90 (SDSC)
  # It's Big-endian, but the algorithms work properly when B_ENDIAN is NOT
-@@ -345,6 +357,7 @@
- my $depflags="";
+@@ -421,6 +432,7 @@
+ my $openssl_other_defines="";
  my $libs="";
  my $target="";
 +my $xmakelib="";
  my $options="";
  foreach (@ARGV)
  	{
-@@ -377,10 +390,11 @@
+@@ -458,11 +470,12 @@
  		{
  		$libs.= "-lRSAglue -lrsaref ";
  		$flags.= "-DRSAref ";
 +		$xmakelib=" libRSAglue.a";
+ 		$openssl_other_defines .= "#define RSAref\n";
  		}
  	elsif (/^[-+]/)
  		{
@@ -65,7 +54,7 @@ $NetBSD: patch-ab,v 1.4 2000/02/05 04:41:15 wiz Exp $
  			{
  			$libs.=$_." ";
  			}
-@@ -524,13 +538,19 @@
+@@ -626,14 +639,19 @@
  
  if ($version =~ /(^[0-9]*)\.([0-9\.]*)/)
  	{
@@ -78,16 +67,16 @@ $NetBSD: patch-ab,v 1.4 2000/02/05 04:41:15 wiz Exp $
  
  open(IN,'<Makefile.org') || die "unable to read Makefile.org:$!\n";
  open(OUT,">$Makefile") || die "unable to create $Makefile:$!\n";
+ print OUT "### Generated automatically from Makefile.org by Configure.\n\n";
  my $sdirs=0;
 +my $is_elf="0";
-+if ($target =~ /.*elf.*/)
-+	{
++if ($target =~ /.*elf.*/) {
 +	$is_elf="1";
-+	}
++}
  while (<IN>)
  	{
  	chop;
-@@ -542,6 +562,7 @@
+@@ -645,6 +663,7 @@
  			}
  		}
  	$sdirs = 0 unless /\\$/;
@@ -95,10 +84,15 @@ $NetBSD: patch-ab,v 1.4 2000/02/05 04:41:15 wiz Exp $
  	s/^VERSION=.*/VERSION=$version/;
  	s/^MAJOR=.*/MAJOR=$major/;
  	s/^MINOR=.*/MINOR=$minor/;
-@@ -571,6 +592,19 @@
- close(IN);
- close(OUT);
- 
+@@ -669,6 +688,19 @@
+ 	s/^PROCESSOR=.*/PROCESSOR= $processor/;
+ 	s/^RANLIB=.*/RANLIB= $ranlib/;
+ 	s/^PERL=.*/PERL= $perl/;
++	print OUT $_."\n";
++	}
++close(IN);
++close(OUT);
++
 +rename("crypto/Makefile.ssl", "crypto/Makefile.org") unless -e "crypto/Makefile.org";
 +open(IN, '<crypto/Makefile.org') || die "unable to read crypto/Makefile.org:$!\n";
 +open(OUT,">crypto/Makefile.ssl") || die "unable to create crypto/Makefile.ssl:$!\n";
@@ -107,42 +101,6 @@ $NetBSD: patch-ab,v 1.4 2000/02/05 04:41:15 wiz Exp $
 +	{
 +	chop;
 +	s/^(.*)\${MAKELIB}(.*)$/$&$xmakelib/;
-+	print OUT $_."\n";
-+	}
-+close(IN);
-+close(OUT);
-+
- print "CC            =$cc\n";
- print "CFLAG         =$cflags\n";
- print "EX_LIBS       =$lflags\n";
-@@ -747,30 +781,6 @@
- 	$pwd =`pwd`;
- 	chop($pwd);
- }
--print <<EOF;
--
--NOTE: The OpenSSL header files have been moved from include/*.h
--to include/openssl/*.h.  To include OpenSSL header files, now
--directives of the form
--     #include <openssl/foo.h>
--should be used instead of #include <foo.h>.
--These new file locations allow installing the OpenSSL header
--files in /usr/local/include/openssl/ and should help avoid
--conflicts with other libraries.
--
--To compile programs that use the old form <foo.h>,
--usually an additional compiler option will suffice: E.g., add
--     -I$prefix/include/openssl
--or
--     -I$pwd/include/openssl
--to the CFLAGS in the Makefile of the program that you want to compile
--(and leave all the original -I...'s in place!).
--
--Please make sure that no old OpenSSL header files are around:
--The include directory should now be empty except for the openssl
--subdirectory.
--
--EOF
- 
- print <<\EOF if (!$no_threads && !$threads);
- 
+ 	print OUT $_."\n";
+ 	}
+ close(IN);
diff --git a/security/openssl/pkg/PLIST b/security/openssl/pkg/PLIST
index f059fad3e7c..f4ee1794da1 100644
--- a/security/openssl/pkg/PLIST
+++ b/security/openssl/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2000/02/12 14:08:30 fredb Exp $
+@comment $NetBSD: PLIST,v 1.4 2000/04/21 02:15:41 explorer Exp $
 bin/CA.pl
 bin/CA.sh
 bin/asn1parse
@@ -141,16 +141,142 @@ lib/libcrypto.so.1.0
 lib/libssl.a
 lib/libssl.so.1.0
 share/doc/openssl/README
+share/doc/openssl/apps/CA.pl.pod
+share/doc/openssl/apps/crl.pod
+share/doc/openssl/apps/dsaparam.pod
+share/doc/openssl/apps/openssl.pod
+share/doc/openssl/apps/rand.pod
+share/doc/openssl/apps/sess_id.pod
+share/doc/openssl/apps/version.pod
+share/doc/openssl/apps/asn1parse.pod
+share/doc/openssl/apps/crl2pkcs7.pod
+share/doc/openssl/apps/enc.pod
+share/doc/openssl/apps/passwd.pod
+share/doc/openssl/apps/req.pod
+share/doc/openssl/apps/smime.pod
+share/doc/openssl/apps/x509.pod
+share/doc/openssl/apps/ca.pod
+share/doc/openssl/apps/dgst.pod
+share/doc/openssl/apps/gendsa.pod
+share/doc/openssl/apps/pkcs12.pod
+share/doc/openssl/apps/rsa.pod
+share/doc/openssl/apps/speed.pod
+share/doc/openssl/apps/ciphers.pod
+share/doc/openssl/apps/dhparam.pod
+share/doc/openssl/apps/genrsa.pod
+share/doc/openssl/apps/pkcs7.pod
+share/doc/openssl/apps/s_client.pod
+share/doc/openssl/apps/spkac.pod
+share/doc/openssl/apps/config.pod
+share/doc/openssl/apps/dsa.pod
+share/doc/openssl/apps/nseq.pod
+share/doc/openssl/apps/pkcs8.pod
+share/doc/openssl/apps/s_server.pod
+share/doc/openssl/apps/verify.pod
 share/doc/openssl/c-indentation.el
-share/doc/openssl/crypto.pod
-share/doc/openssl/openssl.pod
+share/doc/openssl/crypto/BN_CTX_new.pod
+share/doc/openssl/crypto/BN_CTX_start.pod
+share/doc/openssl/crypto/BN_add.pod
+share/doc/openssl/crypto/BN_add_word.pod
+share/doc/openssl/crypto/BN_bn2bin.pod
+share/doc/openssl/crypto/BN_cmp.pod
+share/doc/openssl/crypto/BN_copy.pod
+share/doc/openssl/crypto/BN_generate_prime.pod
+share/doc/openssl/crypto/BN_mod_inverse.pod
+share/doc/openssl/crypto/BN_mod_mul_montgomery.pod
+share/doc/openssl/crypto/BN_mod_mul_reciprocal.pod
+share/doc/openssl/crypto/BN_new.pod
+share/doc/openssl/crypto/BN_num_bytes.pod
+share/doc/openssl/crypto/BN_rand.pod
+share/doc/openssl/crypto/BN_set_bit.pod
+share/doc/openssl/crypto/BN_zero.pod
+share/doc/openssl/crypto/CRYPTO_set_ex_data.pod
+share/doc/openssl/crypto/DH_generate_key.pod
+share/doc/openssl/crypto/DH_generate_parameters.pod
+share/doc/openssl/crypto/DH_get_ex_new_index.pod
+share/doc/openssl/crypto/DH_new.pod
+share/doc/openssl/crypto/DH_set_method.pod
+share/doc/openssl/crypto/DH_size.pod
+share/doc/openssl/crypto/DSA_SIG_new.pod
+share/doc/openssl/crypto/DSA_do_sign.pod
+share/doc/openssl/crypto/DSA_dup_DH.pod
+share/doc/openssl/crypto/DSA_generate_key.pod
+share/doc/openssl/crypto/DSA_generate_parameters.pod
+share/doc/openssl/crypto/DSA_get_ex_new_index.pod
+share/doc/openssl/crypto/DSA_new.pod
+share/doc/openssl/crypto/DSA_set_method.pod
+share/doc/openssl/crypto/DSA_sign.pod
+share/doc/openssl/crypto/DSA_size.pod
+share/doc/openssl/crypto/ERR_GET_LIB.pod
+share/doc/openssl/crypto/ERR_clear_error.pod
+share/doc/openssl/crypto/ERR_error_string.pod
+share/doc/openssl/crypto/ERR_get_error.pod
+share/doc/openssl/crypto/ERR_load_crypto_strings.pod
+share/doc/openssl/crypto/ERR_load_strings.pod
+share/doc/openssl/crypto/ERR_print_errors.pod
+share/doc/openssl/crypto/ERR_put_error.pod
+share/doc/openssl/crypto/ERR_remove_state.pod
+share/doc/openssl/crypto/EVP_DigestInit.pod
+share/doc/openssl/crypto/EVP_EncryptInit.pod
+share/doc/openssl/crypto/EVP_OpenInit.pod
+share/doc/openssl/crypto/EVP_SealInit.pod
+share/doc/openssl/crypto/EVP_SignInit.pod
+share/doc/openssl/crypto/EVP_VerifyInit.pod
+share/doc/openssl/crypto/OPENSSL_VERSION_NUMBER.pod
+share/doc/openssl/crypto/OpenSSL_add_all_algorithms.pod
+share/doc/openssl/crypto/RAND_add.pod
+share/doc/openssl/crypto/RAND_bytes.pod
+share/doc/openssl/crypto/RAND_cleanup.pod
+share/doc/openssl/crypto/RAND_egd.pod
+share/doc/openssl/crypto/RAND_load_file.pod
+share/doc/openssl/crypto/RAND_set_rand_method.pod
+share/doc/openssl/crypto/RSA_blinding_on.pod
+share/doc/openssl/crypto/RSA_check_key.pod
+share/doc/openssl/crypto/RSA_generate_key.pod
+share/doc/openssl/crypto/RSA_get_ex_new_index.pod
+share/doc/openssl/crypto/RSA_new.pod
+share/doc/openssl/crypto/RSA_padding_add_PKCS1_type_1.pod
+share/doc/openssl/crypto/RSA_print.pod
+share/doc/openssl/crypto/RSA_private_encrypt.pod
+share/doc/openssl/crypto/RSA_public_encrypt.pod
+share/doc/openssl/crypto/RSA_set_method.pod
+share/doc/openssl/crypto/RSA_sign.pod
+share/doc/openssl/crypto/RSA_sign_ASN1_OCTET_STRING.pod
+share/doc/openssl/crypto/RSA_size.pod
+share/doc/openssl/crypto/blowfish.pod
+share/doc/openssl/crypto/bn.pod
+share/doc/openssl/crypto/bn_internal.pod
+share/doc/openssl/crypto/buffer.pod
+share/doc/openssl/crypto/crypto.pod
+share/doc/openssl/crypto/d2i_DHparams.pod
+share/doc/openssl/crypto/d2i_RSAPublicKey.pod
+share/doc/openssl/crypto/des.pod
+share/doc/openssl/crypto/des_modes.pod
+share/doc/openssl/crypto/dh.pod
+share/doc/openssl/crypto/dsa.pod
+share/doc/openssl/crypto/err.pod
+share/doc/openssl/crypto/hmac.pod
+share/doc/openssl/crypto/lh_stats.pod
+share/doc/openssl/crypto/lhash.pod
+share/doc/openssl/crypto/md5.pod
+share/doc/openssl/crypto/mdc2.pod
+share/doc/openssl/crypto/rand.pod
+share/doc/openssl/crypto/rc4.pod
+share/doc/openssl/crypto/ripemd.pod
+share/doc/openssl/crypto/rsa.pod
+share/doc/openssl/crypto/sha.pod
+share/doc/openssl/crypto/threads.pod
 share/doc/openssl/openssl.txt
 share/doc/openssl/openssl_button.gif
 share/doc/openssl/openssl_button.html
-share/doc/openssl/ssl.pod
+share/doc/openssl/ssl/SSL_get_error.pod
+share/doc/openssl/ssl/ssl.pod
 share/doc/openssl/ssleay.txt
 @exec mkdir -p %D/certs %D/private
 @dirrm certs
 @dirrm include/openssl
 @dirrm private
+@dirrm share/doc/openssl/apps
+@dirrm share/doc/openssl/crypto
+@dirrm share/doc/openssl/ssl
 @dirrm share/doc/openssl