Merge branch 'PHP-8.4'

Author: petk

CHANGELOG.md

@@ -19,6 +19,7 @@ Removed configuration variables:
 
 * Aspell_ROOT
 * Cclient_ROOT
+* EXT_DBA_GDBM
 * EXT_IMAP
 * EXT_IMAP_KERBEROS
 * EXT_IMAP_SHARED
@@ -30,6 +31,7 @@ Removed configuration variables:
 * EXT_PSPELL
 * EXT_PSPELL_SHARED
 * EXT_READLINE_LIBREADLINE
+* GDBM_ROOT
 * Kerberos_ROOT
 * Readline_ROOT
 

README.md

@@ -32,7 +32,7 @@ sudo dnf install cmake gcc gcc-c++ bison sqlite-devel
   brew install cmake bison # See https://brew.sh how to install Homebrew
 
   # Prerequisites for Alpine Linux:
-  sudo apk add --no-cache cmake make gcc g++ bison sqlite-dev musl-dev
+  sudo apk add --no-cache cmake make gcc g++ musl-dev bison sqlite-dev
 
   # Prerequisites for BSD-based systems:
   sudo pkg install cmake bison sqlite3

cmake/cmake/modules/FindDbm.cmake

@@ -4,7 +4,8 @@ Find the dbm library.
 Depending on the system, the dbm library can be part of other libraries as an
 interface.
 
-* GNU dbm has compatibility interface via gdbm_compatibility
+* GNU dbm library (GDBM) has compatibility interface via gdbm_compatibility but
+  it is licensed as GPL 3, which is incompatible with PHP.
 * TODO: Built into default libraries (C): Solaris still has some macros
   definitions mapping to internal dbm functions available in the db.h header.
   When defining `DB_DBM_HSEARCH` dbm handler is available as built into C
@@ -22,8 +23,6 @@ Module defines the following `IMPORTED` target(s):
 * `Dbm_IS_BUILT_IN` - Whether dbm is a part of the C library.
 * `Dbm_INCLUDE_DIRS` - Include directories needed to use this package.
 * `Dbm_LIBRARIES` - Libraries needed to link to the package library.
-* `Dbm_IMPLEMENTATION` - String of the library name that implements the dbm
-  library.
 
 ## Cache variables
 
@@ -72,7 +71,6 @@ else()
   find_path(
     Dbm_INCLUDE_DIR
     NAMES dbm.h
-    PATH_SUFFIXES gdbm
     DOC "Directory containing dbm library headers"
   )
 
@@ -82,9 +80,7 @@ else()
 
   find_library(
     Dbm_LIBRARY
-    NAMES
-      gdbm_compat
-      dbm
+    NAMES dbm
     DOC "The path to the dbm library"
   )
 
@@ -104,12 +100,6 @@ else()
   mark_as_advanced(Dbm_INCLUDE_DIR Dbm_LIBRARY)
 endif()
 
-if(Dbm_LIBRARY MATCHES "gdbm_compat")
-  set(Dbm_IMPLEMENTATION "GDBM")
-elseif(Dbm_LIBRARY)
-  set(Dbm_IMPLEMENTATION "DBM")
-endif()
-
 find_package_handle_standard_args(
   Dbm
   REQUIRED_VARS

cmake/cmake/modules/FindGDBM.cmake

@@ -4,8 +4,9 @@ Find the ndbm library.
 Depending on the system, the nbdm ("new" dbm) can be part of other libraries as
 an interface.
 
-* GNU dbm library (GDBM) has a compatibility interface that provides ndbm.h
-  header and gdbm_compat library.
+* GNU dbm library (GDBM) has compatibility interface via gdbm_compatibility that
+  provides ndbm.h header but it is licensed as GPL 3, which is incompatible with
+  PHP.
 * Built into default libraries (C): BSD-based systems, macOS, Solaris.
 
 Module defines the following `IMPORTED` target(s):
@@ -78,7 +79,6 @@ else()
     Ndbm_LIBRARY
     NAMES
       ndbm
-      gdbm_compat
       db1
     DOC "The path to the ndbm library"
   )

cmake/cmake/modules/FindNdbm.cmake

