summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Matteo Bernardini2024-02-23 06:50:46 +0100
committer Matteo Bernardini2024-03-16 09:15:02 +0100
commitfed0c0925509616c1df220aa951c433ed50c5a18 (patch)
tree108feb7801c05534cfa7e1bd393c16b9b16e121d
parentf2fd02d810ccafdcb54cd1ce380341a85bbefd77 (diff)
downloadslackbuilds-avahi.tar.gz
network/avahi: Removed (added to Slackware).avahi
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
-rw-r--r--network/avahi/README14
-rw-r--r--network/avahi/README.SBo43
-rw-r--r--network/avahi/avahi-discover.116
-rw-r--r--network/avahi/avahi.SlackBuild201
-rw-r--r--network/avahi/avahi.info10
-rw-r--r--network/avahi/bssh.136
-rw-r--r--network/avahi/doinst.sh38
-rw-r--r--network/avahi/patches/CVE-2021-3502.patch148
-rw-r--r--network/avahi/patches/Fetch-build-db-from-upstream-git.patch71
-rw-r--r--network/avahi/patches/Ship-avahi-discover-1-bssh-1-and-bvnc-1-also-for-GTK3.patch50
-rw-r--r--network/avahi/patches/avahi-client-fix-resource-leak.patch22
-rw-r--r--network/avahi/patches/avahi-daemon-chroot-fix-bogus-assignments-in-assertions.patch24
-rw-r--r--network/avahi/patches/avahi-discover-Don-t-decode-unicode-strings-only-bytestri.patch41
-rw-r--r--network/avahi/patches/avahi_dns_packet_consume_uint32-fix-potential-undefined-b.patch29
-rw-r--r--network/avahi/patches/avoid-infinite-loop-in-avahi-daemon-by-handling-hup-event-in-client-work.patch37
-rw-r--r--network/avahi/patches/build-db-Use-the-same-database-format-that-the-C-code-exp.patch106
-rw-r--r--network/avahi/patches/fix-bytestring-decoding-for-proper-display.patch28
-rw-r--r--network/avahi/patches/fixup_avahi-dnsconfd.action.patch69
-rw-r--r--network/avahi/patches/ipv6_race_condition_fix.patch51
-rw-r--r--network/avahi/patches/man-add-missing-bshell.1-symlink.patch33
-rw-r--r--network/avahi/patches/man-fix-reference-to-avahi-autoipd.action-8-in-avahi-auto.patch24
-rw-r--r--network/avahi/patches/series13
-rw-r--r--network/avahi/slack-desc19
23 files changed, 0 insertions, 1123 deletions
diff --git a/network/avahi/README b/network/avahi/README
deleted file mode 100644
index 3057f78a16..0000000000
--- a/network/avahi/README
+++ /dev/null
@@ -1,14 +0,0 @@
-Avahi is an implementation of the DNS Service Discovery and Multicast
-DNS specifications for Zeroconf Computing. It uses D-BUS for
-communication between user applications and a system daemon. The
-daemon is used to coordinate application efforts in caching replies,
-necessary to minimize the traffic imposed on networks. This kind
-of technology is already found in Apple MacOS X (branded Rendezvous
-Bonjour and sometimes Zeroconf) and is very convenient.
-
-You will need to have an "avahi" user and group on the target
-system prior to installing the avahi package. See README.SBo in this
-directory (it is also installed to the package docmentation directory)
-for more information and for setup notes.
-
-mono support is not working ATM so it's forcibly disabled.
diff --git a/network/avahi/README.SBo b/network/avahi/README.SBo
deleted file mode 100644
index d05e6bb6b9..0000000000
--- a/network/avahi/README.SBo
+++ /dev/null
@@ -1,43 +0,0 @@
-README.SBo (avahi)
-
-First, be sure you have an "avahi" user and group. Do this *before*
-you install the avahi package. We recommend uid/gid of 214, but
-adjust as needed for your system. Something like this should suffice:
-
- # groupadd -g 214 avahi
- # useradd -u 214 -g 214 -c "Avahi User" -d /dev/null -s /bin/false avahi
-
-
-Now start the Avahi daemon:
-
- # /etc/rc.d/rc.avahidaemon start
-
-Optionally start the unicast DNS configuration daemon:
-
- # /etc/rc.d/rc.avahidnsconfd start
-
-
-You will need to start avahi at boot by adding the following
-to your /etc/rc.d/rc.local and make them executable:
-
- # Start avahidaemon
- if [ -x /etc/rc.d/rc.avahidaemon ]; then
- /etc/rc.d/rc.avahidaemon start
- fi
- # Start avahidnsconfd
- if [ -x /etc/rc.d/rc.avahidnsconfd ]; then
- /etc/rc.d/rc.avahidnsconfd start
- fi
-
-You will also want to put the following into /etc/rc.d/rc.local_shutdown
-(if that file does not exist, create it and make it executable):
-
- # Stop avahidnsconfd
- if [ -x /etc/rc.d/rc.avahidnsconfd ]; then
- /etc/rc.d/rc.avahidnsconfd stop
- fi
- # Stop avahidaemon
- if [ -x /etc/rc.d/rc.avahidaemon ]; then
- /etc/rc.d/rc.avahidaemon stop
- fi
-
diff --git a/network/avahi/avahi-discover.1 b/network/avahi/avahi-discover.1
deleted file mode 100644
index 085ff1354e..0000000000
--- a/network/avahi/avahi-discover.1
+++ /dev/null
@@ -1,16 +0,0 @@
-.TH avahi-discover 1 User Manuals
-.SH NAME
-avahi-discover \- Browse for mDNS/DNS-SD services using the Avahi daemon
-.SH SYNOPSIS
-\fBavahi-discover
-\f1
-.SH DESCRIPTION
-Show a real-time graphical browse list for mDNS/DNS-SD network services running on the local LAN using the Avahi daemon.
-.SH OPTIONS
-avahi-discover takes no command line arguments at the moment.
-.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-browse(1)\f1
-.SH COMMENTS
-This man page was written using \fBxml2man(1)\f1 by Oliver Kurth.
diff --git a/network/avahi/avahi.SlackBuild b/network/avahi/avahi.SlackBuild
deleted file mode 100644
index e81a77cc29..0000000000
--- a/network/avahi/avahi.SlackBuild
+++ /dev/null
@@ -1,201 +0,0 @@
-#!/bin/bash
-
-# Slackware build script for avahi
-
-# Copyright 2008-2012 David Somero (dsomero@hotmail.com) Athens, TN, USA
-# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, Minnesota, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# 20220301 bkw: Modified by SlackBuilds.org, BUILD=7:
-# - don't include empty /run dir in package.
-# - remove useless INSTALL from doc dir.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PRGNAM=avahi
-VERSION=${VERSION:-0.8}
-BUILD=${BUILD:-7}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
- echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
- exit 0
-fi
-
-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: "
- echo " # groupadd -g 214 avahi"
- echo " # useradd -u 214 -g 214 -c "Avahi" -d /dev/null -s /bin/false avahi"
- exit 1
-}
-
-# Bail if user and/or group isn't valid on your system
-if ! getent passwd avahi &>/dev/null; then
- warn_accounts
-fi
-if ! getent group avahi &>/dev/null; then
- warn_accounts
-fi
-
-if [ "${ARCH}" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \+ -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
-
-# 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
-
-export PYTHON=python3
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --with-systemdsystemunitdir=no \
- --enable-tests \
- --disable-static \
- --disable-monodoc \
- --disable-autoipd \
- --enable-compat-libdns_sd \
- --enable-python-dbus \
- --enable-glib \
- --enable-dbus \
- --enable-python \
- --enable-gtk \
- --enable-gtk3 \
- --enable-qt5 \
- --disable-qt4 \
- --disable-qt3 \
- --enable-core-docs \
- --with-dbus-sys=/usr/share/dbus-1/system.d \
- --with-avahi-user=avahi \
- --with-avahi-group=avahi \
- --with-avahi-priv-access-group=netdev \
- --with-distro=slackware \
- --program-prefix= \
- --program-suffix= \
- --build=$ARCH-slackware-linux \
- $MONO
-
-make
-make install-strip DESTDIR=$PKG
-
-# 20220414 bkw: if this dir is empty, it doesn't need to be included
-# in the package.
-rmdir $PKG/run &> /dev/null || true
-
-rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/*.la
-
-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
-
-sed -i "s|#!python3|#!/usr/bin/python3|g" $PKG/usr/bin/avahi-{discover,bookmarks}
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-rm -f docs/INSTALL
-cp -a LICENSE docs/* $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/avahi/avahi.info b/network/avahi/avahi.info
deleted file mode 100644
index ced5e61121..0000000000
--- a/network/avahi/avahi.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="avahi"
-VERSION="0.8"
-HOMEPAGE="http://avahi.org/"
-DOWNLOAD="https://github.com/lathiat/avahi/releases/download/v0.8/avahi-0.8.tar.gz"
-MD5SUM="229c6aa30674fc43c202b22c5f8c2be7"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="libdaemon"
-MAINTAINER="Robby Workman"
-EMAIL="rworkman@slackbuilds.org"
diff --git a/network/avahi/bssh.1 b/network/avahi/bssh.1
deleted file mode 100644
index 913554eb30..0000000000
--- a/network/avahi/bssh.1
+++ /dev/null
@@ -1,36 +0,0 @@
-.TH bssh/bvnc/bshell 1 User Manuals
-.SH NAME
-bssh/bvnc/bshell \- Browse for SSH/VNC servers on the local network
-.SH SYNOPSIS
-\fBbssh
-
-bvnc
-
-bshell
-\f1
-.SH DESCRIPTION
-bssh/bvnc/bshell browses for SSH/VNC servers on the local network, shows them in a GUI for the user to select one and finally calls ssh/vncviewer after a selection was made.
-
-If the binary is called as bssh only ssh servers will be shown. If the binary is called as bvnc only VNC servers will be shown. If the binary is called as bshell both VNC and SSH servers are shown.
-.SH OPTIONS
-.TP
-\fB-s | --ssh\f1
-Browse for SSH servers (and only SSH servers) regardless under which name the binary is called.
-.TP
-\fB-v | --vnc\f1
-Browse for VNC servers (and only VNC servers) regardless under which name the binary is called.
-.TP
-\fB-S | --shell\f1
-Browse for both VNC and SSH servers regardless under which name the binary is called.
-.TP
-\fB-d | --domain=\f1 \fIDOMAIN\f1
-Browse in the specified domain. If omitted bssh/bvnc/bshell will browse in the default browsing domain (usually .local)
-.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, \fBssh(1)\f1, \fBvncviewer(1)\f1
-.SH COMMENTS
-This man page was written using \fBxml2man(1)\f1 by Oliver Kurth.
diff --git a/network/avahi/doinst.sh b/network/avahi/doinst.sh
deleted file mode 100644
index 9bf5bd8772..0000000000
--- a/network/avahi/doinst.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-config() {
- NEW="$1"
- OLD="$(dirname $NEW)/$(basename $NEW .new)"
- # If there's no config file by that name, mv it over:
- if [ ! -r $OLD ]; then
- mv $NEW $OLD
- elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
- # toss the redundant copy
- rm $NEW
- fi
- # Otherwise, we leave the .new copy for the admin to consider...
-}
-
-preserve_perms() {
- NEW="$1"
- OLD="$(dirname $NEW)/$(basename $NEW .new)"
- if [ -e $OLD ]; then
- cp -a $OLD ${NEW}.incoming
- cat $NEW > ${NEW}.incoming
- mv ${NEW}.incoming $NEW
- fi
- config $NEW
-}
-
-
-preserve_perms etc/rc.d/rc.avahidaemon.new
-preserve_perms etc/rc.d/rc.avahidnsconfd.new
-preserve_perms etc/avahi/avahi-daemon.conf.new
-
-if [ -x /usr/bin/update-desktop-database ]; then
- /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
-fi
-
-# Reload messagebus service
-if [ -x etc/rc.d/rc.messagebus ]; then
- chroot . /etc/rc.d/rc.messagebus reload
-fi
-
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/fixup_avahi-dnsconfd.action.patch b/network/avahi/patches/fixup_avahi-dnsconfd.action.patch
deleted file mode 100644
index 88f9b5f807..0000000000
--- a/network/avahi/patches/fixup_avahi-dnsconfd.action.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-avahi-dnsconfd.action looks for /sbin/netconfig, and if found, attempts to
-use it to modify /etc/resolv.conf. While *our* netconfig and SuSE's
-netconfig started out the same, they're quite different these days, and
-thus the result is /etc/HOSTNAME getting set to some nonsense such as:
- INTERFACE='eth0'.DNSSERVERS='192.168.13.1'
-This was quite some fun tracking down, by the way... :-) --rworkman
-
-
-diff -Nur avahi-0.6.30.orig/avahi-dnsconfd/avahi-dnsconfd.action avahi-0.6.30/avahi-dnsconfd/avahi-dnsconfd.action
---- avahi-0.6.30.orig/avahi-dnsconfd/avahi-dnsconfd.action 2010-06-28 22:30:34.000000000 -0500
-+++ avahi-0.6.30/avahi-dnsconfd/avahi-dnsconfd.action 2012-01-21 16:18:24.337986754 -0600
-@@ -33,48 +33,16 @@
- # $AVAHI_INTERFACE_DNS_SERVERS A whitespace seperated list of DNS servers on $AVAHI_INTERFACE
- # $AVAHI_DNS_SERVERS The complete list of all DNS servers found on all interfaces
-
--if [ -x /sbin/netconfig ]; then
-- # SUSE method on 11.1+
-- if [ -n "$AVAHI_INTERFACE_DNS_SERVERS" ]; then
-- /sbin/netconfig modify -s avahi -i "$AVAHI_INTERFACE" <<-EOF
-- INTERFACE='$AVAHI_INTERFACE'
-- DNSSERVERS='$AVAHI_INTERFACE_DNS_SERVERS'
-- EOF
-- else
-- /sbin/netconfig remove -s avahi -i "$AVAHI_INTERFACE"
-- fi
--elif [ -x /sbin/modify_resolvconf ] ; then
-- # method for SUSE <= 11.0
-- if [ -n "$AVAHI_DNS_SERVERS" ]; then
-- /sbin/modify_resolvconf modify -s avahi -t - -p avahi-dnsconfd -n "$AVAHI_DNS_SERVERS" <<-EOF
-- if you don't like avahi to update your Nameservers
-- disable the avahi-dnsconfd init script
-- EOF
-- else
-- /sbin/modify_resolvconf restore -s avahi
-- fi
--elif [ -x /sbin/resolvconf ] ; then
-
-- # We have Debian's resolvconf tool
--
-- if [ "x$AVAHI_INTERFACE_DNS_SERVERS" = "x" ] ; then
-- /sbin/resolvconf -d "$AVAHI_INTERFACE.avahi"
-- else
-- for n in $AVAHI_INTERFACE_DNS_SERVERS ; do
-- echo "nameserver $n"
-- done | /sbin/resolvconf -a "$AVAHI_INTERFACE.avahi"
-- fi
--else
--
-- # No resolvconf tool available
--
-- if [ "x$AVAHI_DNS_SERVERS" = "x" ] ; then
-+if [ "x$AVAHI_DNS_SERVERS" = "x" ] ; then
- test -f /etc/resolv.conf.avahi && mv /etc/resolv.conf.avahi /etc/resolv.conf
-- else
-+else
- test -f /etc/resolv.conf.avahi || mv /etc/resolv.conf /etc/resolv.conf.avahi
-
-- for n in $AVAHI_DNS_SERVERS ; do
-- echo "nameserver $n"
-- done > /etc/resolv.conf
-- fi
-+ grep -v ^nameserver /etc/resolv.conf.avahi > /etc/resolv.conf
-+
-+ for n in $AVAHI_DNS_SERVERS ; do
-+ echo "nameserver $n"
-+ done >> /etc/resolv.conf
- fi
-+
-
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
deleted file mode 100644
index 8fb66245a4..0000000000
--- a/network/avahi/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# 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
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-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: