Update security/openssl to openssl-0.9.7f.

Pkgsrc changes from version 0.9.7e include:

  *) Install the man pages with names that are less likely to collide
     with other packages' man pages.
  *) Support PKG_OPTIONS of "idea", "mdc2" and "rc5" to allow building
     with patented algorithms.  By default, this package still builds
     without patented algorithms.

Major changes from version 0.9.7e include:

  *) Prompt for pass phrases when appropriate for PKCS12 input format.
  *) Back-port of selected performance improvements from development
     branch, as well as improved support for PowerPC platforms.
  *) Add lots of checks for memory allocation failure, error codes to indicate
     failure and freeing up memory if a failure occurs.
  *) Add new -passin argument to dgst.
  *) Make an explicit check during certificate validation to see that
     the CA setting in each certificate on the chain is correct.

8 files changed, 214 insertions, 117 deletions

diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index 143bf2a2a4f..fdacf029537 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.101 2005/02/02 23:43:42 jlam Exp $
+# $NetBSD: Makefile,v 1.102 2005/03/23 09:06:38 jlam Exp $
 
 OPENSSL_SNAPSHOT?=	# empty
 OPENSSL_STABLE?=	# empty
-OPENSSL_VERS?=		0.9.7e
+OPENSSL_VERS?=		0.9.7f
 
 .if empty(OPENSSL_SNAPSHOT)
 DISTNAME=	openssl-${OPENSSL_VERS}
-PKGREVISION=	1
 MASTER_SITES=	http://mirrors.isc.org/pub/openssl/source/ \
 		http://www.mirrors.wiretapped.net/security/cryptography/libraries/tls/openssl/ \
 		http://sunsite.rediris.es/pub/mirror/OpenSSL/ \
@@ -52,9 +51,6 @@ CONFIGURE_ARGS+=	--prefix=${PREFIX}
 CONFIGURE_ARGS+=	--openssldir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	shared
 
-# IDEA, RC5, and MDC2 are disabled due to licensing and/or patent issues.
-CONFIGURE_ARGS+=	no-idea no-rc5 no-mdc2
-
 .if ${OPSYS} == "SunOS" && ${MACHINE_ARCH} == "sparc"
 CONFIGURE_SCRIPT=	./Configure
 .  if !empty(CC_VERSION:Mgcc*)
@@ -70,6 +66,8 @@ CONFIGURE_ARGS+=	irix64-mips4-cc
 .  endif
 .endif
 
+.include "../../security/openssl/options.mk"
+
 CONFIGURE_ARGS+=	${CFLAGS} ${LDFLAGS}
 CONFIGURE_ENV+=		PERL="${PERL5}"
 
diff --git a/security/openssl/PLIST.common b/security/openssl/PLIST.common
index 6c0c92a95b1..eba4d41672d 100644
--- a/security/openssl/PLIST.common
+++ b/security/openssl/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.9 2004/12/24 22:02:38 jlam Exp $
+@comment $NetBSD: PLIST.common,v 1.10 2005/03/23 09:06:38 jlam Exp $
 bin/c_rehash
 bin/openssl
 bin/openssl_fips_fingerprint
@@ -29,12 +29,14 @@ include/openssl/evp.h
 include/openssl/fips.h
 include/openssl/fips_rand.h
 include/openssl/hmac.h
+${IDEA}include/openssl/idea.h
 include/openssl/krb5_asn.h
 include/openssl/kssl.h
 include/openssl/lhash.h
 include/openssl/md2.h
 include/openssl/md4.h
 include/openssl/md5.h
+${MDC2}include/openssl/mdc2.h
 include/openssl/obj_mac.h
 include/openssl/objects.h
 include/openssl/ocsp.h
@@ -48,6 +50,7 @@ include/openssl/pkcs7.h
 include/openssl/rand.h
 include/openssl/rc2.h
 include/openssl/rc4.h
+${RC5}include/openssl/rc5.h
 include/openssl/ripemd.h
 include/openssl/rsa.h
 include/openssl/safestack.h
@@ -70,46 +73,47 @@ lib/libcrypto.a
 lib/libssl.a
 lib/pkgconfig/openssl.pc
 man/man1/CA.pl.1
