Merge branch 'PHP-8.3' into PHP-8.4

Author: petk

.github/workflows/ci.yaml

@@ -72,7 +72,6 @@ jobs:
             libbz2-dev \
             libcurl4-openssl-dev \
             libdb5.3++-dev \
-            libdb-dev \
             libenchant-2-dev \
             libpng-dev \
             libgmp-dev \
@@ -101,9 +100,8 @@ jobs:
             libcapstone-dev \
             libedit-dev \
             libcdb-dev \
-            libgdbm-dev \
-            libgdbm-compat-dev \
             liblmdb-dev \
+            libqdbm-dev \
             libtokyocabinet-dev \
             libsnmp-dev \
             snmpd \

cmake/cmake/modules/FindBerkeleyDB.cmake

@@ -10,6 +10,7 @@ Module defines the following `IMPORTED` target(s):
 * `BerkeleyDB_FOUND` - Whether the package has been found.
 * `BerkeleyDB_INCLUDE_DIRS`- Include directories needed to use this package.
 * `BerkeleyDB_LIBRARIES`- Libraries needed to link to the package library.
+* `BerkeleyDB_VERSION` - Package version, if found.
 
 ## Cache variables
 
@@ -42,6 +43,7 @@ set(_reason "")
 find_path(
   BerkeleyDB_INCLUDE_DIR
   NAMES db.h
+  PATH_SUFFIXES db
   DOC "Directory containing Berkeley DB library headers"
 )
 
@@ -63,12 +65,15 @@ if(BerkeleyDB_USE_DB1)
   find_path(
     BerkeleyDB_DB1_INCLUDE_DIR
     NAMES db_185.h
+    PATH_SUFFIXES db
     DOC "Directory containing Berkeley DB db_185.h header for v1 emulation"
   )
 
+  message(CHECK_START "Checking for Berkeley DB 1.x support/emulation")
   cmake_push_check_state(RESET)
     set(CMAKE_REQUIRED_LIBRARIES ${BerkeleyDB_LIBRARY})
     set(CMAKE_REQUIRED_INCLUDES ${BerkeleyDB_DB1_INCLUDE_DIR})
+    set(CMAKE_REQUIRED_QUIET TRUE)
 
     check_source_compiles(C [[
       #include <db_185.h>
@@ -82,8 +87,9 @@ if(BerkeleyDB_USE_DB1)
 
   if(NOT _berkeleydb_db1_sanity_check)
     unset(BerkeleyDB_DB1_INCLUDE_DIR CACHE)
+    message(CHECK_FAIL "disabled, not found")
   else()
-    message(WARNING "Berkeley DB 1.x support/emulation not enabled")
+    message(CHECK_PASS "enabled")
   endif()
 endif()
 
@@ -92,6 +98,7 @@ if(BerkeleyDB_LIBRARY)
   cmake_push_check_state(RESET)
     set(CMAKE_REQUIRED_LIBRARIES ${BerkeleyDB_LIBRARY})
     set(CMAKE_REQUIRED_INCLUDES ${BerkeleyDB_INCLUDE_DIR})
+    set(CMAKE_REQUIRED_QUIET TRUE)
 
     check_source_compiles(C [[
       #include <db.h>
@@ -109,6 +116,32 @@ if(BerkeleyDB_LIBRARY)
   endif()
 endif()
 
+# Get package version.
+block(PROPAGATE BerkeleyDB_VERSION)
+  if(BerkeleyDB_INCLUDE_DIR)
+    file(
+      STRINGS
+      ${BerkeleyDB_INCLUDE_DIR}/db.h
+      results
+      REGEX "^[ \t]*#[ \t]*define[ \t]+DB_VERSION_(MAJOR|MINOR|PATCH)[ \t]+[0-9]+[^\r\n]*$"
+    )
+
+    unset(BerkeleyDB_VERSION)
+
+    foreach(item MAJOR MINOR PATCH)
+      foreach(line ${results})
+        if(line MATCHES "^[ \t]*#[ \t]*define[ \t]+DB_VERSION_${item}[ \t]+([0-9]+)[^\r\n]*$")
+          if(DEFINED BerkeleyDB_VERSION)
+            string(APPEND BerkeleyDB_VERSION ".${CMAKE_MATCH_1}")
+          else()
+            set(BerkeleyDB_VERSION "${CMAKE_MATCH_1}")
+          endif()
+        endif()
+      endforeach()
+    endforeach()
+  endif()
+endblock()
+
 mark_as_advanced(
   BerkeleyDB_DB1_INCLUDE_DIR
   BerkeleyDB_INCLUDE_DIR
@@ -121,6 +154,7 @@ find_package_handle_standard_args(
     BerkeleyDB_LIBRARY
     BerkeleyDB_INCLUDE_DIR
     _berkeleydb_sanity_check
+  VERSION_VAR BerkeleyDB_VERSION
   REASON_FAILURE_MESSAGE "${_reason}"
 )
 

cmake/cmake/modules/FindCdb.cmake

@@ -52,13 +52,7 @@ endif()
 
 find_library(
   Cdb_LIBRARY
-  NAMES
-    cdb
-    # TODO: Which system still has cdb built in the default C library? In such
-    # case this find module should be refactored to search the built-in library
-    # similar to how FindIconv does it. Otherwise, more likely, this should be
-    # removed from here.
-    c
+  NAMES cdb
   PATHS ${PC_Cdb_LIBRARY_DIRS}
   DOC "The path to the cdb library"
 )

cmake/cmake/modules/FindTokyoCabinet.cmake

@@ -29,7 +29,7 @@ include(FindPackageHandleStandardArgs)
 set_package_properties(
   TokyoCabinet
   PROPERTIES
-    URL "https://en.wikipedia.org/wiki/Tkrzw"
+    URL "https://dbmx.net/tokyocabinet/"
     DESCRIPTION "Key-value database library"
 )
 

cmake/cmake/presets/all-enabled.json

@@ -15,10 +15,8 @@
         "EXT_CALENDAR": true,
         "EXT_CURL": true,
         "EXT_DBA": true,
-        "EXT_DBA_DBM": true,
-        "EXT_DBA_GDBM": true,
         "EXT_DBA_LMDB": true,
-        "EXT_DBA_NDBM": true,
+        "EXT_DBA_QDBM": true,
         "EXT_DBA_TCADB": true,
         "EXT_DL_TEST": true,
         "EXT_ENCHANT": true,
@@ -108,9 +106,6 @@
         "PHP_DTRACE": true,
 
         "EXT_DBA_CDB_EXTERNAL": true,
-        "EXT_DBA_DBM": false,
-        "EXT_DBA_GDBM": false,
-        "EXT_DBA_QDBM": true,
         "EXT_OPENSSL_SYSTEM_CIPHERS": true,
         "EXT_PCRE_EXTERNAL": true,
         "EXT_SESSION_MM": true,