Pullup ticket #4431 - requested by wiz

security/openssl: security update

Revisions pulled up:
- security/openssl/Makefile                                     1.193
- security/openssl/builtin.mk                                   1.42
- security/openssl/distinfo                                     1.106-1.107
- security/openssl/patches/patch-Configure                      1.2
- security/openssl/patches/patch-Makefile.org                   1.2
- security/openssl/patches/patch-Makefile.shared                1.2
- security/openssl/patches/patch-apps_Makefile                  1.2
- security/openssl/patches/patch-config                         1.2
- security/openssl/patches/patch-crypto_bn_bn__prime.pl         1.2
- security/openssl/patches/patch-crypto_des_Makefile            1.1
- security/openssl/patches/patch-crypto_dso_dso__dlfcn.c        1.2
- security/openssl/patches/patch-doc_apps_cms.pod               deleted
- security/openssl/patches/patch-doc_apps_smine.pod             deleted
- security/openssl/patches/patch-doc_ssl_SSL__COMP__add__compression__method.pod deleted
- security/openssl/patches/patch-doc_ssl_SSL__CTX__add__session.pod deleted
- security/openssl/patches/patch-doc_ssl_SSL__CTX__load__verify__locations.pod deleted
- security/openssl/patches/patch-doc_ssl_SSL__CTX__set__client__CA__list.pod deleted
- security/openssl/patches/patch-doc_ssl_SSL__CTX__set__session__id__context.pod deleted
- security/openssl/patches/patch-doc_ssl_SSL__CTX__set__ssl__version.pod deleted
- security/openssl/patches/patch-doc_ssl_SSL__CTX__use__psk__identity__hint.pod deleted
- security/openssl/patches/patch-doc_ssl_SSL__accept.pod        deleted
- security/openssl/patches/patch-doc_ssl_SSL__clear.pod         deleted
- security/openssl/patches/patch-doc_ssl_SSL__connect.pod       deleted
- security/openssl/patches/patch-doc_ssl_SSL__do__handshake.pod deleted
- security/openssl/patches/patch-doc_ssl_SSL__read.pod          deleted
- security/openssl/patches/patch-doc_ssl_SSL__session__reused.pod deleted
- security/openssl/patches/patch-doc_ssl_SSL__set__fd.pod       deleted
- security/openssl/patches/patch-doc_ssl_SSL__set__session.pod  deleted
- security/openssl/patches/patch-doc_ssl_SSL__shutdown.pod      deleted
- security/openssl/patches/patch-doc_ssl_SSL__write.pod         deleted
- security/openssl/patches/patch-engines_ccgost_Makefile        1.2
- security/openssl/patches/patch-tools_Makefile                 1.2

---
   Module Name:	pkgsrc
   Committed By:	rodent
   Date:		Tue May 13 02:23:11 UTC 2014

   Modified Files:
   	pkgsrc/security/openssl: distinfo
   	pkgsrc/security/openssl/patches: patch-Configure patch-Makefile.org
   	    patch-Makefile.shared patch-apps_Makefile patch-config
   	    patch-crypto_bn_bn__prime.pl patch-crypto_dso_dso__dlfcn.c
   	    patch-doc_apps_cms.pod patch-doc_apps_smine.pod
   	    patch-doc_ssl_SSL__COMP__add__compression__method.pod
   	    patch-doc_ssl_SSL__CTX__add__session.pod
   	    patch-doc_ssl_SSL__CTX__load__verify__locations.pod
   	    patch-doc_ssl_SSL__CTX__set__client__CA__list.pod
   	    patch-doc_ssl_SSL__CTX__set__session__id__context.pod
   	    patch-doc_ssl_SSL__CTX__set__ssl__version.pod
   	    patch-doc_ssl_SSL__CTX__use__psk__identity__hint.pod
   	    patch-doc_ssl_SSL__accept.pod patch-doc_ssl_SSL__clear.pod
   	    patch-doc_ssl_SSL__connect.pod patch-doc_ssl_SSL__do__handshake.pod
   	    patch-doc_ssl_SSL__read.pod patch-doc_ssl_SSL__session__reused.pod
   	    patch-doc_ssl_SSL__set__fd.pod patch-doc_ssl_SSL__set__session.pod
   	    patch-doc_ssl_SSL__shutdown.pod patch-doc_ssl_SSL__write.pod
   	    patch-engines_ccgost_Makefile patch-tools_Makefile
   Added Files:
   	pkgsrc/security/openssl/patches: patch-crypto_des_Makefile

   Log Message:
   Fix build on OpenBSD/sparc64. Defuzz patches (sorry if this is annoying).

