Forráskód Böngészése

Fix libsodium-dev is too old

lj2007331@gmail.com 7 éve
szülő
commit
4284e8a81f
3 módosított fájl, 7 hozzáadás és 7 törlés
  1. 1 1
      include/download.sh
  2. 4 4
      ss.sh
  3. 2 2
      versions.txt

+ 1 - 1
include/download.sh

@@ -9,7 +9,7 @@
 #       https://github.com/lj2007331/oneinstack
 
 Download_src() {
-  [ -s "${src_url##*/}" ] && echo "[${CMSG}${src_url##*/}${CEND}] found" || { wget --tries=6 -c --no-check-certificate $src_url; sleep 1; }
+  [ -s "${src_url##*/}" ] && echo "[${CMSG}${src_url##*/}${CEND}] found" || { wget -4 --tries=6 -c --no-check-certificate $src_url; sleep 1; }
   if [ ! -e "${src_url##*/}" ]; then
     echo "${CFAILURE}${src_url##*/} download failed, Please contact the author! ${CEND}"
     kill -9 $$

+ 4 - 4
ss.sh

@@ -111,7 +111,7 @@ Def_parameter() {
     done
   elif [[ "${OS}" =~ ^Ubuntu$|^Debian$ ]]; then
     apt-get -y update
-    pkgList="curl wget unzip gcc swig automake make perl cpio git libmbedtls-dev libudns-dev libev-dev gettext build-essential autoconf libtool libpcre3-dev asciidoc xmlto libc-ares-dev libsodium-dev"
+    pkgList="curl wget unzip gcc swig automake make perl cpio git libmbedtls-dev libudns-dev libev-dev gettext build-essential autoconf libtool libpcre3-dev asciidoc xmlto libc-ares-dev"
     for Package in ${pkgList}; do
       apt-get -y install $Package
     done
@@ -140,15 +140,15 @@ Install_SS-python() {
 Install_SS-libev() {
   src_url=http://mirrors.linuxeye.com/oneinstack/src/shadowsocks-libev-3.1.3.tar.gz && Download_src
   src_url=http://mirrors.linuxeye.com/oneinstack/src/libsodium-1.0.16.tar.gz && Download_src
-  src_url=http://mirrors.linuxeye.com/oneinstack/src/mbedtls-2.7.0-gpl.tgz && Download_src
+  src_url=http://mirrors.linuxeye.com/oneinstack/src/mbedtls-2.7.1.tgz && Download_src
   tar xzf shadowsocks-libev-3.1.3.tar.gz
   tar xzf libsodium-1.0.16.tar.gz
-  tar xzf mbedtls-2.7.0-gpl.tgz 
+  tar xzf mbedtls-2.7.1.tgz 
   pushd libsodium-1.0.16
   ./configure
   make -j ${THREAD} && make install
   popd
-  pushd mbedtls-2.7.0
+  pushd mbedtls-2.7.1
   make SHARED=1 CFLAGS=-fPIC
   make DESTDIR=/usr install
   popd

+ 2 - 2
versions.txt

@@ -32,7 +32,7 @@ percona55_version=5.5.59-38.11
 
 alisql56_version=5.6.32-8
 
-pgsql_version=10.2
+pgsql_version=10.3
 
 mongodb_version=3.6.3
 
@@ -76,7 +76,7 @@ redis_version=4.0.8
 redis_pecl_version=3.1.6
 
 # Memcached
-memcached_version=1.5.5
+memcached_version=1.5.6
 libmemcached_version=1.0.18
 memcached_pecl_version=2.2.0
 memcached_pecl_php7_version=3.0.4