Skip to content

Commit f9dd597

Browse files
authored
Patch coredns to fix its %check (#12282)
1 parent a59c430 commit f9dd597

2 files changed

Lines changed: 33 additions & 1 deletion

File tree

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
From d8ecde1080e7cbbeb98257ba4e03a271f16b4cd9 Mon Sep 17 00:00:00 2001
2+
From: Arthur Outhenin-Chalandre <arthur@cri.epita.fr>
3+
Date: Tue, 21 Jan 2025 09:41:38 +0100
4+
Subject: [PATCH] test: fix cname with proxy test (#7083)
5+
6+
www.example.net is now behind akamai with various IP answered and a
7+
chain of CNAME. Let's replace www.example.net by one of the root server
8+
which answer a single IP and hopefully should remain this way.
9+
10+
Signed-off-by: Arthur Outhenin-Chalandre <arthur@cri.epita.fr>
11+
---
12+
test/example_test.go | 2 +-
13+
1 file changed, 1 insertion(+), 1 deletion(-)
14+
15+
diff --git a/test/example_test.go b/test/example_test.go
16+
index 863b69fcce1..ed1f9c7c30f 100644
17+
--- a/test/example_test.go
18+
+++ b/test/example_test.go
19+
@@ -11,6 +11,6 @@ short 1 IN A 127.0.0.3
20+
21+
*.w 3600 IN TXT "Wildcard"
22+
a.b.c.w IN TXT "Not a wildcard"
23+
-cname IN CNAME www.example.net.
24+
+cname IN CNAME h.gtld-servers.net.
25+
service IN SRV 8080 10 10 @
26+
`

SPECS/coredns/coredns.spec

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Summary: Fast and flexible DNS server
44
Name: coredns
55
Version: 1.11.1
6-
Release: 12%{?dist}
6+
Release: 13%{?dist}
77
License: Apache License 2.0
88
Vendor: Microsoft Corporation
99
Distribution: Mariner
@@ -37,6 +37,9 @@ Patch3: CVE-2024-22189.patch
3737
Patch4: CVE-2023-45288.patch
3838
Patch5: CVE-2024-0874.patch
3939
Patch6: CVE-2024-24786.patch
40+
# Patch to fix the package test suite due to external akamai update
41+
# https://github.com/coredns/coredns/commit/d8ecde1080e7cbbeb98257ba4e03a271f16b4cd9
42+
Patch7: coredns-example-net-test.patch
4043

4144
BuildRequires: golang
4245

@@ -75,6 +78,9 @@ install -p -m 755 -t %{buildroot}%{_bindir} %{name}
7578
%{_bindir}/%{name}
7679

7780
%changelog
81+
* Mon Feb 10 2025 Sam Meluch <sammeluch@microsoft.com> - 1.11.1-13
82+
- Fix package test with upstream patch
83+
7884
* Mon Dec 09 2024 Kavya Sree Kaitepalli <kkaitepalli@microsoft.com> - 1.11.1-12
7985
- Patch for CVE-2024-24786
8086

0 commit comments

Comments
 (0)