Browse Source

Update versions.txt

lj2007331 8 years ago
parent
commit
acded3fe04
9 changed files with 24 additions and 24 deletions
  1. 2 2
      addons.sh
  2. 1 1
      config/index.html
  3. 1 1
      config/index_cn.html
  4. 1 1
      include/check_download.sh
  5. 1 1
      include/php-5.3.sh
  6. 1 1
      include/tomcat-6.sh
  7. 1 1
      include/tomcat-7.sh
  8. 1 1
      include/tomcat-8.sh
  9. 15 15
      versions.txt

+ 2 - 2
addons.sh

@@ -145,8 +145,8 @@ EOF
   fi
 
   if [ ! -e "${python_install_dir}/bin/easy_install" ] ;then
-    src_url=http://mirrors.linuxeye.com/oneinstack/src/setuptools-${setuptools_version}.tar.gz && Download_src
-    tar xzf setuptools-${setuptools_version}.tar.gz
+    src_url=http://mirrors.linuxeye.com/oneinstack/src/setuptools-${setuptools_version}.zip && Download_src
+    unzip -q setuptools-${setuptools_version}.zip
     pushd setuptools-${setuptools_version}
     ${python_install_dir}/bin/python setup.py install
     popd

+ 1 - 1
config/index.html

@@ -30,7 +30,7 @@ font-family:"Microsoft YaHei",sans-serif;
 <p><b>Author email:&nbsp;&nbsp;</b><a class="email" href="mailto:lj2007331@gmail.com">lj2007331@gmail.com</a></p>
 <p><b>Donate:</b>&nbsp;&nbsp;&nbsp;&nbsp;<a href="https://paypal.me/yeho" target="_blank"><img src="https://img.shields.io/badge/Paypal-donate-green.svg" alt="" /></a> <a href="https://static.oneinstack.com/images/alipay.png" target="_blank"><img src="https://img.shields.io/badge/Alipay-donate-green.svg" alt="" /></a> <a href="https://static.oneinstack.com/images/weixin.png" target="_blank"><img src="https://img.shields.io/badge/Wechat-donate-green.svg" /></a></p>
 <p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Paypal:&nbsp;&nbsp;lj2007331@gmail.com &nbsp;&nbsp;Alipay:&nbsp;&nbsp;lj2007331@gmail.com</p>
-<div align="center"><iframe src="https://blog.linuxeye.com/ad_buttom.html" width="475" frameborder="0" scrolling="no"></iframe></div>
+<div align="center"><iframe src="https://static.oneinstack.com/ad_buttom.html" width="475" frameborder="0" scrolling="no"></iframe></div>
 <div align="center"><h3><a href="https://oneinstack.com" target="_blank">OneinStack</a> by <a href="https://blog.linuxeye.com/" target="_blank">LinuxEye</a></h3></div>
 </div>
 </body>

+ 1 - 1
config/index_cn.html

@@ -31,7 +31,7 @@ font-family:微软雅黑,sans-serif;
 <p><b>QQ 群:</b>&nbsp;&nbsp;558540514(付费千人群) 535783209(新)</p>
 <p><b>赞助我们:</b>&nbsp;&nbsp;&nbsp;&nbsp;<a href="https://paypal.me/yeho" target="_blank"><img src="https://img.shields.io/badge/Paypal-donate-green.svg" alt="" /></a> <a href="https://static.oneinstack.com/images/alipay.png" target="_blank"><img src="https://img.shields.io/badge/%E6%94%AF%E4%BB%98%E5%AE%9D-%E5%90%91TA%E6%8D%90%E5%8A%A9-green.svg" alt="" /></a> <a href="https://static.oneinstack.com/images/weixin.png" target="_blank"><img src="https://img.shields.io/badge/%E5%BE%AE%E4%BF%A1-%E5%90%91TA%E6%8D%90%E5%8A%A9-green.svg" /></a></p>
 <p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Paypal:&nbsp;&nbsp;lj2007331@gmail.com &nbsp;&nbsp;支付宝:&nbsp;&nbsp;lj2007331@gmail.com</p>
-<div align="center"><iframe src="https://blog.linuxeye.com/ad_buttom.html" width="475" frameborder="0" scrolling="no"></iframe></div>
+<div align="center"><iframe src="https://static.oneinstack.com/ad_buttom.html" width="475" frameborder="0" scrolling="no"></iframe></div>
 <div align="center"><h3><a href="https://oneinstack.com" target="_blank">OneinStack</a> by <a href="https://blog.linuxeye.com/" target="_blank">Linux 运维笔记</a></h3></div>
 </div>
 </body>

+ 1 - 1
include/check_download.sh