-man/man1/asn1parse.1
-man/man1/ca.1
-man/man1/ciphers.1
-man/man1/crl.1
-man/man1/crl2pkcs7.1
-man/man1/dgst.1
-man/man1/dhparam.1
-man/man1/dsa.1
-man/man1/dsaparam.1
-man/man1/enc.1
-man/man1/gendsa.1
-man/man1/genrsa.1
-man/man1/md2.1
-man/man1/md4.1
-man/man1/md5.1
-man/man1/mdc2.1
-man/man1/nseq.1
-man/man1/ocsp.1
 man/man1/openssl.1
-man/man1/passwd.1
-man/man1/pkcs12.1
-man/man1/pkcs7.1
-man/man1/pkcs8.1
-man/man1/rand.1
-man/man1/req.1
-man/man1/ripemd160.1
-man/man1/rsa.1
-man/man1/rsautl.1
-man/man1/s_client.1
-man/man1/s_server.1
-man/man1/s_time.1
-man/man1/sess_id.1
-man/man1/sha.1
-man/man1/sha1.1
-man/man1/smime.1
-man/man1/speed.1
-man/man1/spkac.1
-man/man1/verify.1
-man/man1/version.1
-man/man1/x509.1
+man/man1/openssl_asn1parse.1
+man/man1/openssl_ca.1
+man/man1/openssl_ciphers.1
+man/man1/openssl_crl.1
+man/man1/openssl_crl2pkcs7.1
+man/man1/openssl_dgst.1
+man/man1/openssl_dhparam.1
+man/man1/openssl_dsa.1
+man/man1/openssl_dsaparam.1
+man/man1/openssl_enc.1
+man/man1/openssl_errstr.1
+man/man1/openssl_gendsa.1
+man/man1/openssl_genrsa.1
+man/man1/openssl_md2.1
+man/man1/openssl_md4.1
+man/man1/openssl_md5.1
+man/man1/openssl_mdc2.1
+man/man1/openssl_nseq.1
+man/man1/openssl_ocsp.1
+man/man1/openssl_passwd.1
+man/man1/openssl_pkcs12.1
+man/man1/openssl_pkcs7.1
+man/man1/openssl_pkcs8.1
+man/man1/openssl_rand.1
+man/man1/openssl_req.1
+man/man1/openssl_ripemd160.1
+man/man1/openssl_rsa.1
+man/man1/openssl_rsautl.1
+man/man1/openssl_s_client.1
+man/man1/openssl_s_server.1
+man/man1/openssl_s_time.1
+man/man1/openssl_sess_id.1
+man/man1/openssl_sha.1
+man/man1/openssl_sha1.1
+man/man1/openssl_smime.1
+man/man1/openssl_speed.1
+man/man1/openssl_spkac.1
+man/man1/openssl_verify.1
+man/man1/openssl_version.1
+man/man1/openssl_x509.1
 man/man3/ASN1_OBJECT_free.3
 man/man3/ASN1_OBJECT_new.3
 man/man3/ASN1_STRING_cmp.3
@@ -922,9 +926,6 @@ man/man3/X509_NAME_print_ex.3
 man/man3/X509_NAME_print_ex_fp.3
 man/man3/X509_free.3
 man/man3/X509_new.3
-man/man3/bio.3
-man/man3/blowfish.3
-man/man3/bn.3
 man/man3/bn_add_words.3
 man/man3/bn_check_top.3
 man/man3/bn_cmp_words.3
@@ -955,8 +956,6 @@ man/man3/bn_sqr_recursive.3
 man/man3/bn_sqr_words.3
 man/man3/bn_sub_words.3
 man/man3/bn_wexpand.3
-man/man3/buffer.3
-man/man3/crypto.3
 man/man3/d2i_509_CRL_fp.3
 man/man3/d2i_ASN1_OBJECT.3
 man/man3/d2i_DHparams.3
@@ -983,17 +982,10 @@ man/man3/d2i_X509_REQ_fp.3
 man/man3/d2i_X509_SIG.3
 man/man3/d2i_X509_bio.3
 man/man3/d2i_X509_fp.3
-man/man3/des.3
 man/man3/des_read_2passwords.3
 man/man3/des_read_password.3
 man/man3/des_read_pw.3
 man/man3/des_read_pw_string.3
-man/man3/dh.3
-man/man3/dsa.3
-man/man3/engine.3
-man/man3/err.3
-man/man3/evp.3
-man/man3/hmac.3
 man/man3/i2d_ASN1_OBJECT.3
 man/man3/i2d_DHparams.3
 man/man3/i2d_DSAPrivateKey.3
@@ -1035,20 +1027,32 @@ man/man3/lh_node_usage_stats_bio.3
 man/man3/lh_retrieve.3
 man/man3/lh_stats.3
 man/man3/lh_stats_bio.3
-man/man3/lhash.3
-man/man3/md5.3
-man/man3/mdc2.3
-man/man3/pem.3
-man/man3/rand.3
-man/man3/rc4.3
-man/man3/ripemd.3
-man/man3/rsa.3
-man/man3/sha.3
-man/man3/ssl.3
-man/man3/threads.3
-man/man3/ui.3
-man/man3/ui_compat.3
-man/man5/config.5
+man/man3/openssl_bio.3
+man/man3/openssl_blowfish.3
+man/man3/openssl_bn.3
+man/man3/openssl_buffer.3
+man/man3/openssl_crypto.3
+man/man3/openssl_des.3
+man/man3/openssl_dh.3
+man/man3/openssl_dsa.3
+man/man3/openssl_engine.3
+man/man3/openssl_err.3
+man/man3/openssl_evp.3
+man/man3/openssl_hmac.3
+man/man3/openssl_lhash.3
+man/man3/openssl_md5.3
+man/man3/openssl_mdc2.3
+man/man3/openssl_pem.3
+man/man3/openssl_rand.3
+man/man3/openssl_rc4.3
+man/man3/openssl_ripemd.3
+man/man3/openssl_rsa.3
+man/man3/openssl_sha.3
+man/man3/openssl_ssl.3
+man/man3/openssl_threads.3
+man/man3/openssl_ui.3
+man/man3/openssl_ui_compat.3
+man/man5/openssl_config.5
 man/man7/Modes_of_DES.7
 man/man7/des_modes.7
 share/examples/openssl/CA.pl
diff --git a/security/openssl/builtin.mk b/security/openssl/builtin.mk
index f3d8ba31c2f..6d8fe6e0609 100644
--- a/security/openssl/builtin.mk
+++ b/security/openssl/builtin.mk
@@ -1,6 +1,6 @@
-# $NetBSD: builtin.mk,v 1.11 2004/12/24 22:02:38 jlam Exp $
+# $NetBSD: builtin.mk,v 1.12 2005/03/23 09:06:38 jlam Exp $
 
-_OPENSSL_PKGSRC_PKGNAME=	openssl-0.9.7e
+_OPENSSL_PKGSRC_PKGNAME=	openssl-0.9.7f
 _OPENSSL_OPENSSLV_H=		/usr/include/openssl/opensslv.h
 
 .for _lib_ in des
diff --git a/security/openssl/distinfo b/security/openssl/distinfo
index 668a4649679..d603710f26d 100644
--- a/security/openssl/distinfo
+++ b/security/openssl/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.44 2005/02/24 13:10:08 agc Exp $
+$NetBSD: distinfo,v 1.45 2005/03/23 09:06:38 jlam Exp $
 
-SHA1 (openssl-0.9.7e.tar.gz) = b2eb7f13cc09655ec2378c3dde3025bf7072af54
-RMD160 (openssl-0.9.7e.tar.gz) = f09e952bbcdbc840dc8189cbed2dfd13f77de11a
-Size (openssl-0.9.7e.tar.gz) = 3043231 bytes
+SHA1 (openssl-0.9.7f.tar.gz) = 0c655553869e5ef060e824be3641385f6b8f7704
+RMD160 (openssl-0.9.7f.tar.gz) = 38ef59bf557bd1adee79481dbcc6d251f13c3ce6
+Size (openssl-0.9.7f.tar.gz) = 3104957 bytes
 SHA1 (patch-aa) = 5ab4ec9fdf15c9ded6a6205dc4801e053b3769fc
-SHA1 (patch-ac) = f470b63fe24795cb7bbb566262e8ae0b32404a05
-SHA1 (patch-ad) = 3d0a5534c6946aeda219d670f241a01e72d86c6a
+SHA1 (patch-ac) = 94d20483b9b1cb91f6bf6a3c742a85877d1a3918
+SHA1 (patch-ad) = 0bee225764123f741dd08ec88ba36fc24451e1d2
 SHA1 (patch-ae) = cb3ce622ef9efc4098d57b10059e5424272520c8
-SHA1 (patch-af) = 6afdf70d0be25fa39950efe3e6af459ff0caf9c9
+SHA1 (patch-af) = e36f298157d6030b71c2240b67f18a5a09ad8b9a
 SHA1 (patch-ak) = 7f9960a97cbe83c381c2a4565ca3a6e4e661bf54
