[PR PATCH] avahi: preserve default behavior for disallow-other-stacks

[PR PATCH] avahi: preserve default behavior for disallow-other-stacks

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 811 bytes --]

There is a new pull request by ahesford against master on the void-packages repository

https://github.com/ahesford/void-packages avahi
https://github.com/void-linux/void-packages/pull/18773

avahi: preserve default behavior for disallow-other-stacks
The void package for avahi overrides the default configuration for disallow-other-stacks, which causes avahi-daemon to bind port 5353. This is "recommended" practice by the Avahi maintainers, but is disabled by default to "not annoy people". In particular, setting this to true breaks the hpaio SANE driver, which attempts to use its own mDNS stack to search for network-connected scanners.

To be consistent with default avahi behavior, this PR undoes the override.

A patch file from https://github.com/void-linux/void-packages/pull/18773.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-avahi-18773.patch --]
[-- Type: text/x-diff, Size: 1176 bytes --]

From 9b7a4373a37b5285d6a22d34e6d43b853f6f878a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 3 Feb 2020 11:19:43 -0500
Subject: [PATCH] avahi: preserve default behavior for disallow-other-stacks in
 avahi-daemon.conf

---
 srcpkgs/avahi/template | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/avahi/template b/srcpkgs/avahi/template
index 572075be35a..199cbd4e057 100644
--- a/srcpkgs/avahi/template
+++ b/srcpkgs/avahi/template
@@ -1,7 +1,7 @@
 # Template file for 'avahi'
 pkgname=avahi
 version=0.7
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
  --disable-doxygen-doc --enable-compat-libdns_sd --enable-compat-howl
@@ -42,8 +42,6 @@ post_extract() {
 }
 post_install() {
 	rm -rf ${DESTDIR}/usr/lib/python*
-	# Enable 'disallow_other_stacks' option by default.
-	sed -e 's,\#\(disallow-other-stacks\).*,\1=yes,' -i ${DESTDIR}/etc/avahi/avahi-daemon.conf
 	# Set 'enable-dbus=warn' option by default to not require dbus.
 	sed -e 's,\#\(enable-dbus\).*,\1=warn,' -i ${DESTDIR}/etc/avahi/avahi-daemon.conf
 	vsv avahi-daemon

Re: [PR PATCH] [Merged]: avahi: preserve default behavior for disallow-other-stacks

[xtraeme]

[-- Attachment #1: Type: text/plain, Size: 660 bytes --]

There's a merged pull request on the void-packages repository

avahi: preserve default behavior for disallow-other-stacks
https://github.com/void-linux/void-packages/pull/18773

Description:
The void package for avahi overrides the default configuration for disallow-other-stacks, which causes avahi-daemon to bind port 5353. This is "recommended" practice by the Avahi maintainers, but is disabled by default to "not annoy people". In particular, setting this to true breaks the hpaio SANE driver, which attempts to use its own mDNS stack to search for network-connected scanners.

To be consistent with default avahi behavior, this PR undoes the override.