Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package netavark for openSUSE:Factory
checked in at 2024-08-13 13:22:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/netavark (Old)
and /work/SRC/openSUSE:Factory/.netavark.new.7232 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "netavark"
Tue Aug 13 13:22:05 2024 rev:12 rq:1193335 version:1.12.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/netavark/netavark.changes 2024-06-04
12:50:16.061946674 +0200
+++ /work/SRC/openSUSE:Factory/.netavark.new.7232/netavark.changes
2024-08-13 13:22:10.859588923 +0200
@@ -1,0 +2,39 @@
+Wed Aug 07 06:36:53 UTC 2024 - danish.prak...@suse.com
+
+- Update to version 1.12.1:
+ * Release v1.12.1
+ * Update release notes for v1.12.1
+ * Change nv cargo categories
+ * Bump to 1.13.0-dev
+ * Release 1.12
+ * Release Notes for 1.12
+ * run cargo update
+ * rpm: use nftables as default for f41
+ * fix(deps): update rust crate serde_json to 1.0.121
+ * fix(deps): update rust crate tokio to 1.39.2
+ * aardvark-dns: trim whitespaces from error text
+ * fix(deps): update rust crate env_logger to 0.11.5
+ * [skip-ci] RPM: handle iptables/nftables dependencies
+ * fix aardvark-dns error handling
+ * fix(deps): update rust crate tokio to 1.39.1
+ * fix(deps): update rust crate env_logger to 0.11.4
+ * fix(deps): update rust crate tokio to 1.38.1
+ * update mozim to 0.2.4
+ * fix(deps): update rust crate serde_json to 1.0.120
+ * netavark: dhcp_proxy: use dns servers from dhcp lease
+ * fix(deps): update rust crate serde_json to 1.0.119
+ * fix(deps): update rust crate netlink-packet-route to 0.20.1
+ * fix(deps): update rust crate log to 0.4.22
+ * Fix Epoch so upgrade path is preserved from Fedora/RHEL.
+ * test: add macvlan metric test
+ * fix(deps): update rust crate serde_json to 1.0.118
+ * fix(deps): update rust crate url to 2.5.2
+ * fix(deps): update rust crate prost to 0.12.6
+ * fix(deps): update rust crate url to 2.5.1
+ * fix(deps): update rust crate iptables to 0.5.2
+ * [CI:BUILD] rpm: Update Rust macro usage
+ * fix(deps): update rust crate nftables to 0.4.1
+ * fix(deps): update rust crate tokio to 1.38.0
+ * Bump to 1.12.0-dev
+
+-------------------------------------------------------------------
Old:
----
netavark-1.11.0.tar.gz
New:
----
netavark-1.12.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ netavark.spec ++++++
--- /var/tmp/diff_new_pack.2t2NXw/_old 2024-08-13 13:22:12.539658923 +0200
+++ /var/tmp/diff_new_pack.2t2NXw/_new 2024-08-13 13:22:12.543659090 +0200
@@ -19,7 +19,7 @@
%define major_minor %((v=%{version}; echo ${v%.*}))
Name: netavark
-Version: 1.11.0
+Version: 1.12.1
Release: 0
Summary: Container network stack
License: Apache-2.0
++++++ _service ++++++
--- /var/tmp/diff_new_pack.2t2NXw/_old 2024-08-13 13:22:12.571660256 +0200
+++ /var/tmp/diff_new_pack.2t2NXw/_new 2024-08-13 13:22:12.575660423 +0200
@@ -3,7 +3,7 @@
<param name="url">https://github.com/containers/netavark.git</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="scm">git</param>
- <param name="revision">v1.11.0</param>
+ <param name="revision">v1.12.1</param>
<param name="match-tag">*</param>
<param name="versionrewrite-pattern">v(\d+\.\d+\.\d+)</param>
<param name="versionrewrite-replacement">\1</param>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.2t2NXw/_old 2024-08-13 13:22:12.591661089 +0200
+++ /var/tmp/diff_new_pack.2t2NXw/_new 2024-08-13 13:22:12.595661256 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/containers/netavark.git</param>
- <param
name="changesrevision">ab4f101a39b687c01e2df578162c2fa16a881c1b</param></service></servicedata>
+ <param
name="changesrevision">a4e1359ee7fa036db2712f495d4afc95c63a32d8</param></service></servicedata>
(No newline at EOF)
++++++ netavark-1.11.0.tar.gz -> netavark-1.12.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/netavark-1.11.0/Cargo.lock
new/netavark-1.12.1/Cargo.lock
--- old/netavark-1.11.0/Cargo.lock 2024-05-30 16:20:33.000000000 +0200
+++ new/netavark-1.12.1/Cargo.lock 2024-08-01 22:45:40.000000000 +0200
@@ -43,9 +43,9 @@
[[package]]
name = "anstream"
-version = "0.6.14"
+version = "0.6.15"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b"
+checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
dependencies = [
"anstyle",
"anstyle-parse",
@@ -58,33 +58,33 @@
[[package]]
name = "anstyle"
-version = "1.0.7"
+version = "1.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b"
+checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
[[package]]
name = "anstyle-parse"
-version = "0.2.4"
+version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4"
+checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
dependencies = [
"utf8parse",
]
[[package]]
name = "anstyle-query"
-version = "1.0.3"
+version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5"
+checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
dependencies = [
"windows-sys 0.52.0",
]
[[package]]
name = "anstyle-wincon"
-version = "3.0.3"
+version = "3.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19"
+checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
dependencies = [
"anstyle",
"windows-sys 0.52.0",
@@ -119,16 +119,16 @@
checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a"
dependencies = [
"concurrent-queue",
- "event-listener-strategy 0.5.2",
+ "event-listener-strategy",
"futures-core",
"pin-project-lite",
]
[[package]]
name = "async-executor"
-version = "1.12.0"
+version = "1.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0"
+checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7"
dependencies = [
"async-task",
"concurrent-queue",
@@ -171,17 +171,17 @@
[[package]]
name = "async-io"
-version = "2.3.2"
+version = "2.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884"
+checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964"
dependencies = [
- "async-lock 3.3.0",
+ "async-lock 3.4.0",
"cfg-if",
"concurrent-queue",
"futures-io",
"futures-lite 2.3.0",
"parking",
- "polling 3.7.0",
+ "polling 3.7.2",
"rustix 0.38.34",
"slab",
"tracing",
@@ -199,12 +199,12 @@
[[package]]
name = "async-lock"
-version = "3.3.0"
+version = "3.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b"
+checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
dependencies = [
- "event-listener 4.0.3",
- "event-listener-strategy 0.4.0",
+ "event-listener 5.3.1",
+ "event-listener-strategy",
"pin-project-lite",
]
@@ -233,17 +233,17 @@
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.66",
+ "syn 2.0.72",
]
[[package]]
name = "async-signal"
-version = "0.2.6"
+version = "0.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "afe66191c335039c7bb78f99dc7520b0cbb166b3a1cb33a03f53d8a1c6f2afda"
+checksum = "dfb3634b73397aa844481f814fad23bbf07fdb0eabec10f2eb95e58944b1ec32"
dependencies = [
- "async-io 2.3.2",
- "async-lock 3.3.0",
+ "async-io 2.3.3",
+ "async-lock 3.4.0",
"atomic-waker",
"cfg-if",
"futures-core",
@@ -273,7 +273,7 @@
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.66",
+ "syn 2.0.72",
]
[[package]]
@@ -284,13 +284,13 @@
[[package]]
name = "async-trait"
-version = "0.1.80"
+version = "0.1.81"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
+checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.66",
+ "syn 2.0.72",
]
[[package]]
@@ -352,9 +352,9 @@
[[package]]
name = "backtrace"
-version = "0.3.72"
+version = "0.3.73"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "17c6a35df3749d2e8bb1b7b21a976d82b15548788d2735b9d82f329268f71a11"
+checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
dependencies = [
"addr2line",
"cc",
@@ -379,9 +379,9 @@
[[package]]
name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
[[package]]
name = "block-buffer"
@@ -419,15 +419,15 @@
[[package]]
name = "bytes"
-version = "1.6.0"
+version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
+checksum = "fca2be1d5c43812bae364ee3f30b3afcb7877cf59f4aeb94c66f313a41d2fac9"
[[package]]
name = "cc"
-version = "1.0.98"
+version = "1.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f"
+checksum = "26a5c3fd7bfa1ce3897a3a3501d362b2d87b7f2583ebcb4a949ec25911025cbc"
[[package]]
name = "cfg-if"
@@ -451,7 +451,7 @@
"iana-time-zone",
"num-traits",
"serde",
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
]
[[package]]
@@ -485,7 +485,7 @@
"heck 0.4.1",
"proc-macro2",
"quote",
- "syn 2.0.66",
+ "syn 2.0.72",
]
[[package]]
@@ -496,9 +496,9 @@
[[package]]
name = "colorchoice"
-version = "1.0.1"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422"
+checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
[[package]]
name = "concurrent-queue"
@@ -590,9 +590,9 @@
[[package]]
name = "either"
-version = "1.12.0"
+version = "1.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
[[package]]
name = "enum-as-inner"
@@ -615,14 +615,14 @@
"heck 0.4.1",
"proc-macro2",
"quote",
- "syn 2.0.66",
+ "syn 2.0.72",
]
[[package]]
name = "enumflags2"
-version = "0.7.9"
+version = "0.7.10"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d"
+checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d"
dependencies = [
"enumflags2_derive",
"serde",
@@ -630,20 +630,20 @@
[[package]]
name = "enumflags2_derive"
-version = "0.7.9"
+version = "0.7.10"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4"
+checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.66",
+ "syn 2.0.72",
]
[[package]]
name = "env_filter"
-version = "0.1.0"
+version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea"
+checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab"
dependencies = [
"log",
"regex",
@@ -651,9 +651,9 @@
[[package]]
name = "env_logger"
-version = "0.11.3"
+version = "0.11.5"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9"
+checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d"
dependencies = [
"anstream",
"anstyle",
@@ -726,17 +726,6 @@
[[package]]
name = "event-listener"
-version = "4.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e"
-dependencies = [
- "concurrent-queue",
- "parking",
- "pin-project-lite",
-]
-
-[[package]]
-name = "event-listener"
version = "5.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba"
@@ -748,16 +737,6 @@
[[package]]
name = "event-listener-strategy"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3"
-dependencies = [
- "event-listener 4.0.3",
- "pin-project-lite",
-]
-
-[[package]]
-name = "event-listener-strategy"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1"
@@ -896,7 +875,7 @@
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.66",
+ "syn 2.0.72",
]
[[package]]
@@ -1021,6 +1000,12 @@
checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
[[package]]
+name = "hermit-abi"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
+
+[[package]]
name = "hex"
version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index";
@@ -1050,9 +1035,9 @@
[[package]]
name = "httparse"
-version = "1.8.0"
+version = "1.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
+checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
[[package]]
name = "httpdate"
@@ -1068,9 +1053,9 @@
[[package]]
name = "hyper"
-version = "0.14.28"
+version = "0.14.30"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80"
+checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9"
dependencies = [
"bytes",
"futures-channel",
@@ -1181,7 +1166,7 @@
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
dependencies = [
- "hermit-abi",
+ "hermit-abi 0.3.9",
"libc",
"windows-sys 0.48.0",
]
@@ -1197,20 +1182,20 @@
[[package]]
name = "iptables"
-version = "0.5.1"
+version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "d39f0d72d0feb83c9b7f4e1fbde2b4a629886f30841127b3f86383831dba2629"
+checksum = "43b627935a2f5d654613bea2bcd677cc760b03ecf224ced0f1970c0d174813b9"
dependencies = [
"lazy_static",
- "nix 0.27.1",
+ "nix 0.29.0",
"regex",
]
[[package]]
name = "is_terminal_polyfill"
-version = "1.70.0"
+version = "1.70.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800"
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
[[package]]
name = "itertools"
@@ -1238,9 +1223,9 @@
[[package]]
name = "lazy_static"
-version = "1.4.0"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
[[package]]
name = "libc"
@@ -1262,9 +1247,9 @@
[[package]]
name = "log"
-version = "0.4.21"
+version = "0.4.22"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
[[package]]
name = "matches"
@@ -1280,9 +1265,9 @@
[[package]]
name = "memchr"
-version = "2.7.2"
+version = "2.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
[[package]]
name = "memoffset"
@@ -1310,29 +1295,30 @@
[[package]]
name = "miniz_oxide"
-version = "0.7.3"
+version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae"
+checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
dependencies = [
"adler",
]
[[package]]
name = "mio"
-version = "0.8.11"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
+checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4"
dependencies = [
+ "hermit-abi 0.3.9",
"libc",
"wasi",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
]
[[package]]
name = "mozim"
-version = "0.2.3"
+version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "e45df57fccf2794fe629fd5aa9bfac597a7e2e66fa58c3afcedd20e97dd2f4ed"
+checksum = "60e650710a77d000a05361154218ae4a30bcb8cb7eb453b2e46666fe1e2b0cf8"
dependencies = [
"byteorder",
"dhcproto",
@@ -1373,7 +1359,7 @@
[[package]]
name = "netavark"
-version = "1.11.0"
+version = "1.12.1"
dependencies = [
"anyhow",
"chrono",
@@ -1389,7 +1375,7 @@
"log",
"mozim",
"netlink-packet-core",
- "netlink-packet-route 0.20.0",
+ "netlink-packet-route 0.20.1",
"netlink-packet-utils",
"netlink-sys",
"nftables",
@@ -1452,12 +1438,12 @@
[[package]]
name = "netlink-packet-route"
-version = "0.20.0"
+version = "0.20.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "a37142a3d25dff78c49e99c27244827409717366287ff229b16e36cfeee17cf1"
+checksum = "55e5bda7ca0f9ac5e75b5debac3b75e29a8ac8e2171106a2c3bb466389a8dd83"
dependencies = [
"anyhow",
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
"byteorder",
"libc",
"log",
@@ -1507,9 +1493,9 @@
[[package]]
name = "nftables"
-version = "0.4.0"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "e689b44b33fc8c2894b6f609701f785a0c1816b7fcf43d05797bd25a513028d1"
+checksum = "3b5081f5cae4d24af558828494371be6672d02a693e9b4cbca4a0cbae5443e6f"
dependencies = [
"serde",
"serde_json",
@@ -1557,7 +1543,7 @@
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
"cfg-if",
"libc",
]
@@ -1568,7 +1554,7 @@
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
"cfg-if",
"cfg_aliases",
"libc",
@@ -1584,20 +1570,10 @@
]
[[package]]
-name = "num_cpus"
-version = "1.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
-dependencies = [
- "hermit-abi",
- "libc",
-]
-
-[[package]]
name = "object"
-version = "0.35.0"
+version = "0.36.2"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e"
+checksum = "3f203fa8daa7bb185f760ae12bd8e097f63d17041dcdcaf675ac54cdf863170e"
dependencies = [
"memchr",
]
@@ -1672,7 +1648,7 @@
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.66",
+ "syn 2.0.72",
]
[[package]]
@@ -1689,9 +1665,9 @@
[[package]]
name = "piper"
-version = "0.2.2"
+version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "464db0c665917b13ebb5d453ccdec4add5658ee1adc7affc7677615356a8afaf"
+checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391"
dependencies = [
"atomic-waker",
"fastrand 2.1.0",
@@ -1716,13 +1692,13 @@
[[package]]
name = "polling"
-version = "3.7.0"
+version = "3.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3"
+checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b"
dependencies = [
"cfg-if",
"concurrent-queue",
- "hermit-abi",
+ "hermit-abi 0.4.0",
"pin-project-lite",
"rustix 0.38.34",
"tracing",
@@ -1731,9 +1707,12 @@
[[package]]
name = "ppv-lite86"
-version = "0.2.17"
+version = "0.2.18"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+checksum = "dee4364d9f3b902ef14fab8a1ddffb783a1cb6b4bba3bfc1fa3922732c7de97f"
+dependencies = [
+ "zerocopy",
+]
[[package]]
name = "prettyplease"
@@ -1742,7 +1721,7 @@
checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e"
dependencies = [
"proc-macro2",
- "syn 2.0.66",
+ "syn 2.0.72",
]
[[package]]
@@ -1757,9 +1736,9 @@
[[package]]
name = "proc-macro2"
-version = "1.0.84"
+version = "1.0.86"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
dependencies = [
"unicode-ident",
]
@@ -1791,7 +1770,7 @@
"prost",
"prost-types",
"regex",
- "syn 2.0.66",
+ "syn 2.0.72",
"tempfile",
]
@@ -1805,7 +1784,7 @@
"itertools",
"proc-macro2",
"quote",
- "syn 2.0.66",
+ "syn 2.0.72",
]
[[package]]
@@ -1858,9 +1837,9 @@
[[package]]
name = "regex"
-version = "1.10.4"
+version = "1.10.5"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
+checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
dependencies = [
"aho-corasick",
"memchr",
@@ -1870,9 +1849,9 @@
[[package]]
name = "regex-automata"
-version = "0.4.6"
+version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
+checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
dependencies = [
"aho-corasick",
"memchr",
@@ -1881,9 +1860,9 @@
[[package]]
name = "regex-syntax"
-version = "0.8.3"
+version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
+checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
[[package]]
name = "rtnetlink"
@@ -1929,7 +1908,7 @@
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
"errno",
"libc",
"linux-raw-sys 0.4.14",
@@ -1959,9 +1938,9 @@
[[package]]
name = "serde"
-version = "1.0.203"
+version = "1.0.204"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
+checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12"
dependencies = [
"serde_derive",
]
@@ -1978,22 +1957,23 @@
[[package]]
name = "serde_derive"
-version = "1.0.203"
+version = "1.0.204"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
+checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.66",
+ "syn 2.0.72",
]
[[package]]
name = "serde_json"
-version = "1.0.117"
+version = "1.0.121"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"
+checksum = "4ab380d7d9f22ef3f21ad3e6c1ebe8e4fc7a2000ccba2e4d71fc96f15b2cb609"
dependencies = [
"itoa",
+ "memchr",
"ryu",
"serde",
]
@@ -2016,7 +1996,7 @@
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.66",
+ "syn 2.0.72",
]
[[package]]
@@ -2099,21 +2079,21 @@
[[package]]
name = "strum"
-version = "0.26.2"
+version = "0.26.3"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29"
+checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
[[package]]
name = "strum_macros"
-version = "0.26.2"
+version = "0.26.4"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946"
+checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
dependencies = [
- "heck 0.4.1",
+ "heck 0.5.0",
"proc-macro2",
"quote",
"rustversion",
- "syn 2.0.66",
+ "syn 2.0.72",
]
[[package]]
@@ -2129,9 +2109,9 @@
[[package]]
name = "syn"
-version = "2.0.66"
+version = "2.0.72"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
dependencies = [
"proc-macro2",
"quote",
@@ -2150,7 +2130,7 @@
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "ec7dddc5f0fee506baf8b9fdb989e242f17e4b11c61dfbb0635b705217199eea"
dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
"byteorder",
"enum-as-inner 0.6.0",
"libc",
@@ -2172,29 +2152,29 @@
[[package]]
name = "thiserror"
-version = "1.0.61"
+version = "1.0.63"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
+checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.61"
+version = "1.0.63"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
+checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.66",
+ "syn 2.0.72",
]
[[package]]
name = "tinyvec"
-version = "1.6.0"
+version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
dependencies = [
"tinyvec_macros",
]
@@ -2207,20 +2187,19 @@
[[package]]
name = "tokio"
-version = "1.37.0"
+version = "1.39.2"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787"
+checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1"
dependencies = [
"backtrace",
"bytes",
"libc",
"mio",
- "num_cpus",
"pin-project-lite",
"signal-hook-registry",
"socket2 0.5.7",
"tokio-macros",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
]
[[package]]
@@ -2235,13 +2214,13 @@
[[package]]
name = "tokio-macros"
-version = "2.2.0"
+version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
+checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.66",
+ "syn 2.0.72",
]
[[package]]
@@ -2270,9 +2249,9 @@
[[package]]
name = "toml_datetime"
-version = "0.6.6"
+version = "0.6.8"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf"
+checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
[[package]]
name = "toml_edit"
@@ -2322,7 +2301,7 @@
"proc-macro2",
"prost-build",
"quote",
- "syn 2.0.66",
+ "syn 2.0.72",
]
[[package]]
@@ -2377,7 +2356,7 @@
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.66",
+ "syn 2.0.72",
]
[[package]]
@@ -2459,9 +2438,9 @@
[[package]]
name = "url"
-version = "2.5.0"
+version = "2.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
+checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
dependencies = [
"form_urlencoded",
"idna 0.5.0",
@@ -2471,15 +2450,15 @@
[[package]]
name = "utf8parse"
-version = "0.2.1"
+version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
[[package]]
name = "version_check"
-version = "0.9.4"
+version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
[[package]]
name = "waker-fn"
@@ -2533,7 +2512,7 @@
"once_cell",
"proc-macro2",
"quote",
- "syn 2.0.66",
+ "syn 2.0.72",
"wasm-bindgen-shared",
]
@@ -2555,7 +2534,7 @@
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.66",
+ "syn 2.0.72",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@@ -2603,7 +2582,7 @@
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
dependencies = [
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
]
[[package]]
@@ -2621,7 +2600,7 @@
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
dependencies = [
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
]
[[package]]
@@ -2641,18 +2620,18 @@
[[package]]
name = "windows-targets"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
dependencies = [
- "windows_aarch64_gnullvm 0.52.5",
- "windows_aarch64_msvc 0.52.5",
- "windows_i686_gnu 0.52.5",
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
"windows_i686_gnullvm",
- "windows_i686_msvc 0.52.5",
- "windows_x86_64_gnu 0.52.5",
- "windows_x86_64_gnullvm 0.52.5",
- "windows_x86_64_msvc 0.52.5",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
]
[[package]]
@@ -2663,9 +2642,9 @@
[[package]]
name = "windows_aarch64_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
[[package]]
name = "windows_aarch64_msvc"
@@ -2675,9 +2654,9 @@
[[package]]
name = "windows_aarch64_msvc"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
[[package]]
name = "windows_i686_gnu"
@@ -2687,15 +2666,15 @@
[[package]]
name = "windows_i686_gnu"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
[[package]]
name = "windows_i686_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
[[package]]
name = "windows_i686_msvc"
@@ -2705,9 +2684,9 @@
[[package]]
name = "windows_i686_msvc"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
[[package]]
name = "windows_x86_64_gnu"
@@ -2717,9 +2696,9 @@
[[package]]
name = "windows_x86_64_gnu"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
[[package]]
name = "windows_x86_64_gnullvm"
@@ -2729,9 +2708,9 @@
[[package]]
name = "windows_x86_64_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
[[package]]
name = "windows_x86_64_msvc"
@@ -2741,9 +2720,9 @@
[[package]]
name = "windows_x86_64_msvc"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
[[package]]
name = "winnow"
@@ -2756,12 +2735,12 @@
[[package]]
name = "xdg-home"
-version = "1.1.0"
+version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e"
+checksum = "ca91dcf8f93db085f3a0a29358cd0b9d670915468f4290e8b85d118a34211ab8"
dependencies = [
"libc",
- "winapi",
+ "windows-sys 0.52.0",
]
[[package]]
@@ -2831,6 +2810,27 @@
]
[[package]]
+name = "zerocopy"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "854e949ac82d619ee9a14c66a1b674ac730422372ccb759ce0c39cabcf2bf8e6"
+dependencies = [
+ "byteorder",
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "125139de3f6b9d625c39e2efdd73d41bdac468ccd556556440e322be0e1bbd91"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.72",
+]
+
+[[package]]
name = "zvariant"
version = "3.15.2"
source = "registry+https://github.com/rust-lang/crates.io-index";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/netavark-1.11.0/Cargo.toml
new/netavark-1.12.1/Cargo.toml
--- old/netavark-1.11.0/Cargo.toml 2024-05-30 16:20:33.000000000 +0200
+++ new/netavark-1.12.1/Cargo.toml 2024-08-01 22:45:40.000000000 +0200
@@ -1,6 +1,6 @@
[package]
name = "netavark"
-version = "1.11.0"
+version = "1.12.1"
edition = "2021"
authors = ["github.com/containers"]
license = "Apache-2.0"
@@ -8,7 +8,7 @@
description = "A container network stack"
homepage = "https://github.com/containers/netavark";
repository = "https://github.com/containers/netavark";
-categories = ["containers", "networking", "podman"]
+categories = ["virtualization"]
exclude = ["/.cirrus.yml", "/.github/*", "/hack/*"]
build = "build.rs"
@@ -32,31 +32,31 @@
[dependencies]
anyhow = "1.0.86"
clap = { version = "~4.4.12", features = ["derive", "env"] }
-env_logger = "0.11.3"
+env_logger = "0.11.5"
ipnet = { version = "2.9.0", features = ["serde"] }
-iptables = "0.5.1"
+iptables = "0.5.2"
libc = "0.2.154"
-log = "0.4.21"
+log = "0.4.22"
serde = { version = "1.0.199", features = ["derive"], optional = true }
serde-value = "0.7.0"
-serde_json = "1.0.117"
+serde_json = "1.0.121"
sysctl = "0.5.5"
-url = "2.5.0"
+url = "2.5.2"
zbus = { version = "3.15.2" }
nix = { version = "0.29.0", features = ["sched", "signal", "user"] }
rand = "0.8.5"
sha2 = "0.10.8"
netlink-packet-utils = "0.5.2"
-netlink-packet-route = "0.20.0"
+netlink-packet-route = "0.20.1"
netlink-packet-core = "0.7.0"
-nftables = "0.4"
+nftables = "0.4.1"
fs2 = "0.4.3"
netlink-sys = "0.8.6"
-tokio = { version = "1.37", features = ["rt", "rt-multi-thread", "signal",
"fs"] }
+tokio = { version = "1.39.2", features = ["rt", "rt-multi-thread", "signal",
"fs"] }
tokio-stream = { version = "0.1.15", features = ["net"] }
tonic = "0.11"
-mozim = "0.2.3"
-prost = "0.12.4"
+mozim = "0.2.4"
+prost = "0.12.6"
futures-channel = "0.3.30"
futures-core = "0.3.30"
futures-util = "0.3.30"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/netavark-1.11.0/RELEASE_NOTES.md
new/netavark-1.12.1/RELEASE_NOTES.md
--- old/netavark-1.11.0/RELEASE_NOTES.md 2024-05-30 16:20:33.000000000
+0200
+++ new/netavark-1.12.1/RELEASE_NOTES.md 2024-08-01 22:45:40.000000000
+0200
@@ -1,5 +1,16 @@
# Release Notes
+## v1.12.1
+
+* Fixed problem with categories in Cargo.toml that prevented us from
publishing v1.12.0
+
+## v1.12.0
+
+* Dependency updates
+* Netavark-DHCP proxy: use dns servers from dhcp lease
+* Improved handling and visibility of errors from aardvark-dns
+* Use nftables as default driver for Fedora 41
+
## v1.11.0
* Do not perform namespace detection for aardvark-dns updates as it is not
needed
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/netavark-1.11.0/rpm/netavark.spec
new/netavark-1.12.1/rpm/netavark.spec
--- old/netavark-1.11.0/rpm/netavark.spec 2024-05-30 16:20:33.000000000
+0200
+++ new/netavark-1.12.1/rpm/netavark.spec 2024-08-01 22:45:40.000000000
+0200
@@ -14,10 +14,10 @@
# Minimum X.Y dep for aardvark-dns
%define major_minor %((v=%{version}; echo ${v%.*}))
-# Set default firewall to nftables on CentOS Stream 10+, RHEL 10+
+# Set default firewall to nftables on CentOS Stream 10+, RHEL 10+, Fedora 41+
# and default to iptables on all other environments
# The `rhel` macro is defined on CentOS Stream, RHEL as well as Fedora ELN.
-%if %{defined rhel} && 0%{?rhel} >= 10
+%if (%{defined rhel} && 0%{?rhel} >= 10) || (%{defined fedora} && 0%{?fedora}
>= 41)
%define default_fw nftables
%else
%define default_fw iptables
@@ -28,7 +28,7 @@
%if %{defined copr_username}
Epoch: 102
%else
-Epoch: 0
+Epoch: 2
%endif
Version: 0
Release: %autorelease
@@ -49,6 +49,11 @@
# aardvark-dns and %%{name} are usually released in sync
Requires: aardvark-dns >= %{epoch}:%{major_minor}
Provides: container-network-stack = 2
+%if "%{default_fw}" == "nftables"
+Requires: nftables
+%else
+Requires: iptables
+%endif
BuildRequires: make
BuildRequires: protobuf-c
BuildRequires: protobuf-compiler
@@ -90,19 +95,20 @@
# 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
NETAVARK_DEFAULT_FW=%{default_fw} %{__make} CARGO="%{__cargo}" build
+%if (0%{?fedora} || 0%{?rhel} >= 10) && !%{defined copr_username}
+%cargo_license_summary
+%{cargo_license} > LICENSE.dependencies
+%cargo_vendor_manifest
+%endif
cd docs
%{__make}
@@ -120,6 +126,10 @@
%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}*
%{_mandir}/man1/%{name}.1*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/netavark-1.11.0/src/dns/aardvark.rs
new/netavark-1.12.1/src/dns/aardvark.rs
--- old/netavark-1.11.0/src/dns/aardvark.rs 2024-05-30 16:20:33.000000000
+0200
+++ new/netavark-1.12.1/src/dns/aardvark.rs 2024-08-01 22:45:40.000000000
+0200
@@ -116,16 +116,35 @@
// After https://github.com/containers/aardvark-dns/pull/148 this
command
// will block till aardvark-dns's parent process returns back and let
// aardvark inherit all the fds.
- Command::new(aardvark_args[0])
+ let out = Command::new(aardvark_args[0])
.args(&aardvark_args[1..])
- .stdin(Stdio::inherit())
- .stdout(Stdio::inherit())
- .stderr(Stdio::inherit())
+ .stdin(Stdio::null())
+ .stdout(Stdio::null())
// set RUST_LOG for aardvark
.env("RUST_LOG", log::max_level().as_str())
.output()?;
- Ok(())
+ if out.status.success() {
+ return Ok(());
+ }
+ if out.stderr.is_empty() {
+ return Err(std::io::Error::new(
+ std::io::ErrorKind::Other,
+ "aardvark-dns exited unexpectedly without error message",
+ ));
+ }
+ // aardvark-dns failed capture stderr
+ let msg = String::from_utf8(out.stderr).map_err(|e| {
+ std::io::Error::new(
+ std::io::ErrorKind::Other,
+ format!("failed to parse aardvark-dns stderr message: {e}"),
+ )
+ })?;
+
+ Err(std::io::Error::new(
+ std::io::ErrorKind::Other,
+ format!("aardvark-dns failed to start: {}", msg.trim()),
+ ))
}
fn check_netns(&self, pid: pid_t) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/netavark-1.11.0/src/network/macvlan_dhcp.rs
new/netavark-1.12.1/src/network/macvlan_dhcp.rs
--- old/netavark-1.11.0/src/network/macvlan_dhcp.rs 2024-05-30
16:20:33.000000000 +0200
+++ new/netavark-1.12.1/src/network/macvlan_dhcp.rs 2024-08-01
22:45:40.000000000 +0200
@@ -6,6 +6,9 @@
use crate::dhcp_proxy::lib::g_rpc::NetworkConfig;
use crate::dhcp_proxy::proxy_conf::DEFAULT_UDS_PATH;
+
+pub type DhcpLeaseInfo = (Vec<NetAddress>, Option<Vec<IpAddr>>,
Option<Vec<String>>);
+
/// dhcp performs the connection to the nv-proxy over grpc where it
/// requests it to perform a lease via the host's network interface
/// but passes it the network interface from the container netns.:w
@@ -30,7 +33,7 @@
container_network_interface: &str,
ns_path: &str,
container_macvlan_mac: &str,
-) -> NetavarkResult<Vec<NetAddress>> {
+) -> NetavarkResult<DhcpLeaseInfo> {
let nvp_config = NetworkConfig {
host_iface: host_network_interface.to_string(),
// TODO add in domain name support
@@ -73,6 +76,25 @@
None
};
+ let dns_servers = if !lease.dns_servers.is_empty() {
+ let servers = lease
+ .dns_servers
+ .into_iter()
+ .map(|d| match IpAddr::from_str(&d) {
+ Ok(d) => Ok(d),
+ Err(e) => Err(NetavarkError::msg(format!("bad dns address:
{e}"))),
+ })
+ .collect::<Result<Vec<IpAddr>, NetavarkError>>()?;
+ Some(servers)
+ } else {
+ None
+ };
+ let domain_name = if !lease.domain_name.is_empty() {
+ Some(vec![lease.domain_name])
+ } else {
+ None
+ };
+
let ip_addr = match IpAddr::from_str(&lease.yiaddr) {
Ok(i) => i,
Err(e) => return Err(NetavarkError::Message(e.to_string())),
@@ -92,7 +114,7 @@
ipnet: ip,
};
- Ok(vec![ns])
+ Ok((vec![ns], dns_servers, domain_name))
}
pub fn release_dhcp_lease(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/netavark-1.11.0/src/network/vlan.rs
new/netavark-1.12.1/src/network/vlan.rs
--- old/netavark-1.11.0/src/network/vlan.rs 2024-05-30 16:20:33.000000000
+0200
+++ new/netavark-1.12.1/src/network/vlan.rs 2024-08-01 22:45:40.000000000
+0200
@@ -183,12 +183,20 @@
// a dhcp lease. it will also perform the IP address assignment
// to the macvlan interface.
let subnets = if data.ipam.dhcp_enabled {
- get_dhcp_lease(
+ let (subnets, dns_servers, domain_name) = get_dhcp_lease(
&data.host_interface_name,
&data.container_interface_name,
self.info.netns_path,
&container_vlan_mac,
- )?
+ )?;
+ // do not overwrite dns servers set by dns podman flag
+ if !self.info.container_dns_servers.is_some() {
+ response.dns_server_ips = dns_servers;
+ }
+ if domain_name.is_some() {
+ response.dns_search_domains = domain_name;
+ }
+ subnets
} else {
data.ipam.net_addresses.clone()
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/netavark-1.11.0/test/300-macvlan.bats
new/netavark-1.12.1/test/300-macvlan.bats
--- old/netavark-1.11.0/test/300-macvlan.bats 2024-05-30 16:20:33.000000000
+0200
+++ new/netavark-1.12.1/test/300-macvlan.bats 2024-08-01 22:45:40.000000000
+0200
@@ -375,3 +375,17 @@
run_in_container_netns ip -o link show
assert "${#lines[@]}" == 2 "only two interfaces (lo, eth0) in the netns,
the tmp macvlan interface should be gone"
}
+
+@test "macvlan route metric from config" {
+ run_netavark --file ${TESTSDIR}/testfiles/metric-macvlan.json setup
$(get_container_netns_path)
+
+ run_in_container_netns ip -j route list match 0.0.0.0
+ default_route="$output"
+ assert_json "$default_route" '.[0].dst' == "default" "Default route was
selected"
+ assert_json "$default_route" '.[0].metric' == "200" "Route metric set from
config"
+
+ run_in_container_netns ip -j -6 route list match ::0
+ default_route_v6="$output"
+ assert_json "$default_route_v6" '.[0].dst' == "default" "Default route was
selected"
+ assert_json "$default_route_v6" '.[0].metric' == "200" "v6 route metric
matches v4"
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/netavark-1.11.0/test/testfiles/metric-macvlan.json
new/netavark-1.12.1/test/testfiles/metric-macvlan.json
--- old/netavark-1.11.0/test/testfiles/metric-macvlan.json 1970-01-01
01:00:00.000000000 +0100
+++ new/netavark-1.12.1/test/testfiles/metric-macvlan.json 2024-08-01
22:45:40.000000000 +0200
@@ -0,0 +1,37 @@
+{
+ "container_id":
"bc14fe7cd3633e7be338522002bb0c3ccb18150da7a6c733735ffdf8ff7e85d1",
+ "container_name": "metrictest",
+ "networks": {
+ "metric": {
+ "interface_name": "eth1",
+ "static_ips": [
+ "10.89.0.2",
+ "fde0::2"
+ ]
+ }
+ },
+ "network_info": {
+ "metric": {
+ "dns_enabled": false,
+ "driver": "macvlan",
+ "id":
"7ba44a9a709f8093621eae1a1db2ccafc2471bae19cdf9dd2ea7cf3773b9211c",
+ "internal": false,
+ "ipv6_enabled": true,
+ "name": "metric",
+ "network_interface": "dummy0",
+ "subnets": [
+ {
+ "gateway": "10.89.0.1",
+ "subnet": "10.89.0.0/24"
+ },
+ {
+ "subnet": "fde0::/64",
+ "gateway": "fde0::1"
+ }
+ ],
+ "options": {
+ "metric": "200"
+ }
+ }
+ }
+}
++++++ vendor.tar.gz ++++++
/work/SRC/openSUSE:Factory/netavark/vendor.tar.gz
/work/SRC/openSUSE:Factory/.netavark.new.7232/vendor.tar.gz differ: char
200439, line 774
