- Up to 8.3.4

diff --git a/php-both-apxs.patch b/php-both-apxs.patch
index 21260e6a37ed1270144c81945a7f977228ca2fca..3fda4e851a74c3a7cd673e28141184b52002940c 100644 (file)
--- a/php-both-apxs.patch
+++ b/php-both-apxs.patch
@@ -1,8 +1,8 @@
---- php-8.0.0beta4/build/Makefile.global~      2020-10-03 12:59:22.000000000 +0300
-+++ php-8.0.0beta4/build/Makefile.global       2020-10-03 13:02:40.788491363 +0300
-@@ -23,6 +23,12 @@
+--- php-8.3.4/build/Makefile.global.orig       2024-03-18 13:45:46.053679968 +0100
++++ php-8.3.4/build/Makefile.global    2024-03-18 13:46:55.353683379 +0100
+@@ -22,6 +22,12 @@
+ libphp.la: libphp_common.la $(PHP_SAPI_OBJS)
        $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(phptempdir)/libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
-       -@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null 2>&1
  
 +$(LIBTOOL_SAPI): libphp_common.la $(PHP_SAPI_OBJS)
 +      $(LIBTOOL) --mode=link $(CC)                           -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(phptempdir)/libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@

diff --git a/php-shared.patch b/php-shared.patch
index ec44dfd2e3439607c266a3b66646e1566690fe9b..79a545b410a664301fd4362b2ec02eb4076ea369 100644 (file)
--- a/php-shared.patch
+++ b/php-shared.patch
@@ -10,24 +10,80 @@
  dnl Checks for some support/generator progs.
  PHP_PROG_AWK
  PHP_PROG_BISON([3.0.0])
---- php-8.0.0beta4/build/Makefile.global~      2020-09-28 07:54:00.000000000 +0300
-+++ php-8.0.0beta4/build/Makefile.global       2020-09-28 07:54:42.203157017 +0300
-@@ -13,8 +13,12 @@
+--- php-7.0.0beta1/sapi/cgi/Makefile.frag~     2015-07-10 15:11:43.000000000 +0300
++++ php-7.0.0beta1/sapi/cgi/Makefile.frag      2015-07-13 16:03:56.810212555 +0300
+@@ -1,6 +1,6 @@
+ cgi: $(SAPI_CGI_PATH)
+ 
+-$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_FASTCGI_OBJS) $(PHP_CGI_OBJS)
++$(SAPI_CGI_PATH): libphp_common.la $(PHP_BINARY_OBJS) $(PHP_FASTCGI_OBJS) $(PHP_CGI_OBJS)
+       $(BUILD_CGI)
+ 
+ install-cgi: $(SAPI_CGI_PATH)
+--- php-5.4.0alpha2/sapi/cli/Makefile.frag~    2011-01-24 00:40:35.000000000 +0200
++++ php-5.4.0alpha2/sapi/cli/Makefile.frag     2011-08-01 12:22:28.627926487 +0300
+@@ -1,6 +1,6 @@
+ cli: $(SAPI_CLI_PATH)
+ 
+-$(SAPI_CLI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_CLI_OBJS)
++$(SAPI_CLI_PATH): libphp_common.la $(PHP_BINARY_OBJS) $(PHP_CLI_OBJS)
+       $(BUILD_CLI)
+ 
+ install-cli: $(SAPI_CLI_PATH)
+--- php-7.0.0RC3/sapi/phpdbg/Makefile.frag~    2015-09-16 15:49:38.000000000 +0300
++++ php-7.0.0RC3/sapi/phpdbg/Makefile.frag     2015-09-27 21:24:44.370536565 +0300
+@@ -2,10 +2,10 @@
+ 
+ phpdbg-shared: $(BUILD_SHARED)
+ 
+-$(BUILD_SHARED): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS)
++$(BUILD_SHARED): libphp_common.la $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS)
+       $(BUILD_PHPDBG_SHARED)
+ 
+-$(BUILD_BINARY): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS)
++$(BUILD_BINARY): libphp_common.la $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS)
+       $(BUILD_PHPDBG)
+ 
+ %.c: %.y
+--- php-7.0.0RC3/sapi/litespeed/Makefile.frag~ 2015-09-16 15:49:38.000000000 +0300
++++ php-7.0.0RC3/sapi/litespeed/Makefile.frag  2015-09-27 21:26:36.783039512 +0300
+@@ -1,6 +1,6 @@
+ litespeed: $(SAPI_LITESPEED_PATH)
+ 
+-$(SAPI_LITESPEED_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_LITESPEED_OBJS)
++$(SAPI_LITESPEED_PATH): libphp_common.la $(PHP_BINARY_OBJS) $(PHP_LITESPEED_OBJS)
+       $(BUILD_LITESPEED)
+ 
+ install-litespeed: $(SAPI_LITESPEED_PATH)
+--- php-7.0.0beta1/sapi/fpm/Makefile.frag~     2015-07-15 13:54:11.000000000 +0300
++++ php-7.0.0beta1/sapi/fpm/Makefile.frag      2015-07-15 13:56:12.116885111 +0300
+@@ -1,6 +1,6 @@
+ fpm: $(SAPI_FPM_PATH)
+ 
+-$(SAPI_FPM_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_FASTCGI_OBJS) $(PHP_FPM_OBJS)
++$(SAPI_FPM_PATH): libphp_common.la $(PHP_BINARY_OBJS) $(PHP_FASTCGI_OBJS) $(PHP_FPM_OBJS) $(SAPI_EXTRA_DEPS)
+       $(BUILD_FPM)
+ 
+ install-fpm: $(SAPI_FPM_PATH)
+--- php-8.3.4/build/Makefile.global.orig       2024-03-13 00:42:26.000000000 +0100
++++ php-8.3.4/build/Makefile.global    2024-03-18 11:31:00.090281860 +0100
+@@ -15,9 +15,12 @@
  
  build-binaries: $(PHP_BINARIES)
  
 -libphp.la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
