From f4b3389bbea665903368c46fec9f6a3c3095c9fd Mon Sep 17 00:00:00 2001
From: "Hui, Chunyang" <sanqian.hcy@antfin.com>
Date: Sat, 19 Sep 2020 01:43:29 +0000
Subject: [PATCH] Fix golang grpc and local attestation demo to align with
 occlum 0.16.0

---
 demos/golang/grpc_pingpong/run_ping_on_occlum.sh       | 1 -
 demos/golang/grpc_pingpong/run_pong_on_occlum.sh       | 1 -
 demos/local_attestation/download_src_and_build_deps.sh | 4 ++--
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/demos/golang/grpc_pingpong/run_ping_on_occlum.sh b/demos/golang/grpc_pingpong/run_ping_on_occlum.sh
index ef9c72e5..f5262187 100755
--- a/demos/golang/grpc_pingpong/run_ping_on_occlum.sh
+++ b/demos/golang/grpc_pingpong/run_ping_on_occlum.sh
@@ -26,7 +26,6 @@ echo "${new_json}" > Occlum.json
 
 # 2. Copy program into Occlum Workspace and build
 cp ../occlum_ping image/bin
-mkdir image/etc/
 cp /etc/hosts image/etc/
 occlum build
 
diff --git a/demos/golang/grpc_pingpong/run_pong_on_occlum.sh b/demos/golang/grpc_pingpong/run_pong_on_occlum.sh
index cc6c91d4..033f21b4 100755
--- a/demos/golang/grpc_pingpong/run_pong_on_occlum.sh
+++ b/demos/golang/grpc_pingpong/run_pong_on_occlum.sh
@@ -26,7 +26,6 @@ echo "${new_json}" > Occlum.json
 
 # 2. Copy program into Occlum Workspace and build
 cp ../occlum_pong image/bin
-mkdir image/etc/
 cp /etc/hosts image/etc/
 occlum build
 
diff --git a/demos/local_attestation/download_src_and_build_deps.sh b/demos/local_attestation/download_src_and_build_deps.sh
index 6b41f5a0..ad5d497c 100755
--- a/demos/local_attestation/download_src_and_build_deps.sh
+++ b/demos/local_attestation/download_src_and_build_deps.sh
@@ -8,7 +8,7 @@ THISDIR="$(dirname $(readlink -f $0))"
 INSTALLDIR="/usr/local/occlum/x86_64-linux-musl"
 DEPSDIR="$THISDIR/deps"
 TARGET_SO="$DEPSDIR/openssl/libcrypto.so"
-SGX_VER="2.9.1"
+SGX_VER="2.11"
 
 mkdir -p $DEPSDIR || exit 1
 
@@ -70,7 +70,7 @@ sdk/tlibcrypto/sgxssl/sgx_ecc256.cpp,\
 sdk/tlibcrypto/sgxssl/sgx_sha256_msg.cpp\
 } $DH_DIR
 
-cd $DH_DIR && git apply $DH_PATCH >/dev/null 2>&1 || git apply $DH_PATCH -R --check
+cd $DH_DIR && patch -p4 < $DH_PATCH >/dev/null 2>&1 || git apply $DH_PATCH -R --check
 cd - >/dev/null 2>&1
 
 echo "DiffieHellmanLibrary is ready"