Fix expose_all_built_and_installed_apis patches

shivammathur · shivammathur · commit 60f2a4d688c2 · 2025-08-13T11:08:45.000Z
diff --git a/config/patches/5.6/0031-expose_all_built_and_installed_apis.patch b/config/patches/5.6/0031-expose_all_built_and_installed_apis.patch
@@ -33,7 +33,7 @@ index 746a58e..bcbbe22 100644
  phpapi="@DEBIAN_PHP_API@"
  
 +# Query the dpkg database for available PHP sapis
-+php_sapis=$(dpkg-query -W -f='${Package} ' libapache2-mod-php${program_suffix} php${program_suffix}-cgi php${program_suffix}-cli php${program_suffix}-fpm libphp${program_suffix}-embed php${program_suffix}-phpdbg 2>/dev/null | sed -e "s|libapache2-mod-php${program_suffix}|apache2handler|;s|php${program_suffix}-cgi|cgi|;s|php${program_suffix}-cli|cli|;s|php${program_suffix}-fpm|fpm|;s|libphp${program_suffix}-embed|embed|;s|php${program_suffix}-phpdbg|phpdbg|;")
++php_sapis='apache2handler cli cgi embed fpm phpdbg'
 +
  # Set php_cli_binary and php_cgi_binary if available
  for sapi in $php_sapis; do
diff --git a/config/patches/7.0/0031-expose_all_built_and_installed_apis.patch b/config/patches/7.0/0031-expose_all_built_and_installed_apis.patch
@@ -33,7 +33,7 @@ index 746a58e..bcbbe22 100644
  phpapi="@DEBIAN_PHP_API@"
  
 +# Query the dpkg database for available PHP sapis
-+php_sapis=$(dpkg-query -W -f='${Package} ' libapache2-mod-php${program_suffix} php${program_suffix}-cgi php${program_suffix}-cli php${program_suffix}-fpm libphp${program_suffix}-embed php${program_suffix}-phpdbg 2>/dev/null | sed -e "s|libapache2-mod-php${program_suffix}|apache2handler|;s|php${program_suffix}-cgi|cgi|;s|php${program_suffix}-cli|cli|;s|php${program_suffix}-fpm|fpm|;s|libphp${program_suffix}-embed|embed|;s|php${program_suffix}-phpdbg|phpdbg|;")
++php_sapis='apache2handler cli cgi embed fpm phpdbg'
 +
  # Set php_cli_binary and php_cgi_binary if available
  for sapi in $php_sapis; do
diff --git a/config/patches/7.1/0031-expose_all_built_and_installed_apis.patch b/config/patches/7.1/0031-expose_all_built_and_installed_apis.patch
@@ -33,7 +33,7 @@ index 746a58e..bcbbe22 100644
  phpapi="@DEBIAN_PHP_API@"
  
 +# Query the dpkg database for available PHP sapis
-+php_sapis=$(dpkg-query -W -f='${Package} ' libapache2-mod-php${program_suffix} php${program_suffix}-cgi php${program_suffix}-cli php${program_suffix}-fpm libphp${program_suffix}-embed php${program_suffix}-phpdbg 2>/dev/null | sed -e "s|libapache2-mod-php${program_suffix}|apache2handler|;s|php${program_suffix}-cgi|cgi|;s|php${program_suffix}-cli|cli|;s|php${program_suffix}-fpm|fpm|;s|libphp${program_suffix}-embed|embed|;s|php${program_suffix}-phpdbg|phpdbg|;")
++php_sapis='apache2handler cli cgi embed fpm phpdbg'
 +
  # Set php_cli_binary and php_cgi_binary if available
  for sapi in $php_sapis; do
diff --git a/config/patches/7.2/0031-expose_all_built_and_installed_apis.patch b/config/patches/7.2/0031-expose_all_built_and_installed_apis.patch
@@ -33,7 +33,7 @@ index 746a58e..bcbbe22 100644
  phpapi="@DEBIAN_PHP_API@"
  
 +# Query the dpkg database for available PHP sapis
