Problem: Travis rebuilds libsodium every time

Solution: use packages on Ubuntu and brews on OSX. The packages and
the brews are always kept up to date, so it's no use to rebuild the
libsodium stable branch manually everytime.

.travis.yml

@@ -12,7 +12,6 @@ env:
 - BUILD_TYPE=default CURVE=tweetnacl DRAFT=enabled
 - BUILD_TYPE=android CURVE=tweetnacl
 - BUILD_TYPE=cmake CURVE=tweetnacl
-- BUILD_TYPE=default CURVE=libsodium
 - BUILD_TYPE=default
 
 matrix:
@@ -33,11 +32,23 @@ matrix:
       apt:
         packages:
         - valgrind
+  - env: BUILD_TYPE=default CURVE=libsodium
+    os: linux
+    addons:
+      apt:
+        sources:
+        - sourceline: 'deb http://download.opensuse.org/repositories/home:/zeromq:/git-stable/xUbuntu_14.04/ ./'
+          key_url: 'http://download.opensuse.org/repositories/home:/zeromq:/git-stable/xUbuntu_14.04/Release.key'
+        packages:
+        - libsodium-dev
+  - env: BUILD_TYPE=default CURVE=libsodium
+    os: osx
 
 sudo: required
 
 before_install:
 - if [ $TRAVIS_OS_NAME == "osx" ] ; then brew update; brew install binutils ; fi
+- if [ $TRAVIS_OS_NAME == "osx" -a $CURVE == "libsodium" ] ; then brew install libsodium ; fi
 
 before_script:
 # ZMQ stress tests need more open socket (files) than the usual default

builds/cmake/ci_build.sh

@@ -23,8 +23,19 @@ if [ -z $CURVE ]; then
 elif [ $CURVE == "libsodium" ]; then
     CMAKE_OPTS+=("-DWITH_LIBSODIUM=ON")
 
-    git clone --depth 1 -b stable git://github.com/jedisct1/libsodium.git
-    ( cd libsodium; ./autogen.sh; ./configure --prefix=$BUILD_PREFIX; make install)
+    if command -v dpkg-query >/dev/null 2>&1; then
+        dpkg-query --list libsodium-dev >/dev/null 2>&1
+        HAVE_SODIUM=$?
+    elif command -v brew >/dev/null 2>&1; then
+        brew ls --versions libsodium >/dev/null 2>&1
+        HAVE_SODIUM=$?
+    else
+        HAVE_SODIUM=1
+    fi
+    if [ $HAVE_SODIUM -ne 0 ]; then
+        git clone --depth 1 -b stable git://github.com/jedisct1/libsodium.git
+        ( cd libsodium; ./autogen.sh; ./configure --prefix=$BUILD_PREFIX; make check; make install)
+    fi
 fi
 
 # Build, check, and install from local source

builds/coverage/ci_build.sh

@@ -19,8 +19,19 @@ if [ -z $CURVE ]; then
 elif [ $CURVE == "libsodium" ]; then
     CMAKE_OPTS+=("-DWITH_LIBSODIUM=ON")
 
-    git clone --depth 1 -b stable git://github.com/jedisct1/libsodium.git
-    ( cd libsodium; ./autogen.sh; ./configure --prefix=$BUILD_PREFIX; make install)
+    if command -v dpkg-query >/dev/null 2>&1; then
+        dpkg-query --list libsodium-dev >/dev/null 2>&1
+        HAVE_SODIUM=$?
+    elif command -v brew >/dev/null 2>&1; then
+        brew ls --versions libsodium >/dev/null 2>&1
+        HAVE_SODIUM=$?
+    else
+        HAVE_SODIUM=1
+    fi
+    if [ $HAVE_SODIUM -ne 0 ]; then
+        git clone --depth 1 -b stable git://github.com/jedisct1/libsodium.git
+        ( cd libsodium; ./autogen.sh; ./configure --prefix=$BUILD_PREFIX; make check; make install)
+    fi
 fi
 
 pip install --user cpp-coveralls

builds/valgrind/ci_build.sh

@@ -19,8 +19,19 @@ if [ -z $CURVE ]; then
 elif [ $CURVE == "libsodium" ]; then
     CONFIG_OPTS+=("--with-libsodium=yes")
 
-    git clone --depth 1 -b stable git://github.com/jedisct1/libsodium.git
-    ( cd libsodium; ./autogen.sh; ./configure --prefix=$BUILD_PREFIX; make install)
+    if command -v dpkg-query >/dev/null 2>&1; then
+        dpkg-query --list libsodium-dev >/dev/null 2>&1
+        HAVE_SODIUM=$?
+    elif command -v brew >/dev/null 2>&1; then
+        brew ls --versions libsodium >/dev/null 2>&1
+        HAVE_SODIUM=$?
+    else
+        HAVE_SODIUM=1
+    fi
+    if [ $HAVE_SODIUM -ne 0 ]; then
+        git clone --depth 1 -b stable git://github.com/jedisct1/libsodium.git
+        ( cd libsodium; ./autogen.sh; ./configure --prefix=$BUILD_PREFIX; make check; make install)
+    fi
 fi
 
 # Build, check, and install from local source

ci_build.sh

@@ -20,8 +20,19 @@ if [ $BUILD_TYPE == "default" ]; then
     elif [ $CURVE == "libsodium" ]; then
         CONFIG_OPTS+=("--with-libsodium=yes")
 
-        git clone --depth 1 -b stable git://github.com/jedisct1/libsodium.git
-        ( cd libsodium; ./autogen.sh; ./configure --prefix=$BUILD_PREFIX; make check; make install)
+        if command -v dpkg-query >/dev/null 2>&1; then
+            dpkg-query --list libsodium-dev >/dev/null 2>&1
+            HAVE_SODIUM=$?
+        elif command -v brew >/dev/null 2>&1; then
+            brew ls --versions libsodium >/dev/null 2>&1
+            HAVE_SODIUM=$?
+        else
+            HAVE_SODIUM=1
+        fi
+        if [ $HAVE_SODIUM -ne 0 ]; then
+            git clone --depth 1 -b stable git://github.com/jedisct1/libsodium.git
+            ( cd libsodium; ./autogen.sh; ./configure --prefix=$BUILD_PREFIX; make check; make install)
+        fi
     fi
 
     if [ -z $DRAFT ] || [ $DRAFT == "disabled" ]; then