diff options
30 files changed, 568 insertions, 729 deletions
diff --git a/network/avahi/avahi.SlackBuild b/network/avahi/avahi.SlackBuild index e81a77cc29..8ef58a1590 100644 --- a/network/avahi/avahi.SlackBuild +++ b/network/avahi/avahi.SlackBuild @@ -30,8 +30,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=avahi -VERSION=${VERSION:-0.8} -BUILD=${BUILD:-7} +VERSION=${VERSION:-20240306_709e60f} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -52,14 +52,6 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -# Support for mono -if [ "${MONO:-no}" = "no" ]; then - MONO="--disable-mono" -else - MONO="--enable-mono" -fi -MONO="--disable-mono" # mono support not working ATM - warn_accounts() { echo " You must have an avahi user and group to run this script. " echo " Something like this should suffice for most systems: " @@ -96,7 +88,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.lz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -108,31 +100,7 @@ find -L . \ # This patch is mine --rworkman patch -p1 --verbose < $CWD/patches/fixup_avahi-dnsconfd.action.patch -# Thanks to LFS for this patch -patch -p1 --verbose < $CWD/patches/ipv6_race_condition_fix.patch - -# Thanks to Debian for these patches -patch -p1 --verbose < $CWD/patches/man-fix-reference-to-avahi-autoipd.action-8-in-avahi-auto.patch -patch -p1 --verbose < $CWD/patches/man-add-missing-bshell.1-symlink.patch -patch -p1 --verbose < $CWD/patches/Ship-avahi-discover-1-bssh-1-and-bvnc-1-also-for-GTK3.patch -patch -p1 --verbose < $CWD/patches/avahi_dns_packet_consume_uint32-fix-potential-undefined-b.patch -patch -p1 --verbose < $CWD/patches/fix-bytestring-decoding-for-proper-display.patch -patch -p1 --verbose < $CWD/patches/avahi-discover-Don-t-decode-unicode-strings-only-bytestri.patch -patch -p1 --verbose < $CWD/patches/Fetch-build-db-from-upstream-git.patch -patch -p1 --verbose < $CWD/patches/build-db-Use-the-same-database-format-that-the-C-code-exp.patch -patch -p1 --verbose < $CWD/patches/avahi-daemon-chroot-fix-bogus-assignments-in-assertions.patch -patch -p1 --verbose < $CWD/patches/avahi-client-fix-resource-leak.patch -patch -p1 --verbose < $CWD/patches/avoid-infinite-loop-in-avahi-daemon-by-handling-hup-event-in-client-work.patch -patch -p1 --verbose < $CWD/patches/CVE-2021-3502.patch - -# Okay, I had to cheat a bit on the manual pages; there's a commit -# in git that will fix this, so I just built a git checkout, grabbed -# the built manual pages, and we'll drop them into place so the build -# will work for this released version... -cat $CWD/bssh.1 > man/bssh.1 -cat $CWD/avahi-discover.1 > man/avahi-discover.1 - -autoreconf -vif +NOCONFIGURE=1 ./autogen.sh export PYTHON=python3 CFLAGS="$SLKCFLAGS" \ @@ -147,8 +115,10 @@ CXXFLAGS="$SLKCFLAGS" \ --with-systemdsystemunitdir=no \ --enable-tests \ --disable-static \ + --disable-mono \ --disable-monodoc \ --disable-autoipd \ + --disable-libsystemd \ --enable-compat-libdns_sd \ --enable-python-dbus \ --enable-glib \ @@ -160,6 +130,7 @@ CXXFLAGS="$SLKCFLAGS" \ --disable-qt4 \ --disable-qt3 \ --enable-core-docs \ + --disable-manpages \ --with-dbus-sys=/usr/share/dbus-1/system.d \ --with-avahi-user=avahi \ --with-avahi-group=avahi \ @@ -167,8 +138,7 @@ CXXFLAGS="$SLKCFLAGS" \ --with-distro=slackware \ --program-prefix= \ --program-suffix= \ - --build=$ARCH-slackware-linux \ - $MONO + --build=$ARCH-slackware-linux make make install-strip DESTDIR=$PKG @@ -179,18 +149,27 @@ rmdir $PKG/run &> /dev/null || true rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/*.la +mkdir -p $PKG/usr/man/man1 $PKG/usr/man/man5 $PKG/usr/man/man8 +for i in $CWD/man/man1/* ; do cat $i > $PKG/usr/man/man1/$(basename $i) ; done +for i in $CWD/man/man5/* ; do cat $i > $PKG/usr/man/man5/$(basename $i) ; done +for i in $CWD/man/man8/* ; do cat $i > $PKG/usr/man/man8/$(basename $i) ; done find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $(find $PKG/usr/man -type l); do ln -s $(readlink $i).gz $i.gz; rm $i; done mv $PKG/etc/rc.d/rc.avahidaemon $PKG/etc/rc.d/rc.avahidaemon.new mv $PKG/etc/rc.d/rc.avahidnsconfd $PKG/etc/rc.d/rc.avahidnsconfd.new mv $PKG/etc/avahi/avahi-daemon.conf $PKG/etc/avahi/avahi-daemon.conf.new +# Fix python3 shebangs: sed -i "s|#!python3|#!/usr/bin/python3|g" $PKG/usr/bin/avahi-{discover,bookmarks} +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION rm -f docs/INSTALL -cp -a LICENSE docs/* $PKG/usr/doc/$PRGNAM-$VERSION +cp -a docs/* $PKG/usr/doc/$PRGNAM-$VERSION +mv $PKG/usr/doc/$PRGNAM-$VERSION/README $PKG/usr/doc/$PRGNAM-$VERSION/README.too +cp -a LICENSE* README* $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/network/avahi/avahi.info b/network/avahi/avahi.info index ced5e61121..22888a7b75 100644 --- a/network/avahi/avahi.info +++ b/network/avahi/avahi.info @@ -1,8 +1,8 @@ PRGNAM="avahi" -VERSION="0.8" +VERSION="20240306_709e60f" HOMEPAGE="http://avahi.org/" -DOWNLOAD="https://github.com/lathiat/avahi/releases/download/v0.8/avahi-0.8.tar.gz" -MD5SUM="229c6aa30674fc43c202b22c5f8c2be7" +DOWNLOAD="https://mirrors.slackware.com/slackware/slackware64-current/source/l/avahi/avahi-20240306_709e60f.tar.lz" +MD5SUM="4f289929948f63b4f92f5c3913ea13ee" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libdaemon" diff --git a/network/avahi/man/man1/avahi-bookmarks.1 b/network/avahi/man/man1/avahi-bookmarks.1 new file mode 100644 index 0000000000..80b89f1c1b --- /dev/null +++ b/network/avahi/man/man1/avahi-bookmarks.1 @@ -0,0 +1,33 @@ +.TH avahi-bookmarks 1 User Manuals +.SH NAME +avahi-bookmarks \- Web service showing mDNS/DNS-SD announced HTTP services using the Avahi daemon +.SH SYNOPSIS +\fBavahi-bookmarks +\f1 +.SH DESCRIPTION +A web service for listing HTTP services that are announced via mDNS/DNS-SD using the Avahi daemon. avahi-bookmarks opens a TCP socket on port 8080 and waits for incoming HTTP connections returning a dynamic web site containing links to all services of type _http._tcp on the LAN. Point your browser to http://localhost:8080/ to make use of avahi-bookmarks. +.SH OPTIONS +.TP +\fB-p | --port=\f1 \fIPORT\f1 +Specify a TCP port number to listen on. If omitted defaults to 8080. +.TP +\fB-a | --address=\f1 \fIaddress\f1 +Specify an IP address to listen on. If omitted defaults to 127.0.0.1. Specify 0.0.0.0 if you want to allow remote access. +.TP +\fB-H | --host-names\f1 +Create links pointing to mDNS host names instead of resolved IP addresses. This is only compatible with your browser if you run some kind of local NSS module to resolve mDNS host names (e.g. nss-mdns). If both -A and -H are omitted avahi-bookmarks detects whether NSS support is available locally. This option conflicts with -A. +.TP +\fB-A | --addresses\f1 +Create links pointing to numeric IP addresses instead of mDNS host names. This will break access to hosts running virtual servers. If both -A and -H are omitted avahi-bookmarks detects whether NSS support is available locally. This option conflicts with -H. +.TP +\fB-d | --domain\f1=\fIDOMAIN\f1 +The domain to browse for services in. +.TP +\fB-h | --help\f1 +Show help +.SH AUTHORS +The Avahi Developers <avahi (at) lists (dot) freedesktop (dot) org>; Avahi is available from \fBhttp://avahi.org/\f1 +.SH SEE ALSO +\fBavahi-browse(1)\f1, \fBavahi-daemon(8)\f1 +.SH COMMENTS +This man page was written using \fBxml2man(1)\f1 by Oliver Kurth. diff --git a/network/avahi/man/man1/avahi-browse.1 b/network/avahi/man/man1/avahi-browse.1 new file mode 100644 index 0000000000..11d17cb880 --- /dev/null +++ b/network/avahi/man/man1/avahi-browse.1 @@ -0,0 +1,66 @@ +.TH avahi-browse 1 User Manuals +.SH NAME +avahi-browse \- Browse for mDNS/DNS-SD services using the Avahi daemon +.SH SYNOPSIS +\fBavahi-browse [\fIoptions\fB] \fIservice-type\fB + +avahi-browse [\fIoptions\fB] --all\fB + +avahi-browse [\fIoptions\fB] --browse-domains\fB + +avahi-browse [\fIoptions\fB] --dump-db\fB + +avahi-browse-domains [\fIoptions\fB] +\f1 +.SH DESCRIPTION +Browse for mDNS/DNS-SD network services and browsing domains using the Avahi daemon. +.SH OPTIONS +Specify a DNS-SD service type (e.g. _http._tcp) to browse for on the command line, or \fB-a\f1 to browse for all available service types. Items that appear on the network are prefixed with "+", items that disappear are prefixed with "-". If \fB--resolve\f1 is passed items that are resolved are prefixed with "=". +.TP +\fB-a | --all\f1 +Browse for all service types registered on the LAN, not just the one specified on the command line. +.TP +\fB-D | --browse-domains\f1 +Browse for browsing domains instead for services. avahi-browse-domains is equivalent to avahi-browse --browse-domains +.TP +\fB-d | --domain=\f1 \fIDOMAIN\f1 +Browse in the specified domain. If omitted avahi-browse will browse in the default browsing domain (usually: local) +.TP +\fB-v | --verbose\f1 +Enable verbose mode. +.TP +\fB-t | --terminate\f1 +Terminate after dumping a more or less complete list. +.TP +\fB-c | --cache\f1 +Terminate after dumping all entries available in the cache. +.TP +\fB-l | --ignore-local\f1 +Ignore local services, show only remote services. +.TP +\fB-r | --resolve\f1 +Automatically resolve services found. +.TP +\fB-f | --no-fail\f1 +Don't fail if the daemon is not found running. Instead, wait until it appears. If it disconnects, try to reconnect. +.TP +\fB-p | --parsable\f1 +Make output easily parsable for usage in scripts. If enabled fields are separated by semicolons (;), service names are escaped. It is recommended to combine this with \fB--no-db-lookup\f1. +.TP +\fB-k | --no-db-lookup\f1 +Don't lookup services types in service type database. +.TP +\fB-b | --dump-db\f1 +Dump the service type database (may be combined with -k) +.TP +\fB-h | --help\f1 +Show help. +.TP +\fB-V | --version\f1 +Show version information. +.SH AUTHORS +The Avahi Developers <avahi (at) lists (dot) freedesktop (dot) org>; Avahi is available from \fBhttp://avahi.org/\f1 +.SH SEE ALSO +\fBavahi-publish(1)\f1, \fBavahi-resolve(1)\f1, \fBavahi-daemon(8)\f1 +.SH COMMENTS +This man page was written using \fBxml2man(1)\f1 by Oliver Kurth. diff --git a/network/avahi/avahi-discover.1 b/network/avahi/man/man1/avahi-discover.1 index 085ff1354e..085ff1354e 100644 --- a/network/avahi/avahi-discover.1 +++ b/network/avahi/man/man1/avahi-discover.1 diff --git a/network/avahi/man/man1/avahi-publish.1 b/network/avahi/man/man1/avahi-publish.1 new file mode 100644 index 0000000000..c6bd857d4b --- /dev/null +++ b/network/avahi/man/man1/avahi-publish.1 @@ -0,0 +1,52 @@ +.TH avahi-publish-service 1 User Manuals +.SH NAME +avahi-publish-service \- Register an mDNS/DNS-SD service or host name or address mapping using the Avahi daemon +.SH SYNOPSIS +\fBavahi-publish -s [\fIoptions\fB] \fIname\fB \fIservice-type\fB \fIport\fB [\fITXT data\fB ...] + +avahi-publish-service [\fIoptions\fB] \fIname\fB \fIservice-type\fB \fIport\fB [\fITXT data\fB ...] + +avahi-publish -a [\fIoptions\fB] \fIhost name\fB \fIaddress\fB + +avahi-publish-address [\fIoptions\fB] \fIhost name\fB \fIaddress\fB +\f1 +.SH DESCRIPTION +Register an mDNS/DNS-SD service or host name/address mapping using the Avahi daemon. +.SH OPTIONS +When calling in service registration mode, specify a DNS-SD service name (e.g. "Lennart's Files"), a service type (e.g. _http._tcp) and an IP port number for the service, optionally followed by any number of TXT record strings on the command line. When calling in address/host name registration mode specify a fully qualified host name and an address (IPv4 or IPv6). +.TP +\fB-s | --service\f1 +Register a service. avahi-publish-service is equivalent to avahi-publish -s. +.TP +\fB-a | --address\f1 +Register an address/host name mapping. avahi-publish-address is equivalent to avahi-publish -a. +.TP +\fB-v | --verbose\f1 +Enable verbose mode. +.TP +\fB-H | --host=\f1 \fIHOSTNAME\f1 +Specify a host name for this service, in case it doesn't reside on the local host. This host name needs to be fully qualified and resolvable using mDNS or unicast DNS. +.TP +\fB-d | --domain=\f1 \fIDOMAIN\f1 +Publish the service in the specified domain. If omitted the Avahi daemon will publish it in its default domain (usually .local). +.TP +\fB--subtype=\f1 \fISUBTYPE\f1 +Register the service with an additional subtype in addition to the main type. DNS-SD subtypes have the form _anon._sub._ftp._tcp, where _anon is the identifier of the subtype and _ftp._tcp is the main type. You may pass this option multiple times to register the service with multiple subtypes. +.TP +\fB-R | --no-reverse\f1 +Do not publish reverse entry with address. +.TP +\fB-f | --no-fail\f1 +Don't fail if the daemon is not found running. Instead, wait until it appears. If it disconnects, try to reconnect. +.TP +\fB-h | --help\f1 +Show help +.TP +\fB-V | --version\f1 +Show version information. +.SH AUTHORS +The Avahi Developers <avahi (at) lists (dot) freedesktop (dot) org>; Avahi is available from \fBhttp://avahi.org/\f1 +.SH SEE ALSO +\fBavahi-resolve(1)\f1, \fBavahi-browse(1)\f1, \fBavahi-daemon(8)\f1 +.SH COMMENTS +This man page was written using \fBxml2man(1)\f1 by Oliver Kurth. diff --git a/network/avahi/man/man1/avahi-resolve.1 b/network/avahi/man/man1/avahi-resolve.1 new file mode 100644 index 0000000000..8f5e737790 --- /dev/null +++ b/network/avahi/man/man1/avahi-resolve.1 @@ -0,0 +1,49 @@ +.TH avahi-resolve 1 User Manuals +.SH NAME +avahi-resolve \- Resolve one or more mDNS/DNS host name(s) to IP address(es) (and vice versa) using the Avahi daemon +.SH SYNOPSIS +\fBavahi-resolve --name \fIhost-name ...\fB + +avahi-resolve-host-name \fIhost-name ...\fB + +avahi-resolve --address \fIaddress ...\fB + +avahi-resolve-address \fIaddress ...\fB +\f1 +.SH DESCRIPTION +Resolve one or more mDNS/DNS host name(s) to IP address(es) (and vice versa) using the Avahi daemon. +.SH OPTIONS +When passing -n, specify one or more fully qualified mDNS/DNS host name(s) (e.g. "foo.local") to resolve into IP addresses on the command line. + +When passing -a, specify one or more IP addresses to resolve into host names. When \fBenable-wide-area\f1 is set to yes in \fBavahi-daemon.conf(5)\f1, reverse lookups will go over unicast DNS first and fallback to mDNS. + +avahi-resolve-host-name is equivalent to avahi-resolve --name. + +avahi-resolve-address is equivalent to avahi-resolve --address. +.TP +\fB-n | --name\f1 +Translate one or more fully qualified host names into addresses. +.TP +\fB-a | --address\f1 +Translate one or more addresses into fully qualified host names. +.TP +\fB-v | --verbose\f1 +Enable verbose mode. +.TP +\fB-6\f1 +When resolving a host name, look for IPv6 addresses exclusively. +.TP +\fB-4\f1 +When resolving a host name, look for IPv4 addresses exclusively. +.TP +\fB-h | --help\f1 +Show help. +.TP +\fB-V | --version\f1 +Show version information. +.SH AUTHORS +The Avahi Developers <avahi (at) lists (dot) freedesktop (dot) org>; Avahi is available from \fBhttp://avahi.org/\f1 +.SH SEE ALSO +\fBavahi-publish-address(1)\f1, \fBavahi-daemon(8)\f1 +.SH COMMENTS +This man page was written using \fBxml2man(1)\f1 by Oliver Kurth. diff --git a/network/avahi/man/man1/avahi-set-host-name.1 b/network/avahi/man/man1/avahi-set-host-name.1 new file mode 100644 index 0000000000..9444083006 --- /dev/null +++ b/network/avahi/man/man1/avahi-set-host-name.1 @@ -0,0 +1,24 @@ +.TH avahi-set-host-name 1 User Manuals +.SH NAME +avahi-set-host-name \- Change mDNS host name +.SH SYNOPSIS +\fBavahi-set-host-name \fIhost-name\fB +\f1 +.SH DESCRIPTION +Set the mDNS host name of a currently running Avahi daemon. The effect of this operation is not persistent across daemon restarts. This operation is usually privileged. +.SH OPTIONS +.TP +\fB-v | --verbose\f1 +Enable verbose mode. +.TP +\fB-h | --help\f1 +Show help. +.TP +\fB-V | --version\f1 +Show version information. +.SH AUTHORS +The Avahi Developers <avahi (at) lists (dot) freedesktop (dot) org>; Avahi is available from \fBhttp://avahi.org/\f1 +.SH SEE ALSO +\fBavahi-daemon(8)\f1 +.SH COMMENTS +This man page was written using \fBxml2man(1)\f1 by Oliver Kurth. diff --git a/network/avahi/bssh.1 b/network/avahi/man/man1/bssh.1 index 913554eb30..913554eb30 100644 --- a/network/avahi/bssh.1 +++ b/network/avahi/man/man1/bssh.1 diff --git a/network/avahi/man/man5/avahi-daemon.conf.5 b/network/avahi/man/man5/avahi-daemon.conf.5 new file mode 100644 index 0000000000..064921ca5e --- /dev/null +++ b/network/avahi/man/man5/avahi-daemon.conf.5 @@ -0,0 +1,102 @@ +.TH avahi-daemon.conf 5 User Manuals +.SH NAME +avahi-daemon.conf \- avahi-daemon configuration file +.SH SYNOPSIS +\fB/etc/avahi/avahi-daemon.conf +\f1 +.SH DESCRIPTION +\fIavahi-daemon.conf\f1 is the configuration file for avahi-daemon. +.SH SECTION [SERVER] +.TP +\fBhost-name=\f1 Set the host name avahi-daemon tries to register on the LAN. If omitted defaults to the system host name as set with the sethostname() system call. +.TP +\fBhost-name-from-machine-id=\f1 Takes a boolean value ("yes" or "no"). If set to "yes" avahi-daemon will use the \fBmachine-id(5)\f1 as name on the LAN. It should be noted that this ID uniquely identifies the host. It should be considered "confidential", and must not be exposed in untrusted environments. Defaults to "no". +.TP +\fBdomain-name=\f1 Set the default domain name avahi-daemon tries to register its host name and services on the LAN in. If omitted defaults to ".local". +.TP +\fBbrowse-domains=\f1 Set a comma separated list of browsing domains (in addition to the default one and those announced inside the default browsing domain). Please note that the user may specify additional browsing domains on the client side, either by setting $AVAHI_BROWSE_DOMAINS to a list of colon separated domains or by adding them to the XDG config file \fI~/.config/avahi/browse-domains\f1 (separated by newlines). +.TP +\fBuse-ipv4=\f1 Takes a boolean value ("yes" or "no"). If set to "no" avahi-daemon will not use IPv4 sockets. Default is "yes". +.TP +\fBuse-ipv6=\f1 Takes a boolean value ("yes" or "no"). If set to "no" avahi-daemon will not use IPv6 sockets. Default is "yes". +.TP +\fBallow-interfaces=\f1 Set a comma separated list of allowed network interfaces that should be used by the avahi-daemon. Traffic on other interfaces will be ignored. If set to an empty list all local interfaces except loopback and point-to-point will be used. +.TP +\fBdeny-interfaces=\f1 Set a comma separated list of network interfaces that should be ignored by avahi-daemon. Other not specified interfaces will be used, unless \fBallow-interfaces=\f1 is set. This option takes precedence over \fBallow-interfaces=\f1. +.TP +\fBcheck-response-ttl=\f1 Takes a boolean value ("yes" or "no"). If set to "yes", an additional security check is activated: incoming IP packets will be ignored unless the IP TTL is 255. Earlier mDNS specifications required this check. Since this feature may be incompatible with newer implementations of mDNS it defaults to "no". On the other hand it provides extra security. +.TP +\fBuse-iff-running=\f1 Takes a boolean value ("yes" or "no"). If set to "yes" avahi-daemon monitors the IFF_RUNNING flag bit which is used by some (modern) network drivers to tell user space if a network cable is plugged in (in case of copper ethernet), or the network card is associated with some kind of network (in case of WLAN). If IFF_RUNNING is set avahi-daemon will automatically announce its services on that network. Unfortunately far too many network drivers do not support this flag or support it in a broken way. Therefore this option defaults to "no". +.TP +\fBenable-dbus=\f1 Takes either "yes", "no" or "warn". If set to "yes" avahi-daemon connects to D-Bus, offering an object oriented client API. It is only available if Avahi has been compiled with \fB--enable-dbus\f1 in which case it defaults to "yes". "warn" behaves like "yes", but the daemon starts up even when it fails to connect to a D-Bus daemon. In addition, if the connection to the D-Bus daemon is terminated we try to reconnect. (Unless we are in a chroot() environment where this definitely will fail.) +.TP +\fBdisallow-other-stacks=\f1 Takes a boolean value ("yes" or "no"). If set to "yes" no other process is allowed to bind to UDP port 5353. This effectively impedes other mDNS stacks from running on the host. Use this as a security measure to make sure that only Avahi is responsible for mDNS traffic. Please note that we do not recommend running multiple mDNS stacks on the same host simultaneously. This hampers reliability and is a waste of resources. However, to not annoy people this option defaults to "no". +.TP +\fBallow-point-to-point=\f1 Takes a boolean value ("yes" or "no"). If set to "yes" avahi-daemon will make use of interfaces with the POINTOPOINT flag set. This option defaults to "no" as it might make mDNS unreliable due to usually large latencies with such links and opens a potential security hole by allowing mDNS access from Internet connections. Use with care and YMMV! +.TP +\fBcache-entries-max=\f1 Takes an unsigned integer specifying how many resource records are cached per interface. Bigger values allow mDNS work correctly in large LANs but also increase memory consumption. +.TP +\fBclients-max=\f1 Takes an unsigned integer. The maximum number of concurrent D-Bus clients allowed. If the maximum number is reached further clients will be refused until at least one existing client disconnects. +.TP +\fBobjects-per-client-max=\f1 Takes an unsigned integer. The maximum number of objects (entry groups, browsers, resolvers) that may be registered per D-Bus client at a time. If the maximum number is reached further object creation will be refused until at least one object is freed. +.TP +\fBentries-per-entry-group-max=\f1 Takes an unsigned integer. The maximum number of entries (resource records) per entry group registered by a D-Bus client at a time. If the maximum number is reached further resource records may not be added to an entry group. +.TP +\fBratelimit-interval-usec=\f1 Takes an unsigned integer. Sets the per-interface packet rate-limiting interval parameter. Together with \fBratelimit-burst=\f1 this may be used to control the maximum number of packets Avahi will generated in a specific period of time on an interface. +.TP +\fBratelimit-burst=\f1 Takes an unsigned integer. Sets the per-interface packet rate-limiting burst parameter. Together with \fBratelimit-interval-usec=\f1 this may be used to control the maximum number of packets Avahi will generated in a specific period of time on an interface. +.SH SECTION [WIDE-AREA] +.TP +\fBenable-wide-area=\f1 Takes a boolean value ("yes" or "no"). Enable wide-area DNS-SD, aka DNS-SD over unicast DNS. If this is enabled only domains ending in .local will be resolved on mDNS, all other domains are resolved via unicast DNS. When this is enabled, unless explicitly specified reverse lookups will go over unicast DNS and fall back to mDNS if unicast DNS lookups fail. If you want to maintain multiple different multicast DNS domains even with this option enabled we encourage you to use subdomains of .local, such as "kitchen.local". This option defaults to "no". +.SH SECTION [PUBLISH] +.TP +\fBdisable-publishing=\f1 Takes a boolean value ("yes" or "no"). If set to "yes", no record will be published by Avahi, not even address records for the local host. Avahi will be started in a querying-only mode. Use this is a security measure. This option defaults to "no" +.TP +\fBdisable-user-service-publishing=\f1 Takes a boolean value ("yes" or "no"). If set to "yes", Avahi will still publish address records and suchlike but will not allow user applications to publish services. Use this is a security measure. This option defaults to "no" +.TP +\fBadd-service-cookie=\f1 Takes a boolean value ("yes" or "no"). If set to "yes" an implicit TXT entry will be added to all locally registered services, containing a cookie value which is chosen randomly on daemon startup. This can be used to detect if two services on two different interfaces/protocols are actually identical. Defaults to "no". +.TP +\fBpublish-addresses=\f1 Takes a boolean value ("yes" or "no"). If set to "yes" avahi-daemon will register mDNS address records for all local IP addresses. Unless you want to use avahi-daemon exclusively for browsing it's recommended to enable this. If you plan to register local services you need to enable this option. Defaults to "yes". +.TP +\fBpublish-hinfo=\f1 Takes a boolean value ("yes" or "no"). If set to "yes" avahi-daemon will register an mDNS HINFO record on all interfaces which contains information about the local operating system and CPU, which might be useful for administrative purposes. This is recommended by the mDNS specification but not required. For the sake of privacy you might choose to disable this feature. Defaults to "no". +.TP +\fBpublish-workstation=\f1 Takes a boolean value ("yes" or "no"). If set to "yes" avahi-daemon will register a service of type "_workstation._tcp" on the local LAN. This might be useful for administrative purposes (i.e. browse for all PCs on the LAN), but is not required or recommended by any specification. Newer MacOS X releases register a service of this type. Defaults to "no". +.TP +\fBpublish-domain=\f1 Takes a boolean value ("yes" or "no"). If set to "yes" avahi-daemon will announce the locally used domain name (see above) for browsing by other hosts. Defaults to "yes". +.TP +\fBpublish-dns-servers=\f1 Takes a comma separated list of IP addresses for unicast DNS servers. You can use this to announce unicast DNS servers via mDNS. When used in conjunction with avahi-dnsconfd on the client side this allows DHCP-like configuration of unicast DNS servers. +.TP +\fBpublish-resolv-conf-dns-servers=\f1 Takes a boolean value ("yes" or "no"). If set to "yes" avahi-daemon will publish the unicast DNS servers specified in \fI/etc/resolv.conf\f1 in addition to those specified with \fBpublish-dns-servers\f1. Send avahi-daemon a SIGHUP to have it reload this file. Defaults to "no". +.TP +\fBpublish-aaaa-on-ipv4=\f1 Takes a boolean value ("yes" or "no"). If set to "yes" avahi-daemon will publish an IPv6 AAAA record via IPv4, i.e. the local IPv6 addresses can be resolved using an IPv4 transport. Only useful when IPv4 is enabled with \fBuse-ipv4=true\f1. Defaults to "yes". +.TP +\fBpublish-a-on-ipv6=\f1 Takes a boolean value ("yes" or "no"). If set to "yes" avahi-daemon will publish an IPv4 A record via IPv6, i.e. the local IPv4 addresses can be resolved using an IPv6 transport. Only useful when IPv6 is enabled with \fBuse-ipv6=true\f1. Defaults to "no". +.SH SECTION [REFLECTOR] +.TP +\fBenable-reflector=\f1 Takes a boolean value ("yes" or "no"). If set to "yes" avahi-daemon will reflect incoming mDNS requests to all local network interfaces, effectively allowing clients to browse mDNS/DNS-SD services on all networks connected to the gateway. The gateway is somewhat intelligent and should work with all kinds of mDNS traffic, though some functionality is lost (specifically the unicast reply bit, which is used rarely anyway). Make sure to not run multiple reflectors between the same networks, this might cause them to play Ping Pong with mDNS packets. Defaults to "no". +.TP +\fBreflect-ipv=\f1 Takes a boolean value ("yes" or "no"). If set to "yes" and \fBenable-reflector\f1 is enabled, avahi-daemon will forward mDNS traffic between IPv4 and IPv6, which is usually not recommended. Defaults to "no". +.TP +\fBreflect-filters=\f1 Set a comma separated list of allowed service names to be reflected. Each service that is seen must match an entry in this list to be reflected to other networks. This list can match the type of service or the name of the machine providing the service. Defaults to allowing all services. +.SH SECTION [RLIMITS] +This section is used to define system resource limits for the daemon. See \fBsetrlimit(2)\f1 for more information. If any of the options is not specified in the configuration file, avahi-daemon does not change it from the system defaults. +.TP +\fBrlimit-as=\f1 Value in bytes for RLIMIT_AS (maximum size of the process's virtual memory). Sensible values are heavily system dependent. +.TP +\fBrlimit-core=\f1 Value in bytes for RLIMIT_CORE (maximum core file size). Unless you want to debug avahi-daemon, it is safe to set this to 0. +.TP +\fBrlimit-data=\f1 Value in bytes for RLIMIT_DATA (maximum size of the process's data segment). Sensible values are heavily system dependent. +.TP +\fBrlimit-fsize=\f1 Value for RLIMIT_FSIZE (maximum size of files the process may create). Since avahi-daemon shouldn't write any files to disk, it is safe to set this to 0. +.TP +\fBrlimit-nofile=\f1 Value for RLIMIT_NOFILE (open file descriptors). avahi-daemon shouldn't need more than 15 to 20 open file descriptors concurrently. +.TP +\fBrlimit-stack=\f1 Value in bytes for RLIMIT_STACK (maximum size of the process stack). Sensible values are heavily system dependent. +.TP +\fBrlimit-nproc=\f1 Value for RLIMIT_NPROC (max number of processes a user can launch). avahi-daemon forks of a helper process on systems where \fBchroot(2)\f1 is available therefore this value should not be set below 2. Note that while the process limit only applies to this process, the total count of processes to reach that limit includes all processes on the system with the same UID, including any containers without UID remapping (such as lxd containers with security.privileged=true). The default configuration of 3 was removed to prevent problems in this scenario. +.SH AUTHORS +The Avahi Developers <avahi (at) lists (dot) freedesktop (dot) org>; Avahi is available from \fBhttp://avahi.org/\f1 +.SH SEE ALSO +\fBavahi-daemon(8)\f1, \fBavahi-dnsconfd(8)\f1 +.SH COMMENTS +This man page was written using \fBxml2man(1)\f1 by Oliver Kurth. diff --git a/network/avahi/man/man5/avahi.hosts.5 b/network/avahi/man/man5/avahi.hosts.5 new file mode 100644 index 0000000000..dc4f73fa63 --- /dev/null +++ b/network/avahi/man/man5/avahi.hosts.5 @@ -0,0 +1,16 @@ +.TH avahi.hosts 5 User Manuals +.SH NAME +avahi.hosts \- avahi-daemon static host name file +.SH SYNOPSIS +\fB/etc/avahi/hosts +\f1 +.SH DESCRIPTION +\fI/etc/avahi/hosts\f1 is a file which may be used to define static host name to IP address mappings for multicast DNS. This is especially useful when publishing DNS-SD services on behalf of other hosts. See \fBavahi.service(5)\f1 for more information. + +The file format is similar to the one of \fI/etc/hosts\f1: on each line an IP address and the corresponding host name. The host names should be in FQDN form, i.e. with appended .local suffix. +.SH AUTHORS +The Avahi Developers <avahi (at) lists (dot) freedesktop (dot) org>; Avahi is available from \fBhttp://avahi.org/\f1 +.SH SEE ALSO +\fBavahi-daemon(8)\f1, \fBavahi.service(5)\f1 +.SH COMMENTS +This man page was written using \fBxml2man(1)\f1 by Oliver Kurth. diff --git a/network/avahi/man/man5/avahi.service.5 b/network/avahi/man/man5/avahi.service.5 new file mode 100644 index 0000000000..f56d7a6794 --- /dev/null +++ b/network/avahi/man/man5/avahi.service.5 @@ -0,0 +1,41 @@ +.TH avahi.service 5 User Manuals +.SH NAME +avahi.service \- avahi-daemon static service file +.SH SYNOPSIS +\fB/etc/avahi/services/*.service +\f1 +.SH DESCRIPTION +\fI/etc/avahi/services/*.service\f1 are XML fragments containing static DNS-SD service data. Every service file can contain multiple service definitions which share the same name. This is useful for publishing service data for services which implement multiple protocols. (i.e. a printer implementing _ipp._tcp and _printer._tcp) +.SH XML TAGS +.TP +\fB<service-group>\f1 The document tag of avahi service files. Should contain one \fB<name>\f1 and one or more \fB<service>\f1 elements. +.TP +\fB<name replace-wildcards="yes|no">\f1 The service name. If \fBreplace-wildcards\f1 is "yes", any occurrence of the string "%h" will be replaced by the local host name. This can be used for service names like "Remote Terminal on %h". If \fBreplace-wildcards\f1 is not specified, defaults to "no". +.TP +\fB<service protocol="ipv4|ipv6|any">\f1 Contains the service information for exactly one service type. Should contain one \fB<type>\f1 and one \fB<port>\f1 element. Optionally it may contain one \fB<domain-name>\f1, one \fB<host-name>\f1, any number of \fB<subtype>\f1 and any number of \fB<txt-record>\f1 elements. The attribute \fBprotocol\f1 specifies the protocol to advertise the service on. If \fBany\f1 is used (which is the default), the service will be advertised on both IPv4 and IPv6. +.TP +\fB<type>\f1 Contains the DNS-SD service type for this service. e.g. "_http._tcp". +.TP +\fB<subtype>\f1 Contains an additional DNS-SD service subtype for this service. e.g. "_anon._sub._ftp._tcp". +.TP +\fB<domain-name>\f1 The domain name this service should be registered. If omitted defaults to the default domain of the avahi daemon. (probably .local) +.TP +\fB<host-name>\f1 The host name of the host that provides this service. This should be a host that is resolvable by multicast or unicast DNS. Please note that you need to specify a fully-qualified domain name (FQDN) here, i.e. .local is not appended implicitly! The host name doesn't need to be part of the domain specified in \fB<domain-name>\f1. See \fBavahi.hosts(5)\f1 for more information how to publish additional host name mappings. +.TP +\fB<port>\f1 The IP port number the service listens on. +.TP +\fB<txt-record value-format="text|binary-hex|binary-base64">\f1 DNS-SD TXT record data. If \fBvalue-format\f1 is "text", the value of the TXT record is taken verbatim. If \fBvalue-format\f1 is "binary-hex" then the value of TXT record is decoded by taking pairs of characters after the "=" char and interpreting them as the textual representation of the two-digit hexadecimal number. Both uppercase and lowercase hexadecimal digits are allowed. The 0x or 0X prefix is not allowed. This requires the length of the value to be even. If \fBvalue-format\f1 is "binary-base64" then the value of TXT record is decoded with a base64 decoder. The character set used is A-Za-z0-9+/. This requires the length of the value to be a multiple of 4, with "=" as padding at the end. If \fBvalue-format\f1 is not specified, defaults to "text". Examples (all the values are decoded to the string "value" without quotes): + +<txt-record>key=value</txt-record> + +<txt-record value-format="text">key=value</txt-record> + +<txt-record value-format="binary-hex">key=76616c7565</txt-record> + +<txt-record value-format="binary-base64">key=dmFsdWU=</txt-record> +.SH AUTHORS +The Avahi Developers <avahi (at) lists (dot) freedesktop (dot) org>; Avahi is available from \fBhttp://avahi.org/\f1 +.SH SEE ALSO +\fBavahi-daemon(8)\f1, \fBavahi.hosts(5)\f1 +.SH COMMENTS +This man page was written using \fBxml2man(1)\f1 by Oliver Kurth. diff --git a/network/avahi/man/man8/avahi-daemon.8 b/network/avahi/man/man8/avahi-daemon.8 new file mode 100644 index 0000000000..bf592f2da6 --- /dev/null +++ b/network/avahi/man/man8/avahi-daemon.8 @@ -0,0 +1,76 @@ +.TH avahi-daemon 8 User Manuals +.SH NAME +avahi-daemon \- The Avahi mDNS/DNS-SD daemon +.SH SYNOPSIS +\fBavahi-daemon [\fIoptions\fB] + +avahi-daemon --kill\fB + +avahi-daemon --reload\fB + +avahi-daemon --check\fB +\f1 +.SH DESCRIPTION +The Avahi mDNS/DNS-SD daemon implements Apple's Zeroconf architecture (also known as "Rendezvous" or "Bonjour"). The daemon registers local IP addresses and static services using mDNS/DNS-SD and provides two IPC APIs for local programs to make use of the mDNS record cache the avahi-daemon maintains. First there is the so called "simple protocol" which is used exclusively by avahi-dnsconfd (a daemon which configures unicast DNS servers using server info published via mDNS) and nss-mdns (a libc NSS plugin, providing name resolution via mDNS). Finally there is the D-Bus interface which provides a rich object oriented interface to D-Bus enabled applications. + +Upon startup avahi-daemon interprets its configuration file \fI/etc/avahi/avahi-daemon.conf\f1 and reads XML fragments from \fI/etc/avahi/services/*.service\f1 which may define static DNS-SD services. If you enable \fBpublish-resolv-conf-dns-servers\f1 in \fIavahi-daemon.conf\f1 the file \fI/etc/resolv.conf\f1 will be read, too. +.SH OPTIONS +.TP +\fB-f | --file=\f1 \fIFILE\f1 +Specify the configuration file to read. (default: /etc/avahi/avahi-daemon.conf) +.TP +\fB-D | --daemonize\f1 +Daemonize after startup. Implies \fB--syslog\f1. +.TP +\fB-s | --syslog\f1 +Log to syslog instead of STDERR. Implied by \fB--daemonize\f1. +.TP +\fB--debug\f1 +Increase verbosity to debug level. +.TP +\fB--no-rlimits\f1 +Don't enforce resource limits as specified in the configuration file. (See \fBsetrlimit(2)\f1 for more information) +.TP +\fB--no-drop-root\f1 +Don't drop root privileges after startup and don't require daemon to be started as root. We recommend not to use this option. +.TP +\fB--no-chroot\f1 +Don't \fBchroot(2)\f1 the daemon. This option is only available when compiled with chroot() support. +.TP +\fB--no-proc-title\f1 +Don't change the process name while running. Unless this option is specified avahi-daemon will reflect its current state and the selected host name in the process title. +.TP +\fB-k | --kill\f1 +Kill an already running avahi-daemon. (equivalent to sending a SIGTERM) +.TP +\fB-r | --reload\f1 +Tell an already running avahi-daemon to reread \fI/etc/resolv.conf\f1 (in case you enabled \fBpublish-resolv-conf-dns-servers\f1 in \fIavahi-daemon.conf\f1) and the files from \fI/etc/avahi/services/\f1. Please note that this will not reload the \fI/etc/avahi/avahi-daemon.conf\f1. (equivalent to sending a SIGHUP) +.TP +\fB-c | --check\f1 +Return 0 as return code when avahi-daemon is already running. +.TP +\fB-h | --help\f1 +Show help +.TP +\fB-v | --version\f1 +Show version information +.SH FILES +\fI/etc/avahi/avahi-daemon.conf\f1: the default configuration file for avahi-daemon, see \fBavahi-daemon.conf(5)\f1 for more information. + +\fI/etc/avahi/hosts\f1: additional static hostname mappings to publish in mDNS, see \fBavahi.hosts(5)\f1 for more information. + +\fI/etc/avahi/services/*.service\f1: static service definitions, see \fBavahi.service(5)\f1 for more information. +.SH SIGNALS +\fISIGINT, SIGTERM\f1: avahi-daemon will shutdown. (Same as \fB--kill\f1). + +\fISIGHUP\f1: avahi-daemon will reload unicast DNS server data from \fI/etc/resolv.conf\f1 and static service definitions from \fI/etc/avahi/services/\f1. (Same as \fB--reload\f1) + +\fISIGUSR1\f1: avahi-daemon will dump local and remote cached resource record data to syslog. +.SH AUTHORS +The Avahi Developers <avahi (at) lists (dot) freedesktop (dot) org>; Avahi is available from \fBhttp://avahi.org/\f1 +.SH SEE ALSO +\fBavahi-daemon.conf(5)\f1, \fBavahi.hosts(5)\f1, \fBavahi.service(5)\f1, \fBavahi-dnsconfd(8)\f1, \fBavahi-set-host-name(1)\f1 + +http://avahi.org/wiki/AvahiAndUnicastDotLocal documents the problems when using Avahi in a unicast DNS zone .local. +.SH COMMENTS +This man page was written using \fBxml2man(1)\f1 by Oliver Kurth. diff --git a/network/avahi/man/man8/avahi-dnsconfd.8 b/network/avahi/man/man8/avahi-dnsconfd.8 new file mode 100644 index 0000000000..941547597e --- /dev/null +++ b/network/avahi/man/man8/avahi-dnsconfd.8 @@ -0,0 +1,48 @@ +.TH avahi-dnsconfd 8 User Manuals +.SH NAME +avahi-dnsconfd \- Unicast DNS server from mDNS/DNS-SD configuration daemon +.SH SYNOPSIS +\fBavahi-dnsconfd [\fIoptions\fB] + +avahi-dnsconfd --kill\fB + +avahi-dnsconfd --refresh\fB + +avahi-dnsconfd --check\fB +\f1 +.SH DESCRIPTION +avahi-dnsconfd connects to a running avahi-daemon and runs the script \fI/etc/avahi/avahi-dnsconfd.action\f1 for each unicast DNS server that is announced on the local LAN. This is useful for configuring unicast DNS servers in a DHCP-like fashion with mDNS. +.SH OPTIONS +.TP +\fB-D | --daemonize\f1 +Daemonize after startup and redirect log messages to syslog. +.TP +\fB-s | --syslog\f1 +Log to syslog instead of STDERR. Implied by \fB--daemonize\f1. +.TP +\fB-k | --kill\f1 +Kill an already running avahi-dnsconfd. (equivalent to sending a SIGTERM) +.TP +\fB-r | --refresh\f1 +Tell an already running avahi-dnsconfd to refresh the DNS server data. (equivalent to sending a SIGHUP) +.TP +\fB-c | --check\f1 +Return 0 as return code when avahi-dnsconfd is already running. +.TP +\fB-h | --help\f1 +Show help +.TP +\fB-v | --version\f1 +Show version information +.SH FILES +\fI/etc/avahi/avahi-dnsconfd.action\f1: the script to run when a DNS server is found or removed. +.SH SIGNALS +\fISIGINT, SIGTERM\f1: avahi-dnsconfd will shutdown. This is issued by passing --kill to avahi-daemon. + +\fISIGHUP\f1: avahi-dnsconfd will refresh the DNS server data. +.SH AUTHORS +The Avahi Developers <avahi (at) lists (dot) freedesktop (dot) org>; Avahi is available from \fBhttp://avahi.org/\f1 +.SH SEE ALSO +\fBavahi-daemon(8)\f1, \fBavahi-dnsconfd.action(8)\f1 +.SH COMMENTS +This man page was written using \fBxml2man(1)\f1 by Oliver Kurth. diff --git a/network/avahi/man/man8/avahi-dnsconfd.action.8 b/network/avahi/man/man8/avahi-dnsconfd.action.8 new file mode 100644 index 0000000000..3f2f16a3d0 --- /dev/null +++ b/network/avahi/man/man8/avahi-dnsconfd.action.8 @@ -0,0 +1,30 @@ +.TH avahi-dnsconfd.action 8 User Manuals +.SH NAME +avahi-dnsconfd.action \- avahi-dnsconfd action script +.SH SYNOPSIS +\fB/etc/avahi/avahi-dnsconfd.action +\f1 +.SH DESCRIPTION +\fIavahi-dnsconfd.action\f1 is the action script that is called whenever a new unicast DNS server is found or removed by avahi-dnsconfd. The default script as shipped with avahi patches \fI/etc/resolv.conf\f1 to reflect the changed unicast DNS server configuration. +.SH PARAMETERS +.TP +\fBargv[1]\f1 Contains the character "+" if the DNS server is new, "-" when it shall be removed from the DNS server list. +.TP +\fBargv[2]\f1 The IP address of the DNS server. +.TP +\fBargv[3]\f1 Numerical network interface number this DNS server was found on. +.TP +\fBargv[4]\f1 Numerical protocol number this DNS server was found on. (usually 2 for IPv4 and 10 for IPv6) +.SH ENVIRONMENT +.TP +\fBAVAHI_INTERFACE\f1 Contains the textual interface name the corresponds with argv[3]. (e.g. "eth0") +.TP +\fBAVAHI_INTERFACE_DNS_SERVERS\f1 Contains a list of all DNS servers that avahi-dnsconfd found on the interface \fB$AVAHI_INTERFACE\f1, separated by spaces. +.TP +\fBAVAHI_DNS_SERVERS\f1 Contains a list of all DNS server that avahi-dnsconfd found on all interfaces, separated by spaces. +.SH AUTHORS +The Avahi Developers <avahi (at) lists (dot) freedesktop (dot) org>; Avahi is available from \fBhttp://avahi.org/\f1 +.SH SEE ALSO +\fBavahi-dnsconfd(8)\f1, \fBavahi-daemon(8)\f1 +.SH COMMENTS +This man page was written using \fBxml2man(1)\f1 by Oliver Kurth. diff --git a/network/avahi/patches/CVE-2021-3502.patch b/network/avahi/patches/CVE-2021-3502.patch deleted file mode 100644 index 7b0449a2e4..0000000000 --- a/network/avahi/patches/CVE-2021-3502.patch +++ /dev/null @@ -1,148 +0,0 @@ -From 9d31939e55280a733d930b15ac9e4dda4497680c Mon Sep 17 00:00:00 2001 -From: Tommi Rantala <tommi.t.rantala@nokia.com> -Date: Mon, 8 Feb 2021 11:04:43 +0200 -Subject: [PATCH] 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 ---- - avahi-core/browse-dns-server.c | 5 ++++- - avahi-core/browse-domain.c | 5 ++++- - avahi-core/browse-service-type.c | 3 +++ - avahi-core/browse-service.c | 3 +++ - avahi-core/browse.c | 3 +++ - avahi-core/resolve-address.c | 5 ++++- - avahi-core/resolve-host-name.c | 5 ++++- - avahi-core/resolve-service.c | 5 ++++- - 8 files changed, 29 insertions(+), 5 deletions(-) - -diff --git a/avahi-core/browse-dns-server.c b/avahi-core/browse-dns-server.c -index 049752e9..c2d914fa 100644 ---- a/avahi-core/browse-dns-server.c -+++ b/avahi-core/browse-dns-server.c -@@ -343,7 +343,10 @@ AvahiSDNSServerBrowser *avahi_s_dns_server_browser_new( - AvahiSDNSServerBrowser* b; - - b = avahi_s_dns_server_browser_prepare(server, interface, protocol, domain, type, aprotocol, flags, callback, userdata); -+ if (!b) -+ return NULL; -+ - avahi_s_dns_server_browser_start(b); - - return b; --} -\ No newline at end of file -+} -diff --git a/avahi-core/browse-domain.c b/avahi-core/browse-domain.c -index f145d56a..06fa70c0 100644 ---- a/avahi-core/browse-domain.c -+++ b/avahi-core/browse-domain.c -@@ -253,7 +253,10 @@ AvahiSDomainBrowser *avahi_s_domain_browser_new( - AvahiSDomainBrowser *b; - - b = avahi_s_domain_browser_prepare(server, interface, protocol, domain, type, flags, callback, userdata); -+ if (!b) -+ return NULL; -+ - avahi_s_domain_browser_start(b); - - return b; --} -\ No newline at end of file -+} -diff --git a/avahi-core/browse-service-type.c b/avahi-core/browse-service-type.c -index fdd22dcd..b1fc7af8 100644 ---- a/avahi-core/browse-service-type.c -+++ b/avahi-core/browse-service-type.c -@@ -171,6 +171,9 @@ AvahiSServiceTypeBrowser *avahi_s_service_type_browser_new( - AvahiSServiceTypeBrowser *b; - - b = avahi_s_service_type_browser_prepare(server, interface, protocol, domain, flags, callback, userdata); -+ if (!b) -+ return NULL; -+ - avahi_s_service_type_browser_start(b); - - return b; -diff --git a/avahi-core/browse-service.c b/avahi-core/browse-service.c -index 5531360c..63e0275a 100644 ---- a/avahi-core/browse-service.c -+++ b/avahi-core/browse-service.c -@@ -184,6 +184,9 @@ AvahiSServiceBrowser *avahi_s_service_browser_new( - AvahiSServiceBrowser *b; - - b = avahi_s_service_browser_prepare(server, interface, protocol, service_type, domain, flags, callback, userdata); -+ if (!b) -+ return NULL; -+ - avahi_s_service_browser_start(b); - - return b; -diff --git a/avahi-core/browse.c b/avahi-core/browse.c -index 2941e579..e8a915e9 100644 ---- a/avahi-core/browse.c -+++ b/avahi-core/browse.c -@@ -634,6 +634,9 @@ AvahiSRecordBrowser *avahi_s_record_browser_new( - AvahiSRecordBrowser *b; - - b = avahi_s_record_browser_prepare(server, interface, protocol, key, flags, callback, userdata); -+ if (!b) -+ return NULL; -+ - avahi_s_record_browser_start_query(b); - - return b; -diff --git a/avahi-core/resolve-address.c b/avahi-core/resolve-address.c -index ac0b29b1..e61dd242 100644 ---- a/avahi-core/resolve-address.c -+++ b/avahi-core/resolve-address.c -@@ -286,7 +286,10 @@ AvahiSAddressResolver *avahi_s_address_resolver_new( - AvahiSAddressResolver *b; - - b = avahi_s_address_resolver_prepare(server, interface, protocol, address, flags, callback, userdata); -+ if (!b) -+ return NULL; -+ - avahi_s_address_resolver_start(b); - - return b; --} -\ No newline at end of file -+} -diff --git a/avahi-core/resolve-host-name.c b/avahi-core/resolve-host-name.c -index 808b0e72..4e8e5973 100644 ---- a/avahi-core/resolve-host-name.c -+++ b/avahi-core/resolve-host-name.c -@@ -318,7 +318,10 @@ AvahiSHostNameResolver *avahi_s_host_name_resolver_new( - AvahiSHostNameResolver *b; - - b = avahi_s_host_name_resolver_prepare(server, interface, protocol, host_name, aprotocol, flags, callback, userdata); -+ if (!b) -+ return NULL; -+ - avahi_s_host_name_resolver_start(b); - - return b; --} -\ No newline at end of file -+} -diff --git a/avahi-core/resolve-service.c b/avahi-core/resolve-service.c -index 66bf3cae..43771763 100644 ---- a/avahi-core/resolve-service.c -+++ b/avahi-core/resolve-service.c -@@ -519,7 +519,10 @@ AvahiSServiceResolver *avahi_s_service_resolver_new( - AvahiSServiceResolver *b; - - b = avahi_s_service_resolver_prepare(server, interface, protocol, name, type, domain, aprotocol, flags, callback, userdata); -+ if (!b) -+ return NULL; -+ - avahi_s_service_resolver_start(b); - - return b; --} -\ No newline at end of file -+} diff --git a/network/avahi/patches/Fetch-build-db-from-upstream-git.patch b/network/avahi/patches/Fetch-build-db-from-upstream-git.patch deleted file mode 100644 index eacb6dab5a..0000000000 --- a/network/avahi/patches/Fetch-build-db-from-upstream-git.patch +++ /dev/null @@ -1,71 +0,0 @@ -From: Andreas Henriksson <andreas@fatal.se> -Date: Sat, 26 Oct 2019 15:49:35 +0200 -Subject: Fetch build-db from upstream git - -Fetch the build-db file from: -https://raw.githubusercontent.com/lathiat/avahi/master/service-type-database/build-db - -This file is missing dist tarball, likely caused by changes in: -https://github.com/lathiat/avahi/pull/134 - -Carry it as a patch for now. ---- - service-type-database/build-db | 49 ++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 49 insertions(+) - create mode 100755 service-type-database/build-db - -diff --git a/service-type-database/build-db b/service-type-database/build-db -new file mode 100755 -index 0000000..78ee892 ---- /dev/null -+++ b/service-type-database/build-db -@@ -0,0 +1,49 @@ -+#!/usr/bin/env python -+# -*-python-*- -+# This file is part of avahi. -+# -+# avahi is free software; you can redistribute it and/or modify it -+# under the terms of the GNU Lesser General Public License as -+# published by the Free Software Foundation; either version 2 of the -+# License, or (at your option) any later version. -+# -+# avahi is distributed in the hope that it will be useful, but WITHOUT -+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public -+# License for more details. -+# -+# You should have received a copy of the GNU Lesser General Public -+# License along with avahi; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -+# USA. -+ -+try: -+ import anydbm as dbm -+except ImportError: -+ import dbm -+ -+import sys -+ -+if len(sys.argv) > 1: -+ infn = sys.argv[1] -+else: -+ infn = "service-types" -+ -+if len(sys.argv) > 2: -+ outfn = sys.argv[2] -+else: -+ outfn = infn + ".db" -+ -+db = dbm.open(outfn, "n") -+ -+for ln in open(infn, "r"): -+ ln = ln.strip(" \r\n\t") -+ -+ if ln == "" or ln.startswith("#"): -+ continue -+ -+ t, n = ln.split(":", 1) -+ -+ db[t.strip()] = n.strip() -+ -+db.close() diff --git a/network/avahi/patches/Ship-avahi-discover-1-bssh-1-and-bvnc-1-also-for-GTK3.patch b/network/avahi/patches/Ship-avahi-discover-1-bssh-1-and-bvnc-1-also-for-GTK3.patch deleted file mode 100644 index 076442706a..0000000000 --- a/network/avahi/patches/Ship-avahi-discover-1-bssh-1-and-bvnc-1-also-for-GTK3.patch +++ /dev/null @@ -1,50 +0,0 @@ -From: Andreas Henriksson <andreas@fatal.se> -Date: Thu, 24 Aug 2017 17:52:19 +0200 -Subject: Ship avahi-discover(1), bssh(1) and bvnc(1) also for GTK3 - -These manpages went missing when you disabled gtk2 builds.... - -Forwarded: https://github.com/lathiat/avahi/pull/142 -Applied-upstream: 0.9, commit:751be804e891aec5701a059144e2f5cbfc981b36 ---- - man/Makefile.am | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/man/Makefile.am b/man/Makefile.am -index 77a27bd..289b942 100644 ---- a/man/Makefile.am -+++ b/man/Makefile.am -@@ -56,7 +56,7 @@ man_MANS += \ - avahi-publish.1 \ - avahi-set-host-name.1 - --if HAVE_GTK -+if HAVE_GTK2OR3 - man_MANS += \ - bssh.1 - endif -@@ -64,12 +64,13 @@ endif - if HAVE_PYTHON - man_MANS += \ - avahi-bookmarks.1 --if HAVE_GTK -+endif -+ -+if HAVE_PYGOBJECT - man_MANS += \ - avahi-discover.1 - endif - endif --endif - - if ENABLE_AUTOIPD - if HAVE_LIBDAEMON -@@ -134,7 +135,7 @@ EXTRA_DIST = \ - if HAVE_DBUS - - BSSH_LN = --if HAVE_GTK -+if HAVE_GTK2OR3 - if HAVE_GLIB - BSSH_LN += $(LN_S) bssh.1 bvnc.1 && - BSSH_LN += $(LN_S) bssh.1 bshell.1 && diff --git a/network/avahi/patches/avahi-client-fix-resource-leak.patch b/network/avahi/patches/avahi-client-fix-resource-leak.patch deleted file mode 100644 index 141828a259..0000000000 --- a/network/avahi/patches/avahi-client-fix-resource-leak.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 374245ec1418e7e1e57120fcaf0a12ec695f5f6d Mon Sep 17 00:00:00 2001 -From: Michal Sekletar <msekleta@redhat.com> -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 --git a/network/avahi/patches/avahi-daemon-chroot-fix-bogus-assignments-in-assertions.patch b/network/avahi/patches/avahi-daemon-chroot-fix-bogus-assignments-in-assertions.patch deleted file mode 100644 index 9984722893..0000000000 --- a/network/avahi/patches/avahi-daemon-chroot-fix-bogus-assignments-in-assertions.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 4b48927e8e2c721d103018b4ce39a164b6c2898f Mon Sep 17 00:00:00 2001 -From: Michal Sekletar <msekleta@redhat.com> -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 --git a/network/avahi/patches/avahi-discover-Don-t-decode-unicode-strings-only-bytestri.patch b/network/avahi/patches/avahi-discover-Don-t-decode-unicode-strings-only-bytestri.patch deleted file mode 100644 index 56a92addfc..0000000000 --- a/network/avahi/patches/avahi-discover-Don-t-decode-unicode-strings-only-bytestri.patch +++ /dev/null @@ -1,41 +0,0 @@ -From: Simon McVittie <smcv@debian.org> -Date: Fri, 24 Apr 2020 11:25:41 +0100 -Subject: 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> -Forwarded: https://github.com/lathiat/avahi/pull/282 ---- - avahi-python/avahi-discover/avahi-discover.py | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/avahi-python/avahi-discover/avahi-discover.py b/avahi-python/avahi-discover/avahi-discover.py -index 4a2b575..fddf4a5 100755 ---- a/avahi-python/avahi-discover/avahi-discover.py -+++ b/avahi-python/avahi-discover/avahi-discover.py -@@ -238,15 +238,17 @@ class Main_window: - txts+="<b>" + _("TXT") + " <i>%s</i></b> = %s\n" % (k,v) - else: - txts = "<b>" + _("TXT Data:") + "</b> <i>" + _("empty") + "</i>" -- -- txts = txts.decode("utf-8") -+ -+ if isinstance(txts, bytes): # Python 2 -+ txts = txts.decode("utf-8") - - infos = "<b>" + _("Service Type:") + "</b> %s\n" - infos += "<b>" + _("Service Name:") + "</b> %s\n" - infos += "<b>" + _("Domain Name:") + "</b> %s\n" - infos += "<b>" + _("Interface:") + "</b> %s %s\n" - infos += "<b>" + _("Address:") + "</b> %s/%s:%i\n%s" -- infos = infos.decode("utf-8") -+ if isinstance(infos, bytes): # Python 2 -+ infos = infos.decode("utf-8") - infos = infos % (stype, name, domain, self.siocgifname(interface), self.protoname(protocol), host, address, port, txts.strip()) - self.info_label.set_markup(infos) - diff --git a/network/avahi/patches/avahi_dns_packet_consume_uint32-fix-potential-undefined-b.patch b/network/avahi/patches/avahi_dns_packet_consume_uint32-fix-potential-undefined-b.patch deleted file mode 100644 index d9ba99f4d8..0000000000 --- a/network/avahi/patches/avahi_dns_packet_consume_uint32-fix-potential-undefined-b.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: traffic-millions <60914101+traffic-millions@users.noreply.github.com> -Date: Tue, 3 Mar 2020 11:15:48 +0800 -Subject: 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 -Origin: upstream, 0.9, commit:b897ca43ac100d326d118e5877da710eb7f836f9 ---- - avahi-core/dns.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/avahi-core/dns.c b/avahi-core/dns.c -index 7c38f42..d793b76 100644 ---- a/avahi-core/dns.c -+++ b/avahi-core/dns.c -@@ -455,7 +455,7 @@ int avahi_dns_packet_consume_uint32(AvahiDnsPacket *p, uint32_t *ret_v) { - return -1; - - d = (uint8_t*) (AVAHI_DNS_PACKET_DATA(p) + p->rindex); -- *ret_v = (d[0] << 24) | (d[1] << 16) | (d[2] << 8) | d[3]; -+ *ret_v = ((uint32_t)d[0] << 24) | ((uint32_t)d[1] << 16) | ((uint32_t)d[2] << 8) | (uint32_t)d[3]; - p->rindex += sizeof(uint32_t); - - return 0; diff --git a/network/avahi/patches/avoid-infinite-loop-in-avahi-daemon-by-handling-hup-event-in-client-work.patch b/network/avahi/patches/avoid-infinite-loop-in-avahi-daemon-by-handling-hup-event-in-client-work.patch deleted file mode 100644 index 3e0725a602..0000000000 --- a/network/avahi/patches/avoid-infinite-loop-in-avahi-daemon-by-handling-hup-event-in-client-work.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 447affe29991ee99c6b9732fc5f2c1048a611d3b Mon Sep 17 00:00:00 2001 -From: Riccardo Schirone <sirmy15@gmail.com> -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 --git a/network/avahi/patches/build-db-Use-the-same-database-format-that-the-C-code-exp.patch b/network/avahi/patches/build-db-Use-the-same-database-format-that-the-C-code-exp.patch deleted file mode 100644 index 3017043d47..0000000000 --- a/network/avahi/patches/build-db-Use-the-same-database-format-that-the-C-code-exp.patch +++ /dev/null @@ -1,106 +0,0 @@ -From: Simon McVittie <smcv@debian.org> -Date: Thu, 7 May 2020 12:13:56 +0100 -Subject: 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 ---- - configure.ac | 11 ++++++++--- - service-type-database/Makefile.am | 4 ++-- - service-type-database/build-db | 27 +++++++++++++++++++++------ - 3 files changed, 31 insertions(+), 11 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 58db8c7..5aea4e7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -871,9 +871,14 @@ if test "x$HAVE_PYTHON" = "xyes" ; then - fi - - AM_CHECK_PYMOD(socket,,,[AC_MSG_ERROR(Could not find Python module socket)]) -- if test "x$HAVE_GDBM" = "xyes" || test "x$HAVE_DBM" = "xyes"; then -- AM_CHECK_PYMOD(anydbm,,,[ -- AM_CHECK_PYMOD(dbm,,,[AC_MSG_ERROR(Could not find Python module dbm)]) -+ if test "x$HAVE_GDBM" = "xyes"; then -+ AM_CHECK_PYMOD([dbm.gnu], [], [], [ -+ AM_CHECK_PYMOD([gdbm], [], [], [AC_MSG_ERROR(Could not find Python module dbm.gnu or gdbm)]) -+ ]) -+ fi -+ if test "x$HAVE_DBM" = "xyes"; then -+ AM_CHECK_PYMOD([dbm.ndbm], [], [], [ -+ AM_CHECK_PYMOD([dbm], [], [], [AC_MSG_ERROR(Could not find Python module dbm.ndbm or dbm)]) - ]) - fi - fi -diff --git a/service-type-database/Makefile.am b/service-type-database/Makefile.am -index f9fa082..0ead0f6 100644 ---- a/service-type-database/Makefile.am -+++ b/service-type-database/Makefile.am -@@ -28,7 +28,7 @@ noinst_SCRIPTS=build-db - pkglibdata_DATA+=service-types.db - - service-types.db: service-types -- $(AM_V_GEN)$(PYTHON) build-db $< $@.coming && \ -+ $(AM_V_GEN)$(PYTHON) build-db --gnu $< $@.coming && \ - mv $@.coming $@ - - CLEANFILES = service-types.db -@@ -44,7 +44,7 @@ service-types.db.pag: service-types.db - service-types.db.dir: service-types.db - $(AM_V_GEN)mv service-types.db.coming.dir service-types.db.dir - service-types.db: service-types build-db -- $(AM_V_GEN)$(PYTHON) build-db $< $@.coming && \ -+ $(AM_V_GEN)$(PYTHON) build-db --ndbm $< $@.coming && \ - if test -f "$@.coming"; then mv $@.coming $@; fi - - CLEANFILES = service-types.db* -diff --git a/service-type-database/build-db b/service-type-database/build-db -index 78ee892..6415d27 100755 ---- a/service-type-database/build-db -+++ b/service-type-database/build-db -@@ -17,13 +17,28 @@ - # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - # USA. - --try: -- import anydbm as dbm --except ImportError: -- import dbm -- - import sys - -+if sys.argv[1] == '--gnu': -+ if sys.version_info >= (3,): -+ import dbm.gnu as chosen_dbm -+ else: -+ import gdbm as chosen_dbm -+ -+ sys.argv[1:] = sys.argv[2:] -+elif sys.argv[1] == '--ndbm': -+ if sys.version_info >= (3,): -+ import dbm.ndbm as chosen_dbm -+ else: -+ import dbm as chosen_dbm -+ -+ sys.argv[1:] = sys.argv[2:] -+else: -+ if sys.version_info >= (3,): -+ import dbm as chosen_dbm -+ else: -+ import anydbm as chosen_dbm -+ - if len(sys.argv) > 1: - infn = sys.argv[1] - else: -@@ -34,7 +49,7 @@ if len(sys.argv) > 2: - else: - outfn = infn + ".db" - --db = dbm.open(outfn, "n") -+db = chosen_dbm.open(outfn, "n") - - for ln in open(infn, "r"): - ln = ln.strip(" \r\n\t") diff --git a/network/avahi/patches/fix-bytestring-decoding-for-proper-display.patch b/network/avahi/patches/fix-bytestring-decoding-for-proper-display.patch deleted file mode 100644 index bfb826db93..0000000000 --- a/network/avahi/patches/fix-bytestring-decoding-for-proper-display.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: =?utf-8?q?=C3=89ric_Araujo?= <merwok@netwok.org> -Date: Sat, 29 Feb 2020 19:14:04 -0500 -Subject: fix bytestring decoding for proper display - ---- - avahi-python/avahi-discover/avahi-discover.py | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/avahi-python/avahi-discover/avahi-discover.py b/avahi-python/avahi-discover/avahi-discover.py -index 0db705d..4a2b575 100755 ---- a/avahi-python/avahi-discover/avahi-discover.py -+++ b/avahi-python/avahi-discover/avahi-discover.py -@@ -238,12 +238,15 @@ class Main_window: - txts+="<b>" + _("TXT") + " <i>%s</i></b> = %s\n" % (k,v) - else: - txts = "<b>" + _("TXT Data:") + "</b> <i>" + _("empty") + "</i>" -+ -+ txts = txts.decode("utf-8") - - infos = "<b>" + _("Service Type:") + "</b> %s\n" - infos += "<b>" + _("Service Name:") + "</b> %s\n" - infos += "<b>" + _("Domain Name:") + "</b> %s\n" - infos += "<b>" + _("Interface:") + "</b> %s %s\n" - infos += "<b>" + _("Address:") + "</b> %s/%s:%i\n%s" -+ infos = infos.decode("utf-8") - infos = infos % (stype, name, domain, self.siocgifname(interface), self.protoname(protocol), host, address, port, txts.strip()) - self.info_label.set_markup(infos) - diff --git a/network/avahi/patches/ipv6_race_condition_fix.patch b/network/avahi/patches/ipv6_race_condition_fix.patch deleted file mode 100644 index 3418b1a11c..0000000000 --- a/network/avahi/patches/ipv6_race_condition_fix.patch +++ /dev/null @@ -1,51 +0,0 @@ -Submitted By: Douglas R. Reno <renodr at linuxfromscratch dot org> -Date: 2020-10-19 -Initial Package Version: 0.8 -Upstream Status: PR, not applied -Origin: Upstream PR (github.com/lathiat/avahi/pull/309) -Description: Fixes a race condition when multiple NICs are in use - when IPv6 is enabled. This will exhibit behavior where - messages about withdrawing address records, registering - access records, and new hostname announcements are - spammed to the log every second. - -diff -Naurp avahi-0.8.orig/avahi-core/server.c avahi-0.8/avahi-core/server.c ---- avahi-0.8.orig/avahi-core/server.c 2020-02-16 21:41:24.939967558 -0600 -+++ avahi-0.8/avahi-core/server.c 2020-10-19 11:07:22.054861721 -0500 -@@ -193,7 +193,7 @@ static void withdraw_rrset(AvahiServer * - withdraw_entry(s, e); - } - --static void incoming_probe(AvahiServer *s, AvahiRecord *record, AvahiInterface *i) { -+static void incoming_probe(AvahiServer *s, AvahiRecord *record, AvahiInterface *i, int from_local_iface) { - AvahiEntry *e, *n; - int ours = 0, won = 0, lost = 0; - -@@ -210,7 +210,7 @@ static void incoming_probe(AvahiServer * - if (e->dead) - continue; - -- if ((cmp = avahi_record_lexicographical_compare(e->record, record)) == 0) { -+ if ((cmp = avahi_record_lexicographical_compare(e->record, record)) == 0 || from_local_iface) { - ours = 1; - break; - } else { -@@ -639,7 +639,7 @@ static void handle_query_packet(AvahiSer - if (!avahi_key_is_pattern(record->key)) { - if (!from_local_iface) - reflect_probe(s, i, record); -- incoming_probe(s, record, i); -+ incoming_probe(s, record, i, from_local_iface); - } - - avahi_record_unref(record); -@@ -961,8 +961,7 @@ static void dispatch_packet(AvahiServer - return; - - /* We don't want to reflect local traffic, so we check if this packet is generated locally. */ -- if (s->config.enable_reflector) -- from_local_iface = originates_from_local_iface(s, iface, src_address, port); -+ from_local_iface = originates_from_local_iface(s, iface, src_address, port); - - if (avahi_dns_packet_check_valid_multicast(p) < 0) { - avahi_log_debug("Received invalid packet."); diff --git a/network/avahi/patches/man-add-missing-bshell.1-symlink.patch b/network/avahi/patches/man-add-missing-bshell.1-symlink.patch deleted file mode 100644 index 1bcbbb13e2..0000000000 --- a/network/avahi/patches/man-add-missing-bshell.1-symlink.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Michael Biebl <biebl@debian.org> -Date: Sun, 17 Sep 2017 12:52:39 +0200 -Subject: 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 -Forwarded: https://github.com/lathiat/avahi/pull/148 -Applied-upstream: 0.9, commit:f983df44870b602179b493f9c3d113753b378e27 ---- - man/Makefile.am | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/man/Makefile.am b/man/Makefile.am -index d38267c..77a27bd 100644 ---- a/man/Makefile.am -+++ b/man/Makefile.am -@@ -137,12 +137,13 @@ BSSH_LN = - if HAVE_GTK - if HAVE_GLIB - BSSH_LN += $(LN_S) bssh.1 bvnc.1 && -+BSSH_LN += $(LN_S) bssh.1 bshell.1 && - endif - endif - install-exec-local: - mkdir -p $(DESTDIR)/$(mandir)/man1 && \ - cd $(DESTDIR)/$(mandir)/man1 && \ -- rm -f avahi-resolve-host-name.1 avahi-resolve-address.1 avahi-browse-domains.1 avahi-publish-address.1 avahi-publish-service.1 bvnc.1 && \ -+ rm -f avahi-resolve-host-name.1 avahi-resolve-address.1 avahi-browse-domains.1 avahi-publish-address.1 avahi-publish-service.1 bvnc.1 bshell.1 && \ - $(BSSH_LN) \ - $(LN_S) avahi-resolve.1 avahi-resolve-host-name.1 && \ - $(LN_S) avahi-resolve.1 avahi-resolve-address.1 && \ diff --git a/network/avahi/patches/man-fix-reference-to-avahi-autoipd.action-8-in-avahi-auto.patch b/network/avahi/patches/man-fix-reference-to-avahi-autoipd.action-8-in-avahi-auto.patch deleted file mode 100644 index 94d8d9517a..0000000000 --- a/network/avahi/patches/man-fix-reference-to-avahi-autoipd.action-8-in-avahi-auto.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Michael Biebl <biebl@debian.org> -Date: Sun, 17 Sep 2017 10:57:47 +0200 -Subject: man: fix reference to avahi-autoipd.action(8) in avahi-autoipd(8) - -Forwarded: https://github.com/lathiat/avahi/pull/147 -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=840833 -Applied-upstream: 0.9, commit:1905a6b878064c6cc9bb96a1fc17ef77c75787c6 ---- - man/avahi-autoipd.8.xml.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/man/avahi-autoipd.8.xml.in b/man/avahi-autoipd.8.xml.in -index 7137c30..23764a5 100644 ---- a/man/avahi-autoipd.8.xml.in -+++ b/man/avahi-autoipd.8.xml.in -@@ -150,7 +150,7 @@ - - <section name="See also"> - <p> -- <manref name="autoipd.action" section="8"/>, <manref name="dhclient" section="8"/> -+ <manref name="avahi-autoipd.action" section="8"/>, <manref name="dhclient" section="8"/> - </p> - - <p>http://avahi.org/wiki/AvahiAutoipd documents how avahi-autoipd is best packaged and integrated into distributions.</p> diff --git a/network/avahi/patches/series b/network/avahi/patches/series deleted file mode 100644 index 1246744108..0000000000 --- a/network/avahi/patches/series +++ /dev/null @@ -1,13 +0,0 @@ -avahi-dnsconfd.service-Drop-Also-avahi-daemon.socket.patch -man-fix-reference-to-avahi-autoipd.action-8-in-avahi-auto.patch -man-add-missing-bshell.1-symlink.patch -Ship-avahi-discover-1-bssh-1-and-bvnc-1-also-for-GTK3.patch -avahi_dns_packet_consume_uint32-fix-potential-undefined-b.patch -fix-bytestring-decoding-for-proper-display.patch -avahi-discover-Don-t-decode-unicode-strings-only-bytestri.patch -Fetch-build-db-from-upstream-git.patch -build-db-Use-the-same-database-format-that-the-C-code-exp.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 -CVE-2021-3502.patch diff --git a/network/avahi/slack-desc b/network/avahi/slack-desc index 8fb66245a4..7e2b027fe3 100644 --- a/network/avahi/slack-desc +++ b/network/avahi/slack-desc @@ -2,18 +2,18 @@ # The "handy ruler" below makes it easier to edit a package description. # Line up the first '|' above the ':' following the base package name, and # the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also +# You must make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -avahi: avahi (service discovery aka zeroconf) +avahi: avahi (service discovery aka Zeroconf) avahi: -avahi: Avahi is an Implementation the DNS Service Discovery and Multicast -avahi: DNS specifications for Zeroconf Computing. It uses D-BUS for -avahi: communication between user applications and a system daemon. The -avahi: daemon is used to coordinate application efforts in caching replies, -avahi: necessary to minimize the traffic imposed on networks. This kind of -avahi: technology is already found in Apple MacOS X (branded Rendezvous -avahi: Bonjour and sometimes Zeroconf) and is very convenient. +avahi: Avahi is a system which facilitates service discovery on a local +avahi: network via the mDNS/DNS-SD protocol suite. This enables you to plug +avahi: your laptop or computer into a network and instantly be able to view +avahi: other people who you can chat with, find printers to print to, or find +avahi: files being shared. +avahi: +avahi: Homepage: https://avahi.org avahi: avahi: |