-+php_sapis=$(dpkg-query -W -f='${Package} ' libapache2-mod-php${program_suffix} php${program_suffix}-cgi php${program_suffix}-cli php${program_suffix}-fpm libphp${program_suffix}-embed php${program_suffix}-phpdbg 2>/dev/null | sed -e "s|libapache2-mod-php${program_suffix}|apache2handler|;s|php${program_suffix}-cgi|cgi|;s|php${program_suffix}-cli|cli|;s|php${program_suffix}-fpm|fpm|;s|libphp${program_suffix}-embed|embed|;s|php${program_suffix}-phpdbg|phpdbg|;")
++php_sapis='apache2handler cli cgi embed fpm phpdbg'
 +
  # Set php_cli_binary and php_cgi_binary if available
  for sapi in $php_sapis; do
diff --git a/config/patches/7.3/0030-expose_all_built_and_installed_apis.patch b/config/patches/7.3/0030-expose_all_built_and_installed_apis.patch
@@ -33,7 +33,7 @@ index 746a58e..bcbbe22 100644
  phpapi="@DEBIAN_PHP_API@"
  
 +# Query the dpkg database for available PHP sapis
-+php_sapis=$(dpkg-query -W -f='${Package} ' libapache2-mod-php${program_suffix} php${program_suffix}-cgi php${program_suffix}-cli php${program_suffix}-fpm libphp${program_suffix}-embed php${program_suffix}-phpdbg 2>/dev/null | sed -e "s|libapache2-mod-php${program_suffix}|apache2handler|;s|php${program_suffix}-cgi|cgi|;s|php${program_suffix}-cli|cli|;s|php${program_suffix}-fpm|fpm|;s|libphp${program_suffix}-embed|embed|;s|php${program_suffix}-phpdbg|phpdbg|;")
++php_sapis='apache2handler cli cgi embed fpm phpdbg'
 +
  # Set php_cli_binary and php_cgi_binary if available
  for sapi in $php_sapis; do
diff --git a/config/patches/7.4/0023-expose_all_built_and_installed_apis.patch b/config/patches/7.4/0023-expose_all_built_and_installed_apis.patch
@@ -35,7 +35,7 @@ index cac95ac..45a0759 100644
  ini_path="@EXPANDED_PHP_CONFIG_FILE_PATH@"
  
 +# Query the dpkg database for available PHP sapis
-+php_sapis=$(dpkg-query -W -f='${Package} ' libapache2-mod-php${program_suffix} php${program_suffix}-cgi php${program_suffix}-cli php${program_suffix}-fpm libphp${program_suffix}-embed php${program_suffix}-phpdbg 2>/dev/null | sed -e "s|libapache2-mod-php${program_suffix}|apache2handler|;s|php${program_suffix}-cgi|cgi|;s|php${program_suffix}-cli|cli|;s|php${program_suffix}-fpm|fpm|;s|libphp${program_suffix}-embed|embed|;s|php${program_suffix}-phpdbg|phpdbg|;")
++php_sapis='apache2handler cli cgi embed fpm phpdbg'
 +
  # Set php_cli_binary and php_cgi_binary if available
  for sapi in $php_sapis; do
diff --git a/config/patches/8.0/0021-expose_all_built_and_installed_apis.patch b/config/patches/8.0/0021-expose_all_built_and_installed_apis.patch
@@ -35,7 +35,7 @@ index cac95ac..45a0759 100644
  ini_path="@EXPANDED_PHP_CONFIG_FILE_PATH@"
  
 +# Query the dpkg database for available PHP sapis
-+php_sapis=$(dpkg-query -W -f='${Package} ' libapache2-mod-php${program_suffix} php${program_suffix}-cgi php${program_suffix}-cli php${program_suffix}-fpm libphp${program_suffix}-embed php${program_suffix}-phpdbg 2>/dev/null | sed -e "s|libapache2-mod-php${program_suffix}|apache2handler|;s|php${program_suffix}-cgi|cgi|;s|php${program_suffix}-cli|cli|;s|php${program_suffix}-fpm|fpm|;s|libphp${program_suffix}-embed|embed|;s|php${program_suffix}-phpdbg|phpdbg|;")
++php_sapis='apache2handler cli cgi embed fpm phpdbg'
 +
  # Set php_cli_binary and php_cgi_binary if available
  for sapi in $php_sapis; do
