Merge branch 'main' into 2.0

jslobodzian · jslobodzian · commit da03d0b1ae81 · 2023-05-17T17:04:09.000-07:00
diff --git a/SPECS/dmidecode/dmidecode.signatures.json b/SPECS/dmidecode/dmidecode.signatures.json
@@ -1,5 +1,5 @@
 {
- "Signatures": {
-  "dmidecode-3.3.tar.xz": "82c737a780614c38a783e8055340d295e332fb12c7f418b5d21a0797d3fb1455"
- }
+  "Signatures": {
+    "dmidecode-3.5.tar.xz": "79d76735ee8e25196e2a722964cf9683f5a09581503537884b256b01389cc073"
+  }
 }
diff --git a/SPECS/dmidecode/dmidecode.spec b/SPECS/dmidecode/dmidecode.spec
@@ -1,6 +1,6 @@
 Summary:	Tool to analyze BIOS DMI data
 Name:		dmidecode
-Version:	3.3
+Version:	3.5
 Release:    1%{?dist}
 License:	GPLv2+
 URL:		http://www.nongnu.org/dmidecode/
@@ -25,6 +25,9 @@ make DESTDIR=%{buildroot} prefix=%{_prefix} install
 %{_mandir}/man8/*
 
 %changelog
+* Tue May 02 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 3.5-1
+- Auto-upgrade to 3.5 - to fix CVE-2023-30630
+
 * Fri Jan 21 2022 Nicolas Guibourge <nicolasg@microsoft.com> - 3.3-1
 - Upgrade to 3.3
 - License verified
diff --git a/cgmanifest.json b/cgmanifest.json
@@ -2698,8 +2698,8 @@
         "type": "other",
         "other": {
           "name": "dmidecode",
-          "version": "3.3",
-          "downloadUrl": "https://download.savannah.gnu.org/releases/dmidecode/dmidecode-3.3.tar.xz"
+          "version": "3.5",
+          "downloadUrl": "https://download.savannah.gnu.org/releases/dmidecode/dmidecode-3.5.tar.xz"
         }
       }
     },

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "Signatures": {`
`3`		`- "dmidecode-3.3.tar.xz": "82c737a780614c38a783e8055340d295e332fb12c7f418b5d21a0797d3fb1455"`
`4`		`- }`
	`2`	`+ "Signatures": {`
	`3`	`+ "dmidecode-3.5.tar.xz": "79d76735ee8e25196e2a722964cf9683f5a09581503537884b256b01389cc073"`
	`4`	`+ }`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2698,8 +2698,8 @@`
`2698`	`2698`	`"type": "other",`
`2699`	`2699`	`"other": {`
`2700`	`2700`	`"name": "dmidecode",`
`2701`		`- "version": "3.3",`
`2702`		`- "downloadUrl": "https://download.savannah.gnu.org/releases/dmidecode/dmidecode-3.3.tar.xz"`
	`2701`	`+ "version": "3.5",`
	`2702`	`+ "downloadUrl": "https://download.savannah.gnu.org/releases/dmidecode/dmidecode-3.5.tar.xz"`
`2703`	`2703`	`}`
`2704`	`2704`	`}`
`2705`	`2705`	`},`