Sfoglia il codice sorgente

Fix GraphicsMagick

lj2007331@gmail.com 5 anni fa
parent
commit
cb2dee0a77
8 ha cambiato i file con 34 aggiunte e 29 eliminazioni
  1. 5 5
      backup_setup.sh
  2. 1 1
      include/GraphicsMagick.sh
  3. 3 2
      include/php-5.6.sh
  4. 3 2
      include/php-7.0.sh
  5. 3 2
      include/php-7.1.sh
  6. 3 2
      include/php-7.2.sh
  7. 3 2
      include/php-7.3.sh
  8. 13 13
      versions.txt

+ 5 - 5
backup_setup.sh

@@ -184,7 +184,7 @@ fi
 
 if [ -n "`echo ${desc_bk} | grep -w 3`" ]; then
   if [ ! -e "/usr/local/bin/ossutil" ]; then
-    wget -qc http://gosspublic.alicdn.com/ossutil/1.6.3/ossutil${OS_BIT} -O /usr/local/bin/ossutil
+    wget -qc http://gosspublic.alicdn.com/ossutil/1.6.6/ossutil${OS_BIT} -O /usr/local/bin/ossutil
     chmod +x /usr/local/bin/ossutil
   fi
   while :; do echo
@@ -331,9 +331,9 @@ fi
 if [ -n "`echo ${desc_bk} | grep -w 5`" ]; then
   if [ ! -e "/usr/local/bin/upx" ]; then
     if [ "${OS_BIT}" == '64' ]; then
-      wget -qc http://collection.b0.upaiyun.com/softwares/upx/upx-linux-amd64-v0.2.3 -O /usr/local/bin/upx
+      wget -qc http://collection.b0.upaiyun.com/softwares/upx/upx-linux-amd64-v0.2.4 -O /usr/local/bin/upx
     elif [ "${OS_BIT}" == '32' ]; then
-      wget -qc http://collection.b0.upaiyun.com/softwares/upx/upx-linux-386-v0.2.3 -O /usr/local/bin/upx
+      wget -qc http://collection.b0.upaiyun.com/softwares/upx/upx-linux-386-v0.2.4 -O /usr/local/bin/upx
     fi
     chmod +x /usr/local/bin/upx
   fi
@@ -368,8 +368,8 @@ if [ -n "`echo ${desc_bk} | grep -w 6`" ]; then
     chmod +x /usr/local/bin/qrsctl
   fi
   if [ ! -e "/usr/local/bin/qshell" ]; then
-    wget -qc http://devtools.qiniu.com/qshell-v2.3.6.zip -O /tmp/qshell-v2.3.6.zip
-    unzip -q /tmp/qshell-v2.3.6.zip -d /tmp/
+    wget -qc http://devtools.qiniu.com/qshell-v2.4.0.zip -O /tmp/qshell-v2.4.0.zip
+    unzip -q /tmp/qshell-v2.4.0.zip -d /tmp/
     if [ "${OS_BIT}" == '64' ]; then
       /bin/cp /tmp/qshell_linux_x64 /usr/local/bin/qshell
     elif [ "${OS_BIT}" == '32' ]; then

+ 1 - 1
include/GraphicsMagick.sh

