auto bump to v1.1.0

(cherry picked from commit c0bf4d6173)

.gitignore

@@ -1,2 +1,12 @@
 /aardvark-dns-43cd189.tar.gz
 /v1.0.0-rc1.tar.gz
+/v1.0.0-rc2.tar.gz
+/v1.0.0.tar.gz
+/1.0.1.tar.gz
+/aardvark-dns-v1.0.1-vendor.tar.gz
+/1.0.2.tar.gz
+/aardvark-dns-v1.0.2-vendor.tar.gz
+/1.0.3.tar.gz
+/aardvark-dns-v1.0.3-vendor.tar.gz
+/aardvark-dns-v1.1.0-vendor.tar.gz
+/v1.1.0.tar.gz

aardvark-dns.spec

@@ -4,136 +4,133 @@
 # debuginfo doesn't work yet
 %global debug_package %{nil}
 
-%global built_tag v1.0.0-rc1
-%global built_tag_strip %(b=%{built_tag}; echo ${b:1})
-%global gen_version %(b=%{built_tag_strip}; echo ${b/-/"~"})
+%global built_tag v1.1.0
 
 Name: aardvark-dns
-Version: %{gen_version}
-Release: %autorelease
-Summary: Authoritative DNS server for A/AAAA container records
+Version: 1.1.0
+%if "%{_vendor}" == "debbuild"
+Packager: Lokesh Mandvekar <https://github.com/lsm5>
+License: ASL-2.0+
+Release: 0%{?dist}
+%else
 License: ASL 2.0 and BSD and MIT
+Release: %autorelease
+ExclusiveArch: %{rust_arches}
+%endif
+Summary: Authoritative DNS server for A/AAAA container records
 URL: https://github.com/containers/%{name}
-Source: %{url}/archive/%{built_tag}.tar.gz
+Source0: %{url}/archive/%{built_tag}.tar.gz
+Source1: %{url}/releases/download/%{built_tag}/%{name}-%{built_tag}-vendor.tar.gz
 BuildRequires: cargo
+%if "%{_vendor}" == "debbuild"
+BuildRequires: git
+%else
 BuildRequires: git-core
 BuildRequires: make
 BuildRequires: rust-srpm-macros
-ExclusiveArch: %{rust_arches}
 # cargo tree --prefix none | awk '{print "Provides: bundled(crate("$1")) = "$2}' | sort | uniq
-Provides: bundled(crate(aardvark-dns)) = v1.0.0-dev
+Provides: bundled(crate(aardvark-dns)) = v1.0.3
 Provides: bundled(crate(aho-corasick)) = v0.7.18
-Provides: bundled(crate(anyhow)) = v1.0.52
-Provides: bundled(crate(async-broadcast)) = v0.3.4
-Provides: bundled(crate(async-trait)) = v0.1.52
+Provides: bundled(crate(anyhow)) = v1.0.57
+Provides: bundled(crate(async-broadcast)) = v0.4.0
+Provides: bundled(crate(async-trait)) = v0.1.53
 Provides: bundled(crate(atty)) = v0.2.14
-Provides: bundled(crate(autocfg)) = v1.0.1
+Provides: bundled(crate(autocfg)) = v1.1.0
 Provides: bundled(crate(bitflags)) = v1.3.2
 Provides: bundled(crate(bytes)) = v1.1.0
-Provides: bundled(crate(cc)) = v1.0.72
 Provides: bundled(crate(cfg-if)) = v1.0.0
 Provides: bundled(crate(chrono)) = v0.4.19
-Provides: bundled(crate(clap)) = v3.0.12
-Provides: bundled(crate(clap_derive)) = v3.0.12
+Provides: bundled(crate(clap)) = v3.1.15
+Provides: bundled(crate(clap_derive)) = v3.1.7
+Provides: bundled(crate(clap_lex)) = v0.2.0
 Provides: bundled(crate(data-encoding)) = v2.3.2
 Provides: bundled(crate(easy-parallel)) = v3.2.0
 Provides: bundled(crate(endian-type)) = v0.1.2
-Provides: bundled(crate(enum-as-inner)) = v0.3.3
-Provides: bundled(crate(enum-iterator)) = v0.7.0
-Provides: bundled(crate(enum-iterator-derive)) = v0.7.0
+Provides: bundled(crate(enum-as-inner)) = v0.4.0
 Provides: bundled(crate(env_logger)) = v0.9.0
