Accepting request 955448 from GNOME:Next

- Replace avahi-0.6.31-systemd-order.patch with
  avahi-add-resolv-conf-to-inotify.patch: re-read configuration
  when resolv.conf changes, per discussion on the bug
  (boo#1194561).

OBS-URL: https://build.opensuse.org/request/show/955448
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=197

avahi-0.6.31-systemd-order.patch

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

avahi-add-resolv-conf-to-inotify.patch

@@ -0,0 +1,29 @@
+From a2f1db71e6870ad70dd58bb081741946a59dd5cd Mon Sep 17 00:00:00 2001
+From: Mike Gorse <mgorse@suse.com>
+Date: Tue, 15 Feb 2022 15:37:47 -0600
+Subject: [PATCH] Add an inotify watch for /etc/resolv.conf
+
+This will ensure that avahi is reconfigured when resolv.conf changes.
+Related to https://github.com/lathiat/avahi/issues/118, but this
+patch is insufficient to solve the issue upstream, since it doesn't handle
+a chrooted environment. Currently, SUSE isn't building avahi with chroot
+support, so this doesn't matter here.
+---
+ avahi-daemon/main.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/avahi-daemon/main.c b/avahi-daemon/main.c
+index 346338f..2edac30 100644
+--- a/avahi-daemon/main.c
++++ b/avahi-daemon/main.c
+@@ -944,6 +944,7 @@ static void add_inotify_watches(void) {
+                       |IN_ONLYDIR
+ #endif
+     );
++    inotify_add_watch(inotify_fd, "/etc/resolv.conf", IN_CLOSE_WRITE|IN_DELETE|IN_DELETE_SELF|IN_MOVED_FROM|IN_MOVED_TO|IN_MOVE_SELF);
+ }
+ 
+ #endif
+-- 
+2.35.1
+

avahi-glib2.spec

@@ -76,8 +76,8 @@ Patch0:         avahi-gacdir.patch
 Patch1:         avahi-desktop.patch
 # PATCH-FEATURE-OPENSUSE avahi-daemon-check-dns-suse.patch bnc431704 sbrabec@suse.cz -- Port Debian avahi-daemon-check-dns.sh to SUSE, see also http://avahi.org/wiki/AvahiAndUnicastDotLocal
 Patch4:         avahi-daemon-check-dns-suse.patch
-# PATCH-FIX-OPENSUSE avahi-0.6.31-systemd-order.patch bsc#982317 boo#1194561 mgorse@suse.com -- start after NM/wicked, to ensure resolv.conf present.
+# PATCH-FIX-OPENSUSE avahi-add-resolv-conf-to-inotify.patch bsc#982317 boo#1194561 mgorse@suse.com -- reconfigure when resolv.conf changes.
-Patch19:        avahi-0.6.31-systemd-order.patch
+Patch19:        avahi-add-resolv-conf-to-inotify.patch
 # PATCH-FIX-UPSTREAM add-IT_PROG_INTLTOOL.patch alarrosa@suse.com -- add IT_PROG_INTLTOOL so intltool works
 Patch20:        add-IT_PROG_INTLTOOL.patch
 # PATCH-FIX-UPSTREAM avahi-CVE-2021-3468.patch boo#1184521 mgorse@suse.com -- avoid infinite loop by handling HUP event in client_work.
@@ -429,7 +429,9 @@ DNS specifications for Zeroconf Computing.
 
 
 
+
 # This is the avahi-discover command, only provided for the primary python3 flavor
+
 %package -n python3-avahi-gtk
 Summary:        A set of Avahi utilities written in Python Using python-gtk
 Group:          Development/Languages/Python

avahi-mono.spec

@@ -76,8 +76,8 @@ Patch0:         avahi-gacdir.patch
 Patch1:         avahi-desktop.patch
 # PATCH-FEATURE-OPENSUSE avahi-daemon-check-dns-suse.patch bnc431704 sbrabec@suse.cz -- Port Debian avahi-daemon-check-dns.sh to SUSE, see also http://avahi.org/wiki/AvahiAndUnicastDotLocal
 Patch4:         avahi-daemon-check-dns-suse.patch
-# PATCH-FIX-OPENSUSE avahi-0.6.31-systemd-order.patch bsc#982317 boo#1194561 mgorse@suse.com -- start after NM/wicked, to ensure resolv.conf present.
+# PATCH-FIX-OPENSUSE avahi-add-resolv-conf-to-inotify.patch bsc#982317 boo#1194561 mgorse@suse.com -- reconfigure when resolv.conf changes.
-Patch19:        avahi-0.6.31-systemd-order.patch
+Patch19:        avahi-add-resolv-conf-to-inotify.patch
 # PATCH-FIX-UPSTREAM add-IT_PROG_INTLTOOL.patch alarrosa@suse.com -- add IT_PROG_INTLTOOL so intltool works
 Patch20:        add-IT_PROG_INTLTOOL.patch
 # PATCH-FIX-UPSTREAM avahi-CVE-2021-3468.patch boo#1184521 mgorse@suse.com -- avoid infinite loop by handling HUP event in client_work.
