From e4dabc26cf5d7d5d5da8eb76eb47bc0b02ab3d5c Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 1 Nov 2022 08:32:52 +0100
Subject: Update to 7.4.33 - http://www.php.net/releases/7_4_33.php

---
 php.spec | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'php.spec')

diff --git a/php.spec b/php.spec
index f0d5b15..9a825ac 100644
--- a/php.spec
+++ b/php.spec
@@ -104,13 +104,13 @@
 #global gh_date      20190612
 %global gh_owner     php
 %global gh_project   php-src
-%global upver        7.4.32
+%global upver        7.4.33
 #global rcver        RC1
 
 Summary: PHP scripting language for creating dynamic web sites
 Name:    %{?scl_prefix}php
 Version: %{upver}%{?rcver:~%{rcver}}%{?gh_date:.%{gh_date}}
-Release: 2%{?dist}
+Release: 1%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -175,8 +175,6 @@ Patch91: php-7.2.0-oci8conf.patch
 # Upstream fixes (100+)
 
 # Security fixes (200+)
-Patch200: php-bug81738.patch
-Patch201: php-bug81739.patch
 
 # Fixes for tests (300+)
 # Factory is droped from system tzdata
@@ -955,8 +953,6 @@ rm ext/openssl/tests/p12_with_extra_certs.p12
 # upstream patches
 
 # security patches
-%patch200 -p1 -b .81738
-%patch201 -p1 -b .81739
 
 # Fixes for tests
 %patch300 -p1 -b .datetests
@@ -985,9 +981,9 @@ rm ext/date/tests/timezone_location_get.phpt
 %if 0%{?fedora} < 28
 # need tzdata 2018i
 rm ext/date/tests/bug33414-1.phpt
-rm ext/date/tests/bug33415-2.phpt
 rm ext/date/tests/date_modify-1.phpt
 %endif
+rm ext/date/tests/bug33415-2.phpt
 # too fast builder
 rm ext/date/tests/bug73837.phpt
 # fails sometime
@@ -1833,6 +1829,9 @@ fi
 
 
 %changelog
+* Tue Nov  1 2022 Remi Collet <remi@remirepo.net> - 7.4.33-1
+- Update to 7.4.33 - http://www.php.net/releases/7_4_33.php
+
 * Wed Oct 26 2022 Remi Collet <remi@remirepo.net> - 7.4.32-2
 - add upstream fix for CVE-2022-31630 and CVE-2022-37454
 
-- 
cgit