.aardvark-dns.metadata

@@ -1,2 +1,2 @@
-bb8ff7cbd83800f0043d7320a70f20d1cbde8a1a SOURCES/aardvark-dns-v1.1.0-vendor.tar.gz
-9971b328f307ecf11ba8a42c0988219565aa135a SOURCES/v1.1.0.tar.gz
+72abbe7bffa39a3bb1d74fabbc90d1f18430ebd6 SOURCES/aardvark-dns-v1.10.1-rhel-vendor.tar.gz
+d8b296ae864fb68c80c1805b9cd83de7093f1973 SOURCES/v1.10.1-rhel-3d0fec1.tar.gz

.gitignore

@@ -1,2 +1,2 @@
-SOURCES/aardvark-dns-v1.1.0-vendor.tar.gz
-SOURCES/v1.1.0.tar.gz
+SOURCES/aardvark-dns-v1.10.1-rhel-vendor.tar.gz
+SOURCES/v1.10.1-rhel-3d0fec1.tar.gz

SOURCES/201.patch

@@ -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

SPECS/aardvark-dns.spec

@@ -1,21 +1,29 @@
 # debuginfo doesn't work yet
 %global debug_package %{nil}
 
+%global aardvark_dns_branch v1.10.1-rhel
+%global aardvark_dns_commit0 3d0fec1eb11bfe722ed645c5717425195d4d481f
+%global aardvark_dns_shortcommit0 %(c=%{aardvark_dns_commit0}; echo ${c:0:7})
+
 Epoch: 2
 Name: aardvark-dns
-Version: 1.1.0
+Version: 1.10.1
 License: ASL 2.0 and BSD and MIT
-Release: 4%{?dist}
+Release: 2%{?dist}
 ExclusiveArch: %{rust_arches}
 Summary: Authoritative DNS server for A/AAAA container records
 URL: https://github.com/containers/aardvark-dns
-Patch0: https://patch-diff.githubusercontent.com/raw/containers/aardvark-dns/pull/201.patch
-Source0: %{url}/archive/v%{version}.tar.gz
-Source1: %{url}/releases/download/v%{version}/%{name}-v%{version}-vendor.tar.gz
+%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_branch}-%{aardvark_dns_shortcommit0}.tar.gz
+%endif
+Source1: https://github.com/containers/aardvark-dns/releases/download/%{aardvark_dns_version}/aardvark-dns-%{aardvark_dns_branch}-vendor.tar.gz
 BuildRequires: cargo
 BuildRequires: git-core
 BuildRequires: make
 BuildRequires: rust-srpm-macros
+Conflicts: netavark < %{epoch}:%{version}
 
 %description
 %{summary}
@@ -24,7 +32,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
 
@@ -34,20 +47,83 @@ replace-with = "vendored-sources"
 
 [source.vendored-sources]
 directory = "vendor"
+
+[net]
+offline = true
 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
+* Wed Sep 25 2024 Jindrich Novy <jnovy@redhat.com> - 2:1.10.1-2
+- build off the RHEL maintenance branch
+- Resolves: RHEL-59129
+
+* Thu Jan 25 2024 Jindrich Novy <jnovy@redhat.com> - 2:1.10.0-1
+- update to https://github.com/containers/aardvark-dns/releases/tag/v1.10.0
+- Related: Jira:RHEL-2110
+
+* Thu Dec 07 2023 Lokesh Mandvekar <lsm5@redhat.com> - 2:1.9.0-1
+- update to https://github.com/containers/aardvark-dns/releases/tag/v1.9.0
+- Related: Jira:RHEL-2110
+
+* Fri Sep 29 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.8.0-1
+- update to https://github.com/containers/aardvark-dns/releases/tag/v1.8.0
+- Related: Jira:RHEL-2110
+
+* Mon Jul 03 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.7.0-1
+- update to https://github.com/containers/aardvark-dns/releases/tag/v1.7.0
+- Related: #2176055
+
+* Thu May 11 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.6.0-1
+- update to https://github.com/containers/aardvark-dns/releases/tag/v1.6.0
+- Related: #2176055
+
+* 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
 - Related: #2061390