Selaa lähdekoodia

feat: 更新 PHP 版本支持至 8.4,并调整相关安装脚本和版本信息

feat: 更新 PHP 版本支持至 8.4,并调整相关安装脚本和版本信息
Oneinstack 2 kuukautta sitten
vanhempi
commit
0c7f79ea3d
5 muutettua tiedostoa jossa 19 lisäystä ja 10 poistoa
  1. 6 1
      include/check_download.sh
  2. 1 1
      include/check_sw.sh
  3. 4 0
      include/mphp.sh
  4. 4 4
      install.sh
  5. 4 4
      versions.txt

+ 6 - 1
include/check_download.sh

@@ -493,7 +493,7 @@ checkDownload() {
   fi
 
   # PHP
-  if [[ "${php_option}" =~ ^[1-9]$|^1[0-3]$ ]] || [[ "${mphp_ver}" =~ ^5[3-6]$|^7[0-4]$|^8[0-3]$ ]]; then
+  if [[ "${php_option}" =~ ^[1-9]$|^1[0-4]$ ]] || [[ "${mphp_ver}" =~ ^5[3-6]$|^7[0-4]$|^8[0-4]$ ]]; then
     echo "PHP common..."
     src_url=${mirror_link}/oneinstack/src/libiconv-${libiconv_ver}.tar.gz && Download_src
     src_url=https://curl.haxx.se/download/curl-${curl_ver}.tar.gz && Download_src
@@ -553,6 +553,11 @@ checkDownload() {
     src_url=${mirror_link}/oneinstack/src/argon2-${argon2_ver}.tar.gz && Download_src
     src_url=${mirror_link}/oneinstack/src/libsodium-${libsodium_up_ver}.tar.gz && Download_src
     src_url=${mirror_link}/oneinstack/src/libzip-${libzip_ver}.tar.gz && Download_src
+  elif [ "${php_option}" == '14' ] || [ "${mphp_ver}" == '84' ]; then
+    src_url=${mirror_link}/oneinstack/src/php-${php84_ver}.tar.gz && Download_src
+    src_url=${mirror_link}/oneinstack/src/argon2-${argon2_ver}.tar.gz && Download_src
+    src_url=${mirror_link}/oneinstack/src/libsodium-${libsodium_up_ver}.tar.gz && Download_src
+    src_url=${mirror_link}/oneinstack/src/libzip-${libzip_ver}.tar.gz && Download_src
   fi
 
   # PHP OPCache

+ 1 - 1
include/check_sw.sh

@@ -38,7 +38,7 @@ installDepsDebian() {
 
   # Install needed packages
   case "${Debian_ver}" in
-    9|10|11|12)
+    9|10|11|12|13)
       pkgList="debian-keyring libsodium-dev debian-archive-keyring libxpm-dev build-essential gcc g++ make cmake autoconf libbz2-dev libjpeg62-turbo-dev libjpeg-dev libpng-dev libgd-dev libxml2 libxml2-dev zlib1g zlib1g-dev libc6 libc6-dev libc-client2007e-dev libglib2.0-0 libglib2.0-dev bzip2 libzip-dev libbz2-1.0 libncurses5 libncurses5-dev libaio1 libaio-dev numactl libreadline-dev curl libcurl3-gnutls libcurl4-openssl-dev e2fsprogs libkrb5-3 libkrb5-dev libltdl-dev libidn11 libidn11-dev openssl net-tools libssl-dev libtool libevent-dev bison re2c libsasl2-dev libxslt1-dev libicu-dev locales patch vim zip unzip tmux htop bc dc expect libexpat1-dev libonig-dev libtirpc-dev rsync git lsof lrzsz rsyslog cron logrotate chrony libsqlite3-dev psmisc wget sysv-rc apt-transport-https ca-certificates software-properties-common gnupg ufw"
       ;;
     *)

+ 4 - 0
include/mphp.sh

@@ -68,6 +68,10 @@ Install_MPHP() {
           . include/php-8.3.sh
           Install_PHP83 2>&1 | tee -a ${oneinstack_dir}/install.log
           ;;
+        84)
+          . include/php-8.4.sh
+          Install_PHP84 2>&1 | tee -a ${oneinstack_dir}/install.log
+          ;;
       esac
       if [ -e "${php_install_dir}/sbin/php-fpm" ]; then
         systemctl stop php-fpm

+ 4 - 4
install.sh

@@ -49,8 +49,8 @@ Show_Help() {
   --apache                    Install Apache
   --apache_mode_option [1-2]  Apache2.4 mode, 1(default): php-fpm, 2: mod_php
   --apache_mpm_option [1-3]   Apache2.4 MPM, 1(default): event, 2: prefork, 3: worker
-  --php_option [1-13]         Install PHP version
-  --mphp_ver [53~83]          Install another PHP version (PATH: ${php_install_dir}\${mphp_ver})
+  --php_option [1-14]         Install PHP version
+  --mphp_ver [53~84]          Install another PHP version (PATH: ${php_install_dir}\${mphp_ver})
   --mphp_addons               Only install another PHP addons
   --phpcache_option [1-4]     Install PHP opcode cache, default: 1 opcache
   --php_extensions [ext name] Install PHP extensions, include zendguardloader,ioncube,
@@ -151,8 +151,8 @@ while :; do
     mphp_ver=$2
     mphp_flag=y
     shift 2
-    [[ ! "${mphp_ver}" =~ ^5[3-6]$|^7[0-4]$|^8[0-3]$ ]] && {
-      echo "${CWARNING}mphp_ver input error! Please only input number 53~82${CEND}"
+    [[ ! "${mphp_ver}" =~ ^5[3-6]$|^7[0-4]$|^8[0-4]$ ]] && {
+      echo "${CWARNING}mphp_ver input error! Please only input number 53~84${CEND}"
       exit 1
     }
     ;;

+ 4 - 4
versions.txt

@@ -51,10 +51,10 @@ php72_ver=7.2.34
 php73_ver=7.3.33
 php74_ver=7.4.33
 php80_ver=8.0.30
-php81_ver=8.1.27
-php82_ver=8.2.14
-php83_ver=8.3.2
-php84_ver=8.4.4
+php81_ver=8.1.33
+php82_ver=8.2.29
+php83_ver=8.3.24
+php84_ver=8.4.11
 
 # Nodejs
 nodejs_ver=20.10.0