summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2024-11-13 08:22:44 +0100
committerRemi Collet <remi@php.net>2024-11-13 08:22:44 +0100
commit48da71cabffa853e95433f5a7127c2439eb65ea3 (patch)
treeda3647f9493c24c1d8f4b8484b080e89968cac0b
parent56699414f3808502aa299e7f8c78015c801455fa (diff)
rename patchesHEADmaster
-rw-r--r--php-cve-2022-31631.patch (renamed from php-bug81740.patch)0
-rw-r--r--php-cve-2023-0567.patch (renamed from php-bug81744.patch)0
-rw-r--r--php-cve-2023-0568.patch (renamed from php-bug81746.patch)0
-rw-r--r--php74.spec14
4 files changed, 7 insertions, 7 deletions
diff --git a/php-bug81740.patch b/php-cve-2022-31631.patch
index 4826efc..4826efc 100644
--- a/php-bug81740.patch
+++ b/php-cve-2022-31631.patch
diff --git a/php-bug81744.patch b/php-cve-2023-0567.patch
index 62296ce..62296ce 100644
--- a/php-bug81744.patch
+++ b/php-cve-2023-0567.patch
diff --git a/php-bug81746.patch b/php-cve-2023-0568.patch
index 6e2ba19..6e2ba19 100644
--- a/php-bug81746.patch
+++ b/php-cve-2023-0568.patch
diff --git a/php74.spec b/php74.spec
index da5d2f6..58dbc96 100644
--- a/php74.spec
+++ b/php74.spec
@@ -30,7 +30,7 @@
%global oraclelib 19.1
%global oracledir 19.24
%else
-%global oraclever 23.5
+%global oraclever 23.6
%global oraclemax 24
%global oraclelib 23.1
%global oracledir 23
@@ -178,9 +178,9 @@ Patch91: php-7.2.0-oci8conf.patch
# Upstream fixes (100+)
# Security fixes (200+)
-Patch200: php-bug81740.patch
-Patch201: php-bug81744.patch
-Patch202: php-bug81746.patch
+Patch200: php-cve-2022-31631.patch
+Patch201: php-cve-2023-0567.patch
+Patch202: php-cve-2023-0568.patch
Patch203: php-cve-2023-0662.patch
Patch204: php-cve-2023-3247.patch
Patch205: php-cve-2023-3823.patch
@@ -1203,9 +1203,9 @@ rm ext/openssl/tests/p12_with_extra_certs.p12
# upstream patches
# security patches
-%patch -P200 -p1 -b .bug81740
-%patch -P201 -p1 -b .bug81744
-%patch -P202 -p1 -b .bug81746
+%patch -P200 -p1 -b .cve31631
+%patch -P201 -p1 -b .cve0567
+%patch -P202 -p1 -b .cve0568
%patch -P203 -p1 -b .cve0662
%patch -P204 -p1 -b .cve3247
%patch -P205 -p1 -b .cve3823