[AUTO-CHERRYPICK] Bump frr to 8.5.5 to fix CVE-2024-31950 & CVE-2024-31951 - branch main (#10214)

Co-authored-by: Sumynwa <sumsharma@microsoft.com>

Author: CBL-Mariner-Bot

SPECS/frr/frr.signatures.json

@@ -1,6 +1,6 @@
 {
  "Signatures": {
-  "frr-8.5.3.tar.gz": "5f0d9e47e2621ad01307764df8a228ed0a4ae18f58e8912d638cb8db2c072d78",
+  "frr-8.5.5.tar.gz": "efa3a834c4fae6de9144a20d16f3ef5f0aa66f5b171f168413eec725ce269d5f",
   "frr-sysusers.conf": "c6f5a54402aa5f11e21dac3bd0e6cdeadfbf7937e9b34775b5fd368a9ca96fa4",
   "frr-tmpfiles.conf": "edd7b01b11f2be66bb6b4531496d1eaf6536add9f4b549c659b27f5a32cdc512"
  }

SPECS/frr/frr.spec

@@ -2,8 +2,8 @@
 
 Summary:        Routing daemon
 Name:           frr
-Version:        8.5.3
-Release:        6%{?dist}
+Version:        8.5.5
+Release:        1%{?dist}
 License:        GPL-2.0-or-later
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -16,11 +16,6 @@ Patch1:         0001-enable-openssl.patch
 Patch2:         0002-disable-eigrp-crypto.patch
 Patch3:         0003-fips-mode.patch
 Patch4:         0004-remove-grpc-test.patch
-Patch5:         CVE-2023-46752.patch
-Patch6:         CVE-2023-46753.patch
-Patch7:         CVE-2023-47235.patch
-Patch8:         CVE-2023-47234.patch
-Patch9:         CVE-2024-34088.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  bison
@@ -202,6 +197,10 @@ rm tests/lib/*grpc*
 %{_sysusersdir}/%{name}.conf
 
 %changelog
+* Tue Aug 06 2024 Sumedh Sharma <sumsharma@microsoft.com> - 8.5.5-1
+- Bump version to fix CVE-2024-31950 & CVE-2024-31951
+- Remove patches present in sources
+
 * Fri May 03 2024 Henry Beberman <henry.beberman@microsoft.com> - 8.5.3-6
 - Patch CVE-2024-34088
 - Remove CVE-2024-27913 patch since it's replaced by the CVE-2024-34088 patch

cgmanifest.json

@@ -3930,8 +3930,8 @@
         "type": "other",
         "other": {
           "name": "frr",
-          "version": "8.5.3",
-          "downloadUrl": "https://github.com/FRRouting/frr/archive/refs/tags/frr-8.5.3.tar.gz"
+          "version": "8.5.5",
+          "downloadUrl": "https://github.com/FRRouting/frr/archive/refs/tags/frr-8.5.5.tar.gz"
         }
       }
     },