From 60ae52d386461deea5f7ef0fbe13660ef0c626ae Mon Sep 17 00:00:00 2001
From: Teddysun <i@teddysun.com>
Date: Wed, 5 Apr 2017 22:02:53 +0900
Subject: [PATCH] update libsodium version

---
 shadowsocks-all.sh          |  4 ++--
 shadowsocks-libev-debian.sh |  4 ++--
 shadowsocks-libev.sh        |  4 ++--
 shadowsocks.sh              | 25 ++++++++++++++-----------
 shadowsocksR.sh             | 25 ++++++++++++++-----------
 5 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/shadowsocks-all.sh b/shadowsocks-all.sh
index b91022d..543f92a 100644
--- a/shadowsocks-all.sh
+++ b/shadowsocks-all.sh
@@ -24,8 +24,8 @@ plain='\033[0m'
 cur_dir=$( pwd )
 software=(Shadowsocks-Python ShadowsocksR Shadowsocks-Go Shadowsocks-libev)
 
-libsodium_file="libsodium-1.0.11"
-libsodium_url="https://github.com/jedisct1/libsodium/releases/download/1.0.11/libsodium-1.0.11.tar.gz"
+libsodium_file="libsodium-1.0.12"
+libsodium_url="https://github.com/jedisct1/libsodium/releases/download/1.0.12/libsodium-1.0.12.tar.gz"
 
 mbedtls_file="mbedtls-2.4.0"
 mbedtls_url="https://tls.mbed.org/download/mbedtls-2.4.0-gpl.tgz"
diff --git a/shadowsocks-libev-debian.sh b/shadowsocks-libev-debian.sh
index 1ce32d2..15839a2 100644
--- a/shadowsocks-libev-debian.sh
+++ b/shadowsocks-libev-debian.sh
@@ -12,8 +12,8 @@ export PATH
 # Current folder
 cur_dir=`pwd`
 
-libsodium_file="libsodium-1.0.11"
-libsodium_url="https://github.com/jedisct1/libsodium/releases/download/1.0.11/libsodium-1.0.11.tar.gz"
+libsodium_file="libsodium-1.0.12"
+libsodium_url="https://github.com/jedisct1/libsodium/releases/download/1.0.12/libsodium-1.0.12.tar.gz"
 
 mbedtls_file="mbedtls-2.4.0"
 mbedtls_url="https://tls.mbed.org/download/mbedtls-2.4.0-gpl.tgz"
diff --git a/shadowsocks-libev.sh b/shadowsocks-libev.sh
index 7ebe027..4e13a70 100644
--- a/shadowsocks-libev.sh
+++ b/shadowsocks-libev.sh
@@ -12,8 +12,8 @@ export PATH
 # Current folder
 cur_dir=`pwd`
 
-libsodium_file="libsodium-1.0.11"
-libsodium_url="https://github.com/jedisct1/libsodium/releases/download/1.0.11/libsodium-1.0.11.tar.gz"
+libsodium_file="libsodium-1.0.12"
+libsodium_url="https://github.com/jedisct1/libsodium/releases/download/1.0.12/libsodium-1.0.12.tar.gz"
 
 # Make sure only root can run our script
 rootness(){
diff --git a/shadowsocks.sh b/shadowsocks.sh
index 28d32ef..1365bd2 100644
--- a/shadowsocks.sh
+++ b/shadowsocks.sh
@@ -187,8 +187,8 @@ pre_install(){
 # Download files
 download_files(){
     # Download libsodium file
-    if ! wget --no-check-certificate -O libsodium-1.0.11.tar.gz https://github.com/jedisct1/libsodium/releases/download/1.0.11/libsodium-1.0.11.tar.gz; then
-        echo "Failed to download libsodium-1.0.11.tar.gz!"
+    if ! wget --no-check-certificate -O libsodium-1.0.12.tar.gz https://github.com/jedisct1/libsodium/releases/download/1.0.12/libsodium-1.0.12.tar.gz; then
+        echo "Failed to download libsodium-1.0.12.tar.gz!"
         exit 1
     fi
     # Download Shadowsocks file
@@ -268,15 +268,18 @@ firewall_set(){
 # Install Shadowsocks
 install(){
     # Install libsodium
-    tar zxf libsodium-1.0.11.tar.gz
-    cd libsodium-1.0.11
-    ./configure && make && make install
-    if [ $? -ne 0 ]; then
-        echo "libsodium install failed!"
-        install_cleanup
-        exit 1
+    if [ ! -f /usr/lib/libsodium.a ]; then
+        cd ${cur_dir}
+        tar zxf libsodium-1.0.12.tar.gz
+        cd libsodium-1.0.12
+        ./configure --prefix=/usr && make && make install
+        if [ $? -ne 0 ]; then
+            echo "libsodium install failed!"
+            install_cleanup
+            exit 1
+        fi
     fi
-    echo "/usr/local/lib" > /etc/ld.so.conf.d/local.conf
+
     ldconfig
     # Install Shadowsocks
     cd ${cur_dir}
@@ -324,7 +327,7 @@ install(){
 # Install cleanup
 install_cleanup(){
     cd ${cur_dir}
-    rm -rf shadowsocks-master.zip shadowsocks-master libsodium-1.0.11.tar.gz libsodium-1.0.11
+    rm -rf shadowsocks-master.zip shadowsocks-master libsodium-1.0.12.tar.gz libsodium-1.0.12
 }
 
 # Uninstall Shadowsocks
diff --git a/shadowsocksR.sh b/shadowsocksR.sh
index f460b00..72b84b4 100644
--- a/shadowsocksR.sh
+++ b/shadowsocksR.sh
@@ -187,8 +187,8 @@ pre_install(){
 # Download files
 download_files(){
     # Download libsodium file
-    if ! wget --no-check-certificate -O libsodium-1.0.11.tar.gz https://github.com/jedisct1/libsodium/releases/download/1.0.11/libsodium-1.0.11.tar.gz; then
-        echo "Failed to download libsodium-1.0.11.tar.gz!"
+    if ! wget --no-check-certificate -O libsodium-1.0.12.tar.gz https://github.com/jedisct1/libsodium/releases/download/1.0.12/libsodium-1.0.12.tar.gz; then
+        echo "Failed to download libsodium-1.0.12.tar.gz!"
         exit 1
     fi
     # Download ShadowsocksR file
@@ -276,15 +276,18 @@ EOF
 # Install ShadowsocksR
 install(){
     # Install libsodium
-    tar zxf libsodium-1.0.11.tar.gz
-    cd libsodium-1.0.11
-    ./configure && make && make install
-    if [ $? -ne 0 ]; then
-        echo "libsodium install failed!"
-        install_cleanup
-        exit 1
+    if [ ! -f /usr/lib/libsodium.a ]; then
+        cd ${cur_dir}
+        tar zxf libsodium-1.0.12.tar.gz
+        cd libsodium-1.0.12
+        ./configure --prefix=/usr && make && make install
+        if [ $? -ne 0 ]; then
+            echo "libsodium install failed!"
+            install_cleanup
+            exit 1
+        fi
     fi
-    echo "/usr/local/lib" > /etc/ld.so.conf.d/local.conf
+
     ldconfig
     # Install ShadowsocksR
     cd ${cur_dir}
@@ -328,7 +331,7 @@ install(){
 # Install cleanup
 install_cleanup(){
     cd ${cur_dir}
-    rm -rf manyuser.zip shadowsocksr-manyuser libsodium-1.0.11.tar.gz libsodium-1.0.11
+    rm -rf manyuser.zip shadowsocksr-manyuser libsodium-1.0.12.tar.gz libsodium-1.0.12
 }