--      $(LIBTOOL) --mode=link $(CC) $(LIBPHP_CFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
+-      $(LIBTOOL) --tag=CC --mode=link $(CC) $(LIBPHP_CFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
+-      -@$(LIBTOOL) --silent --tag=CC --mode=install cp $@ $(phptempdir)/$@ >/dev/null 2>&1
 +libphp_common.la: $(PHP_GLOBAL_OBJS)
 +      $(LIBTOOL) --mode=link $(CC) $(LIBPHP_CFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) -avoid-version $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ -release $(PHP_VERSION)
 +      -@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null 2>&1
 +
 +libphp.la: libphp_common.la $(PHP_SAPI_OBJS)
 +      $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(phptempdir)/libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
-       -@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null 2>&1
  
  libs/libphp.bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
-@@ -31,10 +31,10 @@
+       $(CC) $(MH_BUNDLE_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(PHP_GLOBAL_OBJS:.lo=.o) $(PHP_SAPI_OBJS:.lo=.o) $(PHP_FRAMEWORKS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ && cp $@ libs/libphp.so
+@@ -27,10 +30,10 @@
  install-sapi: $(OVERALL_TARGET)
        @echo "Installing PHP SAPI module:       $(PHP_SAPI)"
        -@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
@@ -41,122 +97,67 @@
                                break; \
                        fi; \
                done; \
---- php-8.0.0beta4/sapi/cgi/config9.m4~        2020-09-15 21:36:33.000000000 +0300
-+++ php-8.0.0beta4/sapi/cgi/config9.m4 2020-09-28 08:00:34.341402924 +0300
+--- php-8.3.4/sapi/cgi/config9.m4.orig 2024-03-18 10:34:21.104114513 +0100
++++ php-8.3.4/sapi/cgi/config9.m4      2024-03-18 13:20:11.785604429 +0100
 @@ -55,7 +55,7 @@
          BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_FASTCGI_OBJS:.lo=.o) \$(PHP_CGI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
        ;;
        *)
--        BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_FASTCGI_OBJS:.lo=.o) \$(PHP_CGI_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
-+        BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS)    libphp_common.la        \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_FASTCGI_OBJS:.lo=.o) \$(PHP_CGI_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
+-        BUILD_CGI="\$(LIBTOOL) --tag=CC --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_FASTCGI_OBJS:.lo=.o) \$(PHP_CGI_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
++      BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS)    libphp_common.la        \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_FASTCGI_OBJS:.lo=.o) \$(PHP_CGI_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
        ;;
      esac
  
---- php-7.0.0beta1/sapi/cgi/Makefile.frag~     2015-07-10 15:11:43.000000000 +0300
-+++ php-7.0.0beta1/sapi/cgi/Makefile.frag      2015-07-13 16:03:56.810212555 +0300
-@@ -1,6 +1,6 @@
- cgi: $(SAPI_CGI_PATH)
- 
--$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_FASTCGI_OBJS) $(PHP_CGI_OBJS)
-+$(SAPI_CGI_PATH): libphp_common.la $(PHP_BINARY_OBJS) $(PHP_FASTCGI_OBJS) $(PHP_CGI_OBJS)
-       $(BUILD_CGI)
- 
- install-cgi: $(SAPI_CGI_PATH)
---- php-8.0.0beta4/sapi/cli/config.m4~ 2020-09-15 21:36:33.000000000 +0300
-+++ php-8.0.0beta4/sapi/cli/config.m4  2020-09-28 10:50:26.427391375 +0300
+--- php-8.3.4/sapi/cli/config.m4.orig  2024-03-18 10:34:21.430114529 +0100
++++ php-8.3.4/sapi/cli/config.m4       2024-03-18 13:21:19.723607774 +0100
 @@ -42,7 +42,7 @@
      BUILD_CLI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
      ;;
    *)
