<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ee0a2a46000d92dc4db8ca3a50d1e8d8d0fc2ad6">https://github.com/macports/macports-ports/commit/ee0a2a46000d92dc4db8ca3a50d1e8d8d0fc2ad6</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit ee0a2a46000d92dc4db8ca3a50d1e8d8d0fc2ad6
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Wed Oct 11 13:41:24 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> avahi: make users/groups code more explicit
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> No revbump since final build is unaffected.
</span>---
net/avahi/Portfile | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/avahi/Portfile b/net/avahi/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d734268..bbc1daf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/avahi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/avahi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,7 +31,6 @@ patchfiles patch-avahi-daemon-Makefile.in.diff \
</span> patch-initscript-darwin-org.freedesktop.avahi-daemon.plist.in.diff \
patch-initscript-darwin-org.freedesktop.avahi-dnsconfd.plist.in.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # ensure MacPorts machine-id from dbus is found
# see https://trac.macports.org/ticket/53894 for O_CLOEXEC
patchfiles-append patch-avahi_daemon.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,7 +56,16 @@ depends_lib port:expat \
</span>
gobject_introspection yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set avahiuser avahi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set avahi_user avahi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set avahi_group avahi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+add_users ${avahi_user} group=${avahi_group} realname=Avahi\ Service
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# "Priviliged access group for Avahi clients"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# defaults to netdev
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# macOS has no equivalent group
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://wiki.ubuntu.com/Security/Privileges#Connect_to_wireless_and_ethernet_networks
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://wiki.debian.org/SystemGroups
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set avahi_priv_group avahi
</span>
configure.args --disable-autoipd \
--disable-silent-rules \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,7 +80,9 @@ configure.args --disable-autoipd \
</span> --disable-gtk \
--disable-pygtk \
--disable-tests \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-avahi-priv-access-group=${avahiuser}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-avahi-priv-access-group=${avahi_priv_group} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-avahi-user=${avahi_user} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-avahi-group=${avahi_group}
</span>
# __APPLE_USE_RFC_2292 should be removed once avhi is updated to support RFC 3542
configure.cppflags-append -L${prefix}/lib -D__APPLE_USE_RFC_2292
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -94,8 +104,6 @@ post-destroot {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-add_users ${avahiuser} group=${avahiuser} realname=Avahi\ Service
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-activate {
if {[file exists /System/Library/LaunchDaemons/org.freedesktop.avahi-dnsconfd.plist]} {
ui_debug "Removing cruft from versions prior to 0.6.17_2..."
</pre><pre style='margin:0'>
</pre>