@@ -15,7 +15,7 @@ Install_GraphicsMagick() {
     pushd ${oneinstack_dir}/src > /dev/null
     tar xzf GraphicsMagick-${graphicsmagick_ver}.tar.gz
     pushd GraphicsMagick-${graphicsmagick_ver} > /dev/null
-    ./configure --prefix=${gmagick_install_dir} --enable-shared --enable-static
+    ./configure --prefix=${gmagick_install_dir} --enable-shared --enable-static --enable-symbol-prefix
     make -j ${THREAD} && make install
     popd > /dev/null
     rm -rf GraphicsMagick-${graphicsmagick_ver}

+ 3 - 2
include/php-5.6.sh

@@ -157,8 +157,9 @@ Install_PHP56() {
   sed -i 's@^max_execution_time.*@max_execution_time = 5@' ${php_install_dir}/etc/php.ini
   sed -i 's@^disable_functions.*@disable_functions = passthru,exec,system,chroot,chgrp,chown,shell_exec,proc_open,proc_get_status,ini_alter,ini_restore,dl,readlink,symlink,popepassthru,stream_socket_server,fsocket,popen@' ${php_install_dir}/etc/php.ini
   [ -e /usr/sbin/sendmail ] && sed -i 's@^;sendmail_path.*@sendmail_path = /usr/sbin/sendmail -t -i@' ${php_install_dir}/etc/php.ini
-  sed -i "s@^;curl.cainfo.*@curl.cainfo = ${openssl_install_dir}/cert.pem@" ${php_install_dir}/etc/php.ini
-  sed -i "s@^;openssl.cafile.*@openssl.cafile = ${openssl_install_dir}/cert.pem@" ${php_install_dir}/etc/php.ini
+  sed -i "s@^;curl.cainfo.*@curl.cainfo = \"${openssl_install_dir}/cert.pem\"@" ${php_install_dir}/etc/php.ini
+  sed -i "s@^;openssl.cafile.*@openssl.cafile = \"${openssl_install_dir}/cert.pem\"@" ${php_install_dir}/etc/php.ini
+  sed -i "s@^;openssl.capath.*@openssl.capath = \"${openssl_install_dir}/cert.pem\"@" ${php_install_dir}/etc/php.ini
 
   [ "${phpcache_option}" == '1' ] && cat > ${php_install_dir}/etc/php.d/02-opcache.ini << EOF
 [opcache]

+ 3 - 2
include/php-7.0.sh

@@ -158,8 +158,9 @@ Install_PHP70() {
   sed -i 's@^;realpath_cache_size.*@realpath_cache_size = 2M@' ${php_install_dir}/etc/php.ini
   sed -i 's@^disable_functions.*@disable_functions = passthru,exec,system,chroot,chgrp,chown,shell_exec,proc_open,proc_get_status,ini_alter,ini_restore,dl,readlink,symlink,popepassthru,stream_socket_server,fsocket,popen@' ${php_install_dir}/etc/php.ini
   [ -e /usr/sbin/sendmail ] && sed -i 's@^;sendmail_path.*@sendmail_path = /usr/sbin/sendmail -t -i@' ${php_install_dir}/etc/php.ini
-  sed -i "s@^;curl.cainfo.*@curl.cainfo = ${openssl_install_dir}/cert.pem@" ${php_install_dir}/etc/php.ini
-  sed -i "s@^;openssl.cafile.*@openssl.cafile = ${openssl_install_dir}/cert.pem@" ${php_install_dir}/etc/php.ini
+  sed -i "s@^;curl.cainfo.*@curl.cainfo = \"${openssl_install_dir}/cert.pem\"@" ${php_install_dir}/etc/php.ini
+  sed -i "s@^;openssl.cafile.*@openssl.cafile = \"${openssl_install_dir}/cert.pem\"@" ${php_install_dir}/etc/php.ini
+  sed -i "s@^;openssl.capath.*@openssl.capath = \"${openssl_install_dir}/cert.pem\"@" ${php_install_dir}/etc/php.ini
 
   [ "${phpcache_option}" == '1' ] && cat > ${php_install_dir}/etc/php.d/02-opcache.ini << EOF
 [opcache]

+ 3 - 2
include/php-7.1.sh

@@ -157,8 +157,9 @@ Install_PHP71() {
   sed -i 's@^;realpath_cache_size.*@realpath_cache_size = 2M@' ${php_install_dir}/etc/php.ini
   sed -i 's@^disable_functions.*@disable_functions = passthru,exec,system,chroot,chgrp,chown,shell_exec,proc_open,proc_get_status,ini_alter,ini_restore,dl,readlink,symlink,popepassthru,stream_socket_server,fsocket,popen@' ${php_install_dir}/etc/php.ini
   [ -e /usr/sbin/sendmail ] && sed -i 's@^;sendmail_path.*@sendmail_path = /usr/sbin/sendmail -t -i@' ${php_install_dir}/etc/php.ini
-  sed -i "s@^;curl.cainfo.*@curl.cainfo = ${openssl_install_dir}/cert.pem@" ${php_install_dir}/etc/php.ini
-  sed -i "s@^;openssl.cafile.*@openssl.cafile = ${openssl_install_dir}/cert.pem@" ${php_install_dir}/etc/php.ini
+  sed -i "s@^;curl.cainfo.*@curl.cainfo = \"${openssl_install_dir}/cert.pem\"@" ${php_install_dir}/etc/php.ini
+  sed -i "s@^;openssl.cafile.*@openssl.cafile = \"${openssl_install_dir}/cert.pem\"@" ${php_install_dir}/etc/php.ini
+  sed -i "s@^;openssl.capath.*@openssl.capath = \"${openssl_install_dir}/cert.pem\"@" ${php_install_dir}/etc/php.ini
 
   [ "${phpcache_option}" == '1' ] && cat > ${php_install_dir}/etc/php.d/02-opcache.ini << EOF
 [opcache]

+ 3 - 2
include/php-7.2.sh

@@ -149,8 +149,9 @@ Install_PHP72() {
   sed -i 's@^;realpath_cache_size.*@realpath_cache_size = 2M@' ${php_install_dir}/etc/php.ini
   sed -i 's@^disable_functions.*@disable_functions = passthru,exec,system,chroot,chgrp,chown,shell_exec,proc_open,proc_get_status,ini_alter,ini_restore,dl,readlink,symlink,popepassthru,stream_socket_server,fsocket,popen@' ${php_install_dir}/etc/php.ini
   [ -e /usr/sbin/sendmail ] && sed -i 's@^;sendmail_path.*@sendmail_path = /usr/sbin/sendmail -t -i@' ${php_install_dir}/etc/php.ini
-  sed -i "s@^;curl.cainfo.*@curl.cainfo = ${openssl_install_dir}/cert.pem@" ${php_install_dir}/etc/php.ini
-  sed -i "s@^;openssl.cafile.*@openssl.cafile = ${openssl_install_dir}/cert.pem@" ${php_install_dir}/etc/php.ini
+  sed -i "s@^;curl.cainfo.*@curl.cainfo = \"${openssl_install_dir}/cert.pem\"@" ${php_install_dir}/etc/php.ini
+  sed -i "s@^;openssl.cafile.*@openssl.cafile = \"${openssl_install_dir}/cert.pem\"@" ${php_install_dir}/etc/php.ini
+  sed -i "s@^;openssl.capath.*@openssl.capath = \"${openssl_install_dir}/cert.pem\"@" ${php_install_dir}/etc/php.ini
 
   [ "${phpcache_option}" == '1' ] && cat > ${php_install_dir}/etc/php.d/02-opcache.ini << EOF
 [opcache]

+ 3 - 2
include/php-7.3.sh

@@ -149,8 +149,9 @@ Install_PHP73() {
   sed -i 's@^;realpath_cache_size.*@realpath_cache_size = 2M@' ${php_install_dir}/etc/php.ini
   sed -i 's@^disable_functions.*@disable_functions = passthru,exec,system,chroot,chgrp,chown,shell_exec,proc_open,proc_get_status,ini_alter,ini_restore,dl,readlink,symlink,popepassthru,stream_socket_server,fsocket,popen@' ${php_install_dir}/etc/php.ini
   [ -e /usr/sbin/sendmail ] && sed -i 's@^;sendmail_path.*@sendmail_path = /usr/sbin/sendmail -t -i@' ${php_install_dir}/etc/php.ini
-  sed -i "s@^;curl.cainfo.*@curl.cainfo = ${openssl_install_dir}/cert.pem@" ${php_install_dir}/etc/php.ini
-  sed -i "s@^;openssl.cafile.*@openssl.cafile = ${openssl_install_dir}/cert.pem@" ${php_install_dir}/etc/php.ini
+  sed -i "s@^;curl.cainfo.*@curl.cainfo = \"${openssl_install_dir}/cert.pem\"@" ${php_install_dir}/etc/php.ini
+  sed -i "s@^;openssl.cafile.*@openssl.cafile = \"${openssl_install_dir}/cert.pem\"@" ${php_install_dir}/etc/php.ini
+  sed -i "s@^;openssl.capath.*@openssl.capath = \"${openssl_install_dir}/cert.pem\"@" ${php_install_dir}/etc/php.ini
 
   [ "${phpcache_option}" == '1' ] && cat > ${php_install_dir}/etc/php.d/02-opcache.ini << EOF
 [opcache]

+ 13 - 13
versions.txt

@@ -1,7 +1,7 @@
 # newest software version
 # Web
 nginx_ver=1.16.1
-tengine_ver=2.3.1
+tengine_ver=2.3.2
 openresty_ver=1.15.8.2
 openssl11_ver=1.1.1c
 openssl_ver=1.0.2s
@@ -11,12 +11,12 @@ tomcat8_ver=8.5.45
 tomcat7_ver=7.0.96
 tomcat6_ver=6.0.53
 
-apache24_ver=2.4.39
+apache24_ver=2.4.41
 apache22_ver=2.2.34
 pcre_ver=8.43
 apr_ver=1.7.0
 apr_util_ver=1.6.1
-nghttp2_ver=1.39.1
+nghttp2_ver=1.39.2
 
 # DB
 mysql80_ver=8.0.17
@@ -57,7 +57,7 @@ php54_ver=5.4.45
 php53_ver=5.3.29
 
 libiconv_ver=1.15
-curl_ver=7.65.1
+curl_ver=7.66.0
 libmcrypt_ver=2.5.8
 mcrypt_ver=2.6.8
 mhash_ver=0.9.9.9
@@ -65,9 +65,9 @@ freetype_ver=2.10.1
 icu4c_ver=63_1
 libsodium_ver=1.0.17
 argon2_ver=20171227
-imagemagick_ver=6.9.10-63
-imagick_ver=3.4.3
-graphicsmagick_ver=1.3.31
+imagemagick_ver=7.0.8-64
+imagick_ver=3.4.4
+graphicsmagick_ver=1.3.33
 gmagick_ver=2.0.5RC1
 gmagick_oldver=1.1.7RC3
 zendopcache_ver=7.0.5
@@ -92,14 +92,14 @@ pecl_redis_ver=5.0.2
 pecl_redis_oldver=4.3.0
 
 # Memcached
-memcached_ver=1.5.16
+memcached_ver=1.5.17
 libmemcached_ver=1.0.18
 pecl_memcached_ver=3.1.3
 pecl_memcached_oldver=2.2.0
 pecl_memcache_ver=3.0.8
 
 # MongoDB
-pecl_mongodb_ver=1.5.3
+pecl_mongodb_ver=1.6.0
 pecl_mongo_ver=1.6.16
 
 # phpMyadmin
@@ -107,7 +107,7 @@ phpmyadmin_ver=4.9.0.1
 phpmyadmin_oldver=4.4.15.10
 
 # jemalloc
-jemalloc_ver=5.2.0
+jemalloc_ver=5.2.1
 
 # boost
 boost_ver=1.68.0
@@ -116,7 +116,7 @@ boost_oldver=1.59.0
 # Others
 htop_ver=2.2.0
 bison_ver=2.7.1
-python_ver=3.6.8
-setuptools_ver=40.8.0
-pip_ver=19.0.2
+python_ver=3.6.9
+setuptools_ver=41.2.0
+pip_ver=19.2.3
 fail2ban_ver=0.10.4