From 780a4fb68a0f21575f810f610ee84cc2eb18dfd4 Mon Sep 17 00:00:00 2001
From: Marcin Krol <hawk@tld-linux.org>
Date: Mon, 10 Jul 2023 19:21:26 +0200
Subject: [PATCH] - updated to 8.1.21

---
 fix-test-run.patch | 36 +++++++++++++++++++-----------------
 php.spec           |  4 ++--
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/fix-test-run.patch b/fix-test-run.patch
index cde2b04..d4ac247 100644
--- a/fix-test-run.patch
+++ b/fix-test-run.patch
@@ -1,18 +1,7 @@
---- php-5.4.0alpha2/configure.ac~	2011-08-07 12:43:31.000000000 +0300
-+++ php-5.4.0alpha2/configure.ac	2011-08-07 12:44:11.495394662 +0300
-@@ -1271,6 +1271,9 @@
-   AC_DEFINE_UNQUOTED(PHP_BUILD_ARCH,"$PHP_BUILD_ARCH",[build architecture])
- fi
- 
-+# shift so that extensions like xml are loaded first
-+PHP_MODULES=$(echo "$PHP_MODULES" | sed -e 's,\(.*\)\(\$(phplibdir)/xml.la \),\2\1,')
-+
- PHP_SUBST_OLD(PHP_INSTALLED_SAPIS)
- 
- PHP_SUBST(PHP_FASTCGI_OBJS)
---- php-5.5.11/build/Makefile.global	2014-04-27 15:05:38.963814051 +0300
-+++ php-5.5.11/build/Makefile.global	2014-04-27 15:09:54.438443707 +0300
-@@ -81,8 +81,15 @@
+diff -urNp -x '*.orig' php-8.1.21.org/build/Makefile.global php-8.1.21/build/Makefile.global
+--- php-8.1.21.org/build/Makefile.global	2023-07-10 19:20:41.273462676 +0200
++++ php-8.1.21/build/Makefile.global	2023-07-10 19:20:42.545480764 +0200
+@@ -81,8 +81,15 @@ install-headers:
  		done; \
  	fi
  
@@ -28,8 +17,8 @@
 +	fi; \
  	if test "x$(PHP_MODULES)" != "x"; then \
  		for i in $(PHP_MODULES)""; do \
- 			. $$i; $(top_srcdir)/build/shtool echo -n -- " -d extension=$$dlname"; \
-@@ -111,7 +118,9 @@
+ 			. $$i; \
+@@ -114,7 +121,9 @@ test: all
  		TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
  		TEST_PHP_SRCDIR=$(top_srcdir) \
  		CC="$(CC)" \
@@ -40,3 +29,16 @@
  		TEST_RESULT_EXIT_CODE=$$?; \
  		rm $(top_builddir)/tmp-php.ini; \
  		exit $$TEST_RESULT_EXIT_CODE; \
+diff -urNp -x '*.orig' php-8.1.21.org/configure.ac php-8.1.21/configure.ac
+--- php-8.1.21.org/configure.ac	2023-07-10 19:20:41.283462818 +0200
++++ php-8.1.21/configure.ac	2023-07-10 19:20:42.545480764 +0200
+@@ -1430,6 +1430,9 @@ if test -n "${PHP_BUILD_ARCH}"; then
+   AC_DEFINE_UNQUOTED(PHP_BUILD_ARCH,"$PHP_BUILD_ARCH",[build architecture])
+ fi
+ 
++# shift so that extensions like xml are loaded first
++PHP_MODULES=$(echo "$PHP_MODULES" | sed -e 's,\(.*\)\(\$(phplibdir)/xml.la \),\2\1,')
++
+ PHP_SUBST_OLD(PHP_INSTALLED_SAPIS)
+ 
+ PHP_SUBST(PHP_FASTCGI_OBJS)
diff --git a/php.spec b/php.spec
index 8bde3fd..ddf8642 100644
--- 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.1.19
+Version:	8.1.21
 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:	7a06e016b0af0af215a0d3a18f06e29d
+# Source0-md5:	beafdcc10fd1d597a49f5af2b029dfae
 Source1:	opcache.ini
 Source2:	%{orgname}-mod_php.conf
 Source3:	%{orgname}-cgi-fcgi.ini
-- 
2.46.0