diff --git a/security/openssl/options.mk b/security/openssl/options.mk
new file mode 100644
index 00000000000..3cb6753a684
--- /dev/null
+++ b/security/openssl/options.mk
@@ -0,0 +1,55 @@
+# $NetBSD: options.mk,v 1.1 2005/03/23 09:06:38 jlam Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.openssl
+PKG_SUPPORTED_OPTIONS=	idea mdc2 rc5
+.include "../../mk/bsd.options.mk"
+
+OPENSSL_LICENSE=	# empty
+
+###
+### Support for the IDEA algorithm
+###	US Patent: 5214703
+###	Europe Patent: EP0482154
+###	Japan Patent: 508119/1991
+###
+.if !empty(PKG_OPTIONS:Midea)
+.  if empty(OPENSSL_LICENSE:Mfee-based-commercial)
+OPENSSL_LICENSE=	fee-based-commercial
+.  endif
+PLIST_SUBST+=		IDEA=
+.else
+CONFIGURE_ARGS+=	no-idea
+PLIST_SUBST+=		IDEA="@comment "
+.endif
+
+###
+### Support for the MDC2 algorithm
+###	US Patent: 4908861
+###
+.if !empty(PKG_OPTIONS:Mmdc2)
+.  if empty(OPENSSL_LICENSE:Mfee-based-commercial)
+OPENSSL_LICENSE=	fee-based-commercial
+.  endif
+PLIST_SUBST+=		MDC2=
+.else
+CONFIGURE_ARGS+=	no-mdc2
+PLIST_SUBST+=		MDC2="@comment "
+.endif
+
+###
+### Support for the RC5 algorithm
+###	US Patent: 5724428, 5835600, 6269163
+###
+.if !empty(PKG_OPTIONS:Mrc5)
+.  if empty(OPENSSL_LICENSE:Mfee-based-commercial)
+OPENSSL_LICENSE=	fee-based-commercial
+.  endif
+PLIST_SUBST+=		RC5=
+.else
+CONFIGURE_ARGS+=	no-rc5
+PLIST_SUBST+=		RC5="@comment "
+.endif
+
+.if !empty(OPENSSL_LICENSE)
+LICENSE=	${OPENSSL_LICENSE}
+.endif
diff --git a/security/openssl/patches/patch-ac b/security/openssl/patches/patch-ac
index a68def8d8c4..ae0d3e6f881 100644
--- a/security/openssl/patches/patch-ac
+++ b/security/openssl/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.26 2005/01/18 10:25:17 grant Exp $
+$NetBSD: patch-ac,v 1.27 2005/03/23 09:06:38 jlam Exp $
 