--    BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
-+    BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la           \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) \$(READLINE_SHARED_LIBADD) -o \$(SAPI_CLI_PATH)"
+-    BUILD_CLI="\$(LIBTOOL) --tag=CC --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
++      BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la           \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) \$(READLINE_SHARED_LIBADD) -o \$(SAPI_CLI_PATH)"
      ;;
    esac
  
---- php-5.4.0alpha2/sapi/cli/Makefile.frag~    2011-01-24 00:40:35.000000000 +0200
-+++ php-5.4.0alpha2/sapi/cli/Makefile.frag     2011-08-01 12:22:28.627926487 +0300
-@@ -1,6 +1,6 @@
- cli: $(SAPI_CLI_PATH)
- 
--$(SAPI_CLI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_CLI_OBJS)
-+$(SAPI_CLI_PATH): libphp_common.la $(PHP_BINARY_OBJS) $(PHP_CLI_OBJS)
-       $(BUILD_CLI)
- 
- install-cli: $(SAPI_CLI_PATH)
---- php-7.0.0RC3/sapi/phpdbg/Makefile.frag~    2015-09-16 15:49:38.000000000 +0300
-+++ php-7.0.0RC3/sapi/phpdbg/Makefile.frag     2015-09-27 21:24:44.370536565 +0300
-@@ -2,10 +2,10 @@
- 
- phpdbg-shared: $(BUILD_SHARED)
+--- php-8.3.4/sapi/phpdbg/config.m4.orig       2024-03-18 10:34:21.505114533 +0100
++++ php-8.3.4/sapi/phpdbg/config.m4    2024-03-18 13:22:37.677611612 +0100
+@@ -87,7 +87,7 @@
  
--$(BUILD_SHARED): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS)
-+$(BUILD_SHARED): libphp_common.la $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS)
-       $(BUILD_PHPDBG_SHARED)
- 
--$(BUILD_BINARY): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS)
-+$(BUILD_BINARY): libphp_common.la $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS)
-       $(BUILD_PHPDBG)
- 
- %.c: %.y
---- php-8.0.0beta4/sapi/phpdbg/config.m4~      2020-10-02 16:05:45.000000000 +0300
-+++ php-8.0.0beta4/sapi/phpdbg/config.m4       2020-10-02 17:29:48.820717591 +0300
-@@ -63,7 +63,7 @@
- 
-   BUILD_PHPDBG="\$(LIBTOOL) --mode=link \
+   BUILD_PHPDBG="\$(LIBTOOL) --tag=CC --mode=link \
          \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \
 -                \$(PHP_GLOBAL_OBJS:.lo=.o) \
-+                libphp_common.la \
++              libphp_common.la \
                  \$(PHP_BINARY_OBJS:.lo=.o) \
                  \$(PHP_PHPDBG_OBJS:.lo=.o) \
                  \$(EXTRA_LIBS) \
-@@ -50,7 +50,7 @@
+@@ -98,7 +98,7 @@
  
-   BUILD_PHPDBG_SHARED="\$(LIBTOOL) --mode=link \
+   BUILD_PHPDBG_SHARED="\$(LIBTOOL) --tag=CC --mode=link \
          \$(CC) -shared -Wl,-soname,libphpdbg.so -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \
 -                \$(PHP_GLOBAL_OBJS) \
-+                libphp_common.la \
++              libphp_common.la \
                  \$(PHP_BINARY_OBJS) \
                  \$(PHP_PHPDBG_OBJS) \
                  \$(EXTRA_LIBS) \
