Hello community, here is the log from the commit of package avahi for openSUSE:Factory checked in at 2016-07-21 07:52:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/avahi (Old) and /work/SRC/openSUSE:Factory/.avahi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "avahi" Changes: -------- avahi-mono.changes: same change avahi-qt4.changes: same change --- /work/SRC/openSUSE:Factory/avahi/avahi.changes 2016-07-01 09:54:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.avahi.new/avahi.changes 2016-07-21 07:52:33.000000000 +0200 @@ -1,0 +2,8 @@ +Mon Jul 11 18:31:35 UTC 2016 - [email protected] + +- Replace avahi-0.6.31-systemd-order.patch with + avahi-0.6.32-suppress-resolv-conf-warning.patch: only warn + on missing resolv.conf if the options that use it are enabled. + https://github.com/lathiat/avahi/pull/63 + +------------------------------------------------------------------- Old: ---- avahi-0.6.31-systemd-order.patch New: ---- avahi-0.6.32-suppress-resolv-conf-warning.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ avahi-glib2.spec ++++++ --- /var/tmp/diff_new_pack.wGsjFr/_old 2016-07-21 07:52:34.000000000 +0200 +++ /var/tmp/diff_new_pack.wGsjFr/_new 2016-07-21 07:52:34.000000000 +0200 @@ -85,8 +85,8 @@ Patch17: avahi-outdated-URL.patch # PATCH-FIX-UPSTREAM avahi-0.6.31-invalid-packet.patch boo#947140 [email protected] -- don't spam logs for Windows 10 multicast packets Patch18: avahi-0.6.31-invalid-packet.patch -# PATCH-FIX-UPSTREAM avahi-0.6.31-systemd-order.patch bsc#982317 [email protected] -- start after NM/wicked, to ensure resolv.conf present. -Patch19: avahi-0.6.31-systemd-order.patch +# PATCH-FIX-UPSTREAM avahi-0.6.32-suppress-resolv-conf-warning.patch bsc#982317 [email protected] -- only warn on missing resolv.conf if it is being used. +Patch19: avahi-0.6.32-suppress-resolv-conf-warning.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python BuildRequires: fdupes avahi-mono.spec: same change avahi-qt4.spec: same change ++++++ avahi.spec ++++++ --- /var/tmp/diff_new_pack.wGsjFr/_old 2016-07-21 07:52:34.000000000 +0200 +++ /var/tmp/diff_new_pack.wGsjFr/_new 2016-07-21 07:52:34.000000000 +0200 @@ -87,8 +87,8 @@ Patch17: avahi-outdated-URL.patch # PATCH-FIX-UPSTREAM avahi-0.6.31-invalid-packet.patch boo#947140 [email protected] -- don't spam logs for Windows 10 multicast packets Patch18: avahi-0.6.31-invalid-packet.patch -# PATCH-FIX-UPSTREAM avahi-0.6.31-systemd-order.patch bsc#982317 [email protected] -- start after NM/wicked, to ensure resolv.conf present. -Patch19: avahi-0.6.31-systemd-order.patch +# PATCH-FIX-UPSTREAM avahi-0.6.32-suppress-resolv-conf-warning.patch bsc#982317 [email protected] -- only warn on missing resolv.conf if it is being used. +Patch19: avahi-0.6.32-suppress-resolv-conf-warning.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python BuildRequires: fdupes ++++++ avahi-0.6.32-suppress-resolv-conf-warning.patch ++++++ >From ef06fccecda4c821a013320ef4914469950a95c8 Mon Sep 17 00:00:00 2001 From: Mike Gorse <[email protected]> Date: Sat, 9 Jul 2016 17:12:16 -0500 Subject: [PATCH] Only warn on missing resolv.conf if the options that use it are enabled --- avahi-daemon/main.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/avahi-daemon/main.c b/avahi-daemon/main.c index 10cb41e..a6e90da 100644 --- a/avahi-daemon/main.c +++ b/avahi-daemon/main.c @@ -172,7 +172,11 @@ static int load_resolv_conf(void) { #endif if (!f) { - avahi_log_warn("Failed to open "RESOLV_CONF": %s", strerror(errno)); + if ((config.publish_dns_servers && config.publish_dns_servers[0]) || + config.publish_resolv_conf || + config.server_config.publish_domain) { + avahi_log_warn("Failed to open "RESOLV_CONF": %s", strerror(errno)); + } goto finish; } -- 2.6.6
