<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/fc6cff8fed06215629b5c058c087e28ad09390e4">https://github.com/macports/macports-ports/commit/fc6cff8fed06215629b5c058c087e28ad09390e4</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit fc6cff8fed06215629b5c058c087e28ad09390e4
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Wed Oct 11 05:47:01 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> dbus: never install files in user's home directory
</span>---
devel/dbus/Portfile | 66 ++++++++++++-----------------------------------------
1 file changed, 14 insertions(+), 52 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/dbus/Portfile b/devel/dbus/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 42b3614..8cc0279 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/dbus/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/dbus/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup muniversal 1.0
</span>
name dbus
version 1.10.20
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> maintainers {mcalhoun @MarcusCalhoun-Lopez} openmaintainer
categories devel
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,33 +38,9 @@ if {$macosx_deployment_target eq "10.4"} {
</span> depends_build \
port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-unset -nocomplain startup_root
</span> if { [variant_isset no_root] } {
set dbus_user ${install.user}
set dbus_group ${install.group}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # look for place to install startup files
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [tbool startupitem.install] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # See #28121 and #42994
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #set startup_root [join [lrange [exec /usr/bin/dscl . -read Users/${install.user} NFSHomeDirectory] 1 end]]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #set startup_root [join [lrange [exec /usr/bin/dscl '/Active Directory/All Domains' -read Users/${install.user} NFSHomeDirectory] 1 end]]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach datasource [list . "'/Active Directory/All Domains'" ] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ! [catch {system "/usr/bin/dscl ${datasource} -read Users/${install.user} NFSHomeDirectory"}] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "dscl found ${install.user} in ${datasource}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set startup_root [join [lrange [exec /usr/bin/dscl ${datasource} -read Users/${install.user} NFSHomeDirectory] 1 end]]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "dscl can not find ${install.user} in ${datasource}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ! [info exists startup_root] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ![tbool startupitem.install] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "Unable to find a valid home directory, but user disallows startup items."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_warn "Unable to find a valid home directory even though user requested startup items be installed."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> } else {
if { [variant_isset underscore] } {
set dbus_user _messagebus
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,10 +48,6 @@ if { [variant_isset no_root] } {
</span> set dbus_user messagebus
}
set dbus_group ${dbus_user}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [tbool startupitem.install] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set startup_root ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> add_users ${dbus_user} group=${dbus_group} realname=Message\ Bus
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,13 +62,8 @@ configure.args --disable-doxygen-docs \
</span> --with-dbus-user=${dbus_user} \
--disable-tests
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set sudo ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset no_root]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set sudo "sudo "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [tbool startupitem.create] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${startupitem.install} && ![variant_isset no_root]} {
</span> # Disable if installed into startup directory.
reinplace "s|</array>|</array>\\\n\\\n\\\t<key>Disabled</key>\\\n\\\t<true/>|" \
${worksrcpath}/bus/org.freedesktop.dbus-session.plist.in
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -157,7 +124,7 @@ post-destroot {
</span> puts ${plist} "<key>KeepAlive</key><true/>"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [tbool startupitem.install] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${startupitem.install} && ![variant_isset no_root]} {
</span> puts ${plist} "<key>Disabled</key><true/>"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -166,11 +133,11 @@ post-destroot {
</span>
close ${plist}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [info exists startup_root] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -m 0755 ${destroot}${startup_root}/Library/LaunchDaemons
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -m 0755 ${destroot}${startup_root}/Library/LaunchAgents
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${prefix}/Library/LaunchDaemons/org.freedesktop.dbus-system.plist ${destroot}${startup_root}/Library/LaunchDaemons
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${prefix}/Library/LaunchAgents/org.freedesktop.dbus-session.plist ${destroot}${startup_root}/Library/LaunchAgents
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${startupitem.install} && ![variant_isset no_root]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${destroot}/Library/LaunchDaemons
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${destroot}/Library/LaunchAgents
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/Library/LaunchDaemons/org.freedesktop.dbus-system.plist ${destroot}/Library/LaunchDaemons
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/Library/LaunchAgents/org.freedesktop.dbus-session.plist ${destroot}/Library/LaunchAgents
</span> }
system "env DYLD_LIBRARY_PATH=${destroot}${prefix}/lib ${destroot}${prefix}/bin/dbus-uuidgen --ensure=${destroot}${prefix}/var/lib/dbus/machine-id"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -187,9 +154,9 @@ post-activate {
</span> }
#pre-deactivate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# if { [info exists startup_root] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# catch {system "launchctl unload ${startup_root}/Library/LaunchDaemons/org.freedesktop.dbus-system.plist"}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# catch {system "launchctl unload ${startup_root}/Library/LaunchAgents/org.freedesktop.dbus-session.plist"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# if {${startupitem.install} && ![variant_isset no_root]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# catch {system "launchctl unload /Library/LaunchDaemons/org.freedesktop.dbus-system.plist"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# catch {system "launchctl unload /Library/LaunchAgents/org.freedesktop.dbus-session.plist"}
</span> # }
#}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -205,15 +172,15 @@ variant test description {enable tests (Only Works if dbus is Already Installed)
</span> configure.python ${prefix}/bin/python2.7
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { [info exists startup_root] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${startupitem.install} && ![variant_isset no_root]} {
</span> notes "############################################################################
# Startup items have been generated that will aid in
# starting ${name} with launchd. They are disabled
# by default. Execute the following commands to start them,
# and to cause them to launch at startup:
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# ${sudo}launchctl load -w ${startup_root}/Library/LaunchDaemons/org.freedesktop.dbus-system.plist
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# launchctl load -w ${startup_root}/Library/LaunchAgents/org.freedesktop.dbus-session.plist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# sudo launchctl load -w /Library/LaunchDaemons/org.freedesktop.dbus-system.plist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# launchctl load -w /Library/LaunchAgents/org.freedesktop.dbus-session.plist
</span> ############################################################################"
} else {
notes "############################################################################
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -233,11 +200,6 @@ variant no_root conflicts underscore description {Run the DBUS daemon as MacPort
</span> error "Please do not use this variant with your MacPorts configuration."
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Files are installed into user's startup directory.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [tbool startupitem.install] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.violate_mtree yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
variant underscore conflicts no_root description {Put underscore in front of DBUS daemon user} {
</pre><pre style='margin:0'>
</pre>