<pre style='margin:0'>
Zhenfu Shi (i0ntempest) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f3a1ca4ae4513050b2899e1e966fc59dd7af8f93">https://github.com/macports/macports-ports/commit/f3a1ca4ae4513050b2899e1e966fc59dd7af8f93</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new f3a1ca4ae45 avahi: fix daemon start failure
</span>f3a1ca4ae45 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f3a1ca4ae4513050b2899e1e966fc59dd7af8f93
</span>Author: Brian Kendall <brian@briankendall.net>
AuthorDate: Mon Feb 13 13:15:00 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> avahi: fix daemon start failure
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * patches configure so that daemon places socket file in /var/run rather than /run
</span><span style='display:block; white-space:pre;color:#404040;'> * launches daemon with --no-drop-root argument as setuid is explicitly not supported when launched via launchd
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/57519
</span>---
net/avahi/Portfile | 5 ++++-
net/avahi/files/patch-configure-var-run.diff | 11 +++++++++++
...tscript-darwin-org.freedesktop.avahi-daemon.plist.in.diff | 12 ++++++++++--
3 files changed, 25 insertions(+), 3 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 30ceebe82f0..317bd8ea203 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;'>@@ -29,7 +29,8 @@ patchfiles patch-avahi-daemon-Makefile.in.diff \
</span> patch-avahi-dnsconfd-Makefile.in.diff \
patch-avahi-utils-Makefile.in.diff \
patch-initscript-darwin-org.freedesktop.avahi-daemon.plist.in.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-initscript-darwin-org.freedesktop.avahi-dnsconfd.plist.in.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-initscript-darwin-org.freedesktop.avahi-dnsconfd.plist.in.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-configure-var-run.diff
</span>
# ensure MacPorts machine-id from dbus is found
# see https://trac.macports.org/ticket/53894 for O_CLOEXEC
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -168,11 +169,13 @@ variant gtk3 description {Build with GTK3} {
</span>
variant qt4 description {Build with Qt4} {
PortGroup qt4 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-delete --disable-qt4
}
variant qt5 description {Build with Qt5} {
PortGroup qt5 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # This configure script does not use CXXFLAGS variable for Qt5 compile test so I have to do this
configure.env-append QT5_CFLAGS=-std=c++11\ -DQT_CORE_LIB\ -F${qt_dir}/lib\ -I${qt_dir}/lib/QtCore.framework/Headers\ -I${qt_dir}/include
compiler.cxx_standard 2011
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/avahi/files/patch-configure-var-run.diff b/net/avahi/files/patch-configure-var-run.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..6125968dbe4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/avahi/files/patch-configure-var-run.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.org 2023-02-12 21:25:53.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Configure 2023-02-12 21:28:21.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24638,7 +24638,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Avahi runtime dir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-avahi_runtime_dir="/run"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++avahi_runtime_dir="/var/run"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ avahi_socket="${avahi_runtime_dir}/avahi-daemon/socket"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/avahi/files/patch-initscript-darwin-org.freedesktop.avahi-daemon.plist.in.diff b/net/avahi/files/patch-initscript-darwin-org.freedesktop.avahi-daemon.plist.in.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 09764af7e79..45dbb95bcca 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/avahi/files/patch-initscript-darwin-org.freedesktop.avahi-daemon.plist.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/avahi/files/patch-initscript-darwin-org.freedesktop.avahi-daemon.plist.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- initscript/darwin/org.freedesktop.avahi-daemon.plist.in.orig 2012-02-15 10:30:25.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ initscript/darwin/org.freedesktop.avahi-daemon.plist.in 2012-02-15 10:33:40.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- initscript/darwin/org.freedesktop.avahi-daemon.plist.in.orig 2015-04-01 00:58:00.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ initscript/darwin/org.freedesktop.avahi-daemon.plist.in 2023-02-13 13:09:30.000000000 -0500
</span> @@ -2,6 +2,8 @@
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,3 +9,11 @@
</span> <key>Label</key>
<string>org.freedesktop.avahi-daemon</string>
<key>OnDemand</key>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9,6 +11,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <key>ProgramArguments</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <array>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string>@sbindir@/avahi-daemon</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <string>--no-drop-root</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </array>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <key>ServiceIPC</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <false/>
</span></pre><pre style='margin:0'>
</pre>