+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.19
-Provides: bundled(crate(futures-core)) = v0.3.19
-Provides: bundled(crate(futures-executor)) = v0.3.19
-Provides: bundled(crate(futures-io)) = v0.3.19
-Provides: bundled(crate(futures-macro)) = v0.3.19
-Provides: bundled(crate(futures-task)) = v0.3.19
-Provides: bundled(crate(futures-util)) = v0.3.19
-Provides: bundled(crate(getrandom)) = v0.2.3
-Provides: bundled(crate(getset)) = v0.1.2
-Provides: bundled(crate(git2)) = v0.13.25
+Provides: bundled(crate(futures-channel)) = v0.3.21
+Provides: bundled(crate(futures-core)) = v0.3.21
+Provides: bundled(crate(futures-executor)) = v0.3.21
+Provides: bundled(crate(futures-io)) = v0.3.21
+Provides: bundled(crate(futures-macro)) = v0.3.21
+Provides: bundled(crate(futures-task)) = v0.3.21
+Provides: bundled(crate(futures-util)) = v0.3.21
+Provides: bundled(crate(getrandom)) = v0.2.6
 Provides: bundled(crate(hashbrown)) = v0.11.2
-Provides: bundled(crate(heck)) = v0.3.3
 Provides: bundled(crate(heck)) = v0.4.0
 Provides: bundled(crate(hostname)) = v0.3.1
 Provides: bundled(crate(humantime)) = v2.1.0
 Provides: bundled(crate(idna)) = v0.2.3
-Provides: bundled(crate(indexmap)) = v1.7.0
+Provides: bundled(crate(indexmap)) = v1.8.1
 Provides: bundled(crate(instant)) = v0.1.12
-Provides: bundled(crate(ipnet)) = v2.3.1
-Provides: bundled(crate(jobserver)) = v0.1.24
+Provides: bundled(crate(ipnet)) = v2.5.0
+Provides: bundled(crate(itoa)) = v1.0.1
 Provides: bundled(crate(lazy_static)) = v1.4.0
-Provides: bundled(crate(libc)) = v0.2.112
-Provides: bundled(crate(libgit2-sys)) = v0.12.26+1.3.0
-Provides: bundled(crate(libz-sys)) = v1.1.3
-Provides: bundled(crate(linked-hash-map)) = v0.5.4
-Provides: bundled(crate(lock_api)) = v0.4.5
-Provides: bundled(crate(log)) = v0.4.14
-Provides: bundled(crate(lru-cache)) = v0.1.2
+Provides: bundled(crate(libc)) = v0.2.125
+Provides: bundled(crate(lock_api)) = v0.4.7
+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.4.1
-Provides: bundled(crate(mio)) = v0.7.14
+Provides: bundled(crate(memchr)) = v2.5.0
+Provides: bundled(crate(mio)) = v0.8.2
 Provides: bundled(crate(nibble_vec)) = v0.1.0
-Provides: bundled(crate(num-integer)) = v0.1.44
-Provides: bundled(crate(num-traits)) = v0.2.14
+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(once_cell)) = v1.9.0
+Provides: bundled(crate(num_threads)) = v0.1.6
+Provides: bundled(crate(once_cell)) = v1.10.0
 Provides: bundled(crate(os_str_bytes)) = v6.0.0
-Provides: bundled(crate(parking_lot)) = v0.11.2
-Provides: bundled(crate(parking_lot_core)) = v0.8.5
+Provides: bundled(crate(parking_lot)) = v0.12.0
+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.8
+Provides: bundled(crate(pin-project-lite)) = v0.2.9
 Provides: bundled(crate(pin-utils)) = v0.1.0
-Provides: bundled(crate(pkg-config)) = v0.3.24
 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.36
+Provides: bundled(crate(proc-macro2)) = v1.0.37
 Provides: bundled(crate(quick-error)) = v1.2.3
-Provides: bundled(crate(quote)) = v1.0.14
+Provides: bundled(crate(quote)) = v1.0.18
 Provides: bundled(crate(radix_trie)) = v0.2.1
-Provides: bundled(crate(rand)) = v0.8.4
+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(regex)) = v1.5.4
+Provides: bundled(crate(regex)) = v1.5.5
 Provides: bundled(crate(regex-syntax)) = v0.6.25
 Provides: bundled(crate(resolv-conf)) = v0.7.0
-Provides: bundled(crate(rustc_version)) = v0.4.0
-Provides: bundled(crate(rustversion)) = v1.0.6
 Provides: bundled(crate(scopeguard)) = v1.1.0
-Provides: bundled(crate(semver)) = v1.0.4
-Provides: bundled(crate(serde)) = v1.0.133
-Provides: bundled(crate(serde_derive)) = v1.0.133
+Provides: bundled(crate(serde)) = v1.0.137
+Provides: bundled(crate(serde_derive)) = v1.0.137
 Provides: bundled(crate(signal-hook)) = v0.3.13
 Provides: bundled(crate(signal-hook-registry)) = v1.4.0
