Browse Source

Delete mcrypt PHP7.2

lj2007331@gmail.com 7 years ago
parent
commit
b65ee1caac
4 changed files with 10 additions and 28 deletions
  1. 1 1
      backup.sh
  2. 2 21
      include/php-7.2.sh
  3. 1 0
      ss.sh
  4. 6 6
      versions.txt

+ 1 - 1
backup.sh

@@ -76,7 +76,7 @@ WEB_COS_BK() {
       popd
     fi
     ${python_install_dir}/bin/coscmd upload $PUSH_FILE /`date +%F`/Web_${W}_$(date +%Y%m%d_%H).tgz
-    [ $? -eq 0 ] && { [ -e "$PUSH_FILE" ] && rm -rf $PUSH_FILE; ${python_install_dir}/bin/coscmd delete -r -f `date +%F --date="$expired_days days ago"` > /dev/null 2>&1; }
+    [ $? -eq 0 ] && { [ -e "$PUSH_FILE" -a "$backup_destination" != 'local,cos' ] && rm -rf $PUSH_FILE; ${python_install_dir}/bin/coscmd delete -r -f `date +%F --date="$expired_days days ago"` > /dev/null 2>&1; }
   done
 }
 

+ 2 - 21
include/php-7.2.sh

@@ -26,17 +26,6 @@ Install_PHP72() {
   popd
   rm -rf curl-$curl_version
   
-  tar xzf libmcrypt-$libmcrypt_version.tar.gz
-  pushd libmcrypt-$libmcrypt_version
-  ./configure
-  make -j ${THREAD} && make install
-  ldconfig
-  pushd libltdl
-  ./configure --enable-ltdl-install
-  make -j ${THREAD} && make install
-  popd;popd
-  rm -rf libmcrypt-$libmcrypt_version
-  
   tar xzf mhash-$mhash_version.tar.gz
   pushd mhash-$mhash_version
   ./configure
@@ -48,14 +37,6 @@ Install_PHP72() {
   ldconfig
   [ "$OS" == 'CentOS' ] && { ln -s /usr/local/bin/libmcrypt-config /usr/bin/libmcrypt-config; [ "$OS_BIT" == '64' ] && ln -s /lib64/libpcre.so.0.0.1 /lib64/libpcre.so.1 || ln -s /lib/libpcre.so.0.0.1 /lib/libpcre.so.1; }
   
-  tar xzf mcrypt-$mcrypt_version.tar.gz
-  pushd mcrypt-$mcrypt_version
-  ldconfig
-  ./configure
-  make -j ${THREAD} && make install
-  popd
-  rm -rf mcrypt-$mcrypt_version
-  
   id -u $run_user >/dev/null 2>&1
   [ $? -ne 0 ] && useradd -M -s /sbin/nologin $run_user
   
@@ -73,7 +54,7 @@ Install_PHP72() {
     --with-iconv-dir=/usr/local --with-freetype-dir --with-jpeg-dir --with-png-dir --with-zlib \
     --with-libxml-dir=/usr --enable-xml --disable-rpath --enable-bcmath --enable-shmop --enable-exif \
     --enable-sysvsem --enable-inline-optimization --with-curl=/usr/local --enable-mbregex \
-    --enable-mbstring --with-mcrypt --with-gd --enable-gd-native-ttf --with-openssl=${openssl_install_dir} \
+    --enable-mbstring --with-gd --enable-gd-native-ttf --with-openssl=${openssl_install_dir} \
     --with-mhash --enable-pcntl --enable-sockets --with-xmlrpc --enable-ftp --enable-intl --with-xsl \
     --with-gettext --enable-zip --enable-soap --disable-debug $php_modules_options
   else
@@ -84,7 +65,7 @@ Install_PHP72() {
     --with-iconv-dir=/usr/local --with-freetype-dir --with-jpeg-dir --with-png-dir --with-zlib \
     --with-libxml-dir=/usr --enable-xml --disable-rpath --enable-bcmath --enable-shmop --enable-exif \
     --enable-sysvsem --enable-inline-optimization --with-curl=/usr/local --enable-mbregex \
-    --enable-mbstring --with-mcrypt --with-gd --enable-gd-native-ttf --with-openssl=${openssl_install_dir} \
+    --enable-mbstring --with-gd --enable-gd-native-ttf --with-openssl=${openssl_install_dir} \
     --with-mhash --enable-pcntl --enable-sockets --with-xmlrpc --enable-ftp --enable-intl --with-xsl \
     --with-gettext --enable-zip --enable-soap --disable-debug $php_modules_options
   fi

+ 1 - 0
ss.sh

@@ -156,6 +156,7 @@ Install_SS-libev() {
   ./configure
   make -j ${THREAD} && make install
   popd
+  echo '/usr/local/lib' > /etc/ld.so.conf.d/local.conf
   ldconfig
   if [ -f /usr/local/bin/ss-server ]; then
     if [ "${OS}" == "CentOS" ]; then

+ 6 - 6
versions.txt

@@ -22,7 +22,7 @@ mysql56_version=5.6.38
 mysql55_version=5.5.58
 
 mariadb102_version=10.2.11
-mariadb101_version=10.1.29
+mariadb101_version=10.1.30
 mariadb100_version=10.0.33
 mariadb55_version=5.5.58
 
@@ -42,10 +42,10 @@ jdk17_version=1.7.0_80
 jdk16_version=1.6.0_45
 
 # PHP
-php72_version=7.2.0
-php71_version=7.1.12
-php70_version=7.0.26
-php56_version=5.6.32
+php72_version=7.2.1
+php71_version=7.1.13
+php70_version=7.0.27
+php56_version=5.6.33
 php55_version=5.5.38
 php54_version=5.4.45
 php53_version=5.3.29
@@ -55,7 +55,7 @@ curl_version=7.57.0
 libmcrypt_version=2.5.8
 mcrypt_version=2.6.8
 mhash_version=0.9.9.9
-ImageMagick_version=6.9.9-27
+ImageMagick_version=6.9.9-31
 imagick_version=3.4.3
 GraphicsMagick_version=1.3.26
 gmagick_for_php7_version=2.0.4RC1