---- Configure.orig	2004-10-01 21:34:28.000000000 +1000
+--- Configure.orig	2005-03-12 06:28:21.000000000 -0500
 +++ Configure
 @@ -171,7 +171,7 @@ my %table=(
  "solaris-x86-gcc","gcc:-O3 -fomit-frame-pointer -m486 -Wall -DL_ENDIAN -DOPENSSL_NO_INLINE_ASM::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
@@ -11,10 +11,10 @@ $NetBSD: patch-ac,v 1.26 2005/01/18 10:25:17 grant Exp $
  
  #### SPARC Solaris with GNU C setups
  "solaris-sparcv7-gcc","gcc:-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-@@ -400,9 +400,23 @@ my %table=(
- "linux-ia64",   "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "linux-ia64-ecc",   "ecc:-DL_ENDIAN -DTERMIO -O2 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "linux-x86_64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR BF_PTR2 DES_INT DES_UNROLL:asm/x86_64-gcc.o:::::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+@@ -403,9 +403,23 @@ my %table=(
+ "linux-ia64-ecc",   "ecc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK:asm/ia64.o::::asm/sha1-ia64.o::asm/rc4-ia64.o:::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-x86_64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:asm/x86_64-gcc.o::::::asm/rc4-amd64.o:::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-em64t", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR BF_PTR2 DES_INT DES_UNROLL:asm/x86_64-gcc.o:::::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 -"NetBSD-sparc",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 -"NetBSD-m68",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 -"NetBSD-x86",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
@@ -38,7 +38,7 @@ $NetBSD: patch-ac,v 1.26 2005/01/18 10:25:17 grant Exp $
  "FreeBSD-elf",  "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  "FreeBSD-sparc64","gcc:-DB_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE:::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2 BF_PTR::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  "FreeBSD-ia64","gcc:-DL_ENDIAN -DTERMIOS -O -fomit-frame-pointer::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64-cpp.o:::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-@@ -832,6 +846,10 @@ PROCESS_ARGS:
+@@ -836,6 +850,10 @@ PROCESS_ARGS:
  				{
  				$libs.=$_." ";
  				}
@@ -49,18 +49,7 @@ $NetBSD: patch-ac,v 1.26 2005/01/18 10:25:17 grant Exp $
  			elsif (/^-[^-]/ or /^\+/)
  				{
  				$flags.=$_." ";
-@@ -1167,8 +1185,8 @@ if ($fips)
- 	}
- $des_obj=$des_enc	unless (!$fips && $des_obj =~ /\.o$/);
- my $fips_des_obj='asm/fips-dx86-elf.o';
--$fips_des_obj=$fips_des_enc unless $processor eq '386';
--my $fips_sha1_obj='asm/sx86-elf.o' if $processor eq '386';
-+$fips_des_obj=$fips_des_enc unless ($fips && $processor eq '386');
-+my $fips_sha1_obj='asm/sx86-elf.o' if ($fips && $processor eq '386');
- $bf_obj=$bf_enc		unless ($bf_obj =~ /\.o$/);
- $cast_obj=$cast_enc	unless ($cast_obj =~ /\.o$/);
- $rc4_obj=$rc4_enc	unless ($rc4_obj =~ /\.o$/);
-@@ -1297,7 +1315,7 @@ while (<IN>)
+@@ -1306,7 +1324,7 @@ while (<IN>)
  	elsif ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/)
  		{
  		my $sotmp = $1;
diff --git a/security/openssl/patches/patch-ad b/security/openssl/patches/patch-ad
index a7ce5c6c5e6..f6f7e755f57 100644
--- a/security/openssl/patches/patch-ad
+++ b/security/openssl/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.13 2004/12/24 22:02:38 jlam Exp $
+$NetBSD: patch-ad,v 1.14 2005/03/23 09:06:38 jlam Exp $
 
---- apps/Makefile.orig	2004-08-10 05:09:07.000000000 -0400
+--- apps/Makefile.orig	2005-03-12 07:15:19.000000000 -0500
 +++ apps/Makefile
 @@ -10,6 +10,7 @@ CFLAG=		-g -static
  INSTALL_PREFIX=
@@ -10,15 +10,6 @@ $NetBSD: patch-ad,v 1.13 2004/12/24 22:02:38 jlam Exp $
  MAKEDEPPROG=	makedepend
  MAKEDEPEND=	$(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
  MAKEFILE=	Makefile
-@@ -36,7 +37,7 @@ LIBSSL=-L.. -lssl
- 
- PROGRAM= openssl
- 
--SCRIPTS=CA.sh CA.pl der_chop
-+SCRIPTS=CA.sh CA.pl
- 
- EXE= $(PROGRAM)$(EXE_EXT)
- 
 @@ -106,13 +107,13 @@ install:
  	@for i in $(SCRIPTS); \
  	do  \
diff --git a/security/openssl/patches/patch-af b/security/openssl/patches/patch-af
index ca12d8de2f7..7234a40ec7f 100644
--- a/security/openssl/patches/patch-af
+++ b/security/openssl/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.15 2005/02/20 05:42:51 grant Exp $
+$NetBSD: patch-af,v 1.16 2005/03/23 09:06:38 jlam Exp $
 
---- Makefile.org.orig	2004-09-29 06:52:14.000000000 +1000
+--- Makefile.org.orig	2005-03-15 04:46:13.000000000 -0500
 +++ Makefile.org
 @@ -28,6 +28,7 @@ INSTALLTOP=/usr/local/ssl
  
@@ -43,7 +43,7 @@ $NetBSD: patch-af,v 1.15 2005/02/20 05:42:51 grant Exp $
  		-Wl,--whole-archive lib$$i.a \
  		-Wl,--no-whole-archive $$libs ${EX_LIBS} -lc ) || exit 1; \
  	libs="-l$$i $$libs"; \
-@@ -415,6 +417,7 @@ do_solaris-shared:
+@@ -422,6 +424,7 @@ do_solaris-shared:
  			-o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
  			-h lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
  			-Wl,-Bsymbolic \
@@ -51,7 +51,7 @@ $NetBSD: patch-af,v 1.15 2005/02/20 05:42:51 grant Exp $
  			$${MINUSZ}allextract lib$$i.a $${MINUSZ}defaultextract \
  			$$libs ${EX_LIBS} -lc ) || exit 1; \
  		libs="-l$$i $$libs"; \
