From 6ec8696bbc8f59357665ddc9e10ac3c0d5499516 Mon Sep 17 00:00:00 2001
From: nsubiron <nsubiron@cvc.uab.es>
Date: Tue, 30 Oct 2018 15:07:53 +0100
Subject: [PATCH] Upgrade rpclib to fix crash when client exits too fast

---
 Util/BuildTools/Setup.sh              | 7 +++++--
 Util/InstallersWin/install_rpclib.bat | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Util/BuildTools/Setup.sh b/Util/BuildTools/Setup.sh
index b815e6d13..74175aeac 100755
--- a/Util/BuildTools/Setup.sh
+++ b/Util/BuildTools/Setup.sh
@@ -125,7 +125,7 @@ unset BOOST_BASENAME
 # -- Get rpclib and compile it with libc++ and libstdc++ -----------------------
 # ==============================================================================
 
-RPCLIB_BASENAME=rpclib-2.2.1
+RPCLIB_BASENAME=rpclib-d1146b7
 
 RPCLIB_LIBCXX_INCLUDE=${PWD}/${RPCLIB_BASENAME}-libcxx-install/include
 RPCLIB_LIBCXX_LIBPATH=${PWD}/${RPCLIB_BASENAME}-libcxx-install/lib
@@ -142,7 +142,10 @@ else
 
   log "Retrieving rpclib."
 
-  git clone --depth=1 -b v2.2.1 https://github.com/rpclib/rpclib.git ${RPCLIB_BASENAME}-source
+  git clone https://github.com/rpclib/rpclib.git ${RPCLIB_BASENAME}-source
+  pushd ${RPCLIB_BASENAME}-source >/dev/null
+  git reset --hard d1146b7
+  popd >/dev/null
 
   log "Building rpclib with libc++."
 
diff --git a/Util/InstallersWin/install_rpclib.bat b/Util/InstallersWin/install_rpclib.bat
index 7e9e37cc4..6ea8e3376 100644
--- a/Util/InstallersWin/install_rpclib.bat
+++ b/Util/InstallersWin/install_rpclib.bat
@@ -33,7 +33,7 @@ if not "%1"=="" (
     goto :arg-parse
 )
 
-set RPC_VERSION=v2.2.1
+set RPC_VERSION=d1146b7
 set RPC_SRC=rpclib-src
 set RPC_SRC_DIR=%BUILD_DIR%%RPC_SRC%\
 set RPC_INSTALL=rpclib-install
@@ -47,8 +47,11 @@ if exist "%RPC_INSTALL_DIR%" (
 if not exist "%RPC_SRC_DIR%" (
     echo %FILE_N% Cloning rpclib - version "%RPC_VERSION%"...
 
-    call git clone --depth=1 -b %RPC_VERSION% https://github.com/rpclib/rpclib.git %RPC_SRC_DIR%
+    call git clone https://github.com/rpclib/rpclib.git %RPC_SRC_DIR%
     if %errorlevel% neq 0 goto error_git
+    pushd %RPC_SRC_DIR%
+    call git reset --hard d1146b7
+    popd
 ) else (
     echo %FILE_N% Not cloning rpclib because already exists a folder called "%RPC_SRC%".
 )