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, 7 deletions

diff --git a/security/openssl/patches/patch-config b/security/openssl/patches/patch-config
index 7596d6d07e2..446f6dab6ea 100644
--- a/security/openssl/patches/patch-config
+++ b/security/openssl/patches/patch-config
@@ -1,8 +1,8 @@
-$NetBSD: patch-config,v 1.1.2.2 2014/04/08 10:09:26 tron Exp $
+$NetBSD: patch-config,v 1.1.2.3 2014/06/05 13:20:18 tron Exp $
 
 Adjust config procedure.
 
---- config.orig	Mon Feb 11 15:25:39 2013
+--- config.orig	Mon Mar 17 16:14:20 2014
 +++ config
 @@ -49,6 +49,7 @@ done
  # First get uname entries that we use below
@@ -12,7 +12,7 @@ Adjust config procedure.
  [ "$RELEASE" ] || RELEASE=`(uname -r) 2>/dev/null` || RELEASE="unknown"
  [ "$SYSTEM" ] || SYSTEM=`(uname -s) 2>/dev/null`  || SYSTEM="unknown"
  [ "$BUILD" ] || VERSION=`(uname -v) 2>/dev/null` || VERSION="unknown"
-@@ -162,6 +163,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${
+@@ -162,6 +163,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
  	echo "mips4-sgi-irix64"; exit 0
  	;;
  
@@ -23,7 +23,7 @@ Adjust config procedure.
      Linux:[2-9].*)
  	echo "${MACHINE}-whatever-linux2"; exit 0
  	;;
-@@ -170,6 +175,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${
+@@ -170,6 +175,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
  	echo "${MACHINE}-whatever-linux1"; exit 0
  	;;
  
@@ -34,7 +34,7 @@ Adjust config procedure.
      GNU*)
  	echo "hurd-x86"; exit 0;
  	;;
-@@ -218,15 +227,15 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${
+@@ -218,15 +227,15 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
  	echo "${MACHINE}-whatever-freebsd"; exit 0
  	;;
  
@@ -54,7 +54,7 @@ Adjust config procedure.
  	echo "${MACHINE}-whatever-openbsd"; exit 0
  	;;
  
-@@ -728,6 +737,11 @@ case "$GUESSOS" in
+@@ -728,12 +737,19 @@ case "$GUESSOS" in
  	;;
    *-*-sunos4)		OUT="sunos-$CC" ;;
  
@@ -66,7 +66,6 @@ Adjust config procedure.
    *86*-*-bsdi4)		OUT="BSD-x86-elf"; options="$options no-sse2 -ldl" ;;
    alpha*-*-*bsd*)	OUT="BSD-generic64"; options="$options -DL_ENDIAN" ;;
    powerpc64-*-*bsd*)	OUT="BSD-generic64"; options="$options -DB_ENDIAN" ;;
-@@ -734,6 +748,8 @@ case "$GUESSOS" in
    sparc64-*-*bsd*)	OUT="BSD-sparc64" ;;
    ia64-*-*bsd*)		OUT="BSD-ia64" ;;
    amd64-*-*bsd*)	OUT="BSD-x86_64" ;;