[AUTO-CHERRYPICK] [AUTOPATCHER-CORE] Upgrade dnsmasq to 2.90 Fix CVE-2023-50387 - branch main (#8150)

CBL-Mariner-Bot · web-flow · commit d38bc3c647be · 2024-02-28T14:43:57.000-08:00
diff --git a/SPECS/dnsmasq/CVE-2023-28450.patch b/SPECS/dnsmasq/CVE-2023-28450.patch
diff --git a/SPECS/dnsmasq/dnsmasq.signatures.json b/SPECS/dnsmasq/dnsmasq.signatures.json
@@ -1,5 +1,5 @@
 {
   "Signatures": {
-    "dnsmasq-2.89.tar.xz": "02bd230346cf0b9d5909f5e151df168b2707103785eb616b56685855adebb609"
+    "dnsmasq-2.90.tar.xz": "8e50309bd837bfec9649a812e066c09b6988b73d749b7d293c06c57d46a109e4"
   }
 }
diff --git a/SPECS/dnsmasq/dnsmasq.spec b/SPECS/dnsmasq/dnsmasq.spec
@@ -1,15 +1,14 @@
 Summary:        DNS proxy with integrated DHCP server
 Name:           dnsmasq
-Version:        2.89
-Release:        2%{?dist}
+Version:        2.90
+Release:        1%{?dist}
 License:        GPLv2 or GPLv3
 Group:          System Environment/Daemons
 URL:            https://www.thekelleys.org.uk/dnsmasq/
 Source0:        https://www.thekelleys.org.uk/%{name}/%{name}-%{version}.tar.xz
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
 Patch0:         fix-missing-ioctl-SIOCGSTAMP-add-sockios-header-linux-5.2.patch
-Patch1:         CVE-2023-28450.patch
 
 BuildRequires:  kernel-headers
 
@@ -67,6 +66,9 @@ EOF
 %config  /usr/share/dnsmasq/trust-anchors.conf
 
 %changelog
+* Wed Feb 28 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 2.90-1
+- Auto-upgrade to 2.90 - Fix CVE-2023-50387
+
 * Thu Mar 23 2023 Rohit Rawat <rohitrawat@microsoft.com> - 2.89-2
 - Patch CVE-2023-28450
 
diff --git a/cgmanifest.json b/cgmanifest.json
@@ -2748,8 +2748,8 @@
         "type": "other",
         "other": {
           "name": "dnsmasq",
-          "version": "2.89",
-          "downloadUrl": "https://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.89.tar.xz"
+          "version": "2.90",
+          "downloadUrl": "https://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.90.tar.xz"
         }
       }
     },

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"Signatures": {`
`3`		`- "dnsmasq-2.89.tar.xz": "02bd230346cf0b9d5909f5e151df168b2707103785eb616b56685855adebb609"`
	`3`	`+ "dnsmasq-2.90.tar.xz": "8e50309bd837bfec9649a812e066c09b6988b73d749b7d293c06c57d46a109e4"`
`4`	`4`	`}`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2748,8 +2748,8 @@`
`2748`	`2748`	`"type": "other",`
`2749`	`2749`	`"other": {`
`2750`	`2750`	`"name": "dnsmasq",`
`2751`		`- "version": "2.89",`
`2752`		`- "downloadUrl": "https://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.89.tar.xz"`
	`2751`	`+ "version": "2.90",`
	`2752`	`+ "downloadUrl": "https://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.90.tar.xz"`
`2753`	`2753`	`}`
`2754`	`2754`	`}`
`2755`	`2755`	`},`