From a00a691f273c2670fe0903ee6109f6a27cf0e093 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 16 May 2023 06:04:22 +0000
Subject: [PATCH] import aardvark-dns-1.5.0-2.module+el8.8.0+18060+3f21f2cc

---
 .aardvark-dns.metadata  |  4 +--
 .gitignore              |  4 +--
 SPECS/aardvark-dns.spec | 71 +++++++++++++++++------------------------
 3 files changed, 33 insertions(+), 46 deletions(-)

diff --git a/.aardvark-dns.metadata b/.aardvark-dns.metadata
index 54a36b7..86df983 100644
--- a/.aardvark-dns.metadata
+++ b/.aardvark-dns.metadata
@@ -1,2 +1,2 @@
-f489e0da9d838a60c291be7b70ecfb506884063a SOURCES/aardvark-dns-v1.1.0-vendor.tar.gz
-4cf03433c861419f77fe672415b6cac452668c91 SOURCES/v1.1.0-rhel-4847c54.tar.gz
+39ac41d514839dcc34bbf1db142ec63a59f8d47f SOURCES/aardvark-dns-v1.5.0-vendor.tar.gz
+84c175b7fabd69b3abfe3f60c4859661cc02f267 SOURCES/v1.5.0.tar.gz
diff --git a/.gitignore b/.gitignore
index 6d1e419..e5a7a44 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-SOURCES/aardvark-dns-v1.1.0-vendor.tar.gz
-SOURCES/v1.1.0-rhel-4847c54.tar.gz
+SOURCES/aardvark-dns-v1.5.0-vendor.tar.gz
+SOURCES/v1.5.0.tar.gz
diff --git a/SPECS/aardvark-dns.spec b/SPECS/aardvark-dns.spec
index 9502030..5bc4147 100644
--- a/SPECS/aardvark-dns.spec
+++ b/SPECS/aardvark-dns.spec
@@ -1,25 +1,16 @@
 # 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
+Version: 1.5.0
 License: ASL 2.0 and BSD and MIT
-Release: 5%{?dist}
+Release: 2%{?dist}
 ExclusiveArch: %{rust_arches}
 Summary: Authoritative DNS server for A/AAAA container records
 URL: https://github.com/containers/aardvark-dns
-%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
+Source0: %{url}/archive/v%{version}.tar.gz
+Source1: %{url}/releases/download/v%{version}/%{name}-v%{version}-vendor.tar.gz
 BuildRequires: cargo
 BuildRequires: git-core
 BuildRequires: make
@@ -32,12 +23,7 @@ Forwards other request to configured resolvers.
 Read more about configuration in `src/backend/mod.rs`.
 
 %prep
-tar fx %{SOURCE0}
-%if 0%{?aardvark_dns_branch:1}
-pushd containers-aardvark-dns-%{aardvark_dns_shortcommit0}
-%else
-pushd aardvark-dns-%{aardvark_dns_commit0}
-%endif
+%autosetup -Sgit
 tar fx %{SOURCE1}
 mkdir -p .cargo
 
@@ -47,41 +33,42 @@ replace-with = "vendored-sources"
 
 [source.vendored-sources]
 directory = "vendor"
+
+[net]
+offline = true
 EOF
 
 %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
+%{__make} build
 
 %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
-%if 0%{?aardvark_dns_branch:1}
-%license containers-aardvark-dns-%{aardvark_dns_shortcommit0}/LICENSE
-%else
-%license aardvark-dns-%{aardvark_dns_commit0}/LICENSE
-%endif
+%license LICENSE
 %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: #2130234
+* Fri Feb 03 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.5.0-2
+- always stay offline during build
+- Related: #2123641
+
+* Fri Feb 03 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.5.0-1
+- update to https://github.com/containers/aardvark-dns/releases/tag/v1.5.0
+- Related: #2123641
+
+* Thu Dec 08 2022 Jindrich Novy <jnovy@redhat.com> - 2:1.4.0-1
+- update to https://github.com/containers/aardvark-dns/releases/tag/v1.4.0
+- Related: #2123641
+
+* Mon Nov 14 2022 Jindrich Novy <jnovy@redhat.com> - 2:1.3.0-1
+- update to https://github.com/containers/aardvark-dns/releases/tag/v1.3.0
+- Related: #2123641
+
+* Wed Sep 28 2022 Jindrich Novy <jnovy@redhat.com> - 2:1.2.0-1
+- update to https://github.com/containers/aardvark-dns/releases/tag/v1.2.0
+- Related: #2116481
 
 * Wed Aug 24 2022 Jindrich Novy <jnovy@redhat.com> - 2:1.1.0-4
 - remove windows binaries and regenerate vendor tarball