.aardvark-dns.metadata

@@ -1,2 +1,2 @@
-e29c652dde34337a70e01cd880304216aa35f7c3 SOURCES/aardvark-dns-v1.14.0-vendor.tar.gz
+bb8ff7cbd83800f0043d7320a70f20d1cbde8a1a SOURCES/aardvark-dns-v1.1.0-vendor.tar.gz
-811aabcc6f1b9e39c46adef4058de04f155e29df SOURCES/v1.14.0.tar.gz
+9971b328f307ecf11ba8a42c0988219565aa135a SOURCES/v1.1.0.tar.gz

.gitignore

@@ -1,2 +1,2 @@
-SOURCES/aardvark-dns-v1.14.0-vendor.tar.gz
+SOURCES/aardvark-dns-v1.1.0-vendor.tar.gz
-SOURCES/v1.14.0.tar.gz
+SOURCES/v1.1.0.tar.gz

SOURCES/201.patch

@@ -0,0 +1,26 @@
+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,51 +1,21 @@
-# trust-dns-{client,server} not available
+# debuginfo doesn't work yet
-# using vendored deps
-
-%global with_debug 1
-
-%if 0%{?with_debug}
-%global _find_debuginfo_dwz_opts %{nil}
-%global _dwz_low_mem_die_limit 0
-%else
 %global debug_package %{nil}
-%endif
 
-Name: aardvark-dns
-%if %{defined copr_username}
-Epoch: 102
-%else
 Epoch: 2
-%endif
+Name: aardvark-dns
-# DO NOT TOUCH the Version string!
+Version: 1.1.0
-# The TRUE source of this specfile is:
+License: ASL 2.0 and BSD and MIT
-# https://github.com/containers/podman/blob/main/rpm/podman.spec
+Release: 4%{?dist}
-# If that's what you're reading, Version must be 0, and will be updated by Packit for
+ExclusiveArch: %{rust_arches}
-# copr and koji builds.
-# If you're reading this on dist-git, the version is automatically filled in by Packit.
-Version: 1.14.0
-# The `AND` needs to be uppercase in the License for SPDX compatibility
-License: Apache-2.0 AND MIT AND Zlib
-Release: 1%{?dist}
-%if %{defined golang_arches_future}
-ExclusiveArch: %{golang_arches_future}
-%else
-ExclusiveArch: aarch64 ppc64le s390x x86_64
-%endif
 Summary: Authoritative DNS server for A/AAAA container records
-URL: https://github.com/containers/%{name}
+URL: https://github.com/containers/aardvark-dns
-# Tarballs fetched from upstream's release page
+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
 BuildRequires: cargo
 BuildRequires: git-core
 BuildRequires: make
-%if %{defined rhel}
-# rust-toolset requires the `local` repo enabled on non-koji ELN build environments
-BuildRequires: rust-toolset
-%else
-BuildRequires: rust-packaging
 BuildRequires: rust-srpm-macros
-%endif
 
 %description
 %{summary}
@@ -54,44 +24,42 @@ Forwards other request to configured resolvers.
 Read more about configuration in `src/backend/mod.rs`.
 
 %prep
-%autosetup -Sgit %{name}-%{version}
+%autosetup -Sgit
-# Following steps are only required on environments like koji which have no
-# network access and thus depend on the vendored tarball. Copr pulls
-# dependencies directly from the network.
-%if !%{defined copr_username}
 tar fx %{SOURCE1}
-%if 0%{?fedora} || 0%{?rhel} >= 10
+mkdir -p .cargo
-%cargo_prep -v vendor
+
-%else
+cat >.cargo/config << EOF
-%cargo_prep -V 1
+[source.crates-io]
-%endif
+replace-with = "vendored-sources"
-%endif
+
+[source.vendored-sources]
+directory = "vendor"
+EOF
 
 %build
-%{__make} CARGO="%{__cargo}" build
+%{__make} build
-%if (0%{?fedora} || 0%{?rhel} >= 10) && !%{defined copr_username}
-%cargo_license_summary
-%{cargo_license} > LICENSE.dependencies
-%cargo_vendor_manifest
-%endif
 
 %install
 %{__make} DESTDIR=%{buildroot} PREFIX=%{_prefix} install
 
 %files
 %license LICENSE
-%if (0%{?fedora} || 0%{?rhel} >= 10) && !%{defined copr_username}
-%license LICENSE.dependencies
-%license cargo-vendor.txt
-%endif
 %dir %{_libexecdir}/podman
 %{_libexecdir}/podman/%{name}
 
 %changelog
-* Mon Feb 10 2025 Jindrich Novy <jnovy@redhat.com> - 2:1.14.0-1
+* Wed Aug 24 2022 Jindrich Novy <jnovy@redhat.com> - 2:1.1.0-4
-- update to https://github.com/containers/aardvark-dns/releases/tag/v1.14.0
+- remove windows binaries and regenerate vendor tarball
-- Related: RHEL-60277
+- Related: #2061390
 
-* Wed Nov 13 2024 Jindrich Novy <jnovy@redhat.com> - 2:1.13.1-1
+* Tue Aug 09 2022 Jindrich Novy <jnovy@redhat.com> - 2:1.1.0-3
-- update to https://github.com/containers/aardvark-dns/releases/tag/v1.13.1
+- add gating.yaml
-- Related: RHEL-60277
+- Related: #2061390
+
+* Thu Aug 04 2022 Jindrich Novy <jnovy@redhat.com> - 2:1.1.0-2
+- bump Epoch to preserve upgrade path
+- Related: #2061390
+
+* Wed Aug 3 2022 Jindrich Novy <jnovy@redhat.com> 1.1.0-1
+- initial import
+- Related: #2061390