pool/avahi
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 407811 from home:mgorse:branches:GNOME:Factory

Browse Source 
- 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
This commit is contained in:
Dominique Leuenberger 2016-07-14 09:22:02 +00:00 committed by Git OBS Bridge
parent 05a63233a9
commit b2280fbdfc
7 changed files with 46 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
avahi-0.6.31-systemd-order.patch
View File

@ -1,27 +0,0 @@
From 822ebcca220605beb6a5a2079aa1a387b773841d Mon Sep 17 00:00:00 2001
From: Mike Gorse <mgorse@suse.com>
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

30
avahi-0.6.32-suppress-resolv-conf-warning.patch Normal file
View File

@ -0,0 +1,30 @@
From ef06fccecda4c821a013320ef4914469950a95c8 Mon Sep 17 00:00:00 2001
From: Mike Gorse <mgorse@suse.com>
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

4
avahi-glib2.spec
View File

@ -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

4
avahi-mono.spec
View File

@ -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

4
avahi-qt4.spec
View File

@ -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

8
avahi.changes
View File

@ -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

4
avahi.spec
View File

@ -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