From nobody Wed Aug 02 16:22:28 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RGHM255lSz4qhv2; Wed, 2 Aug 2023 16:22:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RGHLs2Chhz4F3m; Wed, 2 Aug 2023 16:22:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690993349; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sn04lyHrJFr4woGdYsuAe82wkvjuDNOyxJxiC9JW/yA=; b=Zb9um4HCrDInn/pZBwJgDCsKlZBRlrdYApnU5o7UMDL0bu0kTrsCzpchfMr0IETHXzeqxv lTHOEJVB3PjOuogywKucqte+CVFrevinrPqOAlV3HXL4m8Lh0fXBrXv6s6XdKy4yOWBHQW nFWlBnNb3rmjnnsw+6SlSCxuOXtMxaOlgkQkzjv55ljYkud88RBMABbzSQRBDp4Hj3XY/l wlPVM6fl/lFT9Uvk61jgcChAVhy5iLnaQTUxmdguOmGJ1OjVhJdz+t+PXLxCZBhKYimi0F 1Mng7GRLvHfk4L+1rN9G0bxVUvbu3dakSKw78sr3mx8wlPdhhhBQSLTRW+07Fg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690993349; a=rsa-sha256; cv=none; b=vMKI+2bKhn92+iUPb4hjRmURi1yqxNk6GHVe0HfDtx3PkJgknnlDVTEFDdiF3snyBpuCKu Sh4A8YvSdZvxNHOLGtHRVGGqSuXiS9RGCgu/HvTtg4Pvpk/lRbysnTNwIqaVWJL0mu0GR2 nfPAb8pUKgxP8P1u07HPnqF+jiWjACDCUjwaaJQXMj6ecIVSxH48vG/jgqqphHYoicFv5Y rKnq3/LPAPnCZ6teKL9DP1gbYv3JS79b/45MvcYjykzw/g+dIbMTP1YO0sa9U0I9kLNIuc qVamjLQ6yR2+nOBmyk4g2Yju1EdVx/c7q6A9hUD8ST5YjM0KO03aMlco6In9UQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690993349; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sn04lyHrJFr4woGdYsuAe82wkvjuDNOyxJxiC9JW/yA=; b=Lu/a+KHZaoPJ0W5Y12+5kHpHrm1B+nFBHklgeevac9RY2E0jpQLJ8i5/139AuDs9MUEeLM eJ0f28bClfxCk4zdQzfngyguUtD0M7X60rtdrhel6kmP3f9KoTxcuEMGBBjQFhemySdoUN 0Y6l3NHQNCRghaqgq7OGvpqngOjAt30PE8zy0+PCSu+nzVSdxD37kI4Scg5Tu2GFVzHEhV PMNGc7kPfd0HyaOSCblxLt7jLy7WQxAqDpNW6td5idXRockx9hVfDvGj3u2NIzEhdcvsO0 1lUhVvcu7ojBj+A7WSMHTnpL4/mxlEsMtfOWK9BTR634AjrvWn9ldE/c95OAlw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RGHLs0KwKzQfh; Wed, 2 Aug 2023 16:22:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 372GMStI035793; Wed, 2 Aug 2023 16:22:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 372GMSVS035792; Wed, 2 Aug 2023 16:22:28 GMT (envelope-from git) Date: Wed, 2 Aug 2023 16:22:28 GMT Message-Id: <202308021622.372GMSVS035792@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: ed919666b657 - main - lang/php80: Fix build with openssl3 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ed919666b65788a22619ae4f956a482a3380de94 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=ed919666b65788a22619ae4f956a482a3380de94 commit ed919666b65788a22619ae4f956a482a3380de94 Author: Muhammad Moinur Rahman AuthorDate: 2023-08-02 15:03:24 +0000 Commit: Muhammad Moinur Rahman 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]) ])