- updated to 8.4.6

diff --git a/php-both-apxs.patch b/php-both-apxs.patch
index 17daf9bdcc4a3428b52b063db0e955601790181e..ea4a13ea1505947f3620f664ea42f5cc5a11718d 100644 (file)
--- a/php-both-apxs.patch
+++ b/php-both-apxs.patch
@@ -10,6 +10,6 @@
 +
 +libtool-sapi: $(LIBTOOL_SAPI)
 +
- libs/libphp.bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
-       $(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
- 
+ libphp.dylib: libphp.la
+       $(LIBTOOL) --tag=CC --mode=link $(CC) -dynamiclib $(LIBPHP_CFLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) -rpath $(phptempdir) -install_name @rpath/$@ $(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

diff --git a/php-shared.patch b/php-shared.patch
index 6fcf466ba9306926647a4799408bda922a94fc47..98452971eabff1a5b0fd56baf13a4a26032c5dc5 100644 (file)
--- a/php-shared.patch
+++ b/php-shared.patch
@@ -26,7 +26,7 @@
 +      $(LIBTOOL) --tag=CC --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) --tag=CC --mode=install cp $@ $(phptempdir)/$@ >/dev/null 2>&1
  
- libs/libphp.bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
+ libphp.dylib: libphp.la
 @@ -31,10 +31,10 @@
  install-sapi: $(OVERALL_TARGET)
        @echo "Installing PHP SAPI module:       $(PHP_SAPI)"

diff --git a/php.spec b/php.spec
index babfb96b2a954b7e529fd260dcf014b8cf38a25d..7a6ae407a0ddf65685dcca3205130abebf128193 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -113,7 +113,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.4.5
+Version:       8.4.6
 Release:       1
 Epoch:         4
 # All files licensed under PHP version 3.01, except
@@ -122,7 +122,7 @@ Epoch:              4
 License:       PHP 3.01 and Zend and BSD
 Group:         Libraries
 Source0:       https://php.net/distributions/%{orgname}-%{version}.tar.xz
-# Source0-md5: fa5b55bc7111988bf0455ed45797742e
+# Source0-md5: 59cb62ecc45b7cb6a914233227b66e8a
 Source1:       opcache.ini
 Source2:       %{orgname}-mod_php.conf
 Source3:       %{orgname}-cgi-fcgi.ini
@@ -1687,34 +1687,34 @@ Moduł PHP umożliwiający używanie kompresji zlib.
 %setup -q -n %{orgname}-%{version}%{?subver}
 
 cp -p php.ini-production php.ini
-%patch0 -p1
-%patch1 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-
-%patch7 -p1
-%patch10 -p1
-%patch14 -p1
-%patch18 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch27 -p1
-%patch29 -p1
-%patch39 -p1
-%patch41 -p1
-%patch43 -p1
-%patch44 -p1
-%patch50 -p1
-%patch53 -p1
-%patch59 -p1
-%patch66 -p1
-%patch67 -p1
-#%patch68 -p1 DROP or update to 7.0 APIs
-%patch71 -p1
+%patch -P0 -p1
+%patch -P1 -p1
+%patch -P3 -p1
+%patch -P4 -p1
+%patch -P5 -p1
+
+%patch -P7 -p1
+%patch -P10 -p1
+%patch -P14 -p1
+%patch -P18 -p1
+%patch -P21 -p1
+%patch -P22 -p1
+%patch -P23 -p1
+%patch -P24 -p1
+%patch -P25 -p1
+%patch -P27 -p1
+%patch -P29 -p1
+%patch -P39 -p1
+%patch -P41 -p1
+%patch -P43 -p1
+%patch -P44 -p1
+%patch -P50 -p1
+%patch -P53 -p1
+%patch -P59 -p1
+%patch -P66 -p1
+%patch -P67 -p1
+#%patch -P68 -p1 DROP or update to 7.0 APIs
+%patch -P71 -p1
 
 sed -E -i -e '1s,#!\s*/usr/bin/env\s+(.*),#!%{_bindir}/\1%{php_suffix},' \
       ext/ext_skel.php \