diff --git a/.gitignore b/.gitignore index 9e30e5f..75e056f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ /v1.0.0-rc1.tar.gz /v1.0.0-rc2.tar.gz /v1.0.0.tar.gz +/1.0.1.tar.gz +/netavark-v1.0.1-vendor.tar.gz diff --git a/netavark.spec b/netavark.spec index 7919ad5..f678bdf 100644 --- a/netavark.spec +++ b/netavark.spec @@ -4,7 +4,7 @@ %global debug_package %{nil} -%global built_tag v1.0.0 +%global built_tag v1.0.1 %global built_tag_strip %(b=%{built_tag}; echo ${b:1}) %global gen_version %(b=%{built_tag_strip}; echo ${b/-/"~"}) @@ -15,7 +15,8 @@ Summary: OCI network stack ExclusiveArch: %{rust_arches} License: ASL 2.0 and BSD and MIT URL: https://github.com/containers/%{name} -Source0: %{url}/archive/%{built_tag}.tar.gz +Source0: %{url}/archive/%{built_tag}/%{version}.tar.gz +Source1: %{url}/releases/download/%{built_tag}/%{name}-%{built_tag}-vendor.tar.gz BuildRequires: cargo BuildRequires: make BuildRequires: rust-srpm-macros @@ -26,40 +27,40 @@ Provides: container-network-stack = 2 # Generated using: # cargo tree --prefix none | awk '{print "Provides: bundled(crate("$1")) = "$2}' | sort | uniq Provides: bundled(crate(aho-corasick)) = v0.7.18 -Provides: bundled(crate(anyhow)) = v1.0.53 +Provides: bundled(crate(anyhow)) = v1.0.55 Provides: bundled(crate(async-broadcast)) = v0.3.4 Provides: bundled(crate(async-channel)) = v1.6.1 Provides: bundled(crate(async-executor)) = v1.4.1 Provides: bundled(crate(async-io)) = v1.6.0 -Provides: bundled(crate(async-lock)) = v2.4.0 +Provides: bundled(crate(async-lock)) = v2.5.0 Provides: bundled(crate(async-recursion)) = v0.3.2 -Provides: bundled(crate(async-task)) = v4.0.3 +Provides: bundled(crate(async-task)) = v4.1.0 Provides: bundled(crate(async-trait)) = v0.1.52 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(block-buffer)) = v0.10.0 +Provides: bundled(crate(block-buffer)) = v0.10.2 Provides: bundled(crate(byteorder)) = v1.4.3 Provides: bundled(crate(bytes)) = v1.1.0 -Provides: bundled(crate(cache-padded)) = v1.1.1 -Provides: bundled(crate(cc)) = v1.0.71 +Provides: bundled(crate(cache-padded)) = v1.2.0 +Provides: bundled(crate(cc)) = v1.0.73 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.1 +Provides: bundled(crate(clap_derive)) = v3.1.0 Provides: bundled(crate(concurrent-queue)) = v1.2.2 Provides: bundled(crate(cpufeatures)) = v0.2.1 -Provides: bundled(crate(crypto-common)) = v0.1.0 +Provides: bundled(crate(crypto-common)) = v0.1.3 Provides: bundled(crate(derivative)) = v2.2.0 -Provides: bundled(crate(digest)) = v0.10.0 +Provides: bundled(crate(digest)) = v0.10.3 Provides: bundled(crate(easy-parallel)) = v3.2.0 Provides: bundled(crate(enum-iterator)) = v0.7.0 Provides: bundled(crate(enum-iterator-derive)) = v0.7.0 Provides: bundled(crate(enumflags2)) = v0.7.3 Provides: bundled(crate(enumflags2_derive)) = v0.7.3 Provides: bundled(crate(env_logger)) = v0.9.0 -Provides: bundled(crate(event-listener)) = v2.5.1 -Provides: bundled(crate(fastrand)) = v1.5.0 +Provides: bundled(crate(event-listener)) = v2.5.2 +Provides: bundled(crate(fastrand)) = v1.7.0 Provides: bundled(crate(form_urlencoded)) = v1.0.1 Provides: bundled(crate(futures)) = v0.3.21 Provides: bundled(crate(futures-channel)) = v0.3.21 @@ -71,8 +72,8 @@ Provides: bundled(crate(futures-macro)) = v0.3.21 Provides: bundled(crate(futures-sink)) = v0.3.21 Provides: bundled(crate(futures-task)) = v0.3.21 Provides: bundled(crate(futures-util)) = v0.3.21 -Provides: bundled(crate(generic-array)) = v0.14.4 -Provides: bundled(crate(getrandom)) = v0.2.3 +Provides: bundled(crate(generic-array)) = v0.14.5 +Provides: bundled(crate(getrandom)) = v0.2.5 Provides: bundled(crate(getset)) = v0.1.2 Provides: bundled(crate(git2)) = v0.13.25 Provides: bundled(crate(hashbrown)) = v0.11.2 @@ -80,101 +81,102 @@ Provides: bundled(crate(heck)) = v0.4.0 Provides: bundled(crate(hex)) = v0.4.3 Provides: bundled(crate(humantime)) = v2.1.0 Provides: bundled(crate(idna)) = v0.2.3 -Provides: bundled(crate(indexmap)) = v1.7.0 -Provides: bundled(crate(instant)) = v0.1.12 +Provides: bundled(crate(indexmap)) = v1.8.0 Provides: bundled(crate(ipnet)) = v2.3.1 Provides: bundled(crate(iptables)) = v0.5.0 Provides: bundled(crate(itoa)) = v1.0.1 Provides: bundled(crate(jobserver)) = v0.1.24 Provides: bundled(crate(lazy_static)) = v1.4.0 -Provides: bundled(crate(libc)) = v0.2.117 +Provides: bundled(crate(libc)) = v0.2.119 Provides: bundled(crate(libgit2-sys)) = v0.12.26+1.3.0 Provides: bundled(crate(libz-sys)) = v1.1.3 -Provides: bundled(crate(lock_api)) = v0.4.5 +Provides: bundled(crate(lock_api)) = v0.4.6 Provides: bundled(crate(log)) = v0.4.14 Provides: bundled(crate(matches)) = v0.1.9 Provides: bundled(crate(memchr)) = v2.4.1 -Provides: bundled(crate(memoffset)) = v0.6.4 -Provides: bundled(crate(mio)) = v0.7.14 -Provides: bundled(crate(netavark)) = v1.0.0 -Provides: bundled(crate(netlink-packet-core)) = v0.4.1 -Provides: bundled(crate(netlink-packet-route)) = v0.10.0 -Provides: bundled(crate(netlink-packet-utils)) = v0.5.0 -Provides: bundled(crate(netlink-proto)) = v0.9.1 -Provides: bundled(crate(netlink-sys)) = v0.8.1 +Provides: bundled(crate(memoffset)) = v0.6.5 +Provides: bundled(crate(mio)) = v0.8.0 +Provides: bundled(crate(netavark)) = v1.0.1 +Provides: bundled(crate(netlink-packet-core)) = v0.4.2 +Provides: bundled(crate(netlink-packet-route)) = v0.11.0 +Provides: bundled(crate(netlink-packet-utils)) = v0.5.1 +Provides: bundled(crate(netlink-proto)) = v0.9.2 +Provides: bundled(crate(netlink-sys)) = v0.8.2 +Provides: bundled(crate(nix)) = v0.22.3 Provides: bundled(crate(nix)) = v0.23.1 Provides: bundled(crate(num-integer)) = v0.1.44 Provides: bundled(crate(num-traits)) = v0.2.14 -Provides: bundled(crate(num_cpus)) = v1.13.0 -Provides: bundled(crate(once_cell)) = v1.8.0 -Provides: bundled(crate(ordered-float)) = v2.8.0 +Provides: bundled(crate(num_cpus)) = v1.13.1 +Provides: bundled(crate(once_cell)) = v1.9.0 +Provides: bundled(crate(ordered-float)) = v2.10.0 Provides: bundled(crate(ordered-stream)) = v0.0.1 Provides: bundled(crate(os_str_bytes)) = v6.0.0 Provides: bundled(crate(parking)) = v2.0.0 -Provides: bundled(crate(parking_lot)) = v0.11.2 -Provides: bundled(crate(parking_lot_core)) = v0.8.5 -Provides: bundled(crate(paste)) = v1.0.5 +Provides: bundled(crate(parking_lot)) = v0.12.0 +Provides: bundled(crate(parking_lot_core)) = v0.9.1 +Provides: bundled(crate(paste)) = v1.0.6 Provides: bundled(crate(percent-encoding)) = v2.1.0 -Provides: bundled(crate(pin-project-lite)) = v0.2.7 +Provides: bundled(crate(pin-project-lite)) = v0.2.8 Provides: bundled(crate(pin-utils)) = v0.1.0 Provides: bundled(crate(pkg-config)) = v0.3.24 -Provides: bundled(crate(polling)) = v2.1.0 -Provides: bundled(crate(ppv-lite86)) = v0.2.14 -Provides: bundled(crate(proc-macro-crate)) = v1.1.0 +Provides: bundled(crate(polling)) = v2.2.0 +Provides: bundled(crate(ppv-lite86)) = v0.2.16 +Provides: bundled(crate(proc-macro-crate)) = v1.1.2 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.30 -Provides: bundled(crate(quote)) = v1.0.10 +Provides: bundled(crate(proc-macro2)) = v1.0.36 +Provides: bundled(crate(quote)) = v1.0.15 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-syntax)) = v0.6.25 -Provides: bundled(crate(rtnetlink)) = v0.9.0 +Provides: bundled(crate(rtnetlink)) = v0.9.1 Provides: bundled(crate(rustc_version)) = v0.4.0 Provides: bundled(crate(rustversion)) = v1.0.6 -Provides: bundled(crate(ryu)) = v1.0.5 +Provides: bundled(crate(ryu)) = v1.0.9 Provides: bundled(crate(same-file)) = v1.0.6 Provides: bundled(crate(scopeguard)) = v1.1.0 -Provides: bundled(crate(semver)) = v1.0.4 +Provides: bundled(crate(semver)) = v1.0.6 Provides: bundled(crate(serde)) = v1.0.136 Provides: bundled(crate(serde-value)) = v0.7.0 Provides: bundled(crate(serde_derive)) = v1.0.136 Provides: bundled(crate(serde_json)) = v1.0.79 Provides: bundled(crate(serde_repr)) = v0.1.7 -Provides: bundled(crate(sha1)) = v0.6.0 -Provides: bundled(crate(sha2)) = v0.10.1 +Provides: bundled(crate(sha1)) = v0.6.1 +Provides: bundled(crate(sha1_smol)) = v1.0.0 +Provides: bundled(crate(sha2)) = v0.10.2 Provides: bundled(crate(signal-hook-registry)) = v1.4.0 Provides: bundled(crate(simple-error)) = v0.2.3 Provides: bundled(crate(slab)) = v0.4.5 -Provides: bundled(crate(smallvec)) = v1.7.0 -Provides: bundled(crate(socket2)) = v0.4.2 +Provides: bundled(crate(smallvec)) = v1.8.0 +Provides: bundled(crate(socket2)) = v0.4.4 Provides: bundled(crate(static_assertions)) = v1.1.0 Provides: bundled(crate(strsim)) = v0.10.0 -Provides: bundled(crate(syn)) = v1.0.80 +Provides: bundled(crate(syn)) = v1.0.86 Provides: bundled(crate(sysctl)) = v0.4.3 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.44 -Provides: bundled(crate(tinyvec)) = v1.5.0 +Provides: bundled(crate(time)) = v0.1.43 +Provides: bundled(crate(tinyvec)) = v1.5.1 Provides: bundled(crate(tinyvec_macros)) = v0.1.0 -Provides: bundled(crate(tokio)) = v1.16.1 +Provides: bundled(crate(tokio)) = v1.17.0 Provides: bundled(crate(tokio-macros)) = v1.7.0 Provides: bundled(crate(toml)) = v0.5.8 -Provides: bundled(crate(typenum)) = v1.14.0 +Provides: bundled(crate(typenum)) = v1.15.0 Provides: bundled(crate(unicode-bidi)) = v0.3.7 Provides: bundled(crate(unicode-normalization)) = v0.1.19 Provides: bundled(crate(unicode-xid)) = v0.2.2 Provides: bundled(crate(url)) = v2.2.2 Provides: bundled(crate(vergen)) = v6.0.2 -Provides: bundled(crate(version_check)) = v0.9.3 +Provides: bundled(crate(version_check)) = v0.9.4 Provides: bundled(crate(waker-fn)) = v1.1.0 Provides: bundled(crate(walkdir)) = v2.3.2 -Provides: bundled(crate(zbus)) = v2.0.1 -Provides: bundled(crate(zbus_macros)) = v2.0.1 -Provides: bundled(crate(zbus_names)) = v2.0.0 +Provides: bundled(crate(zbus)) = v2.1.1 +Provides: bundled(crate(zbus_macros)) = v2.1.1 +Provides: bundled(crate(zbus_names)) = v2.1.0 Provides: bundled(crate(zvariant)) = v3.1.2 Provides: bundled(crate(zvariant_derive)) = v3.1.2 @@ -200,6 +202,16 @@ Its features include: %prep %autosetup -Sgit -n %{name}-%{built_tag_strip} +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 diff --git a/sources b/sources index b49e3ad..42689cb 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (v1.0.0.tar.gz) = e5769bd37b30b4c7101e64eac06339638f0190839f1338d9fe8d19d110c03953e5c1b8994119908fbcd23e59c3b170bcab078dd942526566236fbfaa6d463624 +SHA512 (1.0.1.tar.gz) = b34afd2be6c7132b97088b3b38f211a0cd4f91add9dca7dd153b31e15823a56eae1fa660c6e4b97cfb1f8eac3d35ebd9df40fe2c10a3539c50043751ffb66455 +SHA512 (netavark-v1.0.1-vendor.tar.gz) = 5b19fb5f17708a281b3b3de062cf2d266ff0bcc4034135b13f988e4b9bf181295c7260f00a10f93f29fd1f6bf75e5109586af6758de6c23e39bd201eb4e0fdd6