@@ -647,7 +647,7 @@ checkDownload() {
 
   if [ "${FTP_yn}" == 'y' ]; then
     echo "Download pureftpd..."
-    src_url=http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-${pureftpd_version}.tar.gz && Download_src
+    src_url=https://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-${pureftpd_version}.tar.gz && Download_src
   fi
 
   if [ "${phpMyAdmin_yn}" == 'y' ]; then

+ 1 - 1
include/php-5.3.sh

@@ -24,7 +24,7 @@ Install_PHP53() {
     if [ ! -e '/usr/local/openssl100s/lib/libcrypto.a' ]; then
       tar xzf openssl-1.0.0s.tar.gz
       pushd openssl-1.0.0s
-      CFLAGS=-fPIC ./config --prefix=/usr/local/openssl100s shared zlib
+      CFLAGS=-fPIC ./config --prefix=/usr/local/openssl100s shared zlib-dynamic 
       make -j ${THREAD} && make install
       popd 
       rm -rf openssl-1.0.0s

+ 1 - 1
include/tomcat-6.sh

@@ -19,7 +19,7 @@ Install_Tomcat6() {
   if [ ! -e "${openssl_install_dir}/lib/libcrypto.a" ]; then
     tar xzf openssl-${openssl_version}.tar.gz
     pushd openssl-${openssl_version}
-    CFLAGS=-fPIC ./config --prefix=${openssl_install_dir} shared zlib
+    CFLAGS=-fPIC ./config --prefix=${openssl_install_dir} shared zlib-dynamic 
     make -j ${THREAD} && make install
     popd
     rm -rf openssl-${openssl_version}

+ 1 - 1
include/tomcat-7.sh

@@ -19,7 +19,7 @@ Install_Tomcat7() {
   if [ ! -e "${openssl_install_dir}/lib/libcrypto.a" ]; then
     tar xzf openssl-${openssl_version}.tar.gz
     pushd openssl-${openssl_version}
-    CFLAGS=-fPIC ./config --prefix=${openssl_install_dir} shared zlib
+    CFLAGS=-fPIC ./config --prefix=${openssl_install_dir} shared zlib-dynamic 
     make -j ${THREAD} && make install
     popd
     rm -rf openssl-${openssl_version}

+ 1 - 1
include/tomcat-8.sh

@@ -19,7 +19,7 @@ Install_Tomcat8() {
   if [ ! -e "${openssl_install_dir}/lib/libcrypto.a" ]; then
     tar xzf openssl-${openssl_version}.tar.gz
     pushd openssl-${openssl_version}
-    CFLAGS=-fPIC ./config --prefix=${openssl_install_dir} shared zlib
+    CFLAGS=-fPIC ./config --prefix=${openssl_install_dir} shared zlib-dynamic 
     make -j ${THREAD} && make install
     popd
     rm -rf openssl-${openssl_version}

+ 15 - 15
versions.txt

@@ -1,12 +1,12 @@
 # newest software version
 # Web
-nginx_version=1.10.2
+nginx_version=1.10.3
 tengine_version=2.1.2
 openresty_version=1.11.2.2
-openssl_version=1.0.2j
+openssl_version=1.0.2k
 
-tomcat8_version=8.0.39
-tomcat7_version=7.0.73
+tomcat8_version=8.0.41
+tomcat7_version=7.0.75
 tomcat6_version=6.0.48
 
 apache24_version=2.4.25
@@ -21,18 +21,18 @@ mysql57_version=5.7.17
 mysql56_version=5.6.35
 mysql55_version=5.5.54
 
-mariadb101_version=10.1.20
-mariadb100_version=10.0.28
+mariadb101_version=10.1.21
+mariadb100_version=10.0.29
 mariadb55_version=5.5.54
 
-percona57_version=5.7.16-10
+percona57_version=5.7.17-11
 percona56_version=5.6.34-79.1
-percona55_version=5.5.53-38.5
+percona55_version=5.5.54-38.6
 
 alisql56_version=5.6.32-3
 
 # JDK
-jdk18_version=1.8.0_112
+jdk18_version=1.8.0_121
 jdk17_version=1.7.0_80
 jdk16_version=1.6.0_45
 
@@ -48,8 +48,8 @@ zendopcache_version=7.0.5
 xcache_version=3.2.0
 apcu_version=4.0.11
 apcu_for_php7_version=5.1.7
-ImageMagick_version=6.9.7-3
-imagick_version=3.4.3RC1
+ImageMagick_version=6.9.7-6
+imagick_version=3.4.3
 imagick_for_php53_version=3.3.0
 GraphicsMagick_version=1.3.25
 gmagick_for_php7_version=2.0.4RC1
@@ -62,11 +62,11 @@ mhash_version=0.9.9.9
 eaccelerator_version=0.9.6.1
 
 # Ftp
-pureftpd_version=1.0.43
+pureftpd_version=1.0.45
 
 # Redis
 redis_version=3.2.6
-redis_pecl_for_php7_version=3.1.0
+redis_pecl_for_php7_version=3.1.1
 redis_pecl_version=2.2.8
 
 # Memcached
@@ -76,7 +76,7 @@ memcached_pecl_version=2.2.0
 memcache_pecl_version=3.0.8
 
 # phpMyadmin
-phpMyAdmin_version=4.4.15.9
+phpMyAdmin_version=4.4.15.10
 
 # jemalloc
 jemalloc_version=4.4.0
@@ -90,5 +90,5 @@ tmux_version=2.3
 htop_version=2.0.2
 bison_version=2.7.1
 python_version=2.7.13
-setuptools_version=32.0.0
+setuptools_version=34.1.1
 pip_version=9.0.1