Merge branch 'PHP-8.4'

Author: petk

cmake/Zend/cmake/CheckStrerrorR.cmake

@@ -29,7 +29,7 @@ include(CheckSourceCompiles)
 include(CheckSymbolExists)
 include(CMakePushCheckState)
 
-check_symbol_exists(strerror_r "string.h" HAVE_STRERROR_R)
+check_symbol_exists(strerror_r string.h HAVE_STRERROR_R)
 
 if(NOT HAVE_STRERROR_R)
   return()

cmake/cmake/modules/FindArgon2.cmake

@@ -27,6 +27,8 @@ find_package(Argon2)
 ```
 #]=============================================================================]
 
+include(CheckSymbolExists)
+include(CMakePushCheckState)
 include(FeatureSummary)
 include(FindPackageHandleStandardArgs)
 
@@ -67,9 +69,50 @@ if(NOT Argon2_LIBRARY)
   string(APPEND _reason "Argon2 library (libargon2) not found. ")
 endif()
 
-# Argon2 headers don't provide version. Try pkg-config.
+# Argon2 headers don't provide version. Try pkg-config, or fallback to
+# heuristic version determination.
 if(PC_Argon2_VERSION AND Argon2_INCLUDE_DIR IN_LIST PC_Argon2_INCLUDE_DIRS)
   set(Argon2_VERSION ${PC_Argon2_VERSION})
+elseif(Argon2_LIBRARY AND Argon2_INCLUDE_DIR)
+  cmake_push_check_state(RESET)
+    set(CMAKE_REQUIRED_LIBRARIES "${Argon2_LIBRARY}")
+    set(CMAKE_REQUIRED_INCLUDES "${Argon2_INCLUDE_DIR}")
+    set(CMAKE_REQUIRED_QUIET TRUE)
+
+    check_symbol_exists(error_message argon2.h _Argon2_HAVE_ERROR_MESSAGE)
+
+    if(_Argon2_HAVE_ERROR_MESSAGE)
+      set(Argon2_VERSION 20151206)
+    else()
+      check_symbol_exists(
+        ARGON2_FLAG_CLEAR_MEMORY
+        argon2.h
+        _Argon2_HAVE_ARGON2_FLAG_CLEAR_MEMORY
+      )
+    endif()
+
+    if(_Argon2_HAVE_ARGON2_FLAG_CLEAR_MEMORY)
+      set(Argon2_VERSION 20160406)
+    else()
+      check_symbol_exists(argon2id_hash_raw argon2.h _Argon2_HAVE_ARGON2ID_HASH_RAW)
+    endif()
+
+    if(_Argon2_HAVE_ARGON2ID_HASH_RAW)
+      set(Argon2_VERSION 20161029)
+    endif()
+
+    check_symbol_exists(ARGON2_LOCAL argon2.h _Argon2_HAVE_ARGON2_LOCAL)
+    if(_Argon2_HAVE_ARGON2_LOCAL)
+      set(Argon2_VERSION 20171227)
+
+      file(STRINGS ${Argon2_INCLUDE_DIR}/argon2.h content REGEX " deafults ")
+
+      if(NOT content)
+        set(Argon2_VERSION 20190702)
+      endif()
+      unset(content)
+    endif()
+  cmake_pop_check_state()
 endif()
 
 mark_as_advanced(Argon2_INCLUDE_DIR Argon2_LIBRARY)

cmake/cmake/modules/PHP/CheckReentrantFunctions.cmake

@@ -80,7 +80,7 @@ function(_php_check_reentrant_function symbol header)
 
   cmake_push_check_state(RESET)
     set(CMAKE_REQUIRED_QUIET TRUE)
-    check_symbol_exists(${symbol} ${header} PHP_HAVE_DECL_${const})
+    check_symbol_exists(${symbol} "${header}" PHP_HAVE_DECL_${const})
   cmake_pop_check_state()
 
   if(NOT PHP_HAVE_DECL_${const})

cmake/ext/standard/CMakeLists.txt

@@ -234,7 +234,7 @@ include(cmake/GenerateGrammar.cmake)
 ################################################################################
 
 if(PHP_EXT_STANDARD_ARGON2)
-  find_package(Argon2 20171227)
+  find_package(Argon2 20161029)
   set_package_properties(
     Argon2
     PROPERTIES
@@ -319,9 +319,9 @@ endif()
 # Check if there is a support means of creating a new process and defining which
 # handles it receives.
 message(CHECK_START "Checking if OS can spawn processes with inherited handles")
-check_symbol_exists(fork "unistd.h" HAVE_FORK)
+check_symbol_exists(fork unistd.h HAVE_FORK)
 if(NOT HAVE_FORK)
-  check_symbol_exists(CreateProcess "windows.h" HAVE_CREATEPROCESS)
+  check_symbol_exists(CreateProcess windows.h HAVE_CREATEPROCESS)
 endif()
 if(HAVE_FORK OR HAVE_CREATEPROCESS)
   set(PHP_CAN_SUPPORT_PROC_OPEN TRUE)
@@ -338,12 +338,12 @@ php_search_libraries(
   LIBRARIES
     socket  # Solaris 11..11.3, illumos
     network # Haiku
-  VARIABLE _HAVE_GETIFADDRS
+  VARIABLE _PHP_HAVE_GETIFADDRS
   LIBRARY_VARIABLE libraryForGetifaddrs
   TARGET php_ext_standard PRIVATE
 )
 
-if(_HAVE_GETIFADDRS)
+if(_PHP_HAVE_GETIFADDRS)
   message(CHECK_START "Checking for usable getifaddrs")
   cmake_push_check_state(RESET)
     if(libraryForGetifaddrs)
@@ -465,7 +465,7 @@ php_search_libraries(
 
 check_symbol_exists(
   posix_spawn_file_actions_addchdir_np
-  "spawn.h"
+  spawn.h
   HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR_NP
 )
 
@@ -520,7 +520,7 @@ endblock()
 # See: https://github.com/php/php-src/issues/11984
 ################################################################################
 
-check_symbol_exists(chroot "unistd.h" HAVE_CHROOT)
+check_symbol_exists(chroot unistd.h HAVE_CHROOT)
 
 add_library(php_ext_standard_functions OBJECT)
 add_library(php_ext_standard_functions_cli OBJECT)

cmake/ext/standard/cmake/CheckStrptime.cmake

@@ -42,7 +42,7 @@ endif()
 # Check whether linker sees the strptime and it is declared in time.h.
 cmake_push_check_state(RESET)
   set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
-  check_symbol_exists(strptime "time.h" HAVE_STRPTIME)
+  check_symbol_exists(strptime time.h HAVE_STRPTIME)
 cmake_pop_check_state()
 
 if(HAVE_STRPTIME)

cmake/sapi/phpdbg/CMakeLists.txt

@@ -235,7 +235,7 @@ message(
 )
 check_symbol_exists(
   UFFDIO_WRITEPROTECT_MODE_WP
-  "linux/userfaultfd.h"
+  linux/userfaultfd.h
   HAVE_UFFDIO_WRITEPROTECT_MODE_WP
 )
 if(HAVE_UFFDIO_WRITEPROTECT_MODE_WP)