From dd33c7d5a50a81f28c716db1cd8f303361bd36af Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 23 Feb 2016 22:41:37 +0000
Subject: [PATCH] openssl: update git patchset.

* build with no-asm, as it fails to link on x86_64 otherwise.
---
 dev-libs/openssl/openssl-1.1.0~git.recipe     |  6 +--
 .../patches/openssl-1.1.0~git.patchset        | 39 ++++++++++---------
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/dev-libs/openssl/openssl-1.1.0~git.recipe b/dev-libs/openssl/openssl-1.1.0~git.recipe
index aab3ea19f..52c49b769 100644
--- a/dev-libs/openssl/openssl-1.1.0~git.recipe
+++ b/dev-libs/openssl/openssl-1.1.0~git.recipe
@@ -16,10 +16,10 @@ COPYRIGHT="1995-1998 Eric Young
 	1998-2016 The OpenSSL Project."
 LICENSE="OpenSSL"
 REVISION="1"
-srcGitRev="01a35a5da7b91718c70c0c6cccfd7531c7010d5d"
+srcGitRev="78c830785ca0f422502db9b201127ef1d9fe3966"
 SOURCE_URI="https://github.com/openssl/openssl/archive/${srcGitRev}.tar.gz"
 SOURCE_FILENAME="openssl-$portVersion.tar.gz"
-CHECKSUM_SHA256="b2896ab6b8ba1464a7bbc80b06634353089f849d080895c26c5f77ec2e19009d"
+CHECKSUM_SHA256="a5b88777e54b43cb313c02e060db16dbce9db9c6f9ed9b8a14bcdd7748fa9445"
 SOURCE_DIR="openssl-$srcGitRev"
 PATCHES="openssl-$portVersion.patchset"
 
@@ -71,7 +71,7 @@ BUILD()
 	PERL="/bin/env perl" \
 	./config --prefix=$prefix --libdir=$relativeLibDir \
 		--openssldir=$dataRootDir/ssl \
-		zlib shared
+		zlib shared no-asm
 	make
 		# multi-job builds don't work correctly
 }
diff --git a/dev-libs/openssl/patches/openssl-1.1.0~git.patchset b/dev-libs/openssl/patches/openssl-1.1.0~git.patchset
index 6674b58b5..b67f864d4 100644
--- a/dev-libs/openssl/patches/openssl-1.1.0~git.patchset
+++ b/dev-libs/openssl/patches/openssl-1.1.0~git.patchset
@@ -1,4 +1,4 @@
-From ab6cfb3fc199def74412bc5460f4902d750cf561 Mon Sep 17 00:00:00 2001
+From b1191b32183e18c96cf6fd6a8dd0844e7d658054 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Tue, 2 Feb 2016 22:45:09 +0000
 Subject: Haiku: add support.
@@ -7,10 +7,10 @@ Subject: Haiku: add support.
 * we don't have mlock(), disable mem_sec.
 
 diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
-index e1c25c0..bb3932c 100644
+index 930bef4..86defd8 100644
 --- a/Configurations/10-main.conf
 +++ b/Configurations/10-main.conf
-@@ -1522,5 +1522,32 @@
+@@ -1525,6 +1525,33 @@
          shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
          ranlib           => "$ENV{'RANLIB'}",
      },
@@ -42,28 +42,29 @@ index e1c25c0..bb3932c 100644
 +    },
 +
  
- );
+     ##### VMS
+     "vms-generic" => {
 diff --git a/Makefile.shared b/Makefile.shared
-index 0ff1a76..7f6789f 100644
+index 313de4e..165a0b0 100644
 --- a/Makefile.shared
 +++ b/Makefile.shared
-@@ -576,10 +576,10 @@ symlink.hpux:
+@@ -561,10 +561,10 @@ symlink.hpux:
  symlink.cygwin symlink.alpha-osf1 symlink.tru64 symlink.tru64-rpath:
  
  # Compatibility targets
--link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared: link_o.gnu
--link_a.bsd-gcc-shared link_a.gnu-shared: link_a.gnu
+-link_dso.bsd-gcc-shared link_dso.linux-shared link_dso.gnu-shared: link_dso.gnu
+-link_shlib.bsd-gcc-shared link_shlib.gnu-shared: link_shlib.gnu
 -link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared: link_app.gnu
 -symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared: symlink.gnu
-+link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared link_o.haiku-shared: link_o.gnu
-+link_a.bsd-gcc-shared link_a.gnu-shared link_a.haiku-shared: link_a.gnu
++link_dso.bsd-gcc-shared link_dso.linux-shared link_dso.gnu-shared link_dso.haiku-shared: link_dso.gnu
++link_shlib.bsd-gcc-shared link_shlib.gnu-shared link_shlib.haiku-shared: link_shlib.gnu
 +link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared link_app.haiku-shared: link_app.gnu
 +symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared symlink.haiku-shared: symlink.gnu
- link_o.bsd-shared: link_o.bsd
- link_a.bsd-shared: link_a.bsd
+ link_dso.bsd-shared: link_dso.bsd
+ link_shlib.bsd-shared: link_shlib.bsd
  link_app.bsd-shared: link_app.bsd
 diff --git a/config b/config
-index a70e3a2..05e7928 100755
+index ba66b33..0d577d8 100755
 --- a/config
 +++ b/config
 @@ -202,6 +202,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
@@ -142,11 +143,11 @@ index 9e620e6..18d1065 100644
  # else
  #  define X509_CERT_AREA          "SSLROOT:[000000]"
 diff --git a/crypto/mem_sec.c b/crypto/mem_sec.c
-index 6760cf4..cdb64a5 100644
+index 7e41765..f25f76b 100644
 --- a/crypto/mem_sec.c
 +++ b/crypto/mem_sec.c
-@@ -14,7 +14,10 @@
- #include <e_os.h>
+@@ -16,7 +16,10 @@
+ #include <string.h>
  
  #if defined(OPENSSL_SYS_LINUX) || defined(OPENSSL_SYS_UNIX)
 -# define IMPLEMENTED
@@ -155,13 +156,13 @@ index 6760cf4..cdb64a5 100644
 +#  define IMPLEMENTED
 +# endif
  # include <stdlib.h>
- # include <string.h>
  # include <assert.h>
+ # include <unistd.h>
 diff --git a/e_os.h b/e_os.h
-index 9b9bb4f..ef6fe23 100644
+index 3a4ba6d..dc311f5 100644
 --- a/e_os.h
 +++ b/e_os.h
-@@ -656,6 +656,13 @@ struct servent *getservbyname(const char *name, const char *proto);
+@@ -671,6 +671,13 @@ struct servent *getservbyname(const char *name, const char *proto);
  # endif
  /* end vxworks */