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
This commit is contained in:
Bjørn Lie
Git OBS Bridge
parent
4b13cf8409
commit
611cab9859
27
avahi-0.6.31-systemd-order.patch
Normal file
27
avahi-0.6.31-systemd-order.patch
Normal file
@ -0,0 +1,27 @@
|
||||
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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user