From cf7fd6697490a6d52a55ccd7db52a62c29b14d5d Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 19 Jan 2022 07:42:57 +0100
Subject: Update to 8.1.2 - http://www.php.net/releases/8_1_2.php

Fix GH-7899 Regression in unpack for negative int value
Fix GH-7883 Segfault when INI file is not readable
---
 php.spec | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'php.spec')

diff --git a/php.spec b/php.spec
index 70e3877..38aee9c 100644
--- a/php.spec
+++ b/php.spec
@@ -127,8 +127,8 @@
 %global gh_owner     php
 %global gh_project   php-src
 %global upver        8.1.2
-%global rcver        RC1
-%global lower        RC1
+#global rcver        RC1
+#global lower        RC1
 
 Summary: PHP scripting language for creating dynamic web sites
 Name:    %{?scl_prefix}php
@@ -196,6 +196,9 @@ Patch47: php-8.1.0-phpinfo.patch
 Patch91: php-7.2.0-oci8conf.patch
 
 # Upstream fixes (100+)
+# Fixed bug GH-7899 Regression in unpack for negative int value
+# Fixed bug GH-7883 Segfault when INI file is not readable
+Patch100: php-upstream.patch
 
 # Security fixes (200+)
 
@@ -969,6 +972,7 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in
 %patch91 -p1 -b .remi-oci8
 
 # upstream patches
+%patch100 -p1 -b .up
 
 # security patches
 
@@ -1845,6 +1849,11 @@ fi
 
 
 %changelog
+* Wed Jan 19 2022 Remi Collet <remi@remirepo.net> - 8.1.2-1
+- Update to 8.1.2 - http://www.php.net/releases/8_1_2.php
+- Fix GH-7899 Regression in unpack for negative int value
+- Fix GH-7883 Segfault when INI file is not readable
+
 * Wed Jan  5 2022 Remi Collet <remi@remirepo.net> - 8.1.2~RC1-1
 - update to 8.1.2RC1
 
-- 
cgit