From 611cab9859a783cd6b7b36ee073a82d39e0dfb3de3e4e158c9025d394ccb272f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Thu, 23 Jun 2016 18:46:52 +0000 Subject: [PATCH] Accepting request 404318 from home:mgorse:branches:GNOME:Factory - Add avahi-0.6.31-systemd-order.patch: start after NM/wicked, to ensure resolv.conf is present (bsc#982317). https://github.com/lathiat/avahi/pull/59 OBS-URL: https://build.opensuse.org/request/show/404318 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=127 --- avahi-0.6.31-systemd-order.patch | 27 +++++++++++++++++++++++++++ avahi-glib2.spec | 3 +++ avahi-mono.spec | 3 +++ avahi-qt4.spec | 3 +++ avahi.changes | 7 +++++++ avahi.spec | 3 +++ 6 files changed, 46 insertions(+) create mode 100644 avahi-0.6.31-systemd-order.patch diff --git a/avahi-0.6.31-systemd-order.patch b/avahi-0.6.31-systemd-order.patch new file mode 100644 index 0000000..f893f9c --- /dev/null +++ b/avahi-0.6.31-systemd-order.patch @@ -0,0 +1,27 @@ +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-glib2.spec b/avahi-glib2.spec index ddcf13a..7e8484d 100644 --- a/avahi-glib2.spec +++ b/avahi-glib2.spec @@ -95,6 +95,8 @@ Patch16: avahi-reserve-space-for-record-data-when-size-e.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 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python BuildRequires: fdupes @@ -776,6 +778,7 @@ translation-update-upstream %patch16 -p1 %patch17 -p1 %patch18 -p1 +%patch19 -p1 %if !%build_core # Replace all .la references from local .la files to installed versions diff --git a/avahi-mono.spec b/avahi-mono.spec index fbeef19..9eadb1a 100644 --- a/avahi-mono.spec +++ b/avahi-mono.spec @@ -95,6 +95,8 @@ Patch16: avahi-reserve-space-for-record-data-when-size-e.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 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python BuildRequires: fdupes @@ -776,6 +778,7 @@ translation-update-upstream %patch16 -p1 %patch17 -p1 %patch18 -p1 +%patch19 -p1 %if !%build_core # Replace all .la references from local .la files to installed versions diff --git a/avahi-qt4.spec b/avahi-qt4.spec index c5ad972..3b8650b 100644 --- a/avahi-qt4.spec +++ b/avahi-qt4.spec @@ -95,6 +95,8 @@ Patch16: avahi-reserve-space-for-record-data-when-size-e.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 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python BuildRequires: fdupes @@ -778,6 +780,7 @@ translation-update-upstream %patch16 -p1 %patch17 -p1 %patch18 -p1 +%patch19 -p1 %if !%build_core # Replace all .la references from local .la files to installed versions diff --git a/avahi.changes b/avahi.changes index ceca6ef..4082897 100644 --- a/avahi.changes +++ b/avahi.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Jun 23 18:45:12 UTC 2016 - mgorse@suse.com + +- Add avahi-0.6.31-systemd-order.patch: start after NM/wicked, to + ensure resolv.conf is present (bsc#982317). + https://github.com/lathiat/avahi/pull/59 + ------------------------------------------------------------------- Fri May 20 10:07:48 UTC 2016 - alarrosa@suse.com diff --git a/avahi.spec b/avahi.spec index 57024ed..d3d44e9 100644 --- a/avahi.spec +++ b/avahi.spec @@ -97,6 +97,8 @@ Patch16: avahi-reserve-space-for-record-data-when-size-e.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 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python BuildRequires: fdupes @@ -778,6 +780,7 @@ translation-update-upstream %patch16 -p1 %patch17 -p1 %patch18 -p1 +%patch19 -p1 %if !%build_core # Replace all .la references from local .la files to installed versions