From 8e6041c7403e129216f3d41a4abd36b351c38e5a Mon Sep 17 00:00:00 2001
From: Peter Kokot <peterkokot@gmail.com>
Date: Mon, 1 Jul 2024 00:04:37 +0200
Subject: [PATCH 1/2] Remove unused defined CPP macros in fpm SAPI

- PHP_FPM_SYSTEMD
- PHP_FPM_USER
- PHP_FPM_GROUP
---
 sapi/fpm/config.m4 | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/sapi/fpm/config.m4 b/sapi/fpm/config.m4
index dfabf450ad49b..0c78cbcff97e5 100644
--- a/sapi/fpm/config.m4
+++ b/sapi/fpm/config.m4
@@ -554,7 +554,6 @@ if test "$PHP_FPM" != "no"; then
   fi
 
   AC_SUBST([php_fpm_systemd])
-  AC_DEFINE_UNQUOTED(PHP_FPM_SYSTEMD, "$php_fpm_systemd", [fpm systemd service type])
 
   if test -z "$PHP_FPM_USER" || test "$PHP_FPM_USER" = "yes" || test "$PHP_FPM_USER" = "no"; then
     php_fpm_user="nobody"
@@ -577,9 +576,6 @@ if test "$PHP_FPM" != "no"; then
   php_fpm_prefix=`eval echo $prefix`
   AC_SUBST([php_fpm_prefix])
 
-  AC_DEFINE_UNQUOTED(PHP_FPM_USER, "$php_fpm_user", [fpm user name])
-  AC_DEFINE_UNQUOTED(PHP_FPM_GROUP, "$php_fpm_group", [fpm group name])
-
   PHP_ADD_BUILD_DIR(sapi/fpm/fpm)
   PHP_ADD_BUILD_DIR(sapi/fpm/fpm/events)
   PHP_OUTPUT(sapi/fpm/php-fpm.conf sapi/fpm/www.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html)

From 55380bbea363b9eb0ae3b129b6e10b7186aed7be Mon Sep 17 00:00:00 2001
From: Peter Kokot <peterkokot@gmail.com>
Date: Mon, 1 Jul 2024 00:07:42 +0200
Subject: [PATCH 2/2] [skip ci] Update UPGRADING.INTERNALS

---
 UPGRADING.INTERNALS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/UPGRADING.INTERNALS b/UPGRADING.INTERNALS
index c629b2dff9f2e..5c9bd91a81cf1 100644
--- a/UPGRADING.INTERNALS
+++ b/UPGRADING.INTERNALS
@@ -136,6 +136,7 @@ PHP 8.4 INTERNALS UPGRADE NOTES
    - Symbol HAVE_WAITPID has been removed.
    - Symbol HAVE_LIBPQ has been removed.
    - Symbols HAVE_LIBRT and HAVE_TIMER_CREATE removed.
+   - Symbols PHP_FPM_SYSTEMD, PHP_FPM_USER, and PHP_FPM_GROUP removed.
    - M4 macro PHP_DEFINE (atomic includes) removed (use AC_DEFINE and config.h).
    - M4 macro PHP_WITH_SHARED has been removed (use PHP_ARG_WITH).
    - M4 macro PHP_STRUCT_FLOCK has been removed (use AC_CHECK_TYPES).