From ce1684e2b7698f0e5729095f8993aa5ac98ce6d8 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 15 Nov 2022 10:36:51 -0500
Subject: [PATCH] import aardvark-dns-1.1.0-5.el9_1

---
 .aardvark-dns.metadata  |  4 ++--
 .gitignore              |  2 +-
 SOURCES/201.patch       | 26 ----------------------
 SPECS/aardvark-dns.spec | 49 +++++++++++++++++++++++++++++++++++------
 4 files changed, 45 insertions(+), 36 deletions(-)
 delete mode 100644 SOURCES/201.patch

diff --git a/.aardvark-dns.metadata b/.aardvark-dns.metadata
index e2f3b1e..54a36b7 100644
--- a/.aardvark-dns.metadata
+++ b/.aardvark-dns.metadata
@@ -1,2 +1,2 @@
-bb8ff7cbd83800f0043d7320a70f20d1cbde8a1a SOURCES/aardvark-dns-v1.1.0-vendor.tar.gz
-9971b328f307ecf11ba8a42c0988219565aa135a SOURCES/v1.1.0.tar.gz
+f489e0da9d838a60c291be7b70ecfb506884063a SOURCES/aardvark-dns-v1.1.0-vendor.tar.gz
+4cf03433c861419f77fe672415b6cac452668c91 SOURCES/v1.1.0-rhel-4847c54.tar.gz
diff --git a/.gitignore b/.gitignore
index 74f53f9..6d1e419 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
 SOURCES/aardvark-dns-v1.1.0-vendor.tar.gz
-SOURCES/v1.1.0.tar.gz
+SOURCES/v1.1.0-rhel-4847c54.tar.gz
diff --git a/SOURCES/201.patch b/SOURCES/201.patch
deleted file mode 100644
index 5dc70ed..0000000
--- a/SOURCES/201.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From a34a32a9faea832f378f67d5121f430d0b96a925 Mon Sep 17 00:00:00 2001
-From: Aditya R <arajan@redhat.com>
-Date: Tue, 23 Aug 2022 22:23:48 +0530
-Subject: [PATCH] makefile: remove windows specific libaries from vendor
-
-Modify `vendor-rm-windows` to remove windows specific libaries from
-vendor directory
-
-Signed-off-by: Aditya R <arajan@redhat.com>
----
- Makefile | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/Makefile b/Makefile
-index 411203a..75ba52d 100644
---- a/Makefile
-+++ b/Makefile
-@@ -109,6 +109,8 @@ vendor: ## vendor everything into vendor/
- vendor-rm-windows:
- 	if [ -d "vendor/winapi" ]; then \
- 		rm -fr vendor/winapi*gnu*/lib/*.a; \
-+		rm -fr vendor/windows*/lib/*.a; \
-+		rm -fr vendor/windows*/lib/*.lib; \
- 	fi
- 
- .PHONY: vendor-tarball
diff --git a/SPECS/aardvark-dns.spec b/SPECS/aardvark-dns.spec
index 1d35053..27fb48c 100644
--- a/SPECS/aardvark-dns.spec
+++ b/SPECS/aardvark-dns.spec
@@ -1,17 +1,25 @@
 # debuginfo doesn't work yet
 %global debug_package %{nil}
 
+%global aardvark_dns_version v1.1.0
+%global aardvark_dns_branch v1.1.0-rhel
+%global aardvark_dns_commit0 4847c54770c2de4a0f9873ff5d99cad8609a0baf
+%global aardvark_dns_shortcommit0 %(c=%{aardvark_dns_commit0}; echo ${c:0:7})
+
 Epoch: 2
 Name: aardvark-dns
 Version: 1.1.0
 License: ASL 2.0 and BSD and MIT
-Release: 4%{?dist}
+Release: 5%{?dist}
 ExclusiveArch: %{rust_arches}
 Summary: Authoritative DNS server for A/AAAA container records
 URL: https://github.com/containers/aardvark-dns
-Source0: %{url}/archive/v%{version}.tar.gz
-Source1: %{url}/releases/download/v%{version}/%{name}-v%{version}-vendor.tar.gz
-Patch0: https://patch-diff.githubusercontent.com/raw/containers/aardvark-dns/pull/201.patch
+%if 0%{?aardvark_dns_branch:1}
+Source0: https://github.com/containers/aardvark-dns/tarball/%{aardvark_dns_commit0}/%{aardvark_dns_branch}-%{aardvark_dns_shortcommit0}.tar.gz
+%else
+Source0: https://github.com/containers/aardvark-dns/archive/%{aardvark_dns_commit0}/aardvark-dns-%{aardvark_dns_version}-%{aardvark_dns_shortcommit0}.tar.gz
+%endif
+Source1: https://github.com/containers/aardvark-dns/releases/download/%{aardvark_dns_version}/aardvark-dns-%{aardvark_dns_version}-vendor.tar.gz
 BuildRequires: cargo
 BuildRequires: git-core
 BuildRequires: make
@@ -25,7 +33,12 @@ Forwards other request to configured resolvers.
 Read more about configuration in `src/backend/mod.rs`.
 
 %prep
-%autosetup -Sgit
+tar fx %{SOURCE0}
+%if 0%{?aardvark_dns_branch:1}
+pushd containers-aardvark-dns-%{aardvark_dns_shortcommit0}
+%else
+pushd aardvark-dns-%{aardvark_dns_commit0}
+%endif
 tar fx %{SOURCE1}
 mkdir -p .cargo
 
@@ -38,17 +51,39 @@ directory = "vendor"
 EOF
 
 %build
-%{__make} build
+%if 0%{?aardvark_dns_branch:1}
+pushd containers-aardvark-dns-%{aardvark_dns_shortcommit0}
+%else
+pushd aardvark-dns-%{aardvark_dns_commit0}
+%endif
+%__scm_setup_git -q
+%make_build build
+popd
 
 %install
+%if 0%{?aardvark_dns_branch:1}
+pushd containers-aardvark-dns-%{aardvark_dns_shortcommit0}
+%else
+pushd aardvark-dns-%{aardvark_dns_commit0}
+%endif
 %{__make} DESTDIR=%{buildroot} PREFIX=%{_prefix} install
+popd
 
 %files
-%license LICENSE
+%if 0%{?aardvark_dns_branch:1}
+%license containers-aardvark-dns-%{aardvark_dns_shortcommit0}/LICENSE
+%else
+%license aardvark-dns-%{aardvark_dns_commit0}/LICENSE
+%endif
 %dir %{_libexecdir}/podman
 %{_libexecdir}/podman/%{name}
 
 %changelog
+* Thu Oct 20 2022 Jindrich Novy <jnovy@redhat.com> - 2:1.1.0-5
+- fix "Two aardvark-dns instances trying to use the same port
+  on the same interface"
+- Resolves: #2136306
+
 * Wed Aug 24 2022 Jindrich Novy <jnovy@redhat.com> - 2:1.1.0-4
 - remove windows binaries and regenerate vendor tarball
 - Related: #2061316