Date: Wed, 2 Aug 2023 16:22:28 GMT From: Muhammad Moinur Rahman <bofh@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: ed919666b657 - main - lang/php80: Fix build with openssl3 Message-ID: <202308021622.372GMSVS035792@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=ed919666b65788a22619ae4f956a482a3380de94 commit ed919666b65788a22619ae4f956a482a3380de94 Author: Muhammad Moinur Rahman <bofh@FreeBSD.org> AuthorDate: 2023-08-02 15:03:24 +0000 Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> CommitDate: 2023-08-02 16:22:19 +0000 lang/php80: Fix build with openssl3 This fix some additional errors on OSVERSION 1400093. Approved by: portmgr (blanket) Sponsored by: The FreeBSD Foundation --- lang/php80/files/patch-configure.ac | 10 +++++----- lang/php80/files/patch-ext_mysqli_mysqli__nonapi.c | 6 +++--- lang/php80/files/patch-ext_mysqli_mysqli__prop.c | 6 +++--- lang/php80/files/patch-ext_mysqli_php__mysqli__structs.h | 4 ++-- lang/php80/files/patch-ext_openssl_openssl.c | 12 ++++++++++++ .../patch-ext_pcre_pcre2lib_sljit_sljitConfigInternal.h | 4 ++-- lang/php80/files/patch-sapi_apache2handler_config.m4 | 6 +++--- lang/php80/files/patch-sapi_fpm_config.m4 | 4 ++-- 8 files changed, 32 insertions(+), 20 deletions(-) diff --git a/lang/php80/files/patch-configure.ac b/lang/php80/files/patch-configure.ac index 77f7449ad90f..09dc2448b502 100644 --- a/lang/php80/files/patch-configure.ac +++ b/lang/php80/files/patch-configure.ac @@ -1,4 +1,4 @@ ---- configure.ac.orig 2020-09-29 22:36:51 UTC +--- configure.ac.orig 2023-06-07 17:25:45 UTC +++ configure.ac @@ -55,6 +55,7 @@ AH_BOTTOM([ @@ -8,7 +8,7 @@ #endif /* PHP_CONFIG_H */ ]) -@@ -262,7 +263,6 @@ sinclude(Zend/Zend.m4) +@@ -273,7 +274,6 @@ sinclude(Zend/Zend.m4) dnl ---------------------------------------------------------------------------- @@ -16,7 +16,7 @@ PHP_HELP_SEPARATOR([SAPI modules:]) PHP_SHLIB_SUFFIX_NAMES PHP_BUILD_PROGRAM -@@ -602,7 +602,7 @@ memmem \ +@@ -613,7 +613,7 @@ memmem \ AX_FUNC_WHICH_GETHOSTBYNAME_R dnl Some systems (like OpenSolaris) do not have nanosleep in libc. @@ -25,7 +25,7 @@ dnl Haiku does not have network api in libc. PHP_CHECK_FUNC_LIB(setsockopt, network) -@@ -1244,7 +1244,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfd +@@ -1262,7 +1262,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfdir` EXPANDED_DATADIR=$datadir EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"` EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"` @@ -34,7 +34,7 @@ exec_prefix=$old_exec_prefix libdir=$old_libdir -@@ -1431,7 +1431,7 @@ PHP_SUBST(all_targets) +@@ -1449,7 +1449,7 @@ PHP_SUBST(all_targets) PHP_SUBST(install_targets) PHP_SUBST(install_binary_targets) diff --git a/lang/php80/files/patch-ext_mysqli_mysqli__nonapi.c b/lang/php80/files/patch-ext_mysqli_mysqli__nonapi.c index 9baa04218bf9..ddcd59d8aaa4 100644 --- a/lang/php80/files/patch-ext_mysqli_mysqli__nonapi.c +++ b/lang/php80/files/patch-ext_mysqli_mysqli__nonapi.c @@ -1,6 +1,6 @@ ---- ext/mysqli/mysqli_nonapi.c.orig 2020-01-09 11:40:57 UTC +--- ext/mysqli/mysqli_nonapi.c.orig 2023-06-07 17:25:45 UTC +++ ext/mysqli/mysqli_nonapi.c -@@ -28,7 +28,9 @@ +@@ -26,7 +26,9 @@ #include "php_ini.h" #include "ext/standard/info.h" #include "zend_smart_str.h" @@ -8,5 +8,5 @@ #include "php_mysqli_structs.h" +#endif #include "mysqli_priv.h" + #define ERROR_ARG_POS(arg_num) (getThis() ? (arg_num-1) : (arg_num)) - #define SAFE_STR(a) ((a)?a:"") diff --git a/lang/php80/files/patch-ext_mysqli_mysqli__prop.c b/lang/php80/files/patch-ext_mysqli_mysqli__prop.c index 37d47a304440..10a1da771df9 100644 --- a/lang/php80/files/patch-ext_mysqli_mysqli__prop.c +++ b/lang/php80/files/patch-ext_mysqli_mysqli__prop.c @@ -1,6 +1,6 @@ ---- ext/mysqli/mysqli_prop.c.orig 2020-01-09 11:40:11 UTC +--- ext/mysqli/mysqli_prop.c.orig 2023-06-07 17:25:45 UTC +++ ext/mysqli/mysqli_prop.c -@@ -26,7 +26,9 @@ +@@ -24,7 +24,9 @@ #include "php.h" #include "php_ini.h" #include "ext/standard/info.h" @@ -9,4 +9,4 @@ +#endif #include "mysqli_priv.h" - #define CHECK_STATUS(value) \ + #define CHECK_STATUS(value, quiet) \ diff --git a/lang/php80/files/patch-ext_mysqli_php__mysqli__structs.h b/lang/php80/files/patch-ext_mysqli_php__mysqli__structs.h index f0e33efd03aa..8ec5c54d9890 100644 --- a/lang/php80/files/patch-ext_mysqli_php__mysqli__structs.h +++ b/lang/php80/files/patch-ext_mysqli_php__mysqli__structs.h @@ -1,6 +1,6 @@ ---- ext/mysqli/php_mysqli_structs.h.orig 2019-12-17 10:29:23 UTC +--- ext/mysqli/php_mysqli_structs.h.orig 2023-06-07 17:25:45 UTC +++ ext/mysqli/php_mysqli_structs.h -@@ -36,7 +36,7 @@ +@@ -34,7 +34,7 @@ #define FALSE 0 #endif diff --git a/lang/php80/files/patch-ext_openssl_openssl.c b/lang/php80/files/patch-ext_openssl_openssl.c new file mode 100644 index 000000000000..61ed805aa166 --- /dev/null +++ b/lang/php80/files/patch-ext_openssl_openssl.c @@ -0,0 +1,12 @@ +--- ext/openssl/openssl.c.orig 2023-08-02 14:33:58 UTC ++++ ext/openssl/openssl.c +@@ -1325,7 +1325,9 @@ PHP_MINIT_FUNCTION(openssl) + REGISTER_LONG_CONSTANT("OPENSSL_CMS_NOSIGS", CMS_NOSIGS, CONST_CS|CONST_PERSISTENT); + + REGISTER_LONG_CONSTANT("OPENSSL_PKCS1_PADDING", RSA_PKCS1_PADDING, CONST_CS|CONST_PERSISTENT); ++#if OPENSSL_VERSION_NUMBER < 0x30000000 + REGISTER_LONG_CONSTANT("OPENSSL_SSLV23_PADDING", RSA_SSLV23_PADDING, CONST_CS|CONST_PERSISTENT); ++#endif + REGISTER_LONG_CONSTANT("OPENSSL_NO_PADDING", RSA_NO_PADDING, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("OPENSSL_PKCS1_OAEP_PADDING", RSA_PKCS1_OAEP_PADDING, CONST_CS|CONST_PERSISTENT); + diff --git a/lang/php80/files/patch-ext_pcre_pcre2lib_sljit_sljitConfigInternal.h b/lang/php80/files/patch-ext_pcre_pcre2lib_sljit_sljitConfigInternal.h index 9a75bc3e86c1..a77bd2dd4d91 100644 --- a/lang/php80/files/patch-ext_pcre_pcre2lib_sljit_sljitConfigInternal.h +++ b/lang/php80/files/patch-ext_pcre_pcre2lib_sljit_sljitConfigInternal.h @@ -1,6 +1,6 @@ ---- ext/pcre/pcre2lib/sljit/sljitConfigInternal.h.orig 2022-03-25 09:54:56 UTC +--- ext/pcre/pcre2lib/sljit/sljitConfigInternal.h.orig 2023-06-07 17:25:45 UTC +++ ext/pcre/pcre2lib/sljit/sljitConfigInternal.h -@@ -283,7 +283,7 @@ +@@ -317,7 +317,7 @@ extern "C" { /* Instruction cache flush. */ /****************************/ diff --git a/lang/php80/files/patch-sapi_apache2handler_config.m4 b/lang/php80/files/patch-sapi_apache2handler_config.m4 index 5b0cfb9d4591..d37a48a6f992 100644 --- a/lang/php80/files/patch-sapi_apache2handler_config.m4 +++ b/lang/php80/files/patch-sapi_apache2handler_config.m4 @@ -1,6 +1,6 @@ ---- sapi/apache2handler/config.m4.orig 2018-08-14 11:39:14 UTC +--- sapi/apache2handler/config.m4.orig 2023-06-07 17:25:45 UTC +++ sapi/apache2handler/config.m4 -@@ -65,7 +65,7 @@ if test "$PHP_APXS2" != "no"; then +@@ -64,7 +64,7 @@ if test "$PHP_APXS2" != "no"; then fi APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` @@ -8,4 +8,4 @@ + if true; then INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ - -i -n php7" + -i -n php" diff --git a/lang/php80/files/patch-sapi_fpm_config.m4 b/lang/php80/files/patch-sapi_fpm_config.m4 index e88c204384ae..405191af8422 100644 --- a/lang/php80/files/patch-sapi_fpm_config.m4 +++ b/lang/php80/files/patch-sapi_fpm_config.m4 @@ -1,6 +1,6 @@ ---- sapi/fpm/config.m4.orig 2018-08-14 11:39:14 UTC +--- sapi/fpm/config.m4.orig 2023-06-07 17:25:45 UTC +++ sapi/fpm/config.m4 -@@ -319,7 +319,7 @@ AC_DEFUN([AC_FPM_LQ], +@@ -315,7 +315,7 @@ AC_DEFUN([AC_FPM_LQ], AC_MSG_RESULT([no]) ])
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308021622.372GMSVS035792>