pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Update security/openssl to 0.9.7e. Changes from opens...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/111683db184f
branches:  trunk
changeset: 486198:111683db184f
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Dec 24 22:02:37 2004 +0000

description:
Update security/openssl to 0.9.7e.  Changes from openssl-0.9.6m are
too numerous to be listed here, but include adding a new DES API
(support for the old one is still present).

Changes to the pkgsrc structure include:

* Install the shared libraries with a version number that matches the
  OpenSSL version number

* Move some of the less often-used c_* utilities back into the examples
  directory.

* Drop support for using the RSAREF library and always use the built-in
  RSA code instead.

diffstat:

 doc/CHANGES                       |    3 +-
 security/openssl/DESCR            |    8 +-
 security/openssl/MESSAGE          |   12 -
 security/openssl/Makefile         |   93 +--
 security/openssl/PLIST.aix        |    1 -
 security/openssl/PLIST.common     |  786 +++++++++++++++++++++++++++++++++++++-
 security/openssl/PLIST.darwin     |   10 +-
 security/openssl/PLIST.rsaref     |    2 -
 security/openssl/PLIST.shlib      |    8 +-
 security/openssl/buildlink3.mk    |    3 +-
 security/openssl/builtin.mk       |    4 +-
 security/openssl/distinfo         |   18 +-
 security/openssl/patches/patch-aa |   12 +-
 security/openssl/patches/patch-ab |   13 -
 security/openssl/patches/patch-ac |  230 ++--------
 security/openssl/patches/patch-ad |   50 +-
 security/openssl/patches/patch-ae |   26 +-
 security/openssl/patches/patch-af |   65 +-
 security/openssl/patches/patch-aj |   15 -
 19 files changed, 963 insertions(+), 396 deletions(-)

diffs (truncated from 1837 to 300 lines):

diff -r 8a649c1f036c -r 111683db184f doc/CHANGES
--- a/doc/CHANGES       Fri Dec 24 18:49:35 2004 +0000
+++ b/doc/CHANGES       Fri Dec 24 22:02:37 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.8425 2004/12/24 18:28:51 seb Exp $
+$NetBSD: CHANGES,v 1.8426 2004/12/24 22:02:37 jlam Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -6523,3 +6523,4 @@
        Updated advi to 1.4.0nb5 [jmmv 2004-12-24]
        Updated swiftsurf to 1.2.5nb2 [jmmv 2004-12-24]
        Updated graphviz to 2.0 [seb 2004-12-24]
+       Updated openssl to 0.9.7e [jlam 2004-12-24]
diff -r 8a649c1f036c -r 111683db184f security/openssl/DESCR
--- a/security/openssl/DESCR    Fri Dec 24 18:49:35 2004 +0000
+++ b/security/openssl/DESCR    Fri Dec 24 22:02:37 2004 +0000
@@ -1,1 +1,7 @@
-This is a Ruby module for OpenSSL, handling SSL sockets and more.
+The OpenSSL Project is a collaborative effort to develop a robust,
+commercial-grade, full-featured, and Open Source toolkit implementing
+the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS
+v1) protocols as well as a full-strength general purpose cryptography
+library.  The project is managed by a worldwide community of volunteers
+that use the Internet to communicate, plan, and develop the OpenSSL
+toolkit and its related documentation.
diff -r 8a649c1f036c -r 111683db184f security/openssl/MESSAGE
--- a/security/openssl/MESSAGE  Fri Dec 24 18:49:35 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.5 2003/09/22 03:13:58 grant Exp $
-
-If upgrading from SSLeay, you will need to copy your ssleay.cnf (used for
-creating certificate requests with "ca") into
-${PKG_SYSCONFDIR}/openssl.cnf.
-
-If installing from scratch, you may want to take a look
-at ${PREFIX}/share/examples/openssl/openssl.cnf copy it
-to ${PKG_SYSCONFDIR}/openssl.cnf, and customize it.
-
-===========================================================================
diff -r 8a649c1f036c -r 111683db184f security/openssl/Makefile
--- a/security/openssl/Makefile Fri Dec 24 18:49:35 2004 +0000
+++ b/security/openssl/Makefile Fri Dec 24 22:02:37 2004 +0000
@@ -1,62 +1,46 @@
-# $NetBSD: Makefile,v 1.97 2004/12/17 23:08:36 wiz Exp $
+# $NetBSD: Makefile,v 1.98 2004/12/24 22:02:38 jlam Exp $
 
