avahi-dnsconfd/avahi-dnsconfd.service.in | 1 0 + 1 - 0 !
1 file changed, 1 deletion(-)

 avahi-dnsconfd.service: drop "also=avahi-daemon.socket"

'Also=avahi-daemon.socket' means that 'systemctl disable avahi-dnsconfd'
will also disable avahi-daemon.socket, which is definitely not what we
want, and it also causes debhelper to throw an error. Just drop this
entry from the configuration.

Bug-Debian: https://bugs.debian.org/878911

man/avahi-autoipd.8.xml.in | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 man: fix reference to avahi-autoipd.action(8) in avahi-autoipd(8)

man/Makefile.am | 3 2 + 1 - 0 !
1 file changed, 2 insertions(+), 1 deletion(-)

 man: add missing bshell.1 symlink

The bshell binary is missing a symlink to its manual page. It should be
symlinked to the man page for bssh, just like how the bvnc man page is.

Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=655190

man/Makefile.am | 9 5 + 4 - 0 !
1 file changed, 5 insertions(+), 4 deletions(-)

 ship avahi-discover(1), bssh(1) and bvnc(1) also for gtk3

These manpages went missing when you disabled gtk2 builds....

avahi-core/dns.c | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 avahi_dns_packet_consume_uint32: fix potential undefined behavior

avahi_dns_packet_consume_uint32 left shifts uint8_t values by 8, 16 and 24 bits to combine them into a 32-bit value. This produces an undefined behavior warning with gcc -fsanitize when fed input values of 128 or 255 however in testing no actual unexpected behavior occurs in practice and the 32-bit uint32_t is always correctly produced as the final value is immediately stored into a uint32_t and the compiler appears to handle this "correctly".

Cast the intermediate values to uint32_t to prevent this warning and ensure the intended result is explicit.

Closes: #267
Closes: #268
Reference: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=19304

avahi-python/avahi-discover/avahi-discover.py | 3 3 + 0 - 0 !
1 file changed, 3 insertions(+)

 fix bytestring decoding for proper display

avahi-python/avahi-discover/avahi-discover.py | 8 5 + 3 - 0 !
1 file changed, 5 insertions(+), 3 deletions(-)

 avahi-discover: don't decode unicode strings, only bytestrings

Unicode strings (unicode in Python 2, str or unicode in Python 3) don't
have a decode method; only bytestrings (str or bytes in Python 2,
bytes in Python 3) have that. Decode exactly the strings that need
decoding.

Resolves: https://github.com/lathiat/avahi/issues/275
Signed-off-by: Simon McVittie <smcv@debian.org>

service-type-database/build-db | 49 49 + 0 - 0 !
1 file changed, 49 insertions(+)

 fetch build-db from upstream git

configure.ac | 11 8 + 3 - 0 !
service-type-database/Makefile.am | 4 2 + 2 - 0 !
service-type-database/build-db | 27 21 + 6 - 0 !
3 files changed, 31 insertions(+), 11 deletions(-)

 build-db: use the same database format that the c code expects

Otherwise, Python 2 anydbm will preferentially choose Berkeley DB format
(dbhash/bsddb), which is neither GNU gdbm nor traditional Unix (n)dbm.

Signed-off-by: Simon McVittie <smcv@debian.org>
Fixes: https://github.com/lathiat/avahi/issues/260

avahi-python/avahi-discover/avahi-discover.py | 19 16 + 3 - 0 !
1 file changed, 16 insertions(+), 3 deletions(-)

 avahi-discover: escape strings substituted into pango markup

Otherwise, a TXT entry containing a URL with '&' will cause an error.

Signed-off-by: Simon McVittie <smcv@debian.org>

avahi-common/simple-watch.c | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 do not disable timeout cleanup on watch cleanup

This was causing timeouts to never be removed from the linked list that
tracks them, resulting in both memory and CPU usage to grow larger over
time.

avahi-core/browse-dns-server.c | 5 4 + 1 - 0 !
avahi-core/browse-domain.c | 5 4 + 1 - 0 !
avahi-core/browse-service-type.c | 3 3 + 0 - 0 !
avahi-core/browse-service.c | 3 3 + 0 - 0 !
avahi-core/browse.c | 3 3 + 0 - 0 !
avahi-core/resolve-address.c | 5 4 + 1 - 0 !
avahi-core/resolve-host-name.c | 5 4 + 1 - 0 !
avahi-core/resolve-service.c | 5 4 + 1 - 0 !
8 files changed, 29 insertions(+), 5 deletions(-)

 fix null pointer crashes from #175

avahi-daemon is crashing when running "ping .local".
The crash is due to failing assertion from NULL pointer.
Add missing NULL pointer checks to fix it.

Introduced in #175 - merge commit 8f75a045709a780c8cf92a6a21e9d35b593bdecd

(cherry picked from commit 9d31939e55280a733d930b15ac9e4dda4497680c)

avahi-daemon/simple-protocol.c | 5 5 + 0 - 0 !
1 file changed, 5 insertions(+)

 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

(cherry picked from commit 447affe29991ee99c6b9732fc5f2c1048a611d3b)