[pkgsrc/trunk]: pkgsrc Update security/openssl to openssl-0.9.7f.

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c7c420dd7def
branches:  trunk
changeset: 491335:c7c420dd7def
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Mar 23 09:06:38 2005 +0000

description:
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.

diffstat:

 doc/CHANGES                       |    3 +-
 security/openssl/Makefile         |   10 +-
 security/openssl/PLIST.common     |  136 +++++++++++++++++++------------------
 security/openssl/builtin.mk       |    4 +-
 security/openssl/distinfo         |   14 +-
 security/openssl/options.mk       |   55 +++++++++++++++
 security/openssl/patches/patch-ac |   27 ++-----
 security/openssl/patches/patch-ad |   13 +---
 security/openssl/patches/patch-af |   72 ++++++++++++++++++-
 9 files changed, 216 insertions(+), 118 deletions(-)

diffs (truncated from 538 to 300 lines):

diff -r 966ba9dec25d -r c7c420dd7def doc/CHANGES
--- a/doc/CHANGES       Wed Mar 23 05:05:27 2005 +0000
+++ b/doc/CHANGES       Wed Mar 23 09:06:38 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.9569 2005/03/23 05:05:02 jlam Exp $
+$NetBSD: CHANGES,v 1.9570 2005/03/23 09:06:40 jlam Exp $
 
 Changes to the packages collection and infrastructure in 2005:
 
@@ -1579,3 +1579,4 @@
        Updated courier-maildir to 0.49.0 [jlam 2005-03-23]
        Updated courier-imap to 4.0.2 [jlam 2005-03-23]
        Updated sqwebmail to 5.0.1 [jlam 2005-03-23]
+       Updated openssl to 0.9.7f [jlam 2005-03-23]
diff -r 966ba9dec25d -r c7c420dd7def security/openssl/Makefile
--- a/security/openssl/Makefile Wed Mar 23 05:05:27 2005 +0000
+++ b/security/openssl/Makefile Wed Mar 23 09:06:38 2005 +0000
@@ -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+=       --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 @@
 .  endif
 .endif
 
+.include "../../security/openssl/options.mk"
+
 CONFIGURE_ARGS+=       ${CFLAGS} ${LDFLAGS}
 CONFIGURE_ENV+=                PERL="${PERL5}"
 
diff -r 966ba9dec25d -r c7c420dd7def security/openssl/PLIST.common
--- a/security/openssl/PLIST.common     Wed Mar 23 05:05:27 2005 +0000
+++ b/security/openssl/PLIST.common     Wed Mar 23 09:06:38 2005 +0000
@@ -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/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/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/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_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_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_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_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 -r 966ba9dec25d -r c7c420dd7def security/openssl/builtin.mk
--- a/security/openssl/builtin.mk       Wed Mar 23 05:05:27 2005 +0000
+++ b/security/openssl/builtin.mk       Wed Mar 23 09:06:38 2005 +0000
@@ -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 -r 966ba9dec25d -r c7c420dd7def security/openssl/distinfo
--- a/security/openssl/distinfo Wed Mar 23 05:05:27 2005 +0000
+++ b/security/openssl/distinfo Wed Mar 23 09:06:38 2005 +0000
@@ -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 -r 966ba9dec25d -r c7c420dd7def security/openssl/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/openssl/options.mk       Wed Mar 23 09:06:38 2005 +0000
@@ -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
+