From 520a01492f9d668649a383561356f3e5c8685d65 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 6 Mar 2023 17:48:34 +0530 Subject: [PATCH 01/29] migrated to SPDX license Signed-off-by: Lokesh Mandvekar --- aardvark-dns.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aardvark-dns.spec b/aardvark-dns.spec index bbb0d75..1257791 100644 --- a/aardvark-dns.spec +++ b/aardvark-dns.spec @@ -16,7 +16,7 @@ Name: aardvark-dns Version: %{gen_version} -License: ASL 2.0 and BSD and MIT +License: Apache-2.0 and MIT and Zlib Release: %autorelease ExclusiveArch: %{arm32} %{arm64} ppc64le s390x x86_64 Summary: Authoritative DNS server for A/AAAA container records From 4f12ae36334ec95d16862de607de0af5520ba5ee Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 6 Mar 2023 17:49:09 +0530 Subject: [PATCH 02/29] exclusivearch: golang_arches_future Signed-off-by: Lokesh Mandvekar --- aardvark-dns.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aardvark-dns.spec b/aardvark-dns.spec index 1257791..b9b1817 100644 --- a/aardvark-dns.spec +++ b/aardvark-dns.spec @@ -18,7 +18,7 @@ Name: aardvark-dns Version: %{gen_version} License: Apache-2.0 and MIT and Zlib Release: %autorelease -ExclusiveArch: %{arm32} %{arm64} ppc64le s390x x86_64 +ExclusiveArch: %{golang_arches_future} Summary: Authoritative DNS server for A/AAAA container records URL: https://github.com/containers/%{name} # Tarballs fetched from upstream's release page From 4c37cf57f94531eb273d960cc6af46641a7f3b38 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 12 Apr 2023 08:04:24 -0400 Subject: [PATCH 03/29] bump to v1.6.0 --- .gitignore | 2 ++ aardvark-dns.spec | 37 +++++++++++++++---------------------- sources | 4 ++-- 3 files changed, 19 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore index 9fadbdf..0283e55 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,5 @@ /v1.4.0.tar.gz /aardvark-dns-v1.5.0-vendor.tar.gz /v1.5.0.tar.gz +/aardvark-dns-v1.6.0-vendor.tar.gz +/v1.6.0.tar.gz diff --git a/aardvark-dns.spec b/aardvark-dns.spec index b9b1817..c63f4ab 100644 --- a/aardvark-dns.spec +++ b/aardvark-dns.spec @@ -10,7 +10,7 @@ %global debug_package %{nil} %endif -%global built_tag v1.5.0 +%global built_tag v1.6.0 %global built_tag_strip %(b=%{built_tag}; echo ${b:1}) %global gen_version %(b=%{built_tag_strip}; echo ${b/-/"~"}) @@ -30,16 +30,15 @@ BuildRequires: make BuildRequires: rust-packaging BuildRequires: rust-srpm-macros # cargo tree --prefix none | awk '{print "Provides: bundled(crate("$1")) = "$2}' | sort | uniq -Provides: bundled(crate(aardvark-dns)) = v1.5.0 -Provides: bundled(crate(anyhow)) = v1.0.68 -Provides: bundled(crate(async-broadcast)) = v0.5.0 +Provides: bundled(crate(anyhow)) = v1.0.70 +Provides: bundled(crate(async-broadcast)) = v0.5.1 Provides: bundled(crate(async-trait)) = v0.1.56 Provides: bundled(crate(atty)) = v0.2.14 Provides: bundled(crate(autocfg)) = v1.1.0 Provides: bundled(crate(bitflags)) = v1.3.2 Provides: bundled(crate(bytes)) = v1.1.0 Provides: bundled(crate(cfg-if)) = v1.0.0 -Provides: bundled(crate(chrono)) = v0.4.23 +Provides: bundled(crate(chrono)) = v0.4.24 Provides: bundled(crate(clap)) = v3.2.23 Provides: bundled(crate(clap_derive)) = v3.2.18 Provides: bundled(crate(clap_lex)) = v0.2.4 @@ -50,11 +49,11 @@ Provides: bundled(crate(error-chain)) = v0.12.4 Provides: bundled(crate(event-listener)) = v2.5.2 Provides: bundled(crate(form_urlencoded)) = v1.0.1 Provides: bundled(crate(futures-channel)) = v0.3.21 -Provides: bundled(crate(futures-core)) = v0.3.25 +Provides: bundled(crate(futures-core)) = v0.3.28 Provides: bundled(crate(futures-executor)) = v0.3.21 Provides: bundled(crate(futures-io)) = v0.3.21 -Provides: bundled(crate(futures-task)) = v0.3.25 -Provides: bundled(crate(futures-util)) = v0.3.25 +Provides: bundled(crate(futures-task)) = v0.3.28 +Provides: bundled(crate(futures-util)) = v0.3.28 Provides: bundled(crate(getrandom)) = v0.2.7 Provides: bundled(crate(hashbrown)) = v0.12.2 Provides: bundled(crate(heck)) = v0.4.0 @@ -65,12 +64,10 @@ Provides: bundled(crate(indexmap)) = v1.9.1 Provides: bundled(crate(ipnet)) = v2.5.0 Provides: bundled(crate(itoa)) = v1.0.2 Provides: bundled(crate(lazy_static)) = v1.4.0 -Provides: bundled(crate(libc)) = v0.2.139 -Provides: bundled(crate(lock_api)) = v0.4.7 +Provides: bundled(crate(libc)) = v0.2.140 Provides: bundled(crate(log)) = v0.4.17 Provides: bundled(crate(match_cfg)) = v0.1.0 Provides: bundled(crate(matches)) = v0.1.9 -Provides: bundled(crate(memchr)) = v2.5.0 Provides: bundled(crate(memoffset)) = v0.7.1 Provides: bundled(crate(mio)) = v0.8.4 Provides: bundled(crate(nibble_vec)) = v0.1.0 @@ -81,44 +78,41 @@ Provides: bundled(crate(num_cpus)) = v1.13.1 Provides: bundled(crate(num_threads)) = v0.1.6 Provides: bundled(crate(once_cell)) = v1.13.0 Provides: bundled(crate(os_str_bytes)) = v6.1.0 -Provides: bundled(crate(parking_lot)) = v0.12.1 -Provides: bundled(crate(parking_lot_core)) = v0.9.3 Provides: bundled(crate(percent-encoding)) = v2.1.0 Provides: bundled(crate(pin-project-lite)) = v0.2.9 Provides: bundled(crate(pin-utils)) = v0.1.0 Provides: bundled(crate(ppv-lite86)) = v0.2.16 Provides: bundled(crate(proc-macro-error)) = v1.0.4 Provides: bundled(crate(proc-macro-error-attr)) = v1.0.4 -Provides: bundled(crate(proc-macro2)) = v1.0.40 +Provides: bundled(crate(proc-macro2)) = v1.0.54 Provides: bundled(crate(quick-error)) = v1.2.3 -Provides: bundled(crate(quote)) = v1.0.20 +Provides: bundled(crate(quote)) = v1.0.26 Provides: bundled(crate(radix_trie)) = v0.2.1 Provides: bundled(crate(rand)) = v0.8.5 Provides: bundled(crate(rand_chacha)) = v0.3.1 Provides: bundled(crate(rand_core)) = v0.6.3 Provides: bundled(crate(resolv-conf)) = v0.7.0 -Provides: bundled(crate(scopeguard)) = v1.1.0 Provides: bundled(crate(serde)) = v1.0.139 Provides: bundled(crate(serde_derive)) = v1.0.139 -Provides: bundled(crate(signal-hook)) = v0.3.14 +Provides: bundled(crate(signal-hook)) = v0.3.15 Provides: bundled(crate(signal-hook-registry)) = v1.4.0 Provides: bundled(crate(slab)) = v0.4.6 Provides: bundled(crate(smallvec)) = v1.9.0 -Provides: bundled(crate(socket2)) = v0.4.4 +Provides: bundled(crate(socket2)) = v0.4.9 Provides: bundled(crate(static_assertions)) = v1.1.0 Provides: bundled(crate(strsim)) = v0.10.0 Provides: bundled(crate(syn)) = v1.0.98 +Provides: bundled(crate(syn)) = v2.0.12 Provides: bundled(crate(syslog)) = v6.0.1 Provides: bundled(crate(termcolor)) = v1.1.3 Provides: bundled(crate(textwrap)) = v0.16.0 Provides: bundled(crate(thiserror)) = v1.0.31 Provides: bundled(crate(thiserror-impl)) = v1.0.31 -Provides: bundled(crate(time)) = v0.1.44 Provides: bundled(crate(time)) = v0.3.11 Provides: bundled(crate(tinyvec)) = v1.6.0 Provides: bundled(crate(tinyvec_macros)) = v0.1.0 -Provides: bundled(crate(tokio)) = v1.25.0 -Provides: bundled(crate(tokio-macros)) = v1.8.0 +Provides: bundled(crate(tokio)) = v1.27.0 +Provides: bundled(crate(tokio-macros)) = v2.0.0 Provides: bundled(crate(toml)) = v0.5.9 Provides: bundled(crate(tracing)) = v0.1.36 Provides: bundled(crate(tracing-attributes)) = v0.1.22 @@ -131,7 +125,6 @@ Provides: bundled(crate(unicode-ident)) = v1.0.1 Provides: bundled(crate(unicode-normalization)) = v0.1.21 Provides: bundled(crate(url)) = v2.2.2 Provides: bundled(crate(version_check)) = v0.9.4 - %description %{summary} diff --git a/sources b/sources index 6114e28..d84d5aa 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (aardvark-dns-v1.5.0-vendor.tar.gz) = 5ce1654ca9ac6000f6bfc0e97cf14f666c4a6810349ae8ec5f914054aefad7dbaa44fcf1c4f171c45a5cba32fd6cabd039469b01049a8a4ae2c936627280ba04 -SHA512 (v1.5.0.tar.gz) = a648f44023bdbcbd4db502a307e42f1e1eb7718be5b559e6e9f1df43ac3a8982afe83ed866ca64bcf9bbece0eca4877713967654e195f7c6958e13aa0440189f +SHA512 (aardvark-dns-v1.6.0-vendor.tar.gz) = d852b794464c0597ea91a80779cde32dbc535366e9ab4c13e49d1e20f224fa6f1efe127af93bc21af49a0e11353f11d4d7b813a8415bfebd4cb609b1992c6359 +SHA512 (v1.6.0.tar.gz) = 699d65e426986204d9cddf04e88930ef59dca21ef5beb025dcad52e63a58421f8c8ee314d490b2f7b3f4a2d0df8444d4e706ca45b21153fc72f905b19e508090 From f55e1e7ec1b2185a58911a0929c67ee158e50ed3 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 29 Jun 2023 13:57:44 +0000 Subject: [PATCH 04/29] [packit] 1.7.0 upstream release Upstream tag: v1.7.0 Upstream commit: d27d3b39 --- .gitignore | 2 + .packit.yaml | 48 ++++++++++++++ README.packit | 3 + aardvark-dns.spec | 165 +++++++++++++++++----------------------------- sources | 4 +- 5 files changed, 114 insertions(+), 108 deletions(-) create mode 100644 .packit.yaml create mode 100644 README.packit diff --git a/.gitignore b/.gitignore index 0283e55..f6598e3 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,5 @@ /v1.5.0.tar.gz /aardvark-dns-v1.6.0-vendor.tar.gz /v1.6.0.tar.gz +/v1.7.0.tar.gz +/aardvark-dns-v1.7.0-vendor.tar.gz diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..a4ed4b1 --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,48 @@ +--- +# See the documentation for more information: +# https://packit.dev/docs/configuration/ + +# COPR build targets can be found at: +# https://copr.fedorainfracloud.org/coprs/rhcontainerbot/packit-builds/ +# and +# https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/ + +specfile_path: rpm/aardvark-dns.spec +upstream_tag_template: v{version} + +jobs: + - &copr + job: copr_build + trigger: pull_request + owner: rhcontainerbot + project: packit-builds + enable_net: true + srpm_build_deps: + - cargo + - make + - openssl-devel + + - <<: *copr + # Run on commit to main branch + trigger: commit + branch: main + project: podman-next + + - job: propose_downstream + trigger: release + update_release: false + dist_git_branches: + - fedora-all + actions: + pre-sync: + - "bash rpm/update-spec-provides.sh" + + - job: koji_build + trigger: commit + dist_git_branches: + - fedora-all + + - job: bodhi_update + trigger: commit + dist_git_branches: + - fedora-branched # rawhide updates are created automatically diff --git a/README.packit b/README.packit new file mode 100644 index 0000000..101115f --- /dev/null +++ b/README.packit @@ -0,0 +1,3 @@ +This repository is maintained by packit. +https://packit.dev/ +The file was generated using packit 0.77.0.post2+g06f877b. diff --git a/aardvark-dns.spec b/aardvark-dns.spec index c63f4ab..98dce4c 100644 --- a/aardvark-dns.spec +++ b/aardvark-dns.spec @@ -1,6 +1,14 @@ # trust-dns-{client,server} not available # using vendored deps +# RHEL doesn't include the package rust-packaging which provides %%__cargo macro, but EPEL +# does. So we set it separately here and skip rust-packaging dependency for RHEL. +# Buildability without EPEL is essential for packit builds. +# ELN doesn't need this. +%if %{defined rhel} && 0%{?rhel} < 10 +%define __cargo %{_bindir}/env CARGO_HOME=.cargo RUSTC_BOOTSTRAP=1 RUSTFLAGS='-Copt-level=3 -Cdebuginfo=2 -Ccodegen-units=1 -Clink-arg=-Wl,-z,relro -Clink-arg=-Wl,-z,now --cap-lints=warn' %{_bindir}/cargo +%endif + %global with_debug 1 %if 0%{?with_debug} @@ -10,121 +18,63 @@ %global debug_package %{nil} %endif -%global built_tag v1.6.0 -%global built_tag_strip %(b=%{built_tag}; echo ${b:1}) -%global gen_version %(b=%{built_tag_strip}; echo ${b/-/"~"}) +# copr_username is only set on copr environments owned by rhcontainerbot, +# not on other coprs or environments like koji. +%if %{defined copr_username} && "%{?copr_username}" == "rhcontainerbot" +%bcond_without copr +%else +%bcond_with copr +%endif + +# rhel 8 does not support %%autochangelog +%if %{defined rhel} && 0%{?rhel} <= 8 +%bcond_without manual_changelog +%else +%bcond_with manual_changelog +%endif + +# rhel does not define %%{golang_arches_future} +%if %{defined fedora} +%bcond_without golang_arches_future +%else +%bcond_with golang_arches_future +%endif Name: aardvark-dns -Version: %{gen_version} +%if %{with copr} +Epoch: 102 +%endif +# DO NOT TOUCH the Version string! +# The TRUE source of this specfile is: +# https://github.com/containers/podman/blob/main/rpm/podman.spec +# If that's what you're reading, Version must be 0, and will be updated by Packit for +# copr and koji builds. +# If you're reading this on dist-git, the version is automatically filled in by Packit. +Version: 1.7.0 License: Apache-2.0 and MIT and Zlib Release: %autorelease +%if %{with 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} # Tarballs fetched from upstream's release page -Source0: %{url}/archive/%{built_tag}.tar.gz -Source1: %{url}/releases/download/%{built_tag}/%{name}-%{built_tag}-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 +%if %{defined rhel} +BuildRequires: rust-toolset +%else BuildRequires: rust-packaging BuildRequires: rust-srpm-macros -# cargo tree --prefix none | awk '{print "Provides: bundled(crate("$1")) = "$2}' | sort | uniq -Provides: bundled(crate(anyhow)) = v1.0.70 -Provides: bundled(crate(async-broadcast)) = v0.5.1 -Provides: bundled(crate(async-trait)) = v0.1.56 -Provides: bundled(crate(atty)) = v0.2.14 -Provides: bundled(crate(autocfg)) = v1.1.0 -Provides: bundled(crate(bitflags)) = v1.3.2 -Provides: bundled(crate(bytes)) = v1.1.0 -Provides: bundled(crate(cfg-if)) = v1.0.0 -Provides: bundled(crate(chrono)) = v0.4.24 -Provides: bundled(crate(clap)) = v3.2.23 -Provides: bundled(crate(clap_derive)) = v3.2.18 -Provides: bundled(crate(clap_lex)) = v0.2.4 -Provides: bundled(crate(data-encoding)) = v2.3.2 -Provides: bundled(crate(endian-type)) = v0.1.2 -Provides: bundled(crate(enum-as-inner)) = v0.5.1 -Provides: bundled(crate(error-chain)) = v0.12.4 -Provides: bundled(crate(event-listener)) = v2.5.2 -Provides: bundled(crate(form_urlencoded)) = v1.0.1 -Provides: bundled(crate(futures-channel)) = v0.3.21 -Provides: bundled(crate(futures-core)) = v0.3.28 -Provides: bundled(crate(futures-executor)) = v0.3.21 -Provides: bundled(crate(futures-io)) = v0.3.21 -Provides: bundled(crate(futures-task)) = v0.3.28 -Provides: bundled(crate(futures-util)) = v0.3.28 -Provides: bundled(crate(getrandom)) = v0.2.7 -Provides: bundled(crate(hashbrown)) = v0.12.2 -Provides: bundled(crate(heck)) = v0.4.0 -Provides: bundled(crate(hostname)) = v0.3.1 -Provides: bundled(crate(iana-time-zone)) = v0.1.53 -Provides: bundled(crate(idna)) = v0.2.3 -Provides: bundled(crate(indexmap)) = v1.9.1 -Provides: bundled(crate(ipnet)) = v2.5.0 -Provides: bundled(crate(itoa)) = v1.0.2 -Provides: bundled(crate(lazy_static)) = v1.4.0 -Provides: bundled(crate(libc)) = v0.2.140 -Provides: bundled(crate(log)) = v0.4.17 -Provides: bundled(crate(match_cfg)) = v0.1.0 -Provides: bundled(crate(matches)) = v0.1.9 -Provides: bundled(crate(memoffset)) = v0.7.1 -Provides: bundled(crate(mio)) = v0.8.4 -Provides: bundled(crate(nibble_vec)) = v0.1.0 -Provides: bundled(crate(nix)) = v0.26.2 -Provides: bundled(crate(num-integer)) = v0.1.45 -Provides: bundled(crate(num-traits)) = v0.2.15 -Provides: bundled(crate(num_cpus)) = v1.13.1 -Provides: bundled(crate(num_threads)) = v0.1.6 -Provides: bundled(crate(once_cell)) = v1.13.0 -Provides: bundled(crate(os_str_bytes)) = v6.1.0 -Provides: bundled(crate(percent-encoding)) = v2.1.0 -Provides: bundled(crate(pin-project-lite)) = v0.2.9 -Provides: bundled(crate(pin-utils)) = v0.1.0 -Provides: bundled(crate(ppv-lite86)) = v0.2.16 -Provides: bundled(crate(proc-macro-error)) = v1.0.4 -Provides: bundled(crate(proc-macro-error-attr)) = v1.0.4 -Provides: bundled(crate(proc-macro2)) = v1.0.54 -Provides: bundled(crate(quick-error)) = v1.2.3 -Provides: bundled(crate(quote)) = v1.0.26 -Provides: bundled(crate(radix_trie)) = v0.2.1 -Provides: bundled(crate(rand)) = v0.8.5 -Provides: bundled(crate(rand_chacha)) = v0.3.1 -Provides: bundled(crate(rand_core)) = v0.6.3 -Provides: bundled(crate(resolv-conf)) = v0.7.0 -Provides: bundled(crate(serde)) = v1.0.139 -Provides: bundled(crate(serde_derive)) = v1.0.139 -Provides: bundled(crate(signal-hook)) = v0.3.15 -Provides: bundled(crate(signal-hook-registry)) = v1.4.0 -Provides: bundled(crate(slab)) = v0.4.6 -Provides: bundled(crate(smallvec)) = v1.9.0 -Provides: bundled(crate(socket2)) = v0.4.9 -Provides: bundled(crate(static_assertions)) = v1.1.0 -Provides: bundled(crate(strsim)) = v0.10.0 -Provides: bundled(crate(syn)) = v1.0.98 -Provides: bundled(crate(syn)) = v2.0.12 -Provides: bundled(crate(syslog)) = v6.0.1 -Provides: bundled(crate(termcolor)) = v1.1.3 -Provides: bundled(crate(textwrap)) = v0.16.0 -Provides: bundled(crate(thiserror)) = v1.0.31 -Provides: bundled(crate(thiserror-impl)) = v1.0.31 -Provides: bundled(crate(time)) = v0.3.11 -Provides: bundled(crate(tinyvec)) = v1.6.0 -Provides: bundled(crate(tinyvec_macros)) = v0.1.0 -Provides: bundled(crate(tokio)) = v1.27.0 -Provides: bundled(crate(tokio-macros)) = v2.0.0 -Provides: bundled(crate(toml)) = v0.5.9 -Provides: bundled(crate(tracing)) = v0.1.36 -Provides: bundled(crate(tracing-attributes)) = v0.1.22 -Provides: bundled(crate(tracing-core)) = v0.1.29 -Provides: bundled(crate(trust-dns-client)) = v0.22.0 -Provides: bundled(crate(trust-dns-proto)) = v0.22.0 -Provides: bundled(crate(trust-dns-server)) = v0.22.0 -Provides: bundled(crate(unicode-bidi)) = v0.3.8 -Provides: bundled(crate(unicode-ident)) = v1.0.1 -Provides: bundled(crate(unicode-normalization)) = v0.1.21 -Provides: bundled(crate(url)) = v2.2.2 -Provides: bundled(crate(version_check)) = v0.9.4 +%endif +# DO NOT DELETE BELOW LINE - used for updating downstream imports +# vendored libraries + %description %{summary} @@ -132,7 +82,11 @@ Forwards other request to configured resolvers. Read more about configuration in `src/backend/mod.rs`. %prep -%autosetup -Sgit %{name}-%{built_tag_strip} +%autosetup -Sgit %{name}-%{version} +# 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 %{without copr} tar fx %{SOURCE1} mkdir -p .cargo @@ -143,11 +97,10 @@ replace-with = "vendored-sources" [source.vendored-sources] directory = "vendor" EOF +%endif %build -%{__cargo} build --release -mkdir -p bin -cp target/release/%{name} bin/ +%{__make} CARGO="%{__cargo}" build %install %{__make} DESTDIR=%{buildroot} PREFIX=%{_prefix} install diff --git a/sources b/sources index d84d5aa..3dd3bb8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (aardvark-dns-v1.6.0-vendor.tar.gz) = d852b794464c0597ea91a80779cde32dbc535366e9ab4c13e49d1e20f224fa6f1efe127af93bc21af49a0e11353f11d4d7b813a8415bfebd4cb609b1992c6359 -SHA512 (v1.6.0.tar.gz) = 699d65e426986204d9cddf04e88930ef59dca21ef5beb025dcad52e63a58421f8c8ee314d490b2f7b3f4a2d0df8444d4e706ca45b21153fc72f905b19e508090 +SHA512 (v1.7.0.tar.gz) = d829ac122f26f17ca44a41a48576ab8c4f9dd238bc52faee816833f63f9ff54e63f62610167e4619084263e61cdb1329c2e1d49f314c8b9e65e748df80fd5096 +SHA512 (aardvark-dns-v1.7.0-vendor.tar.gz) = 07d3ebc7504fc1e4c0fe9b5f3760bdbe9b4153678aae962c9e37a0097bee832b0e4e77fadfc475c82fa05ffaa1a04f53df8f92b63e23b09da05e5e2efaa07c94 From c51566b42432b6cd5fe64dbfe0895212dc44cb8a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 12:47:07 +0000 Subject: [PATCH 05/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering From b916759aa10e8f9176d7e263f8edaf5f476077d2 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 22 Aug 2023 09:10:59 -0400 Subject: [PATCH 06/29] spdx compatible license field --- aardvark-dns.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aardvark-dns.spec b/aardvark-dns.spec index 98dce4c..59920ef 100644 --- a/aardvark-dns.spec +++ b/aardvark-dns.spec @@ -51,7 +51,7 @@ Epoch: 102 # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. Version: 1.7.0 -License: Apache-2.0 and MIT and Zlib +License: Apache-2.0 AND MIT AND Zlib Release: %autorelease %if %{with golang_arches_future} ExclusiveArch: %{golang_arches_future} From fa897de48dd98ca39ced549debb70b06704fc0c8 Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 27 Sep 2023 18:33:42 +0000 Subject: [PATCH 07/29] [packit] 1.8.0 upstream release Upstream tag: v1.8.0 Upstream commit: 1ed94020 --- .gitignore | 2 ++ .packit.yaml | 49 +++++++++++++++++++++++++++-------------------- README.packit | 2 +- aardvark-dns.spec | 34 ++++++-------------------------- sources | 4 ++-- 5 files changed, 39 insertions(+), 52 deletions(-) diff --git a/.gitignore b/.gitignore index f6598e3..bc73427 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,5 @@ /v1.6.0.tar.gz /v1.7.0.tar.gz /aardvark-dns-v1.7.0-vendor.tar.gz +/v1.8.0.tar.gz +/aardvark-dns-v1.8.0-vendor.tar.gz diff --git a/.packit.yaml b/.packit.yaml index a4ed4b1..51b7886 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -2,40 +2,47 @@ # See the documentation for more information: # https://packit.dev/docs/configuration/ -# COPR build targets can be found at: -# https://copr.fedorainfracloud.org/coprs/rhcontainerbot/packit-builds/ -# and -# https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/ - specfile_path: rpm/aardvark-dns.spec upstream_tag_template: v{version} -jobs: - - &copr - job: copr_build - trigger: pull_request - owner: rhcontainerbot - project: packit-builds - enable_net: true - srpm_build_deps: - - cargo - - make - - openssl-devel +srpm_build_deps: + - cargo + - make + - openssl-devel - - <<: *copr - # Run on commit to main branch +jobs: + - job: copr_build + trigger: pull_request + notifications: + failure_comment: + message: "Ephemeral COPR build failed. @containers/packit-build please check." + enable_net: true + targets: + - fedora-all-x86_64 + - fedora-all-aarch64 + - centos-stream+epel-next-8-x86_64 + - centos-stream+epel-next-8-aarch64 + - centos-stream+epel-next-9-x86_64 + - centos-stream+epel-next-9-aarch64 + additional_repos: + - "copr://rhcontainerbot/podman-next" + + # Run on commit to main branch + - job: copr_build trigger: commit + notifications: + failure_comment: + message: "podman-next COPR build failed. @containers/packit-build please check." branch: main + owner: rhcontainerbot project: podman-next + enable_net: true - job: propose_downstream trigger: release update_release: false dist_git_branches: - fedora-all - actions: - pre-sync: - - "bash rpm/update-spec-provides.sh" - job: koji_build trigger: commit diff --git a/README.packit b/README.packit index 101115f..8b12de4 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.77.0.post2+g06f877b. +The file was generated using packit 0.81.0.post1.dev4+g3347ce2b. diff --git a/aardvark-dns.spec b/aardvark-dns.spec index 59920ef..cdbaaf1 100644 --- a/aardvark-dns.spec +++ b/aardvark-dns.spec @@ -18,30 +18,8 @@ %global debug_package %{nil} %endif -# copr_username is only set on copr environments owned by rhcontainerbot, -# not on other coprs or environments like koji. -%if %{defined copr_username} && "%{?copr_username}" == "rhcontainerbot" -%bcond_without copr -%else -%bcond_with copr -%endif - -# rhel 8 does not support %%autochangelog -%if %{defined rhel} && 0%{?rhel} <= 8 -%bcond_without manual_changelog -%else -%bcond_with manual_changelog -%endif - -# rhel does not define %%{golang_arches_future} -%if %{defined fedora} -%bcond_without golang_arches_future -%else -%bcond_with golang_arches_future -%endif - Name: aardvark-dns -%if %{with copr} +%if %{defined copr_username} Epoch: 102 %endif # DO NOT TOUCH the Version string! @@ -50,10 +28,11 @@ Epoch: 102 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.7.0 +Version: 1.8.0 +# The `AND` needs to be uppercase in the License for SPDX compatibility License: Apache-2.0 AND MIT AND Zlib Release: %autorelease -%if %{with golang_arches_future} +%if %{defined golang_arches_future} ExclusiveArch: %{golang_arches_future} %else ExclusiveArch: aarch64 ppc64le s390x x86_64 @@ -67,13 +46,12 @@ 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 -# DO NOT DELETE BELOW LINE - used for updating downstream imports -# vendored libraries %description %{summary} @@ -86,7 +64,7 @@ Read more about configuration in `src/backend/mod.rs`. # 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 %{without copr} +%if !%{defined copr_username} tar fx %{SOURCE1} mkdir -p .cargo diff --git a/sources b/sources index 3dd3bb8..8304be9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (v1.7.0.tar.gz) = d829ac122f26f17ca44a41a48576ab8c4f9dd238bc52faee816833f63f9ff54e63f62610167e4619084263e61cdb1329c2e1d49f314c8b9e65e748df80fd5096 -SHA512 (aardvark-dns-v1.7.0-vendor.tar.gz) = 07d3ebc7504fc1e4c0fe9b5f3760bdbe9b4153678aae962c9e37a0097bee832b0e4e77fadfc475c82fa05ffaa1a04f53df8f92b63e23b09da05e5e2efaa07c94 +SHA512 (v1.8.0.tar.gz) = 271f11d6b8779938682da2affce80601bc642df768b7d868176d641e216c0acff2029a8ed39a20ca25d116ddd694603d67672d3ec6672be29ff6b43ad8bf90d1 +SHA512 (aardvark-dns-v1.8.0-vendor.tar.gz) = da300932f27f3fcde2f3bc2b67f0e5eb2184c428274844363fdaccc29c845e7f2efc238019f4bf3ff10bcd3e867a1d9dc603a0fac37686e579f47a3ac9cb2e55 From 80c15942a93145cff426cc4a7efcdd544dd7dc3f Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 27 Nov 2023 14:19:53 +0000 Subject: [PATCH 08/29] [packit] 1.9.0 upstream release Upstream tag: v1.9.0 Upstream commit: e4785bd5 --- .gitignore | 2 ++ .packit.yaml | 82 +++++++++++++++++++++++++++++++++++++++++++---- README.packit | 2 +- aardvark-dns.spec | 2 +- sources | 4 +-- 5 files changed, 81 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index bc73427..c4089ab 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,5 @@ /aardvark-dns-v1.7.0-vendor.tar.gz /v1.8.0.tar.gz /aardvark-dns-v1.8.0-vendor.tar.gz +/v1.9.0.tar.gz +/aardvark-dns-v1.9.0-vendor.tar.gz diff --git a/.packit.yaml b/.packit.yaml index 51b7886..61e87f1 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -16,16 +16,22 @@ jobs: notifications: failure_comment: message: "Ephemeral COPR build failed. @containers/packit-build please check." - enable_net: true targets: - - fedora-all-x86_64 - - fedora-all-aarch64 - - centos-stream+epel-next-8-x86_64 - - centos-stream+epel-next-8-aarch64 - - centos-stream+epel-next-9-x86_64 - - centos-stream+epel-next-9-aarch64 + fedora-all-x86_64: {} + fedora-all-aarch64: {} + fedora-eln-x86_64: + additional_repos: + - "https://kojipkgs.fedoraproject.org/repos/eln-build/latest/x86_64/" + fedora-eln-aarch64: + additional_repos: + - "https://kojipkgs.fedoraproject.org/repos/eln-build/latest/aarch64/" + epel-8-x86_64: {} + epel-8-aarch64: {} + epel-9-x86_64: {} + epel-9-aarch64: {} additional_repos: - "copr://rhcontainerbot/podman-next" + enable_net: true # Run on commit to main branch - job: copr_build @@ -38,6 +44,68 @@ jobs: project: podman-next enable_net: true + # Validate test + - job: tests + trigger: pull_request + skip_build: true + targets: + # Only need to test on one target + - fedora-latest-stable-x86_64 + identifier: validate_test + tmt_plan: "/plans/validate_test" + + # Unit tests + - job: tests + trigger: pull_request + skip_build: true + targets: &pr_test_targets + - fedora-all-x86_64 + - fedora-all-aarch64 + - epel-8-x86_64 + - epel-8-aarch64 + - epel-9-x86_64 + - epel-9-aarch64 + identifier: unit_test + tmt_plan: "/plans/unit_test" + + # Integration tests + - job: tests + trigger: pull_request + targets: *pr_test_targets + identifier: integration_test + tmt_plan: "/plans/integration_test" + + # Unit tests on RHEL + - job: tests + trigger: pull_request + skip_build: true + use_internal_tf: true + notifications: + failure_comment: + message: "podman e2e tests failed on RHEL. @containers/packit-build please check." + targets: &pr_test_targets_rhel + epel-8-aarch64: + distros: [RHEL-8.9.0-Nightly,RHEL-8.10.0-Nightly] + epel-8-x86_64: + distros: [RHEL-8.9.0-Nightly,RHEL-8.10.0-Nightly] + epel-9-aarch64: + distros: [RHEL-9.3.0-Nightly,RHEL-9.4.0-Nightly] + epel-9-x86_64: + distros: [RHEL-9.3.0-Nightly,RHEL-9.4.0-Nightly] + identifier: unit_test_internal + tmt_plan: "/plans/unit_test" + + # Integration tests on RHEL + - job: tests + trigger: pull_request + use_internal_tf: true + notifications: + failure_comment: + message: "podman system tests failed on RHEL. @containers/packit-build please check." + targets: *pr_test_targets_rhel + identifier: integration_test_internal + tmt_plan: "/plans/integration_test" + - job: propose_downstream trigger: release update_release: false diff --git a/README.packit b/README.packit index 8b12de4..d778d97 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.81.0.post1.dev4+g3347ce2b. +The file was generated using packit 0.86.2.post1.dev2+g209847d1. diff --git a/aardvark-dns.spec b/aardvark-dns.spec index cdbaaf1..e25087d 100644 --- a/aardvark-dns.spec +++ b/aardvark-dns.spec @@ -28,7 +28,7 @@ Epoch: 102 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.8.0 +Version: 1.9.0 # The `AND` needs to be uppercase in the License for SPDX compatibility License: Apache-2.0 AND MIT AND Zlib Release: %autorelease diff --git a/sources b/sources index 8304be9..026387b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (v1.8.0.tar.gz) = 271f11d6b8779938682da2affce80601bc642df768b7d868176d641e216c0acff2029a8ed39a20ca25d116ddd694603d67672d3ec6672be29ff6b43ad8bf90d1 -SHA512 (aardvark-dns-v1.8.0-vendor.tar.gz) = da300932f27f3fcde2f3bc2b67f0e5eb2184c428274844363fdaccc29c845e7f2efc238019f4bf3ff10bcd3e867a1d9dc603a0fac37686e579f47a3ac9cb2e55 +SHA512 (v1.9.0.tar.gz) = aff59b43b2a03dccd5dc418c8ba64f1f90cd665f017dc11ff55e25af5146c76491bfb52e2cf06adaf62c08ba02309cd128d8cdd34343cf9ee5c57d0599fa5f8e +SHA512 (aardvark-dns-v1.9.0-vendor.tar.gz) = f7174f1c4275991a6a2655046697f32511586f53fb343efa25f995cc07663091a634e8a82395840b022b6b3c8363863cdf8c9b6d4e38984fb841978eef0b1f22 From 107b1217dcea6ea25f9f158ea91f5ec80d824272 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 11:58:16 +0000 Subject: [PATCH 09/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 253943f6416a6250d5380c4080aeacd10cfa0902 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 22:32:20 +0000 Subject: [PATCH 10/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 2833edf44fc0a603f510e17d08bb4c3ca03fb3a7 Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 24 Jan 2024 20:59:23 +0000 Subject: [PATCH 11/29] [packit] 1.10.0 upstream release Upstream tag: v1.10.0 Upstream commit: 875c7173 --- .gitignore | 2 ++ README.packit | 2 +- aardvark-dns.spec | 2 +- sources | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index c4089ab..afa8b52 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,5 @@ /aardvark-dns-v1.8.0-vendor.tar.gz /v1.9.0.tar.gz /aardvark-dns-v1.9.0-vendor.tar.gz +/v1.10.0.tar.gz +/aardvark-dns-v1.10.0-vendor.tar.gz diff --git a/README.packit b/README.packit index d778d97..bba9424 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.86.2.post1.dev2+g209847d1. +The file was generated using packit 0.89.0.post1.dev4+gabf90471. diff --git a/aardvark-dns.spec b/aardvark-dns.spec index e25087d..ef26893 100644 --- a/aardvark-dns.spec +++ b/aardvark-dns.spec @@ -28,7 +28,7 @@ Epoch: 102 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.9.0 +Version: 1.10.0 # The `AND` needs to be uppercase in the License for SPDX compatibility License: Apache-2.0 AND MIT AND Zlib Release: %autorelease diff --git a/sources b/sources index 026387b..7e0d26c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (v1.9.0.tar.gz) = aff59b43b2a03dccd5dc418c8ba64f1f90cd665f017dc11ff55e25af5146c76491bfb52e2cf06adaf62c08ba02309cd128d8cdd34343cf9ee5c57d0599fa5f8e -SHA512 (aardvark-dns-v1.9.0-vendor.tar.gz) = f7174f1c4275991a6a2655046697f32511586f53fb343efa25f995cc07663091a634e8a82395840b022b6b3c8363863cdf8c9b6d4e38984fb841978eef0b1f22 +SHA512 (v1.10.0.tar.gz) = 9ff315dc576f94bfc0affb6658bb47d9b7d448cf11294df607f7e8701662f148fb655f1eae6eb118f16b9e0779d27ab86d651883b1fd3bdc0e29c587bf47729b +SHA512 (aardvark-dns-v1.10.0-vendor.tar.gz) = 68d0106b71f42ba789810020d62911d880debf90a35a086aabfd614403985025dc0c5934087a98943b53f6dfd8ede4add99465cec1ae9a098ff1de1082e1ef9c From ae8535aa2dacbbef49d45765fc729abbef6b68b6 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 30 May 2024 15:37:57 +0000 Subject: [PATCH 12/29] Update to 1.11.0 upstream release Upstream tag: v1.11.0 Upstream commit: 666d7b15 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 2 + .packit.yaml | 140 ++++++++++++++++++++++++++++++++++------------ README.packit | 2 +- aardvark-dns.spec | 10 +--- sources | 4 +- 5 files changed, 109 insertions(+), 49 deletions(-) diff --git a/.gitignore b/.gitignore index afa8b52..776472d 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,5 @@ /aardvark-dns-v1.9.0-vendor.tar.gz /v1.10.0.tar.gz /aardvark-dns-v1.10.0-vendor.tar.gz +/v1.11.0.tar.gz +/aardvark-dns-v1.11.0-vendor.tar.gz diff --git a/.packit.yaml b/.packit.yaml index 61e87f1..d13d559 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -2,9 +2,19 @@ # See the documentation for more information: # https://packit.dev/docs/configuration/ -specfile_path: rpm/aardvark-dns.spec +downstream_package_name: aardvark-dns upstream_tag_template: v{version} +packages: + aardvark-dns-fedora: + pkg_tool: fedpkg + specfile_path: rpm/aardvark-dns.spec + aardvark-dns-centos: + pkg_tool: centpkg + specfile_path: rpm/aardvark-dns.spec + aardvark-dns-rhel: + specfile_path: rpm/aardvark-dns.spec + srpm_build_deps: - cargo - make @@ -13,7 +23,8 @@ srpm_build_deps: jobs: - job: copr_build trigger: pull_request - notifications: + packages: [aardvark-dns-fedora] + notifications: &copr_build_failure_notification failure_comment: message: "Ephemeral COPR build failed. @containers/packit-build please check." targets: @@ -25,12 +36,26 @@ jobs: fedora-eln-aarch64: additional_repos: - "https://kojipkgs.fedoraproject.org/repos/eln-build/latest/aarch64/" - epel-8-x86_64: {} - epel-8-aarch64: {} - epel-9-x86_64: {} - epel-9-aarch64: {} - additional_repos: - - "copr://rhcontainerbot/podman-next" + enable_net: true + + - job: copr_build + trigger: pull_request + packages: [aardvark-dns-centos] + notifications: *copr_build_failure_notification + targets: + - centos-stream-9-x86_64 + - centos-stream-9-aarch64 + - centos-stream-10-x86_64 + - centos-stream-10-aarch64 + enable_net: true + + - job: copr_build + trigger: pull_request + packages: [aardvark-dns-rhel] + notifications: *copr_build_failure_notification + targets: + - epel-9-x86_64 + - epel-9-aarch64 enable_net: true # Run on commit to main branch @@ -54,70 +79,111 @@ jobs: identifier: validate_test tmt_plan: "/plans/validate_test" - # Unit tests + # Unit tests on Fedora - job: tests trigger: pull_request skip_build: true - targets: &pr_test_targets + notifications: &unit_test_failure_notification + failure_comment: + message: "Unit tests failed. @containers/packit-build please check." + targets: &pr_test_targets_fedora - fedora-all-x86_64 - fedora-all-aarch64 - - epel-8-x86_64 - - epel-8-aarch64 - - epel-9-x86_64 - - epel-9-aarch64 - identifier: unit_test + identifier: unit_test_fedora tmt_plan: "/plans/unit_test" - # Integration tests + # Unit tests on CentOS Stream - job: tests trigger: pull_request - targets: *pr_test_targets - identifier: integration_test - tmt_plan: "/plans/integration_test" + skip_build: true + notifications: *unit_test_failure_notification + targets: &pr_test_targets_centos + - centos-stream-9-x86_64 + - centos-stream-9-aarch64 + # TODO: iptables kernel module is not available on rhel10. + # Enable these after netavark default is switched to nftables. + #- centos-stream-10-x86_64 + #- centos-stream-10-aarch64 + identifier: unit_test_centos + tmt_plan: "/plans/unit_test" # Unit tests on RHEL - job: tests trigger: pull_request skip_build: true + notifications: *unit_test_failure_notification use_internal_tf: true - notifications: - failure_comment: - message: "podman e2e tests failed on RHEL. @containers/packit-build please check." targets: &pr_test_targets_rhel - epel-8-aarch64: - distros: [RHEL-8.9.0-Nightly,RHEL-8.10.0-Nightly] - epel-8-x86_64: - distros: [RHEL-8.9.0-Nightly,RHEL-8.10.0-Nightly] epel-9-aarch64: - distros: [RHEL-9.3.0-Nightly,RHEL-9.4.0-Nightly] + distros: [RHEL-9-Nightly,RHEL-9.4.0-Nightly] epel-9-x86_64: - distros: [RHEL-9.3.0-Nightly,RHEL-9.4.0-Nightly] - identifier: unit_test_internal + distros: [RHEL-9-Nightly,RHEL-9.4.0-Nightly] + # NOTE: Need to use centos-stream-10 until RHEL-10/EPEL-10 copr targets + # are available + # TODO: iptables kernel module is not available on rhel10. + # Enable these after netavark default is switched to nftables. + #centos-stream-10-aarch64: + # distros: [RHEL-10-Beta-Nightly] + #centos-stream-10-x86_64: + # distros: [RHEL-10-Beta-Nightly] + identifier: unit_test_rhel tmt_plan: "/plans/unit_test" + # Integration tests on Fedora + - job: tests + trigger: pull_request + packages: [aardvark-dns-fedora] + notifications: &integration_test_failure_notification + failure_comment: + message: "Integration tests failed. @containers/packit-build please check." + targets: *pr_test_targets_fedora + identifier: integration_test_fedora + tmt_plan: "/plans/integration_test" + + # Integration tests on CentOS Stream + - job: tests + trigger: pull_request + packages: [aardvark-dns-centos] + notifications: *integration_test_failure_notification + targets: *pr_test_targets_centos + identifier: integration_test_centos + tmt_plan: "/plans/integration_test" + # Integration tests on RHEL - job: tests trigger: pull_request + packages: [aardvark-dns-rhel] + notifications: *integration_test_failure_notification use_internal_tf: true - notifications: - failure_comment: - message: "podman system tests failed on RHEL. @containers/packit-build please check." targets: *pr_test_targets_rhel - identifier: integration_test_internal + identifier: integration_test_rhel tmt_plan: "/plans/integration_test" + # Sync to Fedora - job: propose_downstream trigger: release + packages: [aardvark-dns-fedora] update_release: false dist_git_branches: - fedora-all + # Sync to CentOS Stream + - job: propose_downstream + trigger: release + packages: [aardvark-dns-centos] + update_release: false + dist_git_branches: + - c10s + - job: koji_build trigger: commit dist_git_branches: - fedora-all - - job: bodhi_update - trigger: commit - dist_git_branches: - - fedora-branched # rawhide updates are created automatically + # NOTE: Bodhi update tasks are disabled to allow netavark and aardvark-dns X.Y + # builds in a single manual bodhi update. Leaving this commented out + # but not deleted so it's not forgotten. + #- job: bodhi_update + #trigger: commit + #dist_git_branches: + #- fedora-branched # rawhide updates are created automatically diff --git a/README.packit b/README.packit index bba9424..2fa216c 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.89.0.post1.dev4+gabf90471. +The file was generated using packit 0.97.1.post1.dev4+g1268842e. diff --git a/aardvark-dns.spec b/aardvark-dns.spec index ef26893..b10a069 100644 --- a/aardvark-dns.spec +++ b/aardvark-dns.spec @@ -1,14 +1,6 @@ # trust-dns-{client,server} not available # using vendored deps -# RHEL doesn't include the package rust-packaging which provides %%__cargo macro, but EPEL -# does. So we set it separately here and skip rust-packaging dependency for RHEL. -# Buildability without EPEL is essential for packit builds. -# ELN doesn't need this. -%if %{defined rhel} && 0%{?rhel} < 10 -%define __cargo %{_bindir}/env CARGO_HOME=.cargo RUSTC_BOOTSTRAP=1 RUSTFLAGS='-Copt-level=3 -Cdebuginfo=2 -Ccodegen-units=1 -Clink-arg=-Wl,-z,relro -Clink-arg=-Wl,-z,now --cap-lints=warn' %{_bindir}/cargo -%endif - %global with_debug 1 %if 0%{?with_debug} @@ -28,7 +20,7 @@ Epoch: 102 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.10.0 +Version: 1.11.0 # The `AND` needs to be uppercase in the License for SPDX compatibility License: Apache-2.0 AND MIT AND Zlib Release: %autorelease diff --git a/sources b/sources index 7e0d26c..95b5cfe 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (v1.10.0.tar.gz) = 9ff315dc576f94bfc0affb6658bb47d9b7d448cf11294df607f7e8701662f148fb655f1eae6eb118f16b9e0779d27ab86d651883b1fd3bdc0e29c587bf47729b -SHA512 (aardvark-dns-v1.10.0-vendor.tar.gz) = 68d0106b71f42ba789810020d62911d880debf90a35a086aabfd614403985025dc0c5934087a98943b53f6dfd8ede4add99465cec1ae9a098ff1de1082e1ef9c +SHA512 (v1.11.0.tar.gz) = c8c7ecf98fa705ab6de9a7a63cbe8b0b1226fe145bdd7aca2d633504c930a0e02afab9665ee0175ea4a584300eaeecbf277e83e6cfdd8c0caeecade98c454b31 +SHA512 (aardvark-dns-v1.11.0-vendor.tar.gz) = e49a6bb410238b90287a75adee481b8fe899ff680be48831c9b3cf36f9985d1fec1ba5bb858a095ffd520c05888651163d65f8b038e7512e975cfa522c0bee56 From 4d693d5144f5e536d26cfded232c8b317347a8c6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 16:28:41 +0000 Subject: [PATCH 13/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 14f5d331e710676f6dd9c7fc83d51ce499bc3d7b Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 26 Jul 2024 10:00:30 -0400 Subject: [PATCH 14/29] epoch: 2 on non-copr --- aardvark-dns.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/aardvark-dns.spec b/aardvark-dns.spec index b10a069..ec9c821 100644 --- a/aardvark-dns.spec +++ b/aardvark-dns.spec @@ -13,6 +13,8 @@ Name: aardvark-dns %if %{defined copr_username} Epoch: 102 +%else +Epoch: 2 %endif # DO NOT TOUCH the Version string! # The TRUE source of this specfile is: From 2af607a4576c9bd3f12be619d38a25849ddbff56 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 26 Jul 2024 10:39:44 -0400 Subject: [PATCH 15/29] rebuild From 5d3e595eb626f1b1cab16ab90124663d4deed28c Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 26 Jul 2024 10:39:46 -0400 Subject: [PATCH 16/29] rebuild From 43998e7c071c16517cc87d11ba752223b2e67611 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 2 Aug 2024 13:32:40 -0400 Subject: [PATCH 17/29] bump to v1.12.1 --- .gitignore | 2 ++ aardvark-dns.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 776472d..e5c5c66 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,5 @@ /aardvark-dns-v1.10.0-vendor.tar.gz /v1.11.0.tar.gz /aardvark-dns-v1.11.0-vendor.tar.gz +/aardvark-dns-v1.12.1-vendor.tar.gz +/v1.12.1.tar.gz diff --git a/aardvark-dns.spec b/aardvark-dns.spec index ec9c821..8f62ce1 100644 --- a/aardvark-dns.spec +++ b/aardvark-dns.spec @@ -22,7 +22,7 @@ Epoch: 2 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.11.0 +Version: 1.12.1 # The `AND` needs to be uppercase in the License for SPDX compatibility License: Apache-2.0 AND MIT AND Zlib Release: %autorelease diff --git a/sources b/sources index 95b5cfe..95eb2f7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (v1.11.0.tar.gz) = c8c7ecf98fa705ab6de9a7a63cbe8b0b1226fe145bdd7aca2d633504c930a0e02afab9665ee0175ea4a584300eaeecbf277e83e6cfdd8c0caeecade98c454b31 -SHA512 (aardvark-dns-v1.11.0-vendor.tar.gz) = e49a6bb410238b90287a75adee481b8fe899ff680be48831c9b3cf36f9985d1fec1ba5bb858a095ffd520c05888651163d65f8b038e7512e975cfa522c0bee56 +SHA512 (aardvark-dns-v1.12.1-vendor.tar.gz) = f4b7cfeface7c725201499f3a182ab1d3ad0aba9ad1fcfd364a8dc0684b31c42800c671e856f93634e71f1fb334121cf8dfc809f0e4a9bb14fe0cc493715dc43 +SHA512 (v1.12.1.tar.gz) = 63e10296b97791d23ae8714af99bc533bf01c4a584bc8bd9e2b935785a61eed58f96bb1e369fb46ed45dcc5ca0740fc3264315ad584a32212b49f5ee8e524881 From 1868b265e47246e824291915ea1c2a5668ac7cef Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 4 Sep 2024 13:55:48 +0000 Subject: [PATCH 18/29] Update to 1.12.2 upstream release Upstream tag: v1.12.2 Upstream commit: 4034a243 Commit authored by Packit automation (https://packit.dev/) --- .fmf/version | 1 + .gitignore | 2 ++ .packit.yaml | 89 +++++++++++++++-------------------------------- README.packit | 2 +- aardvark-dns.spec | 25 +++++++------ gating.yaml | 12 +++++++ plans/all.fmf | 22 ++++++++++++ sources | 4 +-- 8 files changed, 84 insertions(+), 73 deletions(-) create mode 100644 .fmf/version create mode 100644 gating.yaml create mode 100644 plans/all.fmf diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/.gitignore b/.gitignore index e5c5c66..15bdafa 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,5 @@ /aardvark-dns-v1.11.0-vendor.tar.gz /aardvark-dns-v1.12.1-vendor.tar.gz /v1.12.1.tar.gz +/v1.12.2.tar.gz +/aardvark-dns-v1.12.2-vendor.tar.gz diff --git a/.packit.yaml b/.packit.yaml index d13d559..d3ca1ec 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -5,6 +5,22 @@ downstream_package_name: aardvark-dns upstream_tag_template: v{version} +# These files get synced from upstream to downstream (Fedora / CentOS Stream) on every +# propose-downstream job. This is done so tests maintained upstream can be run +# downstream in Zuul CI and Bodhi. +# Ref: https://packit.dev/docs/configuration#files_to_sync +files_to_sync: + - src: rpm/gating.yaml + dest: gating.yaml + delete: true + - src: plans/ + dest: plans/ + delete: true + - src: .fmf/ + dest: .fmf/ + delete: true + - .packit.yaml + packages: aardvark-dns-fedora: pkg_tool: fedpkg @@ -61,6 +77,7 @@ jobs: # Run on commit to main branch - job: copr_build trigger: commit + packages: [aardvark-dns-fedora] notifications: failure_comment: message: "podman-next COPR build failed. @containers/packit-build please check." @@ -69,51 +86,35 @@ jobs: project: podman-next enable_net: true - # Validate test - - job: tests - trigger: pull_request - skip_build: true - targets: - # Only need to test on one target - - fedora-latest-stable-x86_64 - identifier: validate_test - tmt_plan: "/plans/validate_test" - # Unit tests on Fedora - job: tests trigger: pull_request - skip_build: true - notifications: &unit_test_failure_notification + packages: [aardvark-dns-fedora] + notifications: &test_failure_notification failure_comment: - message: "Unit tests failed. @containers/packit-build please check." - targets: &pr_test_targets_fedora + message: "Tests failed. @containers/packit-build please check." + targets: - fedora-all-x86_64 - fedora-all-aarch64 - identifier: unit_test_fedora - tmt_plan: "/plans/unit_test" # Unit tests on CentOS Stream - job: tests trigger: pull_request - skip_build: true - notifications: *unit_test_failure_notification - targets: &pr_test_targets_centos + packages: [aardvark-dns-centos] + notifications: *test_failure_notification + targets: - centos-stream-9-x86_64 - centos-stream-9-aarch64 - # TODO: iptables kernel module is not available on rhel10. - # Enable these after netavark default is switched to nftables. - #- centos-stream-10-x86_64 - #- centos-stream-10-aarch64 - identifier: unit_test_centos - tmt_plan: "/plans/unit_test" + - centos-stream-10-x86_64 + - centos-stream-10-aarch64 # Unit tests on RHEL - job: tests trigger: pull_request - skip_build: true - notifications: *unit_test_failure_notification + packages: [aardvark-dns-rhel] + notifications: *test_failure_notification use_internal_tf: true - targets: &pr_test_targets_rhel + targets: epel-9-aarch64: distros: [RHEL-9-Nightly,RHEL-9.4.0-Nightly] epel-9-x86_64: @@ -126,38 +127,6 @@ jobs: # distros: [RHEL-10-Beta-Nightly] #centos-stream-10-x86_64: # distros: [RHEL-10-Beta-Nightly] - identifier: unit_test_rhel - tmt_plan: "/plans/unit_test" - - # Integration tests on Fedora - - job: tests - trigger: pull_request - packages: [aardvark-dns-fedora] - notifications: &integration_test_failure_notification - failure_comment: - message: "Integration tests failed. @containers/packit-build please check." - targets: *pr_test_targets_fedora - identifier: integration_test_fedora - tmt_plan: "/plans/integration_test" - - # Integration tests on CentOS Stream - - job: tests - trigger: pull_request - packages: [aardvark-dns-centos] - notifications: *integration_test_failure_notification - targets: *pr_test_targets_centos - identifier: integration_test_centos - tmt_plan: "/plans/integration_test" - - # Integration tests on RHEL - - job: tests - trigger: pull_request - packages: [aardvark-dns-rhel] - notifications: *integration_test_failure_notification - use_internal_tf: true - targets: *pr_test_targets_rhel - identifier: integration_test_rhel - tmt_plan: "/plans/integration_test" # Sync to Fedora - job: propose_downstream diff --git a/README.packit b/README.packit index 2fa216c..00daafb 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.97.1.post1.dev4+g1268842e. +The file was generated using packit 0.100.3.post1.dev13+g92513a8e. diff --git a/aardvark-dns.spec b/aardvark-dns.spec index 8f62ce1..cb3efc6 100644 --- a/aardvark-dns.spec +++ b/aardvark-dns.spec @@ -22,7 +22,7 @@ Epoch: 2 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.12.1 +Version: 1.12.2 # The `AND` needs to be uppercase in the License for SPDX compatibility License: Apache-2.0 AND MIT AND Zlib Release: %autorelease @@ -60,25 +60,30 @@ Read more about configuration in `src/backend/mod.rs`. # dependencies directly from the network. %if !%{defined copr_username} tar fx %{SOURCE1} -mkdir -p .cargo - -cat >.cargo/config << EOF -[source.crates-io] -replace-with = "vendored-sources" - -[source.vendored-sources] -directory = "vendor" -EOF +%if 0%{?fedora} || 0%{?rhel} >= 10 +%cargo_prep -v vendor +%else +%cargo_prep -V 1 +%endif %endif %build %{__make} CARGO="%{__cargo}" 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} diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..dbb1d91 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,12 @@ +--- !Policy +product_versions: + - fedora-* +decision_context: bodhi_update_push_stable +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} + +--- !Policy +product_versions: + - rhel-* +decision_context: osci_compose_gate +rules: [] diff --git a/plans/all.fmf b/plans/all.fmf new file mode 100644 index 0000000..6413ecf --- /dev/null +++ b/plans/all.fmf @@ -0,0 +1,22 @@ +discover: + how: fmf +execute: + how: tmt + +/upstream: + summary: Run tests on upstream PRs + discover+: + filter: tag:upstream + adjust+: + enabled: false + when: initiator is not defined or initiator != packit + +/downstream: + summary: Run tests on bodhi / errata and dist-git PRs + discover+: + filter: tag:downstream + dist-git-source: true + dist-git-remove-fmf-root: true + adjust+: + enabled: false + when: initiator == packit diff --git a/sources b/sources index 95eb2f7..5be99cc 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (aardvark-dns-v1.12.1-vendor.tar.gz) = f4b7cfeface7c725201499f3a182ab1d3ad0aba9ad1fcfd364a8dc0684b31c42800c671e856f93634e71f1fb334121cf8dfc809f0e4a9bb14fe0cc493715dc43 -SHA512 (v1.12.1.tar.gz) = 63e10296b97791d23ae8714af99bc533bf01c4a584bc8bd9e2b935785a61eed58f96bb1e369fb46ed45dcc5ca0740fc3264315ad584a32212b49f5ee8e524881 +SHA512 (v1.12.2.tar.gz) = 851683cd5ac569358c0f89895879c19ac607653f2f4578030a99911a4723dab025ca6d26615da6037baf95514e9bb7d3a2c86c618d57c67cee2b28fd3a73c072 +SHA512 (aardvark-dns-v1.12.2-vendor.tar.gz) = 1dfacc29962acca5c7baa11fbe4d1c93276b91cb5e1db6033d8e23e963ca4c4098bdbf4bdf89730fdea4d5a45b3a2c00ee65888d502e8009d2adaaa6f8374dba From 5716cbb68b57f0b9cfa7af6f841922620b63af28 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 5 Sep 2024 17:10:13 +0530 Subject: [PATCH 19/29] install builddeps for tmt tests Signed-off-by: Lokesh Mandvekar --- plans/all.fmf | 1 + 1 file changed, 1 insertion(+) diff --git a/plans/all.fmf b/plans/all.fmf index 6413ecf..5f468c5 100644 --- a/plans/all.fmf +++ b/plans/all.fmf @@ -15,6 +15,7 @@ execute: summary: Run tests on bodhi / errata and dist-git PRs discover+: filter: tag:downstream + dist-git-install-builddeps: true dist-git-source: true dist-git-remove-fmf-root: true adjust+: From cece91cf4e4db14d6d8b32f96702d50973eef0e4 Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 29 Oct 2024 18:27:42 +0000 Subject: [PATCH 20/29] Update to 1.13.0 upstream release Upstream tag: v1.13.0 Upstream commit: 8bb48068 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 2 ++ .packit.yaml | 48 ++++++++++++++++++++++++++--------------------- README.packit | 2 +- aardvark-dns.spec | 2 +- plans/all.fmf | 1 - sources | 4 ++-- 6 files changed, 33 insertions(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index 15bdafa..c822e4a 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,5 @@ /v1.12.1.tar.gz /v1.12.2.tar.gz /aardvark-dns-v1.12.2-vendor.tar.gz +/v1.13.0.tar.gz +/aardvark-dns-v1.13.0-vendor.tar.gz diff --git a/.packit.yaml b/.packit.yaml index d3ca1ec..f695011 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -30,6 +30,8 @@ packages: specfile_path: rpm/aardvark-dns.spec aardvark-dns-rhel: specfile_path: rpm/aardvark-dns.spec + aardvark-dns-eln: + specfile_path: rpm/aardvark-dns.spec srpm_build_deps: - cargo @@ -44,8 +46,15 @@ jobs: failure_comment: message: "Ephemeral COPR build failed. @containers/packit-build please check." targets: - fedora-all-x86_64: {} - fedora-all-aarch64: {} + - fedora-all-x86_64 + - fedora-all-aarch64 + enable_net: true + + - job: copr_build + trigger: pull_request + packages: [aardvark-dns-eln] + notifications: *copr_build_failure_notification + targets: fedora-eln-x86_64: additional_repos: - "https://kojipkgs.fedoraproject.org/repos/eln-build/latest/x86_64/" @@ -58,7 +67,7 @@ jobs: trigger: pull_request packages: [aardvark-dns-centos] notifications: *copr_build_failure_notification - targets: + targets: ¢os_copr_targets - centos-stream-9-x86_64 - centos-stream-9-aarch64 - centos-stream-10-x86_64 @@ -94,19 +103,21 @@ jobs: failure_comment: message: "Tests failed. @containers/packit-build please check." targets: - - fedora-all-x86_64 - - fedora-all-aarch64 + - fedora-development-x86_64 + - fedora-development-aarch64 + - fedora-latest-x86_64 + - fedora-latest-aarch64 + - fedora-latest-stable-x86_64 + - fedora-latest-stable-aarch64 + - fedora-40-x86_64 + - fedora-40-aarch64 # Unit tests on CentOS Stream - job: tests trigger: pull_request packages: [aardvark-dns-centos] notifications: *test_failure_notification - targets: - - centos-stream-9-x86_64 - - centos-stream-9-aarch64 - - centos-stream-10-x86_64 - - centos-stream-10-aarch64 + targets: *centos_copr_targets # Unit tests on RHEL - job: tests @@ -133,7 +144,7 @@ jobs: trigger: release packages: [aardvark-dns-fedora] update_release: false - dist_git_branches: + dist_git_branches: &fedora_targets - fedora-all # Sync to CentOS Stream @@ -146,13 +157,8 @@ jobs: - job: koji_build trigger: commit - dist_git_branches: - - fedora-all - - # NOTE: Bodhi update tasks are disabled to allow netavark and aardvark-dns X.Y - # builds in a single manual bodhi update. Leaving this commented out - # but not deleted so it's not forgotten. - #- job: bodhi_update - #trigger: commit - #dist_git_branches: - #- fedora-branched # rawhide updates are created automatically + packages: [aardvark-dns-fedora] + sidetag_group: netavark-releases + dependents: + - netavark + dist_git_branches: *fedora_targets diff --git a/README.packit b/README.packit index 00daafb..3d207b6 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.100.3.post1.dev13+g92513a8e. +The file was generated using packit 0.102.2.post1.dev2+gbdca14cb. diff --git a/aardvark-dns.spec b/aardvark-dns.spec index cb3efc6..c39435f 100644 --- a/aardvark-dns.spec +++ b/aardvark-dns.spec @@ -22,7 +22,7 @@ Epoch: 2 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.12.2 +Version: 1.13.0 # The `AND` needs to be uppercase in the License for SPDX compatibility License: Apache-2.0 AND MIT AND Zlib Release: %autorelease diff --git a/plans/all.fmf b/plans/all.fmf index 5f468c5..6413ecf 100644 --- a/plans/all.fmf +++ b/plans/all.fmf @@ -15,7 +15,6 @@ execute: summary: Run tests on bodhi / errata and dist-git PRs discover+: filter: tag:downstream - dist-git-install-builddeps: true dist-git-source: true dist-git-remove-fmf-root: true adjust+: diff --git a/sources b/sources index 5be99cc..a326fe6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (v1.12.2.tar.gz) = 851683cd5ac569358c0f89895879c19ac607653f2f4578030a99911a4723dab025ca6d26615da6037baf95514e9bb7d3a2c86c618d57c67cee2b28fd3a73c072 -SHA512 (aardvark-dns-v1.12.2-vendor.tar.gz) = 1dfacc29962acca5c7baa11fbe4d1c93276b91cb5e1db6033d8e23e963ca4c4098bdbf4bdf89730fdea4d5a45b3a2c00ee65888d502e8009d2adaaa6f8374dba +SHA512 (v1.13.0.tar.gz) = 012734539ff13a78b03a61a865aa4e3679a5f153aee75fe132f2727260832b617fd658925f6926e6b978ddaa591fa7da963cbcfa793c86518adec574a46c56da +SHA512 (aardvark-dns-v1.13.0-vendor.tar.gz) = 056172a6ccb8a2e345c323bc40812fe9ea14f88ef3860a49e80c1cdf1b289b2797c6f7e0c8c74ab0bb1cde9d0c8dbfb501d1e452b36a4d09b0064b052927e94b From 5f1f1ea08d665ca192388117fd5e3d8bebc95cd9 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 4 Nov 2024 17:19:44 +0530 Subject: [PATCH 21/29] fix tmt tests downstream Fixed upstream at: https://github.com/containers/aardvark-dns/pull/536 --- plans/all.fmf | 1 + 1 file changed, 1 insertion(+) diff --git a/plans/all.fmf b/plans/all.fmf index 6413ecf..5f468c5 100644 --- a/plans/all.fmf +++ b/plans/all.fmf @@ -15,6 +15,7 @@ execute: summary: Run tests on bodhi / errata and dist-git PRs discover+: filter: tag:downstream + dist-git-install-builddeps: true dist-git-source: true dist-git-remove-fmf-root: true adjust+: From ae197181c5b8b5dbf754d3ee51dd5f5da5b76564 Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 6 Nov 2024 17:19:21 +0000 Subject: [PATCH 22/29] Update to 1.13.1 upstream release Upstream tag: v1.13.1 Upstream commit: 966017cf Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 2 ++ .packit.yaml | 45 ++++++++++++------------------------- README.packit | 2 +- aardvark-dns.spec | 2 +- plans/{all.fmf => main.fmf} | 0 sources | 4 ++-- 6 files changed, 20 insertions(+), 35 deletions(-) rename plans/{all.fmf => main.fmf} (100%) diff --git a/.gitignore b/.gitignore index c822e4a..43728e4 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,5 @@ /aardvark-dns-v1.12.2-vendor.tar.gz /v1.13.0.tar.gz /aardvark-dns-v1.13.0-vendor.tar.gz +/v1.13.1.tar.gz +/aardvark-dns-v1.13.1-vendor.tar.gz diff --git a/.packit.yaml b/.packit.yaml index f695011..e3e0afc 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -28,8 +28,6 @@ packages: aardvark-dns-centos: pkg_tool: centpkg specfile_path: rpm/aardvark-dns.spec - aardvark-dns-rhel: - specfile_path: rpm/aardvark-dns.spec aardvark-dns-eln: specfile_path: rpm/aardvark-dns.spec @@ -49,6 +47,7 @@ jobs: - fedora-all-x86_64 - fedora-all-aarch64 enable_net: true + osh_diff_scan_after_copr_build: false - job: copr_build trigger: pull_request @@ -74,15 +73,6 @@ jobs: - centos-stream-10-aarch64 enable_net: true - - job: copr_build - trigger: pull_request - packages: [aardvark-dns-rhel] - notifications: *copr_build_failure_notification - targets: - - epel-9-x86_64 - - epel-9-aarch64 - enable_net: true - # Run on commit to main branch - job: copr_build trigger: commit @@ -111,6 +101,11 @@ jobs: - fedora-latest-stable-aarch64 - fedora-40-x86_64 - fedora-40-aarch64 + tf_extra_params: + environments: + - artifacts: + - type: repository-file + id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/fedora-$releasever/rhcontainerbot-podman-next-fedora-$releasever.repo # Unit tests on CentOS Stream - job: tests @@ -118,26 +113,13 @@ jobs: packages: [aardvark-dns-centos] notifications: *test_failure_notification targets: *centos_copr_targets - - # Unit tests on RHEL - - job: tests - trigger: pull_request - packages: [aardvark-dns-rhel] - notifications: *test_failure_notification - use_internal_tf: true - targets: - epel-9-aarch64: - distros: [RHEL-9-Nightly,RHEL-9.4.0-Nightly] - epel-9-x86_64: - distros: [RHEL-9-Nightly,RHEL-9.4.0-Nightly] - # NOTE: Need to use centos-stream-10 until RHEL-10/EPEL-10 copr targets - # are available - # TODO: iptables kernel module is not available on rhel10. - # Enable these after netavark default is switched to nftables. - #centos-stream-10-aarch64: - # distros: [RHEL-10-Beta-Nightly] - #centos-stream-10-x86_64: - # distros: [RHEL-10-Beta-Nightly] + tf_extra_params: + environments: + - artifacts: + - type: repository-file + id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/centos-stream-$releasever/rhcontainerbot-podman-next-centos-stream-$releasever.repo + - type: repository-file + id: https://src.fedoraproject.org/rpms/epel-release/raw/epel$releasever/f/epel.repo # Sync to Fedora - job: propose_downstream @@ -154,6 +136,7 @@ jobs: update_release: false dist_git_branches: - c10s + - c9s - job: koji_build trigger: commit diff --git a/README.packit b/README.packit index 3d207b6..1b4760d 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.102.2.post1.dev2+gbdca14cb. +The file was generated using packit 0.102.2.post1.dev4+g3142fcf8. diff --git a/aardvark-dns.spec b/aardvark-dns.spec index c39435f..85b901a 100644 --- a/aardvark-dns.spec +++ b/aardvark-dns.spec @@ -22,7 +22,7 @@ Epoch: 2 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.13.0 +Version: 1.13.1 # The `AND` needs to be uppercase in the License for SPDX compatibility License: Apache-2.0 AND MIT AND Zlib Release: %autorelease diff --git a/plans/all.fmf b/plans/main.fmf similarity index 100% rename from plans/all.fmf rename to plans/main.fmf diff --git a/sources b/sources index a326fe6..f63296e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (v1.13.0.tar.gz) = 012734539ff13a78b03a61a865aa4e3679a5f153aee75fe132f2727260832b617fd658925f6926e6b978ddaa591fa7da963cbcfa793c86518adec574a46c56da -SHA512 (aardvark-dns-v1.13.0-vendor.tar.gz) = 056172a6ccb8a2e345c323bc40812fe9ea14f88ef3860a49e80c1cdf1b289b2797c6f7e0c8c74ab0bb1cde9d0c8dbfb501d1e452b36a4d09b0064b052927e94b +SHA512 (v1.13.1.tar.gz) = 30265a8d134f600e52c4a412a5fa9b00313cef26ad019adf5233ed0a63cd108b5636e15322569b1bd609d6eb741ceca94f3a076b391aef7ef0d47e3ae7e7c9ad +SHA512 (aardvark-dns-v1.13.1-vendor.tar.gz) = b5d5850409b54e74627b143669313dce35c94ea34533c6a89ea2d16e3155fe8030d406674fed8adbe9be9da6a71c5773d63382bde4364981adcfdbc036f515ac From 71e88aab3c8fdef805394a3b764468bd5ebe62f5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 10:26:31 +0000 Subject: [PATCH 23/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 47a0e242764c15f7ba1833ef9e1e4b8fcf660715 Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 10 Feb 2025 14:29:37 +0000 Subject: [PATCH 24/29] Update to 1.14.0 upstream release Upstream tag: v1.14.0 Upstream commit: 423ee203 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 2 ++ README.packit | 2 +- aardvark-dns.spec | 2 +- sources | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 43728e4..a7999de 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,5 @@ /aardvark-dns-v1.13.0-vendor.tar.gz /v1.13.1.tar.gz /aardvark-dns-v1.13.1-vendor.tar.gz +/v1.14.0.tar.gz +/aardvark-dns-v1.14.0-vendor.tar.gz diff --git a/README.packit b/README.packit index 1b4760d..7017e6c 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.102.2.post1.dev4+g3142fcf8. +The file was generated using packit 1.1.0.post1.dev2+gf7b527d0. diff --git a/aardvark-dns.spec b/aardvark-dns.spec index 85b901a..da9579f 100644 --- a/aardvark-dns.spec +++ b/aardvark-dns.spec @@ -22,7 +22,7 @@ Epoch: 2 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.13.1 +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: %autorelease diff --git a/sources b/sources index f63296e..6221c50 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (v1.13.1.tar.gz) = 30265a8d134f600e52c4a412a5fa9b00313cef26ad019adf5233ed0a63cd108b5636e15322569b1bd609d6eb741ceca94f3a076b391aef7ef0d47e3ae7e7c9ad -SHA512 (aardvark-dns-v1.13.1-vendor.tar.gz) = b5d5850409b54e74627b143669313dce35c94ea34533c6a89ea2d16e3155fe8030d406674fed8adbe9be9da6a71c5773d63382bde4364981adcfdbc036f515ac +SHA512 (v1.14.0.tar.gz) = 0300c474bb748063bf96488c06920df15ade525a8ee288446d3f30c3cffdccd687744efbb76e54a6b2213c38c02b00400ad79459bd78e8721556ff8dcdc1df8e +SHA512 (aardvark-dns-v1.14.0-vendor.tar.gz) = 0d738d0a737bfc9b6b2fe728de343a6a91c6e197d888fd37c0859b831b05f8c92efce13c268fc8f31a09bb78d43f4330230a0454744523df5a4fa96498ca3dac From df26b36a6e1d6584986caba8d36cae6054f23f1e Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 13 May 2025 15:33:04 +0000 Subject: [PATCH 25/29] Update to 1.15.0 upstream release Upstream tag: v1.15.0 Upstream commit: d71294ce Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 2 ++ .packit.yaml | 23 ++++++++----------- README.packit | 2 +- aardvark-dns.spec | 30 ++++++++++++++++++++++++- gating.yaml | 8 +++++-- plans/main.fmf | 38 ++++++++++++++++++++------------ sources | 4 ++-- test/tmt/tmt/main.fmf | 26 ++++++++++++++++++++++ test/tmt/tmt/test_integration.sh | 8 +++++++ 9 files changed, 107 insertions(+), 34 deletions(-) create mode 100644 test/tmt/tmt/main.fmf create mode 100644 test/tmt/tmt/test_integration.sh diff --git a/.gitignore b/.gitignore index a7999de..90851e7 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,5 @@ /aardvark-dns-v1.13.1-vendor.tar.gz /v1.14.0.tar.gz /aardvark-dns-v1.14.0-vendor.tar.gz +/v1.15.0.tar.gz +/aardvark-dns-v1.15.0-vendor.tar.gz diff --git a/.packit.yaml b/.packit.yaml index e3e0afc..42b0f7d 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -16,6 +16,11 @@ files_to_sync: - src: plans/ dest: plans/ delete: true + mkpath: true + - src: test/tmt + dest: test/tmt + delete: true + mkpath: true - src: .fmf/ dest: .fmf/ delete: true @@ -43,7 +48,7 @@ jobs: notifications: &copr_build_failure_notification failure_comment: message: "Ephemeral COPR build failed. @containers/packit-build please check." - targets: + targets: &fedora_copr_targets - fedora-all-x86_64 - fedora-all-aarch64 enable_net: true @@ -85,29 +90,21 @@ jobs: project: podman-next enable_net: true - # Unit tests on Fedora + # Tests on Fedora - job: tests trigger: pull_request packages: [aardvark-dns-fedora] notifications: &test_failure_notification failure_comment: message: "Tests failed. @containers/packit-build please check." - targets: - - fedora-development-x86_64 - - fedora-development-aarch64 - - fedora-latest-x86_64 - - fedora-latest-aarch64 - - fedora-latest-stable-x86_64 - - fedora-latest-stable-aarch64 - - fedora-40-x86_64 - - fedora-40-aarch64 + targets: *fedora_copr_targets tf_extra_params: environments: - artifacts: - type: repository-file id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/fedora-$releasever/rhcontainerbot-podman-next-fedora-$releasever.repo - # Unit tests on CentOS Stream + # Tests on CentOS Stream - job: tests trigger: pull_request packages: [aardvark-dns-centos] @@ -118,8 +115,6 @@ jobs: - artifacts: - type: repository-file id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/centos-stream-$releasever/rhcontainerbot-podman-next-centos-stream-$releasever.repo - - type: repository-file - id: https://src.fedoraproject.org/rpms/epel-release/raw/epel$releasever/f/epel.repo # Sync to Fedora - job: propose_downstream diff --git a/README.packit b/README.packit index 7017e6c..807ffc6 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 1.1.0.post1.dev2+gf7b527d0. +The file was generated using packit 1.6.0.post1.dev2+gd5a7662a. diff --git a/aardvark-dns.spec b/aardvark-dns.spec index da9579f..0bc518d 100644 --- a/aardvark-dns.spec +++ b/aardvark-dns.spec @@ -22,7 +22,7 @@ Epoch: 2 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.14.0 +Version: 1.15.0 # The `AND` needs to be uppercase in the License for SPDX compatibility License: Apache-2.0 AND MIT AND Zlib Release: %autorelease @@ -53,6 +53,23 @@ BuildRequires: rust-srpm-macros Forwards other request to configured resolvers. Read more about configuration in `src/backend/mod.rs`. +%package tests +Summary: Tests for %{name} + +Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: bats +Requires: bind-utils +Requires: jq +Requires: netavark +Requires: nmap-ncat +Requires: dnsmasq + +%description tests +%{summary} + +This package contains system tests for %{name} and is only intended to be used +for gating tests. + %prep %autosetup -Sgit %{name}-%{version} # Following steps are only required on environments like koji which have no @@ -78,6 +95,14 @@ tar fx %{SOURCE1} %install %{__make} DESTDIR=%{buildroot} PREFIX=%{_prefix} install +%{__install} -d -p %{buildroot}%{_datadir}/%{name}/test +%{__cp} -rp test/* %{buildroot}%{_datadir}/%{name}/test/ +%{__rm} -rf %{buildroot}%{_datadir}/%{name}/test/tmt/ + +# Add empty check section to silence rpmlint warning. +# No tests meant to be run here. +%check + %files %license LICENSE %if (0%{?fedora} || 0%{?rhel} >= 10) && !%{defined copr_username} @@ -87,5 +112,8 @@ tar fx %{SOURCE1} %dir %{_libexecdir}/podman %{_libexecdir}/podman/%{name} +%files tests +%{_datadir}/%{name}/test + %changelog %autochangelog diff --git a/gating.yaml b/gating.yaml index dbb1d91..1fb3172 100644 --- a/gating.yaml +++ b/gating.yaml @@ -1,7 +1,10 @@ --- !Policy product_versions: - fedora-* -decision_context: bodhi_update_push_stable +decision_contexts: + - bodhi_update_push_stable + - bodhi_update_push_testing +subject_type: koji_build rules: - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} @@ -9,4 +12,5 @@ rules: product_versions: - rhel-* decision_context: osci_compose_gate -rules: [] +rules: + - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional} diff --git a/plans/main.fmf b/plans/main.fmf index 5f468c5..2b884e7 100644 --- a/plans/main.fmf +++ b/plans/main.fmf @@ -2,22 +2,32 @@ discover: how: fmf execute: how: tmt +prepare: + - when: distro == centos-stream or distro == rhel + how: shell + script: | + dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-$(rpm --eval '%{?rhel}').noarch.rpm + dnf -y config-manager --set-enabled epel + order: 10 + - when: initiator == packit + how: shell + script: | + COPR_REPO_FILE="/etc/yum.repos.d/*podman-next*.repo" + if compgen -G $COPR_REPO_FILE > /dev/null; then + sed -i -n '/^priority=/!p;$apriority=1' $COPR_REPO_FILE + fi + dnf -y upgrade --allowerasing + order: 20 -/upstream: - summary: Run tests on upstream PRs +/no-rpm: + summary: Run tests independent of rpm discover+: - filter: tag:upstream + filter: tag:no-rpm adjust+: - enabled: false - when: initiator is not defined or initiator != packit + - enabled: false + when: initiator is not defined or initiator != packit -/downstream: - summary: Run tests on bodhi / errata and dist-git PRs +/rpm: + summary: Run tests on the rpm discover+: - filter: tag:downstream - dist-git-install-builddeps: true - dist-git-source: true - dist-git-remove-fmf-root: true - adjust+: - enabled: false - when: initiator == packit + filter: tag:rpm diff --git a/sources b/sources index 6221c50..17a2977 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (v1.14.0.tar.gz) = 0300c474bb748063bf96488c06920df15ade525a8ee288446d3f30c3cffdccd687744efbb76e54a6b2213c38c02b00400ad79459bd78e8721556ff8dcdc1df8e -SHA512 (aardvark-dns-v1.14.0-vendor.tar.gz) = 0d738d0a737bfc9b6b2fe728de343a6a91c6e197d888fd37c0859b831b05f8c92efce13c268fc8f31a09bb78d43f4330230a0454744523df5a4fa96498ca3dac +SHA512 (v1.15.0.tar.gz) = 0f77cfa09cb2c93d6750c114aff9a8efa1becd75da366b95b04a81ccecb2b00884d4cba61061b80f2a747f40fe619080f077559efb7dcc2b37c6334f4d02dbe3 +SHA512 (aardvark-dns-v1.15.0-vendor.tar.gz) = fbe6e77a2d412ed34bcf2c710db3aa8989a5887ab475988c393fb1c49584cac5b09a34b82e880eebe81c59af7817985af87391ffb8421da07abf080704cae5c0 diff --git a/test/tmt/tmt/main.fmf b/test/tmt/tmt/main.fmf new file mode 100644 index 0000000..9210cc8 --- /dev/null +++ b/test/tmt/tmt/main.fmf @@ -0,0 +1,26 @@ +/validate: + tag: [ no-rpm, validate ] + summary: Validate test + test: make -C ../.. validate + require: + - clippy + - rustfmt + +/unit: + tag: [ no-rpm, unit ] + summary: Unit tests + test: make -C ../.. unit + require: + - cargo + +/integration: + tag: [ rpm, integration ] + summary: Integration tests + test: bash test_integration.sh + environment: + AARDVARK: /usr/libexec/podman/aardvark-dns + require: + - aardvark-dns-tests + adjust: + duration: 10m + when: arch == aarch64 diff --git a/test/tmt/tmt/test_integration.sh b/test/tmt/tmt/test_integration.sh new file mode 100644 index 0000000..0839800 --- /dev/null +++ b/test/tmt/tmt/test_integration.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +set -exo pipefail + +rpm -q aardvark-dns aardvark-dns-tests netavark + +cd /usr/share/aardvark-dns/ +bats test/ From 913f3a45e526207fd1de0183194c699b69879adf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 16:41:16 +0000 Subject: [PATCH 26/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 1702e377199c9923bce5935c45648eaaabe7cfa7 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 14 Aug 2025 18:16:39 +0000 Subject: [PATCH 27/29] Update to 1.16.0 upstream release Upstream tag: v1.16.0 Upstream commit: 56db1e0c Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 2 ++ README.packit | 2 +- aardvark-dns.spec | 2 +- sources | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 90851e7..802337b 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,5 @@ /aardvark-dns-v1.14.0-vendor.tar.gz /v1.15.0.tar.gz /aardvark-dns-v1.15.0-vendor.tar.gz +/v1.16.0.tar.gz +/aardvark-dns-v1.16.0-vendor.tar.gz diff --git a/README.packit b/README.packit index 807ffc6..3ad54d6 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 1.6.0.post1.dev2+gd5a7662a. +The file was generated using packit 1.11.0. diff --git a/aardvark-dns.spec b/aardvark-dns.spec index 0bc518d..70ae11b 100644 --- a/aardvark-dns.spec +++ b/aardvark-dns.spec @@ -22,7 +22,7 @@ Epoch: 2 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.15.0 +Version: 1.16.0 # The `AND` needs to be uppercase in the License for SPDX compatibility License: Apache-2.0 AND MIT AND Zlib Release: %autorelease diff --git a/sources b/sources index 17a2977..164c3ca 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (v1.15.0.tar.gz) = 0f77cfa09cb2c93d6750c114aff9a8efa1becd75da366b95b04a81ccecb2b00884d4cba61061b80f2a747f40fe619080f077559efb7dcc2b37c6334f4d02dbe3 -SHA512 (aardvark-dns-v1.15.0-vendor.tar.gz) = fbe6e77a2d412ed34bcf2c710db3aa8989a5887ab475988c393fb1c49584cac5b09a34b82e880eebe81c59af7817985af87391ffb8421da07abf080704cae5c0 +SHA512 (v1.16.0.tar.gz) = 6acdc06856e88f582f3eb651463dc627b4f33fe78605725f500ba21bd74385fe76bf2cb29adec356618a15b2f288b844e38cbd18c4522f7748b29c6d0ab7f59a +SHA512 (aardvark-dns-v1.16.0-vendor.tar.gz) = 60e31efef6b37f5856d59931372971134707d82794d1fbc2fc2e446bc079efa975dfe00c4c21813502cbab70a1caa58eee38a06b5927f155df80a1232ed4f917 From a840b54a294dcbb0dd8f92b46ab1ac1e339066b5 Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 12 Nov 2025 15:19:24 +0000 Subject: [PATCH 28/29] Update to 1.17.0 upstream release Upstream tag: v1.17.0 Upstream commit: 2158073b Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 2 ++ .packit.yaml | 6 ++++++ README.packit | 2 +- aardvark-dns.spec | 6 +++--- sources | 4 ++-- 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 802337b..edf038e 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,5 @@ /aardvark-dns-v1.15.0-vendor.tar.gz /v1.16.0.tar.gz /aardvark-dns-v1.16.0-vendor.tar.gz +/v1.17.0.tar.gz +/aardvark-dns-v1.17.0-vendor.tar.gz diff --git a/.packit.yaml b/.packit.yaml index 42b0f7d..89d1cee 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -38,9 +38,15 @@ packages: srpm_build_deps: - cargo + - git-archive-all - make - openssl-devel +# https://packit.dev/docs/configuration/actions +# fix-spec-file only operates on copr builds and doesn't affect official distro builds +actions: + fix-spec-file: "bash .packit-copr-rpm.sh" + jobs: - job: copr_build trigger: pull_request diff --git a/README.packit b/README.packit index 3ad54d6..e03362b 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 1.11.0. +The file was generated using packit 1.12.0.post1.dev13+gd51655c23. diff --git a/aardvark-dns.spec b/aardvark-dns.spec index 70ae11b..08b71ac 100644 --- a/aardvark-dns.spec +++ b/aardvark-dns.spec @@ -22,7 +22,7 @@ Epoch: 2 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.16.0 +Version: 1.17.0 # The `AND` needs to be uppercase in the License for SPDX compatibility License: Apache-2.0 AND MIT AND Zlib Release: %autorelease @@ -61,7 +61,7 @@ Requires: bats Requires: bind-utils Requires: jq Requires: netavark -Requires: nmap-ncat +Requires: socat Requires: dnsmasq %description tests @@ -97,7 +97,7 @@ tar fx %{SOURCE1} %{__install} -d -p %{buildroot}%{_datadir}/%{name}/test %{__cp} -rp test/* %{buildroot}%{_datadir}/%{name}/test/ -%{__rm} -rf %{buildroot}%{_datadir}/%{name}/test/tmt/ +%{__rm} -rf %{buildroot}%{_datadir}/%{name}/test/tmt/ # Add empty check section to silence rpmlint warning. # No tests meant to be run here. diff --git a/sources b/sources index 164c3ca..413dc03 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (v1.16.0.tar.gz) = 6acdc06856e88f582f3eb651463dc627b4f33fe78605725f500ba21bd74385fe76bf2cb29adec356618a15b2f288b844e38cbd18c4522f7748b29c6d0ab7f59a -SHA512 (aardvark-dns-v1.16.0-vendor.tar.gz) = 60e31efef6b37f5856d59931372971134707d82794d1fbc2fc2e446bc079efa975dfe00c4c21813502cbab70a1caa58eee38a06b5927f155df80a1232ed4f917 +SHA512 (v1.17.0.tar.gz) = 42e3a261bb5b9df83b8bb853ed50dd7dfda643895262aedf5ccdc865c598e913996a244d234ac309a18ee1a884b7ba847679dfe5d8b6521e674114c8aba552da +SHA512 (aardvark-dns-v1.17.0-vendor.tar.gz) = b7ec2a2a34d5bb36dbcc55611dc9ec0ff2c1bed4469cc4b12d4eb0bd78bb7d6cae6f80a02ac32ade5c435fdd11e22ddd99646aa4de504c8369ee56cfa470e6a5 From ad694eb989045e7ff654498fefa3d6cc66d5e66a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:22:36 +0000 Subject: [PATCH 29/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild