From 0bd44eb5cc8bb467aeb04db8ca667a277e4b3178 Mon Sep 17 00:00:00 2001
From: Anthony Scemama <scemama@irsamc.ups-tlse.fr>
Date: Mon, 12 Jan 2015 18:39:28 +0100
Subject: [PATCH] Installation of a static binary for curl

---
 data/curl_insecure_patch.txt | 11 -----------
 scripts/install_curl.sh      | 28 +++++++++++++++-------------
 2 files changed, 15 insertions(+), 24 deletions(-)
 delete mode 100644 data/curl_insecure_patch.txt

diff --git a/data/curl_insecure_patch.txt b/data/curl_insecure_patch.txt
deleted file mode 100644
index 282c520b..00000000
--- a/data/curl_insecure_patch.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/tool_getparam.c	2015-01-12 17:18:15.149251979 +0100
-+++ src/tool_getparam.c	2015-01-12 17:18:39.397148081 +0100
-@@ -227,7 +227,7 @@
-   {"I",  "head",                     FALSE},
-   {"j",  "junk-session-cookies",     FALSE},
-   {"J",  "remote-header-name",       FALSE},
--  {"k",  "insecure",                 FALSE},
-+  {"k",  "insecure",                 TRUE},
-   {"K",  "config",                   TRUE},
-   {"l",  "list-only",                FALSE},
-   {"L",  "location",                 FALSE},
diff --git a/scripts/install_curl.sh b/scripts/install_curl.sh
index 9c872357..d49a06b6 100755
--- a/scripts/install_curl.sh
+++ b/scripts/install_curl.sh
@@ -3,19 +3,21 @@
 # Installs curl for ocaml
 # Thu Oct 23 22:02:08 CEST 2014
 
-CURL_URL="http://curl.haxx.se/download/curl-7.38.0.tar.gz"
+CURL="curl-7.30.0.ermine"
+CURL_URL="http://qmcchem.ups-tlse.fr/files/scemama/${CURL}.tar.bz2"
 
-CURL=$(which curl)
-if [[ -z ${CURL} ]] 
-then 
-    rm -f -- bin/curl
-    ${QPACKAGE_ROOT}/scripts/fetch_from_web.py ${CURL_URL} CURL.tar.gz 
-    tar -zxf CURL.tar.gz && rm CURL.tar.gz ||exit 1
-    cd curl* || exit 1 
-    patch -p0 -f < ../data/curl_insecure_patch.txt
-    ./configure && make || exit 1 
-    ln -s ${PWD}/src/curl ${QPACKAGE_ROOT}/bin 
-else
-    ln -s ${CURL} ${QPACKAGE_ROOT}/bin/curl
+curl -kL "https://github.com/LCPQ/quantum_package" &> /dev/null
+if [[ $? -eq 0 ]]
+then
+  exit 0
 fi
 
+cd ${QPACKAGE_ROOT}
+rm -f -- ${QPACKAGE_ROOT}/bin/curl
+${QPACKAGE_ROOT}/scripts/fetch_from_web.py ${CURL_URL} CURL.tar.bz2
+tar -jxf CURL.tar.bz2 && rm CURL.tar.bz2 ||exit 1
+cd ${CURL} || exit 1 
+mv curl.ermine ${QPACKAGE_ROOT}/bin/curl
+cd ${QPACKAGE_ROOT}
+rm -rf -- ${CURL}
+