-DISTNAME=              openssl-0.9.6m
-PKGREVISION=           2
-SVR4_PKGNAME=          ossl
-CATEGORIES=            security
-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/ \
-                       http://ftp.wayne.edu/pub/openssl/source/ \
-                       http://www.binarycode.org/openssl/source/ \
-                       ftp://ftp.openssl.org/source/
+DISTNAME=      openssl-0.9.7e
+SVR4_PKGNAME=  ossl
+CATEGORIES=    security
+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/ \
+               http://ftp.wayne.edu/pub/openssl/source/ \
+               http://www.binarycode.org/openssl/source/ \
+               ftp://ftp.openssl.org/source/
 
-MAINTAINER=            tech-pkg%NetBSD.org@localhost
-HOMEPAGE=              http://www.openssl.org/
-COMMENT=               Secure Socket Layer and cryptographic library
+MAINTAINER=    jlam%NetBSD.org@localhost
+HOMEPAGE=      http://www.openssl.org/
+COMMENT=       Secure Socket Layer and cryptographic library
 
-CONFLICTS=             SSLeay-[0-9]* ssleay-[0-9]*
+CONFLICTS=     SSLeay-[0-9]* ssleay-[0-9]*
 
-CRYPTO=                        YES
+CRYPTO=                yes
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
+.include "../../mk/bsd.prefs.mk"
 .include "../../mk/compiler.mk"
-.include "../../mk/bsd.prefs.mk"
 
-USE_PERL5=             build
-USE_BUILDLINK3=                YES
-USE_PKGINSTALL=                YES
-HAS_CONFIGURE=         YES
+USE_PERL5=             build   # perl is used throughout the build
+USE_BUILDLINK3=                yes
+USE_PKGINSTALL=                yes
+USE_GNU_TOOLS+=                make
+TEST_TARGET=           tests
+
+HAS_CONFIGURE=         yes
 CONFIGURE_SCRIPT=      ./config
 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
 
