Merge pull request hestiacp#2068 from hestiacp/feature/2021-07_include-openssl

Feature/2021 07 include openssl

Author: jaapmarcus

src/deb/php/control

@@ -1,7 +1,7 @@
 Source: hestia-php
 Package: hestia-php
 Priority: optional
-Version: 7.4.21
+Version: 7.4.22
 Section: admin
 Maintainer: HestaCP <info@hestiacp.com>
 Homepage: https://www.hestiacp.com

src/deb/php/php.ini

@@ -309,7 +309,7 @@ serialize_precision = -1
 ; This directive allows you to disable certain functions.
 ; It receives a comma-delimited list of function names.
 ; http://php.net/disable-functions
-disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals,pcntl_unshare,passthru,system,proc_open,popen,show_source,
+disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals,pcntl_unshare,passthru,system,popen,show_source,
 
 ; This directive allows you to disable certain classes.
 ; It receives a comma-delimited list of class names.

src/hst_autocompile.sh

@@ -212,7 +212,7 @@ echo "Build version $BUILD_VER, with Nginx version $NGINX_V and PHP version $PHP
 
 HESTIA_V="${BUILD_VER}_${BUILD_ARCH}"
 OPENSSL_V='1.1.1k'
-PCRE_V='8.44'
+PCRE_V='8.45'
 ZLIB_V='1.2.11'
 
 # Create build directories
@@ -459,29 +459,31 @@ if [ "$PHP_B" = true ] ; then
         # Download and unpack source files
         cd $BUILD_DIR
         download_file $PHP '-' | tar xz
-        
+
         # Change to untarred php directory
         cd $BUILD_DIR_PHP
 
         # Configure PHP
         if [ $BUILD_ARCH = 'amd64' ]; then
-            ./configure   --prefix=/usr/local/hestia/php \
+            ./configure --prefix=/usr/local/hestia/php \
                         --enable-fpm \
                         --with-fpm-user=admin \
                         --with-fpm-group=admin \
                         --with-libdir=lib/x86_64-linux-gnu \
+                        --with-openssl \
                         --with-mysqli \
                         --with-gettext \
                         --with-curl \
                         --with-zip \
                         --with-gmp \
                         --enable-mbstring
         else
-            ./configure   --prefix=/usr/local/hestia/php \
+            ./configure --prefix=/usr/local/hestia/php \
                         --enable-fpm \
                         --with-fpm-user=admin \
                         --with-fpm-group=admin \
                         --with-libdir=lib/aarch64-linux-gnu \
+                        --with-openssl \
                         --with-mysqli \
                         --with-gettext \
                         --with-curl \
@@ -564,7 +566,7 @@ if [ "$PHP_B" = true ] ; then
 
     # clear up the source folder
     if [ "$KEEPBUILD" != 'true' ]; then
-        rm -r $BUILD_DIR/php-$PHP_V
+        rm -r $BUILD_DIR/php-$(echo $PHP_V |cut -d"~" -f1)
         rm -r $BUILD_DIR_HESTIAPHP
         if [ "$use_src_folder" == 'true' ] && [ -d $BUILD_DIR/hestiacp-$branch_dash ]; then
             rm -r $BUILD_DIR/hestiacp-$branch_dash