---
   Module Name:	pkgsrc
   Committed By:	wiz
   Date:		Thu Jun  5 12:16:06 UTC 2014

   Modified Files:
   	pkgsrc/security/openssl: Makefile builtin.mk distinfo
   Removed Files:
   	pkgsrc/security/openssl/patches: patch-doc_apps_cms.pod
   	    patch-doc_apps_smine.pod
   	    patch-doc_ssl_SSL__COMP__add__compression__method.pod
   	    patch-doc_ssl_SSL__CTX__add__session.pod
   	    patch-doc_ssl_SSL__CTX__load__verify__locations.pod
   	    patch-doc_ssl_SSL__CTX__set__client__CA__list.pod
   	    patch-doc_ssl_SSL__CTX__set__session__id__context.pod
   	    patch-doc_ssl_SSL__CTX__set__ssl__version.pod
   	    patch-doc_ssl_SSL__CTX__use__psk__identity__hint.pod
   	    patch-doc_ssl_SSL__accept.pod patch-doc_ssl_SSL__clear.pod
   	    patch-doc_ssl_SSL__connect.pod patch-doc_ssl_SSL__do__handshake.pod
   	    patch-doc_ssl_SSL__read.pod patch-doc_ssl_SSL__session__reused.pod
   	    patch-doc_ssl_SSL__set__fd.pod patch-doc_ssl_SSL__set__session.pod
   	    patch-doc_ssl_SSL__shutdown.pod patch-doc_ssl_SSL__write.pod

   Log Message:
   Update to 1.0.1h:

     Major changes between OpenSSL 1.0.1g and OpenSSL 1.0.1h [5 Jun 2014]

         o Fix for CVE-2014-0224
         o Fix for CVE-2014-0221
         o Fix for CVE-2014-0195
         o Fix for CVE-2014-3470
         o Fix for CVE-2010-5298

1 files changed, 6 insertions, 3 deletions

diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index 4f1f4cd3ccf..1f69821bb77 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.185.2.1 2014/04/08 10:09:26 tron Exp $
+# $NetBSD: Makefile,v 1.185.2.2 2014/06/05 13:20:18 tron Exp $
 
-DISTNAME=	openssl-1.0.1g
+DISTNAME=	openssl-1.0.1h
 MASTER_SITES=	http://ftp.openssl.org/source/
 SVR4_PKGNAME=	ossl
 CATEGORIES=	security
@@ -8,6 +8,7 @@ CATEGORIES=	security
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.openssl.org/
 COMMENT=	Secure Socket Layer and cryptographic library
+LICENSE=	openssl
 
 CONFLICTS=	SSLeay-[0-9]* ssleay-[0-9]*
 
@@ -22,7 +23,6 @@ USE_GCC_RUNTIME=	yes
 .include "../../mk/bsd.prefs.mk"
 .include "../../mk/compiler.mk"
 
-EXTRACT_USING=		gtar
 USE_TOOLS+=		fgrep gmake perl
 TEST_TARGET=		tests
 MAKE_JOBS_SAFE=		no
@@ -125,6 +125,9 @@ CONFIGURE_ARGS+=	linux-ppc64
 CONFIGURE_ARGS+=	${CFLAGS} ${LDFLAGS}
 CONFIGURE_ENV+=		PERL=${PERL5:Q}
 
+PKGCONFIG_OVERRIDE+=		libcrypto.pc libssl.pc openssl.pc
+PKGCONFIG_OVERRIDE_STAGE=	post-build
+
 PLIST_SRC+=		${PKGDIR}/PLIST.common
 USE_PLIST_SHLIB?=	yes
 .if ${USE_PLIST_SHLIB} == "yes"