Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package avahi for openSUSE:Factory checked in at 2022-02-18 23:02:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/avahi (Old) and /work/SRC/openSUSE:Factory/.avahi.new.1958 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "avahi" Fri Feb 18 23:02:43 2022 rev:148 rq:955685 version:0.8 Changes: -------- avahi-mono.changes: same change avahi-qt5.changes: same change --- /work/SRC/openSUSE:Factory/avahi/avahi.changes 2022-02-06 23:54:54.458568570 +0100 +++ /work/SRC/openSUSE:Factory/.avahi.new.1958/avahi.changes 2022-02-18 23:02:59.437412619 +0100 @@ -1,0 +2,8 @@ +Wed Feb 16 18:26:01 UTC 2022 - Michael Gorse <mgo...@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). + +------------------------------------------------------------------- Old: ---- avahi-0.6.31-systemd-order.patch New: ---- avahi-add-resolv-conf-to-inotify.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ avahi-glib2.spec ++++++ --- /var/tmp/diff_new_pack.uzUas8/_old 2022-02-18 23:03:00.193412560 +0100 +++ /var/tmp/diff_new_pack.uzUas8/_new 2022-02-18 23:03:00.197412559 +0100 @@ -76,8 +76,8 @@ Patch1: avahi-desktop.patch # PATCH-FEATURE-OPENSUSE avahi-daemon-check-dns-suse.patch bnc431704 sbra...@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 mgo...@suse.com -- start after NM/wicked, to ensure resolv.conf present. -Patch19: avahi-0.6.31-systemd-order.patch +# PATCH-FIX-OPENSUSE avahi-add-resolv-conf-to-inotify.patch bsc#982317 boo#1194561 mgo...@suse.com -- reconfigure when resolv.conf changes. +Patch19: avahi-add-resolv-conf-to-inotify.patch # PATCH-FIX-UPSTREAM add-IT_PROG_INTLTOOL.patch alarr...@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 mgo...@suse.com -- avoid infinite loop by handling HUP event in client_work. @@ -429,7 +429,9 @@ + # 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: same change avahi-qt5.spec: same change ++++++ avahi.spec ++++++ --- /var/tmp/diff_new_pack.uzUas8/_old 2022-02-18 23:03:00.261412555 +0100 +++ /var/tmp/diff_new_pack.uzUas8/_new 2022-02-18 23:03:00.265412554 +0100 @@ -78,8 +78,8 @@ Patch1: avahi-desktop.patch # PATCH-FEATURE-OPENSUSE avahi-daemon-check-dns-suse.patch bnc431704 sbra...@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 mgo...@suse.com -- start after NM/wicked, to ensure resolv.conf present. -Patch19: avahi-0.6.31-systemd-order.patch +# PATCH-FIX-OPENSUSE avahi-add-resolv-conf-to-inotify.patch bsc#982317 boo#1194561 mgo...@suse.com -- reconfigure when resolv.conf changes. +Patch19: avahi-add-resolv-conf-to-inotify.patch # PATCH-FIX-UPSTREAM add-IT_PROG_INTLTOOL.patch alarr...@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 mgo...@suse.com -- avoid infinite loop by handling HUP event in client_work. @@ -431,7 +431,9 @@ + # 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-add-resolv-conf-to-inotify.patch ++++++ >From a2f1db71e6870ad70dd58bb081741946a59dd5cd Mon Sep 17 00:00:00 2001 From: Mike Gorse <mgo...@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
