diff -pruN 0.8-6/debian/avahi-daemon.postinst 0.8-6ubuntu1/debian/avahi-daemon.postinst --- 0.8-6/debian/avahi-daemon.postinst 2022-06-05 16:33:10.000000000 +0000 +++ 0.8-6ubuntu1/debian/avahi-daemon.postinst 2021-02-06 21:45:03.000000000 +0000 @@ -41,5 +41,13 @@ case "$1" in ;; esac +if dpkg --compare-versions "$2" lt-nl "0.8-3ubuntu2" ; then + if [ -f /etc/network/if-up.d/avahi-daemon ] ; then + rm /etc/network/if-up.d/avahi-daemon + fi + if [ -L /etc/network/if-post-down.d/avahi-daemon ] ; then + rm /etc/network/if-post-down.d/avahi-daemon + fi +fi #DEBHELPER# diff -pruN 0.8-6/debian/changelog 0.8-6ubuntu1/debian/changelog --- 0.8-6/debian/changelog 2022-06-05 16:33:10.000000000 +0000 +++ 0.8-6ubuntu1/debian/changelog 2022-08-22 12:33:46.000000000 +0000 @@ -1,3 +1,21 @@ +avahi (0.8-6ubuntu1) kinetic; urgency=medium + + * Merge from Debian unstable, remaining changes: + + debian/avahi-daemon.postinst: remove the deprecated conffiles + if-up/down entries on upgrade, use a simple logic and no + dpkg-maintscript-helper since there is no configuration worth saving + + Disable lto, see https://bugzilla.redhat.com/show_bug.cgi?id=1907727 + + avahi-daemon-chroot-fix-bogus-assignments-in-assertions.patch, + avahi-client-fix-resource-leak.patch: Issues discovered by static analysis + (Upstream pull request #202) + + avoid-infinite-loop-in-avahi-daemon-by-handling-hup-event-in-client-work.patch: + Avoid infinite-loop in avahi-daemon by handling HUP event in client_work() + (Upstream pull request #330) + * Dropped changes, included in Debian: + + SECURITY UPDATE: DoS in avahi_s_host_name_resolver_start + + -- Graham Inggs Mon, 22 Aug 2022 12:33:46 +0000 + avahi (0.8-6) unstable; urgency=medium [ Luca Boccassi ] @@ -24,6 +42,50 @@ avahi (0.8-6) unstable; urgency=medium -- Michael Biebl Sun, 05 Jun 2022 18:33:10 +0200 +avahi (0.8-5ubuntu5) jammy; urgency=medium + + * No-change rebuild for ppc64el baseline bump. + + -- Łukasz 'sil2100' Zemczak Wed, 23 Mar 2022 10:42:05 +0100 + +avahi (0.8-5ubuntu4) impish; urgency=medium + + * SECURITY UPDATE: DoS in avahi_s_host_name_resolver_start + - debian/patches/CVE-2021-3502.patch: fix multiple null pointer crashes + in avahi-core/browse-dns-server.c, avahi-core/browse-domain.c, + avahi-core/browse-service-type.c, avahi-core/browse-service.c, + avahi-core/browse.c, avahi-core/resolve-address.c, + avahi-core/resolve-host-name.c, avahi-core/resolve-service.c. + - CVE-2021-3502 + + -- Marc Deslauriers Tue, 06 Jul 2021 10:13:47 -0400 + +avahi (0.8-5ubuntu3) hirsute; urgency=medium + + * avahi-daemon-chroot-fix-bogus-assignments-in-assertions.patch, + avahi-client-fix-resource-leak.patch: Issues discovered by static analysis + (Upstream pull request #202). + * avoid-infinite-loop-in-avahi-daemon-by-handling-hup-event-in-client-work.patch: + Avoid infinite-loop in avahi-daemon by handling HUP event in client_work() + (Upstream pull request #330). + + -- Till Kamppeter Thu, 8 Apr 2021 15:24:07 +0200 + +avahi (0.8-5ubuntu2) hirsute; urgency=medium + + * Disable lto. See https://bugzilla.redhat.com/show_bug.cgi?id=1907727. + + -- Matthias Klose Mon, 22 Mar 2021 20:47:51 +0100 + +avahi (0.8-5ubuntu1) hirsute; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/avahi-daemon.postinst: remove the deprecated conffiles + if-up/down entries on upgrade, use a simple logic and no + dpkg-maintscript-helper since there is no configuration worth saving + + -- Till Kamppeter Wed, 24 Feb 2021 23:53:07 +0100 + avahi (0.8-5) unstable; urgency=medium * d/avahi-daemon.maintscript: Drop removal of symlink, they're not normal @@ -45,6 +107,25 @@ avahi (0.8-4) unstable; urgency=medium -- Sjoerd Simons Fri, 05 Feb 2021 09:21:16 +0100 +avahi (0.8-3ubuntu2) hirsute; urgency=medium + + * debian/avahi-daemon.links: + - remove buggy symlink, the target doesn't exist anymore (lp: #1901090) + * debian/avahi-daemon.postinst: + - remove the deprecated conffiles if-up/down entries on upgrade, + use a simple logic and no dpkg-maintscript-helper since there is no + configuration worth saving + + -- Sebastien Bacher Tue, 10 Nov 2020 15:03:56 +0100 + +avahi (0.8-3ubuntu1) groovy; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Remove avahi-daemon-check-dns.sh hack, the feature is provided by + libnss-mdns now + + -- Steve Langasek Tue, 09 Jun 2020 13:47:56 -0700 + avahi (0.8-3) unstable; urgency=medium * Team upload @@ -87,6 +168,25 @@ avahi (0.8-2) experimental; urgency=medi -- Simon McVittie Sun, 24 May 2020 11:20:46 +0100 +avahi (0.8-1ubuntu1) groovy; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Remove avahi-daemon-check-dns.sh hack, the feature is provided by + libnss-mdns now + * Dropped changes, included upstream: + - debian/patches/CVE-2017-6519-and-CVE-2018-1000845.patch: + fix in avahi-core/server.c. + - debian/patches/local-only-services-support.patch: + replaced by the upstream commited version, part of the code which + was there to workaround a ippusbxd issue has been removed since + the problem has been resolved in cups now + - local-only-services-support.patch: Added support for advertising + * Dropped changes: + - Add udebs corresponding to libavahi-common3 and libavahi-core7, for + maas-enlist-udeb: dropped, d-i no longer used for installing maas. + + -- Steve Langasek Wed, 20 May 2020 15:00:00 -0700 + avahi (0.8-1) unstable; urgency=medium * Team upload @@ -168,6 +268,63 @@ avahi (0.7-5) unstable; urgency=medium -- Simon McVittie Fri, 13 Dec 2019 16:00:32 +0000 +avahi (0.7-4ubuntu7) focal; urgency=medium + + * Remove avahi-daemon-check-dns.sh hack, the feature is provided by + libnss-mdns now (lp: #1870824) + * debian/patches/local-only-services-support.patch: + - replaced by the upstream commited version, part of the code which + was there to workaround a ippusbxd issue has been removed since + the problem has been resolved in cups now + + -- Sebastien Bacher Wed, 08 Apr 2020 13:43:27 +0200 + +avahi (0.7-4ubuntu6) focal; urgency=medium + + * No-change rebuild to generate dependencies on python2. + + -- Matthias Klose Tue, 17 Dec 2019 12:30:55 +0000 + +avahi (0.7-4ubuntu5) disco; urgency=medium + + * SECURITY UPDATE: Denial of service + - debian/patches/CVE-2017-6519-and-CVE-2018-1000845.patch: + fix in avahi-core/server.c. + - CVE-2017-6519 + - CVE-2018-1000845 + + -- Leonidas S. Barbosa Wed, 30 Jan 2019 12:33:23 -0300 + +avahi (0.7-4ubuntu4) disco; urgency=medium + + * No-change rebuild against latest binid9 + + -- Jeremy Bicha Fri, 14 Dec 2018 17:25:36 -0500 + +avahi (0.7-4ubuntu3) disco; urgency=medium + + * Rebuild against new libgdbm6. + + -- Gianfranco Costamagna Sat, 03 Nov 2018 15:15:41 +0100 + +avahi (0.7-4ubuntu2) cosmic; urgency=medium + + * debian/avahi-daemon-check-dns.sh: On some hardware, the 'host' + command gets stuck and does not timeout as it should leaving this script + and boot-up hanging indefinitely. Launch host with 'timeout' to kill it + after 5 seconds in these cases as a workaround. (LP #1752411) + + -- Trent Lloyd Tue, 21 Aug 2018 14:56:18 +0800 + +avahi (0.7-4ubuntu1) cosmic; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Add udebs corresponding to libavahi-common3 and libavahi-core7, for + maas-enlist-udeb. + - local-only-services-support.patch: Added support for advertising + + -- Gianfranco Costamagna Fri, 04 May 2018 09:53:20 +0200 + avahi (0.7-4) unstable; urgency=medium * Team upload @@ -188,6 +345,15 @@ avahi (0.7-4) unstable; urgency=medium -- Simon McVittie Fri, 27 Apr 2018 11:59:11 +0100 +avahi (0.7-3.1ubuntu1) bionic; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - Add udebs corresponding to libavahi-common3 and libavahi-core7, for + maas-enlist-udeb. + - local-only-services-support.patch: Added support for advertising + + -- Gianfranco Costamagna Fri, 02 Feb 2018 15:56:06 +0100 + avahi (0.7-3.1) unstable; urgency=medium * Non-maintainer upload. @@ -197,6 +363,25 @@ avahi (0.7-3.1) unstable; urgency=medium -- Gianfranco Costamagna Fri, 02 Feb 2018 15:51:42 +0100 +avahi (0.7-3ubuntu2) bionic; urgency=low + + * local-only-services-support.patch: Added support for advertising + local-only services on the loopback ("lo", "localhost") device. This + is especially needed for making CUPS and cups-browsed auto-discover + IPP-over-USB printers using ippusbxd (LP: #1736757, Upstream issue #125). + + -- Till Kamppeter Tue, 9 Jan 2017 21:35:51 -0200 + +avahi (0.7-3ubuntu1) bionic; urgency=low + + * Merge from Debian unstable (LP: #1735960). Remaining changes: + - Add udebs corresponding to libavahi-common3 and libavahi-core7, for + maas-enlist-udeb. + * debian/patches/no-systemd-also.patch: Don't use 'Also=' in dnsconfd + systemd unit. Closes: #878911. + + -- Steve Langasek Tue, 02 Jan 2018 17:27:56 -0800 + avahi (0.7-3) unstable; urgency=medium * Brown paper bag release. @@ -265,6 +450,14 @@ avahi (0.6.32-2) unstable; urgency=mediu -- Michael Biebl Mon, 23 Jan 2017 09:41:58 +0100 +avahi (0.6.32-1ubuntu1) yakkety; urgency=medium + + * Merge from Debian unstable, remaining changes: + - Add udebs corresponding to libavahi-common3 and libavahi-core7, for + maas-enlist-udeb. + + -- Martin Pitt Mon, 04 Jul 2016 15:27:54 +0200 + avahi (0.6.32-1) unstable; urgency=medium [ Michael Biebl ] @@ -288,6 +481,34 @@ avahi (0.6.32-1) unstable; urgency=mediu -- Michael Biebl Mon, 27 Jun 2016 22:54:00 +0200 +avahi (0.6.32~rc+dfsg-1ubuntu2) xenial; urgency=medium + + * Put back libavahi-common3-udeb and libavahi-core7-udeb, they are being + used by maas-enlist-udeb. + + -- Martin Pitt Tue, 24 Nov 2015 11:32:59 +0100 + +avahi (0.6.32~rc+dfsg-1ubuntu1) xenial; urgency=medium + + * Merge from Debian unstable, remaining changes: + - Add debian/avahi-daemon.upstart, debian/avahi-dnsconfd.upstart, + debian/avahi-cups-reload.upstart + * Dropped Ubuntu changes: + - debian/control: Add versioned dependency on the dbus that satisfies our + upstart job dependency. This happened before precise already. + - Add udebs corresponding to libavahi-common3 and libavahi-core7, so + that we can use them for Eucalyptus integration in the installer. + Eucalyptus is long gone, and these udebs haven't been used in a long + time. + - d/p/skip-nproc-in-container.patch: Detect whether we are running in a + container, and do not set rlimit_nproc if so. Current LXC does not + create /run/container_type any more so the patch is a no-op. It's also + not necessary any more as avahi does not fail if it cannot set the + rlimit. + * Drop obsolete dh_installinit --upstart-only option. (LP: #1519228) + + -- Martin Pitt Tue, 24 Nov 2015 09:17:30 +0100 + avahi (0.6.32~rc+dfsg-1) unstable; urgency=medium * Team upload. @@ -323,6 +544,48 @@ avahi (0.6.31-5) unstable; urgency=mediu -- Michael Biebl Mon, 13 Apr 2015 21:51:24 +0200 +avahi (0.6.31-4ubuntu4) vivid; urgency=medium + + * No change rebuild to get debug symbols on all architectures. + + -- Brian Murray Mon, 17 Nov 2014 09:22:40 -0800 + +avahi (0.6.31-4ubuntu3) utopic; urgency=medium + + * Drop upstart dependency. We ship init scripts for sysv, upstart, and + systemd now. (LP: #1351306) + + -- Martin Pitt Fri, 01 Aug 2014 15:16:40 +0200 + +avahi (0.6.31-4ubuntu2) utopic; urgency=high + + * No change rebuild against new dh_installinit, to call update-rc.d at + postinst. + + -- Dimitri John Ledkov Wed, 28 May 2014 10:39:06 +0100 + +avahi (0.6.31-4ubuntu1) trusty; urgency=medium + + * Merge from Debian unstable, remaining changes: + - debian/control: Add versioned dependency on the dbus that satisfies our + upstart job dependency. + - Add udebs corresponding to libavahi-common3 and libavahi-core7, so + that we can use them for Eucalyptus integration in the installer. + - Add debian/avahi-daemon.upstart, debian/avahi-dnsconfd.upstart, + debian/avahi-cups-reload.upstart + - d/p/skip-nproc-in-container.patch: Detect whether we are running in a + container, and do not set rlimit_nproc if so. + * Dropped changes, included in Debian: + - d/p/so_reuseport-may-not-exist-in-running-kernel.patch: If + SO_REUSEPORT returns ENOPROTOOPT, continue as if we did not have the + call at all. + - d/p/avahi-core-reserve-space-for-record-data-when-size-estimate.patch: + fix a bug where avahi will use 100% CPU after cups is restarted. + - Add two new symbols to libavahi-core7.symbols file. + - d/p/suse-patch-gtk-box.patch: Use gtk_box API. + + -- Steve Langasek Tue, 31 Dec 2013 00:04:39 -0800 + avahi (0.6.31-4) unstable; urgency=medium * Team upload. @@ -341,6 +604,31 @@ avahi (0.6.31-4) unstable; urgency=mediu -- Laurent Bigonville Thu, 26 Dec 2013 18:24:41 +0100 +avahi (0.6.31-3ubuntu1) trusty; urgency=medium + + * Merge from Debian unstable, remaining changes: + - debian/control: Add versioned dependency on the dbus that satisfies our + upstart job dependency. + - Add udebs corresponding to libavahi-common3 and libavahi-core7, so + that we can use them for Eucalyptus integration in the installer. + - Add debian/avahi-daemon.upstart, debian/avahi-dnsconfd.upstart, + debian/avahi-cups-reload.upstart + - d/p/avahi-core-reserve-space-for-record-data-when-size-estimate.patch: + fix a bug where avahi will use 100% CPU after cups is restarted. + - d/p/suse-patch-gtk-box.patch: Use gtk_box API. + - Add two new symbols to libavahi-core7.symbols file. + - d/p/so_reuseport-may-not-exist-in-running-kernel.patch: If + SO_REUSEPORT returns ENOPROTOOPT, continue as if we did not have the + call at all. + - d/p/skip-nproc-in-container.patch: Detect whether we are running in a + container, and do not set rlimit_nproc if so. + * Dropped changes, included in Debian: + - Build-depend on and use dh_autotools-dev to fix FTBFS on new arches. + - debian/avahi-{daemon,dnsconfd}.links: Remove systemd configuration + symlinks. Superseded by dh-systemd. + + -- Steve Langasek Fri, 13 Dec 2013 15:56:07 -0800 + avahi (0.6.31-3) unstable; urgency=low * Team upload. @@ -369,6 +657,55 @@ avahi (0.6.31-3) unstable; urgency=low -- Laurent Bigonville Sat, 07 Dec 2013 16:24:13 +0100 +avahi (0.6.31-2ubuntu5) trusty; urgency=low + + * d/p/skip-nproc-in-container.patch: Detect whether we are running in a + container, and do not set rlimit_nproc if so (LP: #1251257) + + -- Serge Hallyn Mon, 18 Nov 2013 20:44:14 +0000 + +avahi (0.6.31-2ubuntu4) saucy; urgency=low + + * When userspace defines SO_REUSEPORT we will attempt to enable socket + port number reuse. However if the running kernel does not support + this call it will fail preventing daemon startup. If this call is + present but fails ENOPROTOOPT then we know that actually the kernel + does not support it and we should continue as if we did not have the + call at all. (LP: #1228204) + + -- Andy Whitcroft Fri, 20 Sep 2013 16:07:36 +0100 + +avahi (0.6.31-2ubuntu3) saucy; urgency=low + + * Build-depend on and use dh_autotools-dev to fix FTBFS on new arches. + + -- Adam Conrad Fri, 13 Sep 2013 20:27:08 -0400 + +avahi (0.6.31-2ubuntu2) saucy; urgency=low + + * Use gkt_box API, using patch from SUSE. Thus fixing assignments that + make pointers from integers without a cast. + * Add two new symbols to libavahi-core7.symbols file. + + -- Dmitrijs Ledkovs Thu, 30 May 2013 17:03:51 +0100 + +avahi (0.6.31-2ubuntu1) saucy; urgency=low + + * Merge with Debian unstable. Remaining changes: + - debian/control: Add versioned dependency on the dbus that satisfies our + upstart job dependency. + - Add udebs corresponding to libavahi-common3 and libavahi-core7, so + that we can use them for Eucalyptus integration in the installer. + - Add debian/avahi-daemon.upstart, debian/avahi-dnsconfd.upstart + - debian/avahi-{daemon,dnsconfd}.links: Remove systemd configuration + symlinks. + - Apply a patch + avahi-core-reserve-space-for-record-data-when-size-estimate.patch to + fix http://pad.lv/1059286 . + - Add avahi-cups-reload.upstart job, to refresh remote queues. + + -- Dmitrijs Ledkovs Thu, 30 May 2013 15:46:06 +0100 + avahi (0.6.31-2) unstable; urgency=low * Use recommended maintscript versioning scheme. @@ -380,6 +717,46 @@ avahi (0.6.31-2) unstable; urgency=low -- Michael Biebl Wed, 06 Mar 2013 22:58:55 +0100 +avahi (0.6.31-1ubuntu3) raring; urgency=low + + * Reload cups to refresh remote queues, when avahi-daemon starts. (LP: + #1158686). Until cups learns to reconnect to avahi by itself + https://www.cups.org/str.php?L4300 . + + -- Dmitrijs Ledkovs Fri, 22 Mar 2013 10:49:47 +0000 + +avahi (0.6.31-1ubuntu2) quantal-proposed; urgency=low + + * debian/patches/avahi-core-reserve-space-for-record-data-when-size-estimate.patch: + avahi-core: reserve space for record data when size estimate. This + prevents avahi-daemon from falling into an invalid loop when many CUPS/IPP + printer shares get registered (LP: #1059286, + http://lists.freedesktop.org/archives/avahi/2012-September/002188.html). + + -- Till Kamppeter Mon, 8 Oct 2012 22:23:00 +0200 + +avahi (0.6.31-1ubuntu1) quantal; urgency=low + + * Merge with Debian unstable. Remaining changes: + - debian/control: Add versioned dependency on the dbus that satisfies our + upstart job dependency. + - Add udebs corresponding to libavahi-common3 and libavahi-core7, so + that we can use them for Eucalyptus integration in the installer. + - Add debian/avahi-daemon.upstart, debian/avahi-dnsconfd.upstart + - debian/avahi-{daemon,dnsconfd}.links: Remove systemd configuration + symlinks. + * Dropped changes + - debian/avahi-autoipd.{pre,post}inst: Adjust package versions for conffile + migration for the version when Ubuntu did the DHCP4 migration. We're now + one LTS cycle since this, so there's no need to keep code paths for this + upgrade. + - Build with CFLAGS=-UGTK_DISABLE_DEPRECATED due to deprecation of + gtk_vbox_new. No longer necessary. + - Pass CFLAGS from the environment through to configure. Seems to be no + longer necessary with the move to compat 9. + + -- Iain Lane Tue, 22 May 2012 22:21:27 +0100 + avahi (0.6.31-1) unstable; urgency=low * New upstream release. @@ -401,6 +778,33 @@ avahi (0.6.30-6) unstable; urgency=low -- Michael Biebl Tue, 10 Jan 2012 00:59:49 +0100 +avahi (0.6.30-5ubuntu2) precise; urgency=low + + * Build using dh_python2. + + -- Matthias Klose Sat, 17 Dec 2011 12:06:42 +0100 + +avahi (0.6.30-5ubuntu1) precise; urgency=low + + * Merge from Debian testing. Remaining changes: + - Build with CFLAGS=-UGTK_DISABLE_DEPRECATED due to deprecation of + gtk_vbox_new. + - debian/control: Add versioned dependency on the dbus that satisfies our + upstart job dependency. + - Add udebs corresponding to libavahi-common3 and libavahi-core7, so + that we can use them for Eucalyptus integration in the installer. + - Add debian/avahi-daemon.upstart, debian/avahi-dnsconfd.upstart + - debian/avahi-autoipd.{pre,post}inst: Adjust package versions for conffile + migration for the version when Ubuntu did the DHCP4 migration. This needs + to be kept until after the next LTS. + - debian/avahi-{daemon,dnsconfd}.links: Remove systemd configuration + symlinks. + * Pass CFLAGS from the environment through to configure. This by default + will turn on optimisations and debug symbol generation, both of which + are currently disabled. + + -- Christopher James Halse Rogers Tue, 18 Oct 2011 14:46:25 +1100 + avahi (0.6.30-5) unstable; urgency=low * debian/control: Make python-avahi Architecture: any so the path to @@ -409,12 +813,50 @@ avahi (0.6.30-5) unstable; urgency=low -- Michael Biebl Sat, 02 Jul 2011 10:37:15 +0200 +avahi (0.6.30-4ubuntu1) oneiric; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Build with CFLAGS=-UGTK_DISABLE_DEPRECATED due to deprecation of + gtk_vbox_new. + - debian/control: Add versioned dependency on the dbus that satisfies our + upstart job dependency. + - Add udebs corresponding to libavahi-common3 and libavahi-core7, so + that we can use them for Eucalyptus integration in the installer. + - Add debian/avahi-daemon.upstart, debian/avahi-dnsconfd.upstart + - debian/avahi-autoipd.{pre,post}inst: Adjust package versions for conffile + migration for the version when Ubuntu did the DHCP4 migration. This needs + to be kept until after the next LTS. + - debian/avahi-{daemon,dnsconfd}.links: Remove systemd configuration + symlinks. + + -- Steve Langasek Fri, 01 Jul 2011 13:29:42 +0000 + avahi (0.6.30-4) unstable; urgency=low * Add multiarch support. Patch courtesy of Steve Langasek. (Closes: #631836) -- Michael Biebl Fri, 01 Jul 2011 02:28:05 +0200 +avahi (0.6.30-3ubuntu3) oneiric; urgency=low + + * Build with CFLAGS=-UGTK_DISABLE_DEPRECATED due to deprecation of + gtk_vbox_new. + + -- Steve Langasek Mon, 27 Jun 2011 10:41:14 +0000 + +avahi (0.6.30-3ubuntu2) oneiric; urgency=low + + * No-change rebuild to get consistent changelog files for multiarch. + + -- Steve Langasek Mon, 27 Jun 2011 09:21:11 +0100 + +avahi (0.6.30-3ubuntu1) oneiric; urgency=low + + * Merge with Debian to get GTK 3 support. See 0.6.30-2ubuntu1 for remaining + Ubuntu changes. + + -- Martin Pitt Mon, 16 May 2011 21:46:44 +0200 + avahi (0.6.30-3) unstable; urgency=low * Enable GTK3 support. (Closes: #610772) @@ -426,6 +868,28 @@ avahi (0.6.30-3) unstable; urgency=low -- Michael Biebl Fri, 29 Apr 2011 16:50:38 +0200 +avahi (0.6.30-2ubuntu1) oneiric; urgency=low + + * Merge with Debian unstable; remaining Ubuntu changes: + - debian/control: Add versioned dependency on the dbus that satisfies our + upstart job dependency. + - Add udebs corresponding to libavahi-common3 and libavahi-core7, so + that we can use them for Eucalyptus integration in the installer. + - Add debian/avahi-daemon.upstart, debian/avahi-dnsconfd.upstart + - debian/avahi-autoipd.{pre,post}inst: Adjust package versions for conffile + migration for the version when Ubuntu did the DHCP4 migration. This needs + to be kept until after the next LTS. + - debian/avahi-{daemon,dnsconfd}.links: Remove systemd configuration + symlinks. + - Multiarch support: + + debian/compat: Move to dh compat 9. + + debian/control: Add Multi-Arch: tags, bump debhelper build + dependency to debhelper which supports Multiarch, and add + ${misc:Pre-Depends} fields. + + debian/*.install: Update path to libraries, pkg-config files, etc. + + -- Martin Pitt Thu, 28 Apr 2011 22:03:23 +0200 + avahi (0.6.30-2) unstable; urgency=low * Remove Qt3 integration library. With KDE3 gone, there is no more package @@ -473,6 +937,53 @@ avahi (0.6.28-5) unstable; urgency=low -- Michael Biebl Mon, 07 Mar 2011 10:35:51 +0100 +avahi (0.6.30-0ubuntu2) natty; urgency=low + + * Reapply multiarch patches, on the wrong branch again Make python-avahi + * Architecture: any, since the substituted path to the arch-specific .db + file will be arch-specific. LP: #743438. + + -- Steve Langasek Wed, 06 Apr 2011 16:13:36 -0700 + +avahi (0.6.30-0ubuntu1) natty; urgency=low + + * New upstream version, fixes `iface > 0' assertion errors (lp: #743031) + * debian/patches/02_avahi-discover.patch: + - the patch is in the new version + + -- Sebastien Bacher Tue, 05 Apr 2011 16:12:15 +0200 + +avahi (0.6.29-0ubuntu2) natty; urgency=low + + * FFe LP: #733501: build for multiarch. + + -- Steve Langasek Thu, 24 Mar 2011 21:27:33 -0700 + +avahi (0.6.29-0ubuntu1) natty; urgency=low + + * New upstream release + * debian/patches/02_avahi-discover.patch: + - Fix avahi-discover + * debian/patches/03_read_null_udp_packets.patch: + - Applied upstream + + -- Robert Ancell Wed, 09 Mar 2011 12:29:14 +1100 + +avahi (0.6.28-4ubuntu1) natty; urgency=low + + * Resynchronise with Debian. Remaining Ubuntu changes: + - debian/control: + + Add versioned dependency on the dbus that satisfies our upstart job + dependency. + + Add udebs corresponding to libavahi-common3 and libavahi-core6, so + that we can use them for Eucalyptus integration in the installer. + - Add debian/avahi-daemon.upstart, debian/avahi-dnsconfd.upstart + - debian/avahi-autoipd.{pre,post}inst: Adjust package versions for conffile + migration for the version when Ubuntu did the DHCP4 migration. This needs + to be kept until after the next LTS. + + -- Martin Pitt Thu, 24 Feb 2011 18:57:28 +0100 + avahi (0.6.28-4) unstable; urgency=high * Bump debhelper compatibility level to 8 and update build dependency @@ -1391,7 +1902,6 @@ avahi (0.6.13-3) unstable; urgency=low -- Sjoerd Simons Sun, 3 Sep 2006 19:27:13 +0200 - avahi (0.6.13-2) unstable; urgency=low * debian/patches/02_static-hosts.patch: @@ -1758,3 +2268,4 @@ avahi (0.1-1) breezy; urgency=low * Thanks to Trent Lloyd for reviewing the packages. -- Ross Burton Tue, 23 Aug 2005 09:29:46 +0100 + diff -pruN 0.8-6/debian/control 0.8-6ubuntu1/debian/control --- 0.8-6/debian/control 2022-06-05 16:33:10.000000000 +0000 +++ 0.8-6ubuntu1/debian/control 2022-08-22 11:28:07.000000000 +0000 @@ -1,7 +1,8 @@ Source: avahi Section: net Priority: optional -Maintainer: Utopia Maintenance Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Utopia Maintenance Team Uploaders: Sjoerd Simons , Sebastian Dröge , Loic Minier , diff -pruN 0.8-6/debian/patches/avahi-client-fix-resource-leak.patch 0.8-6ubuntu1/debian/patches/avahi-client-fix-resource-leak.patch --- 0.8-6/debian/patches/avahi-client-fix-resource-leak.patch 1970-01-01 00:00:00.000000000 +0000 +++ 0.8-6ubuntu1/debian/patches/avahi-client-fix-resource-leak.patch 2021-04-08 12:45:23.000000000 +0000 @@ -0,0 +1,22 @@ +From 374245ec1418e7e1e57120fcaf0a12ec695f5f6d Mon Sep 17 00:00:00 2001 +From: Michal Sekletar +Date: Wed, 24 Oct 2018 15:22:19 +0000 +Subject: [PATCH] avahi-client: fix resource leak + +--- + avahi-client/browser.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/avahi-client/browser.c b/avahi-client/browser.c +index c978d942..fa4a9a80 100644 +--- a/avahi-client/browser.c ++++ b/avahi-client/browser.c +@@ -72,6 +72,8 @@ static void parse_domain_file(AvahiDomainBrowser *b) { + if (avahi_normalize_name(buf, domain, sizeof(domain))) + b->static_browse_domains = avahi_string_list_add(b->static_browse_domains, domain); + } ++ ++ fclose(f); + } + + static void domain_browser_ref(AvahiDomainBrowser *db) { diff -pruN 0.8-6/debian/patches/avahi-daemon-chroot-fix-bogus-assignments-in-assertions.patch 0.8-6ubuntu1/debian/patches/avahi-daemon-chroot-fix-bogus-assignments-in-assertions.patch --- 0.8-6/debian/patches/avahi-daemon-chroot-fix-bogus-assignments-in-assertions.patch 1970-01-01 00:00:00.000000000 +0000 +++ 0.8-6ubuntu1/debian/patches/avahi-daemon-chroot-fix-bogus-assignments-in-assertions.patch 2021-04-08 12:45:23.000000000 +0000 @@ -0,0 +1,24 @@ +From 4b48927e8e2c721d103018b4ce39a164b6c2898f Mon Sep 17 00:00:00 2001 +From: Michal Sekletar +Date: Wed, 24 Oct 2018 15:38:48 +0000 +Subject: [PATCH] chroot: fix bogus assignments in assertions + +--- + avahi-daemon/chroot.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/avahi-daemon/chroot.c b/avahi-daemon/chroot.c +index ccd56be0..871b3b34 100644 +--- a/avahi-daemon/chroot.c ++++ b/avahi-daemon/chroot.c +@@ -188,8 +188,8 @@ static int recv_fd(int fd) { + return -1; + } + +- assert(h->cmsg_len = CMSG_LEN(sizeof(int))); +- assert(h->cmsg_level = SOL_SOCKET); ++ assert(h->cmsg_len == CMSG_LEN(sizeof(int))); ++ assert(h->cmsg_level == SOL_SOCKET); + assert(h->cmsg_type == SCM_RIGHTS); + + return *((int*)CMSG_DATA(h)); diff -pruN 0.8-6/debian/patches/avoid-infinite-loop-in-avahi-daemon-by-handling-hup-event-in-client-work.patch 0.8-6ubuntu1/debian/patches/avoid-infinite-loop-in-avahi-daemon-by-handling-hup-event-in-client-work.patch --- 0.8-6/debian/patches/avoid-infinite-loop-in-avahi-daemon-by-handling-hup-event-in-client-work.patch 1970-01-01 00:00:00.000000000 +0000 +++ 0.8-6ubuntu1/debian/patches/avoid-infinite-loop-in-avahi-daemon-by-handling-hup-event-in-client-work.patch 2021-04-08 12:45:23.000000000 +0000 @@ -0,0 +1,37 @@ +From 447affe29991ee99c6b9732fc5f2c1048a611d3b Mon Sep 17 00:00:00 2001 +From: Riccardo Schirone +Date: Fri, 26 Mar 2021 11:50:24 +0100 +Subject: [PATCH] Avoid infinite-loop in avahi-daemon by handling HUP event in + client_work + +If a client fills the input buffer, client_work() disables the +AVAHI_WATCH_IN event, thus preventing the function from executing the +`read` syscall the next times it is called. However, if the client then +terminates the connection, the socket file descriptor receives a HUP +event, which is not handled, thus the kernel keeps marking the HUP event +as occurring. While iterating over the file descriptors that triggered +an event, the client file descriptor will keep having the HUP event and +the client_work() function is always called with AVAHI_WATCH_HUP but +without nothing being done, thus entering an infinite loop. + +See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=984938 +--- + avahi-daemon/simple-protocol.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/avahi-daemon/simple-protocol.c b/avahi-daemon/simple-protocol.c +index 3e0ebb11..6c0274d6 100644 +--- a/avahi-daemon/simple-protocol.c ++++ b/avahi-daemon/simple-protocol.c +@@ -424,6 +424,11 @@ static void client_work(AvahiWatch *watch, AVAHI_GCC_UNUSED int fd, AvahiWatchEv + } + } + ++ if (events & AVAHI_WATCH_HUP) { ++ client_free(c); ++ return; ++ } ++ + c->server->poll_api->watch_update( + watch, + (c->outbuf_length > 0 ? AVAHI_WATCH_OUT : 0) | diff -pruN 0.8-6/debian/patches/series 0.8-6ubuntu1/debian/patches/series --- 0.8-6/debian/patches/series 2022-06-05 16:33:10.000000000 +0000 +++ 0.8-6ubuntu1/debian/patches/series 2022-08-22 11:28:48.000000000 +0000 @@ -10,3 +10,6 @@ build-db-Use-the-same-database-format-th avahi-discover-Escape-strings-substituted-into-Pango-mark.patch Do-not-disable-timeout-cleanup-on-watch-cleanup.patch Fix-NULL-pointer-crashes-from-175.patch +avahi-daemon-chroot-fix-bogus-assignments-in-assertions.patch +avahi-client-fix-resource-leak.patch +avoid-infinite-loop-in-avahi-daemon-by-handling-hup-event-in-client-work.patch diff -pruN 0.8-6/debian/rules 0.8-6ubuntu1/debian/rules --- 0.8-6/debian/rules 2022-06-05 16:33:10.000000000 +0000 +++ 0.8-6ubuntu1/debian/rules 2022-08-22 11:30:02.000000000 +0000 @@ -5,7 +5,7 @@ export PYTHON=/usr/bin/python3 %: dh $@ --with gir,python3 -export DEB_BUILD_MAINT_OPTIONS = hardening=+all +export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=-lto include /usr/share/dpkg/default.mk ifneq (linux,$(DEB_HOST_ARCH_OS))