diff --git a/config/patches/8.1/0021-expose_all_built_and_installed_apis.patch b/config/patches/8.1/0021-expose_all_built_and_installed_apis.patch
@@ -35,7 +35,7 @@ index cac95ac..45a0759 100644
  ini_path="@EXPANDED_PHP_CONFIG_FILE_PATH@"
  
 +# Query the dpkg database for available PHP sapis
-+php_sapis=$(dpkg-query -W -f='${Package} ' libapache2-mod-php${program_suffix} php${program_suffix}-cgi php${program_suffix}-cli php${program_suffix}-fpm libphp${program_suffix}-embed php${program_suffix}-phpdbg 2>/dev/null | sed -e "s|libapache2-mod-php${program_suffix}|apache2handler|;s|php${program_suffix}-cgi|cgi|;s|php${program_suffix}-cli|cli|;s|php${program_suffix}-fpm|fpm|;s|libphp${program_suffix}-embed|embed|;s|php${program_suffix}-phpdbg|phpdbg|;")
++php_sapis='apache2handler cli cgi embed fpm phpdbg'
 +
  # Set php_cli_binary and php_cgi_binary if available
  for sapi in $php_sapis; do
diff --git a/config/patches/8.2/0020-expose_all_built_and_installed_apis.patch b/config/patches/8.2/0020-expose_all_built_and_installed_apis.patch
@@ -35,7 +35,7 @@ index cac95ac..45a0759 100644
  ini_path="@EXPANDED_PHP_CONFIG_FILE_PATH@"
  
 +# Query the dpkg database for available PHP sapis
-+php_sapis=$(dpkg-query -W -f='${Package} ' libapache2-mod-php${program_suffix} php${program_suffix}-cgi php${program_suffix}-cli php${program_suffix}-fpm libphp${program_suffix}-embed php${program_suffix}-phpdbg 2>/dev/null | sed -e "s|libapache2-mod-php${program_suffix}|apache2handler|;s|php${program_suffix}-cgi|cgi|;s|php${program_suffix}-cli|cli|;s|php${program_suffix}-fpm|fpm|;s|libphp${program_suffix}-embed|embed|;s|php${program_suffix}-phpdbg|phpdbg|;")
++php_sapis='apache2handler cli cgi embed fpm phpdbg'
 +
  # Set php_cli_binary and php_cgi_binary if available
  for sapi in $php_sapis; do
diff --git a/config/patches/8.3/0020-expose_all_built_and_installed_apis.patch b/config/patches/8.3/0020-expose_all_built_and_installed_apis.patch
@@ -35,7 +35,7 @@ index cac95ac..45a0759 100644
  ini_path="@EXPANDED_PHP_CONFIG_FILE_PATH@"
  
 +# Query the dpkg database for available PHP sapis
-+php_sapis=$(dpkg-query -W -f='${Package} ' libapache2-mod-php${program_suffix} php${program_suffix}-cgi php${program_suffix}-cli php${program_suffix}-fpm libphp${program_suffix}-embed php${program_suffix}-phpdbg 2>/dev/null | sed -e "s|libapache2-mod-php${program_suffix}|apache2handler|;s|php${program_suffix}-cgi|cgi|;s|php${program_suffix}-cli|cli|;s|php${program_suffix}-fpm|fpm|;s|libphp${program_suffix}-embed|embed|;s|php${program_suffix}-phpdbg|phpdbg|;")
++php_sapis='apache2handler cli cgi embed fpm phpdbg'
 +
  # Set php_cli_binary and php_cgi_binary if available
  for sapi in $php_sapis; do
diff --git a/config/patches/8.4/0019-expose_all_built_and_installed_apis.patch b/config/patches/8.4/0019-expose_all_built_and_installed_apis.patch
@@ -36,7 +36,7 @@ index 3d4e0f1..9e415da 100644
  php_embed_type="@PHP_EMBED_TYPE@"
  
 +# Query the dpkg database for available PHP sapis
