update mailparse PHP extension routine in 123.09beta01

- no longer required to use mailparse PHP extension Git repository for obtaining a PHP 7+ compatible extension. So removing that routine so mailparse PHP extension for PHP 7+ can be obtained via https://pecl.php.net/package/mailparse download - update mailparse PHP extension from 3.0.4 to 3.1.2 as well
centminmod · Sep 30, 2021 · 0a7d5ea · 0a7d5ea
1 parent c3996d6
commit 0a7d5ea
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/centmin-cli.sh b/centmin-cli.sh
@@ -27,7 +27,7 @@ DT=$(date +"%d%m%y-%H%M%S")
 branchname='123.09beta01'
 SCRIPT_MAJORVER='1.2.3'
 SCRIPT_MINORVER='09'
-SCRIPT_INCREMENTVER='705'
+SCRIPT_INCREMENTVER='706'
 SCRIPT_VERSIONSHORT="${branchname}"
 SCRIPT_VERSION="${SCRIPT_VERSIONSHORT}.b${SCRIPT_INCREMENTVER}"
 SCRIPT_DATE='30/06/2021'
@@ -816,7 +816,7 @@ PCRE_VERSION='8.45'          # PCRE version
 # PHP and Cache/Acceleration
 IMAGICKPHP_VER='3.4.4'   # PHP extension for imagick
 MAILPARSEPHP_VER='2.1.6'       # https://pecl.php.net/package/mailparse
-MAILPARSEPHP_COMPATVER='3.0.4' # For PHP 7
+MAILPARSEPHP_COMPATVER='3.1.2' # For PHP 7
 MEMCACHED_INSTALL='y'          # Install Memcached
 LIBEVENT_VERSION='2.1.8'      # Use this version of Libevent
 MEMCACHED_VERSION='1.6.5'    # Use this version of Memcached server

diff --git a/centmin.sh b/centmin.sh
@@ -27,7 +27,7 @@ DT=$(date +"%d%m%y-%H%M%S")
 branchname='123.09beta01'
 SCRIPT_MAJORVER='1.2.3'
 SCRIPT_MINORVER='09'
-SCRIPT_INCREMENTVER='705'
+SCRIPT_INCREMENTVER='706'
 SCRIPT_VERSIONSHORT="${branchname}"
 SCRIPT_VERSION="${SCRIPT_VERSIONSHORT}.b${SCRIPT_INCREMENTVER}"
 SCRIPT_DATE='30/06/2021'
@@ -816,7 +816,7 @@ PCRE_VERSION='8.45'          # PCRE version
 # PHP and Cache/Acceleration
 IMAGICKPHP_VER='3.4.4'   # PHP extension for imagick
 MAILPARSEPHP_VER='2.1.6'       # https://pecl.php.net/package/mailparse
-MAILPARSEPHP_COMPATVER='3.0.4' # For PHP 7
+MAILPARSEPHP_COMPATVER='3.1.2' # For PHP 7
 MEMCACHED_INSTALL='y'          # Install Memcached
 LIBEVENT_VERSION='2.1.8'      # Use this version of Libevent
 MEMCACHED_VERSION='1.6.5'    # Use this version of Memcached server

diff --git a/example/custom_config.inc b/example/custom_config.inc
@@ -332,7 +332,7 @@ PCRE_VERSION='8.45'          # PCRE version
 # PHP and Cache/Acceleration
 IMAGICKPHP_VER='3.4.4'        # PHP extension for imagick
 MAILPARSEPHP_VER='2.1.6'      # https://pecl.php.net/package/mailparse
-MAILPARSEPHP_COMPATVER='3.0.4' # For PHP 7
+MAILPARSEPHP_COMPATVER='3.1.2' # For PHP 7
 MEMCACHED_INSTALL='y'         # Install Memcached
 LIBEVENT_VERSION='2.1.8'      # Use this version of Libevent
 MEMCACHED_VERSION='1.6.5'    # Use this version of Memcached server

diff --git a/inc/mailparse.inc b/inc/mailparse.inc
@@ -22,23 +22,23 @@ fi
         mailparsephpexttarball
     fi
     echo
-    if [[ "$PHPMVER" = '7.3' || "$PHPMUVER" = '7.3' || "$PHPMVER" = '7.4' || "$PHPMUVER" = '7.4' || "$PHPMVER" = '8.0' || "$PHPMUVER" = '8.0' || "$PHPVER_ID" -ge '80000' ]]; then
-        # mailparse PHP 7.3 compatibility
-        # https://git.php.net/?p=pecl/mail/mailparse.git;a=commit;h=13c2c425e519b22660a03d566c35e76b3d4751dc
-        PHPSEVENTHREE_MAILPARSE='y'
-        pushd "${DIR_TMP}"
-        rm -rf mailparse-git
-        echo "git clone --depth=1 https://git.php.net/repository/pecl/mail/mailparse.git mailparse-git"
-        git clone --depth=1 https://git.php.net/repository/pecl/mail/mailparse.git mailparse-git
-        popd
-    fi
+    # if [[ "$PHPMVER" = '7.3' || "$PHPMUVER" = '7.3' || "$PHPMVER" = '7.4' || "$PHPMUVER" = '7.4' || "$PHPMVER" = '8.0' || "$PHPMUVER" = '8.0' || "$PHPVER_ID" -ge '80000' ]]; then
+    #     # mailparse PHP 7.3 compatibility
+    #     # https://git.php.net/?p=pecl/mail/mailparse.git;a=commit;h=13c2c425e519b22660a03d566c35e76b3d4751dc
+    #     PHPSEVENTHREE_MAILPARSE='y'
+    #     pushd "${DIR_TMP}"
+    #     rm -rf mailparse-git
+    #     echo "git clone --depth=1 https://git.php.net/repository/pecl/mail/mailparse.git mailparse-git"
+    #     git clone --depth=1 https://git.php.net/repository/pecl/mail/mailparse.git mailparse-git
+    #     popd
+    # fi
 }
 
 mailparseinstall() {
     if [[ "$PHP_INSTALL" = [yY] ]]; then
     if [[ "$PHPMAILPARSE" = [yY] ]]; then
 
-        checkphpextmailparse
+      checkphpextmailparse
       # set extra cflags fro devtoolset-7 and devtoolset-8 compatibility
       check_devtoolset_php
       enable_devtoolset