From b2280fbdfc5c8922c39357d9634fbe21913714df39e614575dd085e902863be5 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 14 Jul 2016 09:22:02 +0000 Subject: [PATCH] Accepting request 407811 from home:mgorse:branches:GNOME:Factory - 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 OBS-URL: https://build.opensuse.org/request/show/407811 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=131 --- avahi-0.6.31-systemd-order.patch | 27 ----------------- ...-0.6.32-suppress-resolv-conf-warning.patch | 30 +++++++++++++++++++ avahi-glib2.spec | 4 +-- avahi-mono.spec | 4 +-- avahi-qt4.spec | 4 +-- avahi.changes | 8 +++++ avahi.spec | 4 +-- 7 files changed, 46 insertions(+), 35 deletions(-) delete mode 100644 avahi-0.6.31-systemd-order.patch create mode 100644 avahi-0.6.32-suppress-resolv-conf-warning.patch diff --git a/avahi-0.6.31-systemd-order.patch b/avahi-0.6.31-systemd-order.patch deleted file mode 100644 index f893f9c..0000000 --- a/avahi-0.6.31-systemd-order.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 822ebcca220605beb6a5a2079aa1a387b773841d Mon Sep 17 00:00:00 2001 -From: Mike Gorse -Date: Thu, 23 Jun 2016 10:11:15 -0500 -Subject: [PATCH] avahi-daemon.service.in: start after network-online - -We may need resolv.conf to be set up, so ensure that NetworkManager -or wicked have already started before initializing. ---- - avahi-daemon/avahi-daemon.service.in | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/avahi-daemon/avahi-daemon.service.in b/avahi-daemon/avahi-daemon.service.in -index 548c834..b6aae9e 100644 ---- a/avahi-daemon/avahi-daemon.service.in -+++ b/avahi-daemon/avahi-daemon.service.in -@@ -18,6 +18,8 @@ - [Unit] - Description=Avahi mDNS/DNS-SD Stack - Requires=avahi-daemon.socket -+After=network-online.target -+Wants=network-online.target - - [Service] - Type=dbus --- -2.6.2 - diff --git a/avahi-0.6.32-suppress-resolv-conf-warning.patch b/avahi-0.6.32-suppress-resolv-conf-warning.patch new file mode 100644 index 0000000..e0310f5 --- /dev/null +++ b/avahi-0.6.32-suppress-resolv-conf-warning.patch @@ -0,0 +1,30 @@ +From ef06fccecda4c821a013320ef4914469950a95c8 Mon Sep 17 00:00:00 2001 +From: Mike Gorse +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 + diff --git a/avahi-glib2.spec b/avahi-glib2.spec index 10a3cad..f858a25 100644 --- a/avahi-glib2.spec +++ b/avahi-glib2.spec @@ -85,8 +85,8 @@ Patch15: avahi-move-everything-to-run.patch Patch17: avahi-outdated-URL.patch # PATCH-FIX-UPSTREAM avahi-0.6.31-invalid-packet.patch boo#947140 mgorse@suse.com -- 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 mgorse@suse.com -- 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 mgorse@suse.com -- 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 diff --git a/avahi-mono.spec b/avahi-mono.spec index 0e15c95..fa40336 100644 --- a/avahi-mono.spec +++ b/avahi-mono.spec @@ -85,8 +85,8 @@ Patch15: avahi-move-everything-to-run.patch Patch17: avahi-outdated-URL.patch # PATCH-FIX-UPSTREAM avahi-0.6.31-invalid-packet.patch boo#947140 mgorse@suse.com -- 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 mgorse@suse.com -- 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 mgorse@suse.com -- 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 diff --git a/avahi-qt4.spec b/avahi-qt4.spec index 85829c6..5b8ad4a 100644 --- a/avahi-qt4.spec +++ b/avahi-qt4.spec @@ -85,8 +85,8 @@ Patch15: avahi-move-everything-to-run.patch Patch17: avahi-outdated-URL.patch # PATCH-FIX-UPSTREAM avahi-0.6.31-invalid-packet.patch boo#947140 mgorse@suse.com -- 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 mgorse@suse.com -- 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 mgorse@suse.com -- 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 diff --git a/avahi.changes b/avahi.changes index c5e6427..db0d1c0 100644 --- a/avahi.changes +++ b/avahi.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Jul 11 18:31:35 UTC 2016 - mgorse@suse.com + +- 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 + ------------------------------------------------------------------- Thu Jun 23 18:45:13 UTC 2016 - dimstar@opensuse.org diff --git a/avahi.spec b/avahi.spec index 36aaa38..43469a0 100644 --- a/avahi.spec +++ b/avahi.spec @@ -87,8 +87,8 @@ Patch15: avahi-move-everything-to-run.patch Patch17: avahi-outdated-URL.patch # PATCH-FIX-UPSTREAM avahi-0.6.31-invalid-packet.patch boo#947140 mgorse@suse.com -- 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 mgorse@suse.com -- 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 mgorse@suse.com -- 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