---- php-7.0.0RC3/sapi/litespeed/Makefile.frag~ 2015-09-16 15:49:38.000000000 +0300
-+++ php-7.0.0RC3/sapi/litespeed/Makefile.frag  2015-09-27 21:26:36.783039512 +0300
-@@ -1,6 +1,6 @@
- litespeed: $(SAPI_LITESPEED_PATH)
- 
--$(SAPI_LITESPEED_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_LITESPEED_OBJS)
-+$(SAPI_LITESPEED_PATH): libphp_common.la $(PHP_BINARY_OBJS) $(PHP_LITESPEED_OBJS)
-       $(BUILD_LITESPEED)
- 
- install-litespeed: $(SAPI_LITESPEED_PATH)
---- php-8.0.0beta4/sapi/litespeed/config.m4~   2020-09-15 21:36:33.000000000 +0300
-+++ php-8.0.0beta4/sapi/litespeed/config.m4    2020-10-02 17:31:51.010389005 +0300
+--- php-8.3.4/sapi/litespeed/config.m4.orig    2024-03-18 10:34:21.507114533 +0100
++++ php-8.3.4/sapi/litespeed/config.m4 2024-03-18 13:26:27.525622928 +0100
 @@ -18,7 +18,7 @@
-     BUILD_LITESPEED="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_LITESPEED_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)"
+     BUILD_LITESPEED="\$(LIBTOOL) --tag=CC --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_LITESPEED_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)"
      ;;
    *)
--    BUILD_LITESPEED="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_LITESPEED_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)"
-+    BUILD_LITESPEED="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la           \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_LITESPEED_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)"
+-    BUILD_LITESPEED="\$(LIBTOOL) --tag=CC --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_LITESPEED_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)"
++      BUILD_LITESPEED="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la           \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_LITESPEED_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)"
      ;;
    esac
  
---- php-8.0.0beta4/sapi/fpm/config.m4~ 2020-09-15 21:36:33.000000000 +0300
-+++ php-8.0.0beta4/sapi/fpm/config.m4  2020-10-02 17:33:05.217571527 +0300
-@@ -659,7 +659,7 @@
+--- php-8.3.4/sapi/fpm/config.m4.orig  2024-03-18 10:34:21.507114533 +0100
++++ php-8.3.4/sapi/fpm/config.m4       2024-03-18 13:27:20.848625553 +0100
+@@ -725,7 +725,7 @@
          BUILD_FPM="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_FASTCGI_OBJS:.lo=.o) \$(PHP_FPM_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
        ;;
        *)
--        BUILD_FPM="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_FASTCGI_OBJS:.lo=.o) \$(PHP_FPM_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
-+        BUILD_FPM="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la           \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_FASTCGI_OBJS:.lo=.o) \$(PHP_FPM_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
+-        BUILD_FPM="\$(LIBTOOL) --tag=CC --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_FASTCGI_OBJS:.lo=.o) \$(PHP_FPM_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
++      BUILD_FPM="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la           \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_FASTCGI_OBJS:.lo=.o) \$(PHP_FPM_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
        ;;
    esac
  
---- php-7.0.0beta1/sapi/fpm/Makefile.frag~     2015-07-15 13:54:11.000000000 +0300
-+++ php-7.0.0beta1/sapi/fpm/Makefile.frag      2015-07-15 13:56:12.116885111 +0300
-@@ -1,6 +1,6 @@
- fpm: $(SAPI_FPM_PATH)
- 
--$(SAPI_FPM_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_FASTCGI_OBJS) $(PHP_FPM_OBJS)
-+$(SAPI_FPM_PATH): libphp_common.la $(PHP_BINARY_OBJS) $(PHP_FASTCGI_OBJS) $(PHP_FPM_OBJS) $(SAPI_EXTRA_DEPS)
-       $(BUILD_FPM)
- 
- install-fpm: $(SAPI_FPM_PATH)

diff --git a/php.spec b/php.spec
index 064872d1cd01d5aa1eb0b8da970c5ad6969b87e9..b31bd70d3ccabe5e111eca551efe2884762d9c88 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -124,7 +124,7 @@ Summary(pt_BR.UTF-8):       A linguagem de script PHP
 Summary(ru.UTF-8):     PHP - язык препроцессирования HTML-файлов, выполняемый на сервере
 Summary(uk.UTF-8):     PHP - мова препроцесування HTML-файлів, виконувана на сервері
 Name:          %{orgname}%{php_suffix}
-Version:       8.3.2
+Version:       8.3.4
 Release:       1
 Epoch:         4
 # All files licensed under PHP version 3.01, except
@@ -133,7 +133,7 @@ Epoch:              4
 License:       PHP 3.01 and Zend and BSD
 Group:         Libraries
 Source0:       https://php.net/distributions/%{orgname}-%{version}.tar.xz
-# Source0-md5: c6de74ddce25bcea59cf297c8f136ef2
+# Source0-md5: 598f9d78cbf4bbe4dc1c008a43459e61
 Source1:       opcache.ini
 Source2:       %{orgname}-mod_php.conf
 Source3:       %{orgname}-cgi-fcgi.ini