From 64ebff03d91dbf23013014a42c3d06a4a8ee83b9 Mon Sep 17 00:00:00 2001
From: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
Date: Thu, 3 Aug 2017 18:26:32 -0400
Subject: [PATCH] contrib: fix a restbed dependency download

Remove the naked curl command by using safer internal version.
(This has the good side effect to enable archive caching when available)

Change-Id: I126359db576c23d72487c6a3a37b4af316293391
---
 contrib/src/restbed/rules.mak | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/contrib/src/restbed/rules.mak b/contrib/src/restbed/rules.mak
index a4bf160a0d..ac48aea3f6 100644
--- a/contrib/src/restbed/rules.mak
+++ b/contrib/src/restbed/rules.mak
@@ -40,11 +40,13 @@ RESTBED_CONF = -DBUILD_TESTS=NO \
 			-DCMAKE_INSTALL_PREFIX=$(PREFIX) \
 			-DCMAKE_INSTALL_LIBDIR=lib
 
-restbed: restbed-$(RESTBED_VERSION).tar.gz .sum-restbed
+$(TARBALLS)/kashmir.tar.gz:
+	$(call download,https://github.com/Corvusoft/kashmir-dependency/archive/master.tar.gz)
+
+restbed: restbed-$(RESTBED_VERSION).tar.gz kashmir.tar.gz .sum-restbed
 	$(UNPACK)
-	(cd $(UNPACK_DIR)/dependency && \
-	curl -L https://github.com/Corvusoft/kashmir-dependency/archive/master.tar.gz | tar xvz && \
-	rm -r kashmir && mv kashmir-dependency-master kashmir)
+	rm -rf $(UNPACK_DIR)/dependency/kashmir
+	mv kashmir-dependency-master $(UNPACK_DIR)/dependency/kashmir
 	$(APPLY) $(SRC)/restbed/findkashmir.patch
 	$(APPLY) $(SRC)/restbed/strand.patch
 	$(APPLY) $(SRC)/restbed/locale-fix.patch
-- 
GitLab