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-02-15 20:59:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/netavark (Old) and /work/SRC/openSUSE:Factory/.netavark.new.1815 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "netavark" Thu Feb 15 20:59:53 2024 rev:10 rq:1146318 version:1.10.3 Changes: -------- --- /work/SRC/openSUSE:Factory/netavark/netavark.changes 2024-02-06 16:34:07.786144307 +0100 +++ /work/SRC/openSUSE:Factory/.netavark.new.1815/netavark.changes 2024-02-15 21:01:11.321655382 +0100 @@ -1,0 +2,7 @@ +Tue Feb 13 08:43:45 UTC 2024 - [email protected] + +- Update to version 1.10.3: + * v1.10.3 + * fix netavark update to not start a new aardvark-dns + +------------------------------------------------------------------- Old: ---- netavark-1.10.2.tar.gz New: ---- netavark-1.10.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ netavark.spec ++++++ --- /var/tmp/diff_new_pack.OiSRUi/_old 2024-02-15 21:01:14.053751407 +0100 +++ /var/tmp/diff_new_pack.OiSRUi/_new 2024-02-15 21:01:14.053751407 +0100 @@ -19,7 +19,7 @@ %define major_minor %((v=%{version}; echo ${v%.*})) Name: netavark -Version: 1.10.2 +Version: 1.10.3 Release: 0 Summary: Container network stack License: Apache-2.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.OiSRUi/_old 2024-02-15 21:01:14.085752531 +0100 +++ /var/tmp/diff_new_pack.OiSRUi/_new 2024-02-15 21:01:14.089752671 +0100 @@ -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.10.2</param> + <param name="revision">v1.10.3</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.OiSRUi/_old 2024-02-15 21:01:14.109753374 +0100 +++ /var/tmp/diff_new_pack.OiSRUi/_new 2024-02-15 21:01:14.113753515 +0100 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/containers/netavark.git</param> - <param name="changesrevision">664637b12ab9ce96247fa907265171289cf0d501</param></service></servicedata> + <param name="changesrevision">d9f9fdc116ea3ed72a6eb4e59da33bf5d7c60b38</param></service></servicedata> (No newline at EOF) ++++++ netavark-1.10.2.tar.gz -> netavark-1.10.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netavark-1.10.2/Cargo.lock new/netavark-1.10.3/Cargo.lock --- old/netavark-1.10.2/Cargo.lock 2024-01-31 20:53:48.000000000 +0100 +++ new/netavark-1.10.3/Cargo.lock 2024-02-09 18:47:22.000000000 +0100 @@ -1335,7 +1335,7 @@ [[package]] name = "netavark" -version = "1.10.2" +version = "1.10.3" dependencies = [ "anyhow", "chrono", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netavark-1.10.2/Cargo.toml new/netavark-1.10.3/Cargo.toml --- old/netavark-1.10.2/Cargo.toml 2024-01-31 20:53:48.000000000 +0100 +++ new/netavark-1.10.3/Cargo.toml 2024-02-09 18:47:22.000000000 +0100 @@ -1,6 +1,6 @@ [package] name = "netavark" -version = "1.10.2" +version = "1.10.3" edition = "2021" authors = ["github.com/containers"] license = "Apache-2.0" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netavark-1.10.2/RELEASE_NOTES.md new/netavark-1.10.3/RELEASE_NOTES.md --- old/netavark-1.10.2/RELEASE_NOTES.md 2024-01-31 20:53:48.000000000 +0100 +++ new/netavark-1.10.3/RELEASE_NOTES.md 2024-02-09 18:47:22.000000000 +0100 @@ -1,5 +1,8 @@ # Release Notes +## v1.10.3 +* Fixed a bug where the netavark update command could sometimes incorrectly start a new Aardvark DNS server instead of restarting the existing server + ## v1.10.2 * Fixed a bug where netavark update could sometimes fail diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netavark-1.10.2/src/dns/aardvark.rs new/netavark-1.10.3/src/dns/aardvark.rs --- old/netavark-1.10.2/src/dns/aardvark.rs 2024-01-31 20:53:48.000000000 +0100 +++ new/netavark-1.10.3/src/dns/aardvark.rs 2024-02-09 18:47:22.000000000 +0100 @@ -151,18 +151,23 @@ Ok(pid) => { match signal::kill(Pid::from_raw(pid), Signal::SIGHUP) { Ok(_) => { - if !is_update { - match self.check_netns(pid) { - Ok(_) => return Ok(()), - Err(e) => { - // If the error is ENOENT it means the process must have died in - // the meantime so drop down below to start a new server process. - if e.kind() != std::io::ErrorKind::NotFound { - return Err(NetavarkError::wrap( - "check aardvark-dns netns", - e.into(), - )); - } + // We do not want to check the netns when doing an update + // this is not working because podman doe snot enter the + // rootless netns for the update as we only change the file + // and send SIGHUP. + if is_update { + return Ok(()); + } + match self.check_netns(pid) { + Ok(_) => return Ok(()), + Err(e) => { + // If the error is ENOENT it means the process must have died in + // the meantime so drop down below to start a new server process. + if e.kind() != std::io::ErrorKind::NotFound { + return Err(NetavarkError::wrap( + "check aardvark-dns netns", + e.into(), + )); } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netavark-1.10.2/test/100-bridge-iptables.bats new/netavark-1.10.3/test/100-bridge-iptables.bats --- old/netavark-1.10.2/test/100-bridge-iptables.bats 2024-01-31 20:53:48.000000000 +0100 +++ new/netavark-1.10.3/test/100-bridge-iptables.bats 2024-02-09 18:47:22.000000000 +0100 @@ -156,6 +156,10 @@ update podman1 --network-dns-servers 8.8.8.8 assert "$output" = "" + # after update the pid should never change + aardvark_pid2=$(cat "$NETAVARK_TMPDIR/config/aardvark-dns/aardvark.pid") + assert "$aardvark_pid2" == "$aardvark_pid" "aardvark-dns pid after nv update" + # check aardvark config and running run_helper cat "$NETAVARK_TMPDIR/config/aardvark-dns/podman1" assert "${lines[0]}" =~ "10.89.3.1,fd10:88:a::1 8.8.8.8" "aardvark set to listen to all IPs" ++++++ vendor.tar.gz ++++++ /work/SRC/openSUSE:Factory/netavark/vendor.tar.gz /work/SRC/openSUSE:Factory/.netavark.new.1815/vendor.tar.gz differ: char 5, line 1