-Provides: bundled(crate(slab)) = v0.4.5
-Provides: bundled(crate(smallvec)) = v1.7.0
+Provides: bundled(crate(slab)) = v0.4.6
+Provides: bundled(crate(smallvec)) = v1.8.0
+Provides: bundled(crate(socket2)) = v0.4.4
 Provides: bundled(crate(strsim)) = v0.10.0
-Provides: bundled(crate(syn)) = v1.0.84
-Provides: bundled(crate(termcolor)) = v1.1.2
-Provides: bundled(crate(textwrap)) = v0.14.2
-Provides: bundled(crate(thiserror)) = v1.0.30
-Provides: bundled(crate(thiserror-impl)) = v1.0.30
-Provides: bundled(crate(time)) = v0.1.43
-Provides: bundled(crate(tinyvec)) = v1.5.1
+Provides: bundled(crate(syn)) = v1.0.92
+Provides: bundled(crate(syslog)) = v6.0.1
+Provides: bundled(crate(termcolor)) = v1.1.3
+Provides: bundled(crate(textwrap)) = v0.15.0
+Provides: bundled(crate(thiserror)) = v1.0.31
+Provides: bundled(crate(thiserror-impl)) = v1.0.31
+Provides: bundled(crate(time)) = v0.3.9
+Provides: bundled(crate(tinyvec)) = v1.6.0
 Provides: bundled(crate(tinyvec_macros)) = v0.1.0
-Provides: bundled(crate(tokio)) = v1.15.0
+Provides: bundled(crate(tokio)) = v1.18.1
 Provides: bundled(crate(tokio-macros)) = v1.7.0
-Provides: bundled(crate(toml)) = v0.5.8
-Provides: bundled(crate(trust-dns-client)) = v0.20.3
-Provides: bundled(crate(trust-dns-proto)) = v0.20.3
-Provides: bundled(crate(trust-dns-resolver)) = v0.20.3
-Provides: bundled(crate(trust-dns-server)) = v0.20.3
-Provides: bundled(crate(unicode-bidi)) = v0.3.7
+Provides: bundled(crate(toml)) = v0.5.9
+Provides: bundled(crate(trust-dns-client)) = v0.21.2
+Provides: bundled(crate(trust-dns-proto)) = v0.21.2
+Provides: bundled(crate(trust-dns-server)) = v0.21.2
+Provides: bundled(crate(unicode-bidi)) = v0.3.8
 Provides: bundled(crate(unicode-normalization)) = v0.1.19
-Provides: bundled(crate(unicode-segmentation)) = v1.8.0
-Provides: bundled(crate(unicode-xid)) = v0.2.2
+Provides: bundled(crate(unicode-xid)) = v0.2.3
 Provides: bundled(crate(url)) = v2.2.2
-Provides: bundled(crate(vergen)) = v6.0.0
 Provides: bundled(crate(version_check)) = v0.9.4
+%endif
 
 %description
 %{summary}
@@ -142,7 +139,17 @@ Forwards other request to configured resolvers.
 Read more about configuration in `src/backend/mod.rs`.
 
 %prep
-%autosetup -Sgit -n %{name}-%{built_tag_strip}
+%autosetup -Sgit
+tar fx %{SOURCE1}
+mkdir -p .cargo
+
+cat >.cargo/config << EOF
+[source.crates-io]
+replace-with = "vendored-sources"
+
+[source.vendored-sources]
+directory = "vendor"
+EOF
 
 %build
 %{__make} build
@@ -156,4 +163,6 @@ Read more about configuration in `src/backend/mod.rs`.
 %{_libexecdir}/podman/%{name}
 
 %changelog
+%if "%{_vendor}" != "debbuild"
 %autochangelog
+%endif

sources

@@ -1 +1,2 @@
-SHA512 (v1.0.0-rc1.tar.gz) = a8b958e07ac33fe45e33b297d11d6262dc261326d1894ce9f6c56ff6e2ea3dd5966c492ad1679685805af34e9c6e2d328256f68cca39072758f3ee4af9285333
+SHA512 (aardvark-dns-v1.1.0-vendor.tar.gz) = b2c28eb900efc0a4b1c9d39db334ee4613c518689b5a86ea97b8d543ab69331c07c02963339f7c91ec0a2510f8cad0e7efcd4db570f9ed3df77953a85bf91ee2
+SHA512 (v1.1.0.tar.gz) = 96acfac34f6cb894dc7ea170d74de6342da95d345f4109703e0d57ff98662968251fafde8e8a4f5c047a6ff4725ca632b598d024b6660d7dc4a07afeffdee26a