From a13f67a1b454c17786955e34e318263d7b5c7e43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leonard=20K=C3=B6nig?= <leonard.koenig@fu-berlin.de>
Date: Thu, 11 Jun 2020 23:30:59 +0200
Subject: [PATCH] re-enable timer patch

---
 setup.sh | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/setup.sh b/setup.sh
index e83bf75..6425ee9 100755
--- a/setup.sh
+++ b/setup.sh
@@ -67,19 +67,24 @@ echo $done_text
 #)
 
 # Now apply patches to libtock-rs. Do that in a sub-shell
-#(
-#  cd third_party/libtock-rs/ && \
-#  for p in ../../patches/libtock-rs/[0-9][0-9]-*.patch
-#  do
-#    echo -n '[-] Applying patch "'$(basename $p)'"... '
-#    if git apply "$p"
-#    then
-#      echo $done_text
-#    else
-#      patch_conflict_detected
-#    fi
-#  done
-#)
+(
+  cd third_party/libtock-rs/ && \
+  for p in ../../patches/libtock-rs/[0-9][0-9]-*.patch
+  do
+    if [ $p != ../../patches/libtock-rs/03-timer.patch ]
+    then
+      echo "Ignoring patch $p"
+      continue
+    fi
+    echo -n '[-] Applying patch "'$(basename $p)'"... '
+    if git apply "$p"
+    then
+      echo $done_text
+    else
+      patch_conflict_detected
+    fi
+  done
+)
 
 # Ensure we have certificates, keys, etc. so that the tests can run
 source tools/gen_key_materials.sh
-- 
GitLab