From f32344138f4bf2e0997184ec6295a7374a383e0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20S=C3=B6ntgen?= <josef.soentgen@genode-labs.com>
Date: Mon, 13 Nov 2017 15:22:51 +0100
Subject: [PATCH] openssl: patch source relative paths in SSL

---
 repos/libports/ports/openssl.hash        |  2 +-
 repos/libports/ports/openssl.port        |  2 +-
 repos/libports/src/lib/openssl/ssl.patch | 20 ++++++++++++++++++++
 3 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 repos/libports/src/lib/openssl/ssl.patch

diff --git a/repos/libports/ports/openssl.hash b/repos/libports/ports/openssl.hash
index 224c4c8e85..56f4c1b62b 100644
--- a/repos/libports/ports/openssl.hash
+++ b/repos/libports/ports/openssl.hash
@@ -1 +1 @@
-9e008279b054b5f05cf36027e6aa4aa32a211cc6
+473ec42d97b8880c2f88ea9bb439eb114e096fd5
diff --git a/repos/libports/ports/openssl.port b/repos/libports/ports/openssl.port
index a46f11ae43..d6bfd29fff 100644
--- a/repos/libports/ports/openssl.port
+++ b/repos/libports/ports/openssl.port
@@ -38,5 +38,5 @@ src/lib/openssl/x86_64/rc4_md5.s:
 	$(VERBOSE)perl src/lib/openssl/crypto/rc4/asm/rc4-md5-x86_64.pl \
 		src/lib/openssl/crypto/perlasm/x86as.pl > $@
 
-PATCHES   := src/lib/openssl/rand_unix_c.patch
+PATCHES   := $(addprefix src/lib/openssl/,rand_unix_c.patch ssl.patch)
 PATCH_OPT := -p1 -d src/lib/openssl
diff --git a/repos/libports/src/lib/openssl/ssl.patch b/repos/libports/src/lib/openssl/ssl.patch
new file mode 100644
index 0000000000..997e74c3e6
--- /dev/null
+++ b/repos/libports/src/lib/openssl/ssl.patch
@@ -0,0 +1,20 @@
++++ x/ssl/s3_lib.c
+@@ -154,7 +154,7 @@
+ #include "kssl_lcl.h"
+ #ifndef OPENSSL_NO_TLSEXT
+ #ifndef OPENSSL_NO_EC
+-#include "../crypto/ec/ec_lcl.h"
++#include <crypto/ec/ec_lcl.h>
+ #endif /* OPENSSL_NO_EC */
+ #endif /* OPENSSL_NO_TLSEXT */
+ #include <openssl/md5.h>
++++ a/ssl/ssl_cert.c
+@@ -121,7 +121,7 @@
+ # include <sys/types.h>
+ #endif
+ 
+-#include "o_dir.h"
++#include <crypto/o_dir.h>
+ #include <openssl/objects.h>
+ #include <openssl/bio.h>
+ #include <openssl/pem.h>