@@ -105,20 +105,6 @@ add_feature_info(
   "bundled flat-file DBA handler support"
 )
 
-cmake_dependent_option(
-  EXT_DBA_GDBM
-  "DBA: Enable the GNU dbm (GDBM) support"
-  OFF
-  [[EXT_DBA AND NOT EXT_DBA_QDBM]]
-  OFF
-)
-mark_as_advanced(EXT_DBA_GDBM)
-add_feature_info(
-  "ext/dba GDBM"
-  EXT_DBA_GDBM
-  "GNU dbm support"
-)
-
 cmake_dependent_option(
   EXT_DBA_INIFILE
   "DBA: Enable the bundled INI-file DBA handler support"
@@ -164,21 +150,15 @@ cmake_dependent_option(
   EXT_DBA_QDBM
   "DBA: Enable the QDBM support"
   OFF
-  [[EXT_DBA AND NOT EXT_DBA_DBM AND NOT EXT_DBA_GDBM]]
+  [[EXT_DBA AND NOT EXT_DBA_DBM]]
   OFF
 )
 add_feature_info(
   "ext/dba QDBM"
   EXT_DBA_QDBM
   "Quick Database Manager support"
 )
-if(EXT_DBA_QDBM AND EXT_DBA_GDBM)
-  message(
-    FATAL_ERROR
-    "You cannot combine EXT_DBA_GDBM with EXT_DBA_QDBM. Please select either "
-    "GDBM or QDBM."
-  )
-elseif(EXT_DBA_QDBM AND EXT_DBA_DBM)
+if(EXT_DBA_QDBM AND EXT_DBA_DBM)
   message(
     FATAL_ERROR
     "You cannot combine EXT_DBA_DBM with EXT_DBA_QDBM. Please select either "
@@ -327,24 +307,13 @@ if(EXT_DBA_DBM)
       PURPOSE "Necessary to enable the DBM support in the dba extension."
   )
 
-  if(Dbm_LIBRARY MATCHES "gdbm")
-    message(
-      WARNING
-      "The GNU dbm (GDBM) library is licensed under the GNU GPL 3, which is "
-      "not compatible with the PHP license. PHP then shouldn't be distributed. "
-      "The EXT_DBA_DBM is a legacy artifact for testing purposes. The "
-      "recommendation for using and distributing the PHP 'dba' extension is to "
-      "disable the EXT_DBA_DBM."
-    )
-  endif()
-
   target_link_libraries(php_dba PRIVATE Dbm::Dbm)
 
   target_sources(php_dba PRIVATE dba_dbm.c)
 
   set(DBM_INCLUDE_FILE "<dbm.h>")
   set(DBA_DBM 1)
-  set(DBM_VERSION "${Dbm_IMPLEMENTATION}")
+  set(DBM_VERSION "DBM")
 endif()
 
 ################################################################################
@@ -361,34 +330,6 @@ if(EXT_DBA_FLATFILE)
   set(DBA_FLATFILE 1)
 endif()
 
-################################################################################
-# The GNU dbm (GDBM) support.
-################################################################################
-if(EXT_DBA_GDBM)
-  message(
-    WARNING
-    "The GNU dbm (GDBM) library is licensed under the GNU GPL 3, which is not "
-    "compatible with the PHP license. PHP then shouldn't be distributed. The "
-    "recommendation for using and distributing the PHP 'dba' extension is to "
-    "disable EXT_DBA_GDBM."
-  )
-
-  find_package(GDBM)
-  set_package_properties(
-    GDBM
-    PROPERTIES
-      TYPE REQUIRED
-      PURPOSE "Necessary to enable the GDBM support in the dba extension."
-  )
-
-  target_link_libraries(php_dba PRIVATE GDBM::GDBM)
-
-  target_sources(php_dba PRIVATE dba_gdbm.c)
-
-  set(GDBM_INCLUDE_FILE "<gdbm.h>")
-  set(DBA_GDBM 1)
-endif()
-
 ################################################################################
 # INI-file support.
 ################################################################################
@@ -435,17 +376,6 @@ if(EXT_DBA_NDBM)
       PURPOSE "Necessary to enable the ndbm support in the dba extension."
   )
 
