From 3e28c61a5e120d51b670896a521df2ae254974d8 Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Mon, 14 Oct 2024 06:15:36 +0000
Subject: [PATCH] import UBI
 aardvark-dns-1.10.1-2.module+el8.10.0+22346+28c02849

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

diff --git a/.aardvark-dns.metadata b/.aardvark-dns.metadata
index b055ded..dfa9149 100644
--- a/.aardvark-dns.metadata
+++ b/.aardvark-dns.metadata
@@ -1,2 +1,2 @@
-a1c2f6539a0cc52b7a0e54af4ac2a7f5257b56bd SOURCES/aardvark-dns-v1.10.0-vendor.tar.gz
-fba49f4549cc0e40b2c06bcbfd8b71fe12b67d47 SOURCES/v1.10.0.tar.gz
+72abbe7bffa39a3bb1d74fabbc90d1f18430ebd6 SOURCES/aardvark-dns-v1.10.1-rhel-vendor.tar.gz
+d8b296ae864fb68c80c1805b9cd83de7093f1973 SOURCES/v1.10.1-rhel-3d0fec1.tar.gz
diff --git a/.gitignore b/.gitignore
index 81d54ae..a291457 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-SOURCES/aardvark-dns-v1.10.0-vendor.tar.gz
-SOURCES/v1.10.0.tar.gz
+SOURCES/aardvark-dns-v1.10.1-rhel-vendor.tar.gz
+SOURCES/v1.10.1-rhel-3d0fec1.tar.gz
diff --git a/SPECS/aardvark-dns.spec b/SPECS/aardvark-dns.spec
index 87ed991..6716376 100644
--- a/SPECS/aardvark-dns.spec
+++ b/SPECS/aardvark-dns.spec
@@ -1,20 +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.10.0
+Version: 1.10.1
 License: ASL 2.0 and BSD and MIT
-Release: 1%{?dist}
+Release: 2%{?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
+%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}
@@ -23,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
 
@@ -39,17 +53,38 @@ 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
@@ -89,7 +124,6 @@ EOF
 * 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