-@@ -548,7 +551,7 @@ do_hpux64-shared:
+@@ -565,7 +568,7 @@ do_hpux64-shared:
  #  HP/UX-64bit: +forceload
  #  AIX:		-bnogc
  # SHAREDFLAGS would be:
@@ -60,7 +60,7 @@ $NetBSD: patch-af,v 1.15 2005/02/20 05:42:51 grant Exp $
  #  Tru64 Unix:  -shared \
  #		-set_version "${SHLIB_VERSION_HISTORY}${SHLIB_VERSION_NUMBER}"
  #  Solaris:     -G -h lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
-@@ -790,16 +793,14 @@ dist:   
+@@ -798,16 +801,14 @@ dist:   
  dist_pem_h:
  	(cd crypto/pem; $(MAKE) CC='${CC}' SDIRS='${SDIRS}' CFLAG='${CFLAG}' pem.h; $(MAKE) clean)
  
@@ -76,6 +76,66 @@ $NetBSD: patch-af,v 1.15 2005/02/20 05:42:51 grant Exp $
 -		$(INSTALL_PREFIX)$(OPENSSLDIR)/certs \
 -		$(INSTALL_PREFIX)$(OPENSSLDIR)/private
 +		$(INSTALL_PREFIX)$(EXAMPLEDIR)
- 	@for i in $(EXHEADER) ;\
+ 	@headerlist="$(EXHEADER)"; for i in $$headerlist ;\
  	do \
  	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+@@ -893,35 +894,53 @@ install_docs:
+ 	for i in doc/apps/*.pod; do \
+ 		fn=`basename $$i .pod`; \
+ 		if [ "$$fn" = "config" ]; then sec=5; else sec=1; fi; \
+-		echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
++		case "$$fn" in \
++		CA.pl|openssl) ofn="$$fn" ;; \
++		*) ofn="openssl_$$fn" ;; \
++		esac; \
++		echo "installing man$$sec/$$ofn.$${sec}$(MANSUFFIX)"; \
+ 		(cd `$(PERL) util/dirname.pl $$i`; \
+ 		sh -c "$$pod2man \
+ 			--section=$$sec --center=OpenSSL \
+ 			--release=$(VERSION) `basename $$i`") \
+-			>  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
++			>  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$ofn.$${sec}$(MANSUFFIX); \
+ 		$(PERL) util/extract-names.pl < $$i | \
+ 			grep -v $$filecase "^$$fn\$$" | \
+ 			grep -v "[	]" | \
+ 			(cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \
+ 			 while read n; do \
+-				$$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \
++				case "$$n" in \
++				CA.pl|openssl) on="$$n" ;; \
++				*) on="openssl_$$n" ;; \
++				esac; \
++				$$here/util/point.sh $$ofn.$${sec}$(MANSUFFIX) "$$on".$${sec}$(MANSUFFIX); \
+ 			 done); \
+ 	done; \
+ 	for i in doc/crypto/*.pod doc/ssl/*.pod; do \
+ 		fn=`basename $$i .pod`; \
+ 		if [ "$$fn" = "des_modes" ]; then sec=7; else sec=3; fi; \
+-		echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
++		case "$$fn" in \
++		ui*) ofn="openssl_$$fn" ;; \
++		[A-Z]*|*_*) ofn="$$fn" ;; \
++		*) ofn="openssl_$$fn" ;; \
++		esac; \
++		echo "installing man$$sec/$$ofn.$${sec}$(MANSUFFIX)"; \
+ 		(cd `$(PERL) util/dirname.pl $$i`; \
+ 		sh -c "$$pod2man \
+ 			--section=$$sec --center=OpenSSL \
+ 			--release=$(VERSION) `basename $$i`") \
+-			>  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
++			>  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$ofn.$${sec}$(MANSUFFIX); \
+ 		$(PERL) util/extract-names.pl < $$i | \
+ 			grep -v $$filecase "^$$fn\$$" | \
+ 			grep -v "[	]" | \
+ 			(cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \
+ 			 while read n; do \
+-				$$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \
++				case "$$n" in \
++				ui*) on="openssl_$$n" ;; \
++				[A-Z]*|*_*) on="$$n" ;; \
++				*) on="openssl_$$n" ;; \
++				esac; \
++				$$here/util/point.sh $$ofn.$${sec}$(MANSUFFIX) "$$on".$${sec}$(MANSUFFIX); \
+ 			 done); \
+ 	done
+