-  if(Ndbm_LIBRARY MATCHES "gdbm")
-    message(
-      WARNING
-      "The GNU dbm (GDBM) library is licensed under the GNU GPL 3, which is "
-      "not compatible with the PHP license. PHP then shouldn't be distributed. "
-      "The EXT_DBA_NDBM is a legacy artifact for testing purposes. The "
-      "recommendation for using and distributing the PHP 'dba' extension is to "
-      "disable the EXT_DBA_NDBM."
-    )
-  endif()
-
   target_link_libraries(php_dba PRIVATE Ndbm::Ndbm)
 
   target_sources(php_dba PRIVATE dba_ndbm.c)
@@ -457,7 +387,7 @@ endif()
 ################################################################################
 # The qdbm handler support.
 ################################################################################
-if(EXT_DBA_QDBM AND NOT EXT_DBA_DBM AND NOT EXT_DBA_GDBM)
+if(EXT_DBA_QDBM AND NOT EXT_DBA_DBM)
   find_package(QDBM)
   set_package_properties(
     QDBM

cmake/ext/dba/CMakeLists.txt

@@ -44,9 +44,6 @@
 /* Define to 1 if the dba extension uses the bundled flatfile handler. */
 #cmakedefine DBA_FLATFILE 1
 
-/* Define to 1 if the dba extension uses the GDBM handler. */
-#cmakedefine DBA_GDBM 1
-
 /* Define to 1 if the dba extension uses the bundled inifile handler. */
 #cmakedefine DBA_INIFILE 1
 
@@ -68,9 +65,6 @@
 /* The DBM handler version information. */
 #cmakedefine DBM_VERSION "@DBM_VERSION@"
 
-/* The GDBM handler header file. */
-#cmakedefine GDBM_INCLUDE_FILE @GDBM_INCLUDE_FILE@
-
 /* Define to 1 if the PHP extension 'dba' is available. */
 #cmakedefine HAVE_DBA 1
 

cmake/ext/dba/config.cmake.h.in

@@ -277,6 +277,7 @@ version available on the operating system.
 * 3.24
   * `CMAKE_COLOR_DIAGNOSTICS`
   * `CMAKE_COMPILE_WARNING_AS_ERROR`, otherwise INTERFACE library should be used
+  * `if(PATH_EQUAL)`
 * 3.25
   * `block()` command
   * New `try_run` signature

docs/cmake/cmake.md

@@ -1195,15 +1195,15 @@ A list of Autoconf `configure` command-line configuration options, Windows
     <tr>
       <td>&emsp;--without-gdbm</td>
       <td>N/A</td>
-      <td>EXT_DBA_GDBM=OFF</td>
+      <td>EXT_DBA_GDBM=OFF (PHP &lt;= 8.3)</td>
       <td>default</td>
     </tr>
     <tr>
       <td>&emsp;--with-gdbm[=DIR]</td>
       <td>N/A</td>
       <td>
-        EXT_DBA_GDBM=ON<br>
-        [GDBM_ROOT=DIR]
+        EXT_DBA_GDBM=ON (PHP &lt;= 8.3)<br>
+        [GDBM_ROOT=DIR] (PHP &lt;= 8.3)
       </td>
       <td></td>
     </tr>
@@ -2849,7 +2849,7 @@ A list of Autoconf `configure` command-line configuration options, Windows
     <tr>
       <td>&emsp;--without-readline</td>
       <td>--without-readline</td>
-      <td>EXT_READLINE=OFF</td>
+      <td>EXT_READLINE=OFF (PHP &lt;= 8.3)</td>
       <td>default</td>
     </tr>
     <tr>
@@ -2860,7 +2860,7 @@ A list of Autoconf `configure` command-line configuration options, Windows
         EXT_READLINE_LIBREADLINE=ON <i>(PHP &lt;= 8.3)</i><br>
         [Readline_ROOT=DIR] <i>(PHP &lt;= 8.3)</i>
       </td>
-      <td>CMake PHP 8.4 Readline library was removed</td>
+      <td></td>
     </tr>
     <tr>
       <td>&emsp;--with-readline=shared</td>