-+php_sapis=$(dpkg-query -W -f='${Package} ' libapache2-mod-php${program_suffix} php${program_suffix}-cgi php${program_suffix}-cli php${program_suffix}-fpm libphp${program_suffix}-embed php${program_suffix}-phpdbg 2>/dev/null | sed -e "s|libapache2-mod-php${program_suffix}|apache2handler|;s|php${program_suffix}-cgi|cgi|;s|php${program_suffix}-cli|cli|;s|php${program_suffix}-fpm|fpm|;s|libphp${program_suffix}-embed|embed|;s|php${program_suffix}-phpdbg|phpdbg|;")
++php_sapis='apache2handler cli cgi embed fpm phpdbg'
 +
  # Set php_cli_binary and php_cgi_binary if available
  for sapi in $php_sapis; do
diff --git a/config/patches/8.5/0019-expose_all_built_and_installed_apis.patch b/config/patches/8.5/0019-expose_all_built_and_installed_apis.patch
@@ -36,7 +36,7 @@ index 3d4e0f1..9e415da 100644
  php_embed_type="@PHP_EMBED_TYPE@"
  
 +# Query the dpkg database for available PHP sapis
-+php_sapis=$(dpkg-query -W -f='${Package} ' libapache2-mod-php${program_suffix} php${program_suffix}-cgi php${program_suffix}-cli php${program_suffix}-fpm libphp${program_suffix}-embed php${program_suffix}-phpdbg 2>/dev/null | sed -e "s|libapache2-mod-php${program_suffix}|apache2handler|;s|php${program_suffix}-cgi|cgi|;s|php${program_suffix}-cli|cli|;s|php${program_suffix}-fpm|fpm|;s|libphp${program_suffix}-embed|embed|;s|php${program_suffix}-phpdbg|phpdbg|;")
++php_sapis='apache2handler cli cgi embed fpm phpdbg'
 +
  # Set php_cli_binary and php_cgi_binary if available
  for sapi in $php_sapis; do

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ index 746a58e..bcbbe22 100644`
`33`	`33`	`phpapi="@DEBIAN_PHP_API@"`
`34`	`34`
`35`	`35`	`+# Query the dpkg database for available PHP sapis`
`36`		`-+php_sapis=$(dpkg-query -W -f='${Package} ' libapache2-mod-php${program_suffix} php${program_suffix}-cgi php${program_suffix}-cli php${program_suffix}-fpm libphp${program_suffix}-embed php${program_suffix}-phpdbg 2>/dev/null \| sed -e "s\|libapache2-mod-php${program_suffix}\|apache2handler\|;s\|php${program_suffix}-cgi\|cgi\|;s\|php${program_suffix}-cli\|cli\|;s\|php${program_suffix}-fpm\|fpm\|;s\|libphp${program_suffix}-embed\|embed\|;s\|php${program_suffix}-phpdbg\|phpdbg\|;")`
	`36`	`++php_sapis='apache2handler cli cgi embed fpm phpdbg'`
`37`	`37`	`+`
`38`	`38`	`# Set php_cli_binary and php_cgi_binary if available`
`39`	`39`	`for sapi in $php_sapis; do`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ index cac95ac..45a0759 100644`
`35`	`35`	`ini_path="@EXPANDED_PHP_CONFIG_FILE_PATH@"`
`36`	`36`
`37`	`37`	`+# Query the dpkg database for available PHP sapis`
`38`		`-+php_sapis=$(dpkg-query -W -f='${Package} ' libapache2-mod-php${program_suffix} php${program_suffix}-cgi php${program_suffix}-cli php${program_suffix}-fpm libphp${program_suffix}-embed php${program_suffix}-phpdbg 2>/dev/null \| sed -e "s\|libapache2-mod-php${program_suffix}\|apache2handler\|;s\|php${program_suffix}-cgi\|cgi\|;s\|php${program_suffix}-cli\|cli\|;s\|php${program_suffix}-fpm\|fpm\|;s\|libphp${program_suffix}-embed\|embed\|;s\|php${program_suffix}-phpdbg\|phpdbg\|;")`
	`38`	`++php_sapis='apache2handler cli cgi embed fpm phpdbg'`
`39`	`39`	`+`
`40`	`40`	`# Set php_cli_binary and php_cgi_binary if available`
`41`	`41`	`for sapi in $php_sapis; do`