-# Global and legacy options
-.if defined(USE_RSAREF2) && !empty(USE_RSAREF2:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=  rsaref
-.endif
-
-PKG_OPTIONS_VAR=       PKG_OPTIONS.openssl
-PKG_SUPPORTED_OPTIONS= rsaref
-.include "../../mk/bsd.options.mk"
-
-###
-### Use the RSA reference package instead of the built-in code for the
-### RSA algorithm (NOT RECOMMENDED!).
-###
-.if !empty(PKG_OPTIONS:Mrsaref)
-.  include "../../security/rsaref/buildlink3.mk"
-CONFIGURE_ARGS+=       rsaref
-PLIST_RSAREF=          ${PKGDIR}/PLIST.rsaref
-.endif
-
 .if ${OPSYS} == "SunOS" && ${MACHINE_ARCH} == "sparc"
 CONFIGURE_SCRIPT=      ./Configure
-.  if !empty(CC:M*gcc*)
+.  if !empty(CC_VERSION:Mgcc*)
 CONFIGURE_ARGS+=       solaris-${SPARC_TARGET_ARCH}-gcc
 .  else
 CONFIGURE_ARGS+=       solaris-${SPARC_TARGET_ARCH}-cc
@@ -73,37 +57,26 @@
 CONFIGURE_ENV+=                PERL="${PERL5}"
 CONFIGURE_ENV+=                MACHINE_ARCH=${MACHINE_ARCH}
 
-PLIST_OPSYS=           ${PKGDIR}/PLIST.${LOWER_OPSYS:C/([.0-9]*)$//}   
+PLIST_OPSYS=           ${PKGDIR}/PLIST.${LOWER_OPSYS:C/([.0-9]*)$//}
 .if exists(${PLIST_OPSYS})
 PLIST_SHLIB=           ${PLIST_OPSYS}
 .else
 PLIST_SHLIB=           ${PKGDIR}/PLIST.shlib
 .endif
+PLIST_SRC=             ${PLIST_SHLIB}
+PLIST_SRC+=            ${PKGDIR}/PLIST.common
+PLIST_SUBST+=          SHLIB_VERSION=${DISTNAME:S/openssl-//:C/[^0-9]*$//}
+PLIST_SUBST+=          SHLIB_MAJOR=${DISTNAME:S/openssl-//:C/\..*$//}
 
-PLIST_SRC=             ${PLIST_SHLIB}
-PLIST_SRC+=            ${PLIST_RSAREF}
-PLIST_SRC+=            ${PKGDIR}/PLIST.common
+.if ${OPSYS} == "NetBSD"
+PKG_SYSCONFDIR.openssl?=       /etc/openssl
+.endif
 
 PKG_SYSCONFSUBDIR=     openssl
 CONF_FILES=            ${PREFIX}/share/examples/openssl/openssl.cnf    \
                        ${PKG_SYSCONFDIR}/openssl.cnf
 OWN_DIRS=              ${PKG_SYSCONFDIR}/certs ${PKG_SYSCONFDIR}/private
 
-.if ${OPSYS} == "NetBSD"
-PKG_SYSCONFDIR.openssl?=       /etc/openssl
-.  if !exists(/usr/libexec/ld.elf_so) && !exists(/usr/libexec/ld.so)
-PKG_FAIL_REASON=       ${PKGNAME} requires shared object support
-.  endif
-.endif
-
-.if ${OPSYS} == "Darwin"
-LD_PATH_VARNAME=       DYLD_LIBRARY_PATH
-.else
-LD_PATH_VARNAME=       LD_LIBRARY_PATH
-.endif
-TEST_ENV+=             ${LD_PATH_VARNAME}=${WRKSRC}
-TEST_TARGET=           tests
-
 pre-configure:
        cd ${WRKSRC} && ${PERL5} util/perlpath.pl ${PERL5}
 
diff -r 8a649c1f036c -r 111683db184f security/openssl/PLIST.aix
--- a/security/openssl/PLIST.aix        Fri Dec 24 18:49:35 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-@comment $NetBSD: PLIST.aix,v 1.1 2003/12/03 17:35:43 erh Exp $
diff -r 8a649c1f036c -r 111683db184f security/openssl/PLIST.common
--- a/security/openssl/PLIST.common     Fri Dec 24 18:49:35 2004 +0000
+++ b/security/openssl/PLIST.common     Fri Dec 24 22:02:37 2004 +0000
@@ -1,12 +1,11 @@
-@comment $NetBSD: PLIST.common,v 1.8 2004/12/17 23:08:36 wiz Exp $
+@comment $NetBSD: PLIST.common,v 1.9 2004/12/24 22:02:38 jlam Exp $
+bin/c_rehash
 bin/openssl
-bin/c_hash
-bin/c_info
-bin/c_issuer
-bin/c_name
-bin/c_rehash
+bin/openssl_fips_fingerprint
+include/openssl/aes.h
 include/openssl/asn1.h
 include/openssl/asn1_mac.h
+include/openssl/asn1t.h
 include/openssl/bio.h
 include/openssl/blowfish.h
 include/openssl/bn.h
@@ -17,23 +16,31 @@
 include/openssl/conf_api.h
 include/openssl/crypto.h
 include/openssl/des.h
+include/openssl/des_old.h
 include/openssl/dh.h
 include/openssl/dsa.h
 include/openssl/dso.h
-include/openssl/e_os.h
 include/openssl/e_os2.h
 include/openssl/ebcdic.h
+include/openssl/ec.h
+include/openssl/engine.h
 include/openssl/err.h
 include/openssl/evp.h
+include/openssl/fips.h
+include/openssl/fips_rand.h
 include/openssl/hmac.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
 include/openssl/obj_mac.h
 include/openssl/objects.h
+include/openssl/ocsp.h
 include/openssl/opensslconf.h
 include/openssl/opensslv.h
+include/openssl/ossl_typ.h
 include/openssl/pem.h
 include/openssl/pem2.h
 include/openssl/pkcs12.h
@@ -54,11 +61,14 @@
 include/openssl/tls1.h
 include/openssl/tmdiff.h
 include/openssl/txt_db.h
+include/openssl/ui.h
+include/openssl/ui_compat.h
 include/openssl/x509.h
 include/openssl/x509_vfy.h
 include/openssl/x509v3.h
 lib/libcrypto.a
 lib/libssl.a
+lib/pkgconfig/openssl.pc
 man/man1/CA.pl.1
 man/man1/asn1parse.1
 man/man1/ca.1
@@ -72,7 +82,12 @@
 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
@@ -80,18 +95,56 @@
 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/man3/ASN1_OBJECT_free.3
+man/man3/ASN1_OBJECT_new.3
+man/man3/ASN1_STRING_cmp.3
+man/man3/ASN1_STRING_data.3
+man/man3/ASN1_STRING_dup.3
+man/man3/ASN1_STRING_free.3
+man/man3/ASN1_STRING_length.3
+man/man3/ASN1_STRING_length_set.3
+man/man3/ASN1_STRING_new.3
+man/man3/ASN1_STRING_print_ex.3
+man/man3/ASN1_STRING_print_ex_fp.3
+man/man3/ASN1_STRING_set.3
+man/man3/ASN1_STRING_type.3
+man/man3/ASN1_STRING_type_new.3
+man/man3/BF_cbc_encrypt.3



Home | Main Index | Thread Index | Old Index