@@ -428,7 +428,9 @@ DNS specifications for Zeroconf Computing.
 
 
 
+
 # This is the avahi-discover command, only provided for the primary python3 flavor
+
 %package -n python3-avahi-gtk
 Summary:        A set of Avahi utilities written in Python Using python-gtk
 Group:          Development/Languages/Python

avahi-qt5.spec

@@ -76,8 +76,8 @@ Patch0:         avahi-gacdir.patch
 Patch1:         avahi-desktop.patch
 # PATCH-FEATURE-OPENSUSE avahi-daemon-check-dns-suse.patch bnc431704 sbrabec@suse.cz -- Port Debian avahi-daemon-check-dns.sh to SUSE, see also http://avahi.org/wiki/AvahiAndUnicastDotLocal
 Patch4:         avahi-daemon-check-dns-suse.patch
-# PATCH-FIX-OPENSUSE avahi-0.6.31-systemd-order.patch bsc#982317 boo#1194561 mgorse@suse.com -- start after NM/wicked, to ensure resolv.conf present.
+# PATCH-FIX-OPENSUSE avahi-add-resolv-conf-to-inotify.patch bsc#982317 boo#1194561 mgorse@suse.com -- reconfigure when resolv.conf changes.
-Patch19:        avahi-0.6.31-systemd-order.patch
+Patch19:        avahi-add-resolv-conf-to-inotify.patch
 # PATCH-FIX-UPSTREAM add-IT_PROG_INTLTOOL.patch alarrosa@suse.com -- add IT_PROG_INTLTOOL so intltool works
 Patch20:        add-IT_PROG_INTLTOOL.patch
 # PATCH-FIX-UPSTREAM avahi-CVE-2021-3468.patch boo#1184521 mgorse@suse.com -- avoid infinite loop by handling HUP event in client_work.
@@ -429,7 +429,9 @@ DNS specifications for Zeroconf Computing.
 
 
 
+
 # This is the avahi-discover command, only provided for the primary python3 flavor
+
 %package -n python3-avahi-gtk
 Summary:        A set of Avahi utilities written in Python Using python-gtk
 Group:          Development/Languages/Python

avahi.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Feb 16 18:26:01 UTC 2022 - Michael Gorse <mgorse@suse.com>
+
+- Replace avahi-0.6.31-systemd-order.patch with
+  avahi-add-resolv-conf-to-inotify.patch: re-read configuration
+  when resolv.conf changes, per discussion on the bug
+  (boo#1194561).
+
 -------------------------------------------------------------------
 Fri Jan 21 13:05:58 UTC 2022 - Callum Farmer <gmbr3@opensuse.org>
 

avahi.spec

@@ -78,8 +78,8 @@ Patch0:         avahi-gacdir.patch
 Patch1:         avahi-desktop.patch
 # PATCH-FEATURE-OPENSUSE avahi-daemon-check-dns-suse.patch bnc431704 sbrabec@suse.cz -- Port Debian avahi-daemon-check-dns.sh to SUSE, see also http://avahi.org/wiki/AvahiAndUnicastDotLocal
 Patch4:         avahi-daemon-check-dns-suse.patch
-# PATCH-FIX-OPENSUSE avahi-0.6.31-systemd-order.patch bsc#982317 boo#1194561 mgorse@suse.com -- start after NM/wicked, to ensure resolv.conf present.
+# PATCH-FIX-OPENSUSE avahi-add-resolv-conf-to-inotify.patch bsc#982317 boo#1194561 mgorse@suse.com -- reconfigure when resolv.conf changes.
-Patch19:        avahi-0.6.31-systemd-order.patch
+Patch19:        avahi-add-resolv-conf-to-inotify.patch
 # PATCH-FIX-UPSTREAM add-IT_PROG_INTLTOOL.patch alarrosa@suse.com -- add IT_PROG_INTLTOOL so intltool works
 Patch20:        add-IT_PROG_INTLTOOL.patch
 # PATCH-FIX-UPSTREAM avahi-CVE-2021-3468.patch boo#1184521 mgorse@suse.com -- avoid infinite loop by handling HUP event in client_work.
@@ -431,7 +431,9 @@ DNS specifications for Zeroconf Computing.
 
 
 
+
 # This is the avahi-discover command, only provided for the primary python3 flavor
+
 %package -n python3-avahi-gtk
 Summary:        A set of Avahi utilities written in Python Using python-gtk
 Group:          Development/Languages/Python