php-812 - current version of php (based on openssl 1.1) includes fix for m...

fritzkink

2022-02-01 14de080f1356f6e6fbf8126abd709563005eb699

 php-812 - current version of php (based on openssl 1.1) includes fix for mod_php81.so crash

 components/web/php/php-8_1/Makefile

@@ -19,7 +19,7 @@

COMPONENT_NAME=         php
COMPONENT_MJR_VERSION=    8.1
COMPONENT_MNR_VERSION=    1
COMPONENT_MNR_VERSION=    2
COMPONENT_SUMMARY=      PHP 8.1
COMPONENT_DESCRIPTION=    PHP is a popular general-purpose scripting language that is especially suited to web development.
COMPONENT_CLASSIFICATION=Meta Packages/Group Packages
@@ -28,7 +28,7 @@
COMPONENT_PROJECT_URL=  https://www.php.net/
COMPONENT_SRC=          $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE=      $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= sha256:4e4cf3f843a5111f6c55cd21de8f26834ea3cd4a5be77c88357cbcec4a2d671d
COMPONENT_ARCHIVE_HASH= sha256:9992409c0543e0c8e89914f7307e1485a08c057091146e4731565b59065f8bde
COMPONENT_ARCHIVE_URL=  https://www.php.net/distributions/$(COMPONENT_ARCHIVE)
COMPONENT_SIG_URL=    https://www.php.net/distributions/$(COMPONENT_ARCHIVE).asc
COMPONENT_LICENSE=      PHP License
@@ -51,7 +51,9 @@
PHP_SYSCONFDIR=        /etc/php/$(COMPONENT_MJR_VERSION)
PHP_DATADIR=        /var/php/$(COMPONENT_MJR_VERSION)

CFLAGS+=                $(CC_BITS) -D_XPG4_2 -D__EXTENSIONS__
# -D__solaris__ is very important to trigger patched file TSRM.h
# otherwise mod_php81.so is crashing
CFLAGS+=                $(CC_BITS) -D_XPG4_2 -D__EXTENSIONS__ -D__solaris__
CFLAGS+=        -I/usr/include/openldap
CPPFLAGS+=              $(CPP_XPG6MODE)
LDFLAGS+=               -lldap_r

 components/web/php/php-8_1/files/php-fpm.conf

@@ -106,7 +106,7 @@
; - /dev/poll  (Solaris >= 7)
; - port       (Solaris >= 10)
; Default Value: not set (auto detection)
;events.mechanism = epoll
;events.mechanism = /dev/poll

; When FPM is build with systemd integration, specify the interval,
; in second, between health report notification to systemd.

 components/web/php/php-8_1/files/php.ini

@@ -479,7 +479,7 @@
user_dir =

; Directory in which the loadable extensions (modules) reside.
;extension_dir = "/usr/lib/php/8.1/extensions"
;extension_dir = "/usr/php/8.1/extensions"

; Whether or not to enable the dl() function.  The dl() function does NOT work
; properly in multithreaded servers, such as IIS or Zeus, and is automatically

 components/web/php/php-8_1/files/php81.conf

@@ -1,7 +1,7 @@
<IfModule !mod_php8.c>
    LoadModule php8_module libexec/mod_php81.so
<IfModule !mod_php.c>
    LoadModule php_module libexec/mod_php81.so
</IfModule>
<IfModule mod_php8.c>
<IfModule mod_php.c>
    AddHandler application/x-httpd-php .php5
    AddHandler application/x-httpd-php .php
    AddHandler application/x-httpd-php-source .php5s

 components/web/php/php-8_1/patches/01_MYSQL_OPT_LOAD_DATA_LOCAL_DIR.patch

File was deleted

 components/web/php/php-8_1/patches/01_MYSQL_UNIX_ADDR.patch

New file
@@ -0,0 +1,10 @@
--- php-8.1.2/ext/mysqli/mysqli.c    2022-01-30 17:33:12.644053038 +0000
+++ php-8.1.2/ext/mysqli/mysqli.c.new    2022-01-30 17:32:58.157704436 +0000
@@ -886,6 +886,7 @@
     snprintf(buf, sizeof(buf), ZEND_LONG_FMT, MyG(num_links));
     php_info_print_table_row(2, "Active Links", buf);
 #ifndef MYSQLI_USE_MYSQLND
+#include <server/mysql_version.h>
     php_info_print_table_row(2, "Client API header version", MYSQL_SERVER_VERSION);
     php_info_print_table_row(2, "MYSQLI_SOCKET", MYSQL_UNIX_ADDR);
 #endif

 components/web/php/php-8_1/patches/02_MYSQL_OPT_LOAD_DATA_LOCAL_DIR.patch

File was deleted

 components/web/php/php-8_1/patches/02_TSRM_h.patch

New file
@@ -0,0 +1,13 @@
# -D__solaris__ is very important 
# otherwise mod_php81.so is crashing
--- php-8.1.2/TSRM/TSRM.h    2022-01-31 14:37:28.923622243 +0000
+++ php-8.1.2/TSRM/TSRM.h.new    2022-01-31 14:35:45.389879307 +0000
@@ -147,7 +147,7 @@
 # define __has_attribute(x) 0
 #endif
 
-#if !__has_attribute(tls_model) || defined(__FreeBSD__) || defined(__MUSL__)
+#if !__has_attribute(tls_model) || defined(__FreeBSD__) || defined(__MUSL__) || defined(__solaris__)
 # define TSRM_TLS_MODEL_ATTR
 #elif __PIC__
 # define TSRM_TLS_MODEL_ATTR __attribute__((tls_model("initial-exec")))

 components/web/php/php-8_1/patches/03_MYSQL_OPT_LOAD_DATA_LOCAL_DIR.patch

File was deleted

 components/web/php/php-8_1/patches/04_MYSQL_OPT_LOAD_DATA_LOCAL_DIR.patch

File was deleted

 components/web/php/php-8_1/pkg5

@@ -30,8 +30,7 @@
        "text/aspell",
        "text/oniguruma",
        "text/tidy",
        "web/curl",
        "web/php-81/php-cli"
        "web/curl"
    ],
    "fmris": [
        "web/php-81",