From 0fe0c32119dd3a5c7a958a0187dfac7d3ae63d0d Mon Sep 17 00:00:00 2001
From: CBL-Mariner-Bot <75509084+CBL-Mariner-Bot@users.noreply.github.com>
Date: Sat, 7 Dec 2024 17:12:19 -0800
Subject: [PATCH] [AUTO-CHERRYPICK] [AUTOPATCHER-CORE] Upgrade php to 8.1.31to
 fix multiple CVEs - branch main (#11345)

---
 SPECS/php/php.signatures.json | 2 +-
 SPECS/php/php.spec            | 5 ++++-
 cgmanifest.json               | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/SPECS/php/php.signatures.json b/SPECS/php/php.signatures.json
index 38ef7214772..bbfabdfc901 100644
--- a/SPECS/php/php.signatures.json
+++ b/SPECS/php/php.signatures.json
@@ -14,6 +14,6 @@
     "php.conf": "e2388be032eccf7c0197d597ba72259a095bf8434438a184e6a640edb4b59de2",
     "php.ini": "8fd5a4d891c19320c07010fbbbac982c886b422bc8d062acaeae49d70c136fc8",
     "php.modconf": "dc7303ea584452d2f742d002a648abe74905025aabf240259c7e8bd01746d278",
-    "php-8.1.30.tar.xz": "f24a6007f0b25a53cb7fbaee69c85017e0345b62089c2425a0afb7e177192ed1"
+    "php-8.1.31.tar.xz": "c4f244d46ba51c72f7d13d4f66ce6a9e9a8d6b669c51be35e01765ba58e7afca"
   }
 }
diff --git a/SPECS/php/php.spec b/SPECS/php/php.spec
index dd8cb3b4f54..d7395dc8177 100644
--- a/SPECS/php/php.spec
+++ b/SPECS/php/php.spec
@@ -32,7 +32,7 @@
 %global with_qdbm     0
 Summary:        PHP scripting language for creating dynamic web sites
 Name:           php
-Version:        8.1.30
+Version:        8.1.31
 Release:        1%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
@@ -1516,6 +1516,9 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || :
 %dir %{_datadir}/php/preload
 
 %changelog
+* Wed Dec 04 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 8.1.31-1
+- Auto-upgrade to 8.1.31 - Fix CVE-2024-8932, CVE-2024-8929, CVE-2024-11234, CVE-2024-11233, CVE-2024-11236
+
 * Mon Oct 21 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 8.1.30-1
 - Auto-upgrade to 8.1.30 - CVE-2024-8927, CVE-2024-8925
 
diff --git a/cgmanifest.json b/cgmanifest.json
index 39cdbc5ed09..303e49f60d3 100644
--- a/cgmanifest.json
+++ b/cgmanifest.json
@@ -21114,8 +21114,8 @@
         "type": "other",
         "other": {
           "name": "php",
-          "version": "8.1.30",
-          "downloadUrl": "https://www.php.net/distributions/php-8.1.30.tar.xz"
+          "version": "8.1.31",
+          "downloadUrl": "https://www.php.net/distributions/php-8.1.31.tar.xz"
         }
       }
     },