Compare commits

...

No commits in common. "c8-beta" and "c9-beta" have entirely different histories.

4 changed files with 69 additions and 40 deletions

View File

@ -1,2 +1,2 @@
bb8ff7cbd83800f0043d7320a70f20d1cbde8a1a SOURCES/aardvark-dns-v1.1.0-vendor.tar.gz 3b6d64662cb5a5aeb5e3a85341b4eee70144d775 SOURCES/aardvark-dns-v1.12.1-vendor.tar.gz
9971b328f307ecf11ba8a42c0988219565aa135a SOURCES/v1.1.0.tar.gz feeca9adf802325402a04e496462f5b412ca5448 SOURCES/v1.12.1.tar.gz

4
.gitignore vendored
View File

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

View File

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

View File

@ -3,19 +3,19 @@
Epoch: 2 Epoch: 2
Name: aardvark-dns Name: aardvark-dns
Version: 1.1.0 Version: 1.12.1
License: ASL 2.0 and BSD and MIT License: ASL 2.0 and BSD and MIT
Release: 4%{?dist} Release: 1%{?dist}
ExclusiveArch: %{rust_arches} ExclusiveArch: %{rust_arches}
Summary: Authoritative DNS server for A/AAAA container records Summary: Authoritative DNS server for A/AAAA container records
URL: https://github.com/containers/aardvark-dns 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 Source0: %{url}/archive/v%{version}.tar.gz
Source1: %{url}/releases/download/v%{version}/%{name}-v%{version}-vendor.tar.gz Source1: %{url}/releases/download/v%{version}/%{name}-v%{version}-vendor.tar.gz
BuildRequires: cargo BuildRequires: cargo
BuildRequires: git-core BuildRequires: git-core
BuildRequires: make BuildRequires: make
BuildRequires: rust-srpm-macros BuildRequires: rust-srpm-macros
Conflicts: netavark < %{epoch}:%{version}
%description %description
%{summary} %{summary}
@ -34,6 +34,9 @@ replace-with = "vendored-sources"
[source.vendored-sources] [source.vendored-sources]
directory = "vendor" directory = "vendor"
[net]
offline = true
EOF EOF
%build %build
@ -48,18 +51,70 @@ EOF
%{_libexecdir}/podman/%{name} %{_libexecdir}/podman/%{name}
%changelog %changelog
* Mon Aug 05 2024 Jindrich Novy <jnovy@redhat.com> - 2:1.12.1-1
- update to https://github.com/containers/aardvark-dns/releases/tag/v1.12.1
- Related: RHEL-27608
* Mon Jun 03 2024 Jindrich Novy <jnovy@redhat.com> - 2:1.11.0-1
- update to https://github.com/containers/aardvark-dns/releases/tag/v1.11.0
- Related: RHEL-27608
* Mon Apr 08 2024 Lokesh Mandvekar <lsm5@redhat.com> - 2:1.10.0-2
- rebuild for gating tests
- Related: RHEL-31950
* Wed Jan 24 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: RHEL-2112
* Wed Dec 06 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-2112
* 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-2112
* Fri Jul 07 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: #2176063
* Wed Apr 12 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: #2176063
* Fri Feb 03 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.5.0-2
- build always offline
- Related: #2124478
* 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: #2124478
* 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: #2124478
* Wed Nov 16 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: #2124478
* Tue Oct 18 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: #2124478
* Wed Aug 24 2022 Jindrich Novy <jnovy@redhat.com> - 2:1.1.0-4 * Wed Aug 24 2022 Jindrich Novy <jnovy@redhat.com> - 2:1.1.0-4
- remove windows binaries and regenerate vendor tarball - remove windows binaries and regenerate vendor tarball
- Related: #2061390 - Related: #2061316
* Tue Aug 09 2022 Jindrich Novy <jnovy@redhat.com> - 2:1.1.0-3 * Tue Aug 23 2022 Jindrich Novy <jnovy@redhat.com> - 2:1.1.0-3
- add gating.yaml - conflict with older versions than aardvark-dns itself
- Related: #2061390 - Related: #2061316
* Thu Aug 04 2022 Jindrich Novy <jnovy@redhat.com> - 2:1.1.0-2 * Thu Aug 04 2022 Jindrich Novy <jnovy@redhat.com> - 2:1.1.0-2
- bump Epoch to preserve upgrade path - add Epoch to preserve upgrade path
- Related: #2061390 - Related: #2061316
* Wed Aug 3 2022 Jindrich Novy <jnovy@redhat.com> 1.1.0-1 * Wed Aug 3 2022 Jindrich Novy <jnovy@redhat.com> 1.1.0-1
- initial import - initial import
- Related: #2061390 - Related: #2061316