diff --git a/SOURCES/php-8.0.0-embed.patch b/SOURCES/php-8.0.0-embed.patch new file mode 100644 index 0000000..27533ea --- /dev/null +++ b/SOURCES/php-8.0.0-embed.patch @@ -0,0 +1,25 @@ +diff -up ./sapi/embed/config.m4.embed ./sapi/embed/config.m4 +--- ./sapi/embed/config.m4.embed 2020-07-07 13:51:05.879764972 +0200 ++++ ./sapi/embed/config.m4 2020-07-07 13:52:50.128412148 +0200 +@@ -12,7 +12,8 @@ if test "$PHP_EMBED" != "no"; then + yes|shared) + LIBPHP_CFLAGS="-shared" + PHP_EMBED_TYPE=shared +- INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(prefix)/lib; \$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)\$(prefix)/lib" ++ EXTRA_LDFLAGS="$EXTRA_LDFLAGS -release \$(PHP_MAJOR_VERSION).\$(PHP_MINOR_VERSION)" ++ INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(libdir); \$(LIBTOOL) --mode=install \$(INSTALL) -m 0755 \$(OVERALL_TARGET) \$(INSTALL_ROOT)\$(libdir)" + ;; + static) + LIBPHP_CFLAGS="-static" +diff -up ./scripts/php-config.in.embed ./scripts/php-config.in +--- ./scripts/php-config.in.embed 2020-07-07 12:54:42.000000000 +0200 ++++ ./scripts/php-config.in 2020-07-07 13:51:05.880764968 +0200 +@@ -18,7 +18,7 @@ exe_extension="@EXEEXT@" + php_cli_binary=NONE + php_cgi_binary=NONE + configure_options="@CONFIGURE_OPTIONS@" +-php_sapis="@PHP_INSTALLED_SAPIS@" ++php_sapis="apache2handler litespeed fpm phpdbg @PHP_INSTALLED_SAPIS@" + ini_dir="@EXPANDED_PHP_CONFIG_FILE_SCAN_DIR@" + ini_path="@EXPANDED_PHP_CONFIG_FILE_PATH@" + diff --git a/SPECS/php82.spec b/SPECS/php82.spec index 24c9eea..974de76 100644 --- a/SPECS/php82.spec +++ b/SPECS/php82.spec @@ -134,10 +134,6 @@ BuildRequires: bzip2-devel BuildRequires: pkgconfig(libcurl) >= 7.29.0 BuildRequires: httpd-devel >= 2.0.46-1 BuildRequires: pam-devel -# to ensure we are using httpd with filesystem feature (see #1081453) -BuildRequires: httpd-filesystem -# to ensure we are using nginx with filesystem feature (see #1142298) -BuildRequires: nginx-filesystem BuildRequires: libstdc++-devel # no pkgconfig to avoid compat-openssl10 BuildRequires: openssl-devel >= 1.0.2 @@ -169,8 +165,6 @@ Provides: php-zts%{?_isa} = %{version}-%{release} %if %{with modphp} Requires: httpd-mmn = %{_httpd_mmn} Provides: mod_php = %{version}-%{release} -# To ensure correct /var/lib/php/session ownership: -Requires(pre): httpd-filesystem # php engine for Apache httpd webserver Provides: php(httpd) # mod_php is deprecated, no package should requires php or mod_php @@ -240,14 +234,14 @@ BuildRequires: pkgconfig(libselinux) Requires: php-common%{?_isa} = %{version}-%{release} %{?systemd_requires} # To ensure correct /var/lib/php/session ownership: -Requires(pre): httpd-filesystem +#Requires(pre): httpd-filesystem # For php.conf in /etc/httpd/conf.d # and version 2.4.10 for proxy support in SetHandler -Requires: httpd-filesystem >= 2.4.10 +#Requires: httpd-filesystem >= 2.4.10 # php engine for Apache httpd webserver Provides: php(httpd) # for /etc/nginx ownership -Requires: nginx-filesystem +#Requires: nginx-filesystem %description fpm PHP-FPM (FastCGI Process Manager) is an alternative PHP FastCGI