[145293] users/devans/GNOME-3/stable/dports/devel/dbus
devans at macports.org
devans at macports.org
Sat Jan 30 20:05:33 PST 2016
Revision: 145293
https://trac.macports.org/changeset/145293
Author: devans at macports.org
Date: 2016-01-30 20:05:33 -0800 (Sat, 30 Jan 2016)
Log Message:
-----------
GNOME-3/stable: dbus, sync with trunk and update to current version 1.10.6 for testing.
Modified Paths:
--------------
users/devans/GNOME-3/stable/dports/devel/dbus/Portfile
Added Paths:
-----------
users/devans/GNOME-3/stable/dports/devel/dbus/files/patch-configure.diff
Property Changed:
----------------
users/devans/GNOME-3/stable/dports/devel/dbus/
Property changes on: users/devans/GNOME-3/stable/dports/devel/dbus
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/mld-qt-481/dports/devel/dbus:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/cal/ports/devel/dbus:96570-97031
+ /branches/mld-qt-481/dports/devel/dbus:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/devel/dbus:134468-145292
/users/cal/ports/devel/dbus:96570-97031
Modified: users/devans/GNOME-3/stable/dports/devel/dbus/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/devel/dbus/Portfile 2016-01-31 02:55:04 UTC (rev 145292)
+++ users/devans/GNOME-3/stable/dports/devel/dbus/Portfile 2016-01-31 04:05:33 UTC (rev 145293)
@@ -6,7 +6,10 @@
name dbus
conflicts dbus-devel
-version 1.8.18
+version 1.10.6
+# version 1.8.18 introduces security hardening of the session bus
+# this currently breaks many GNOME 3 apps
+# hold off on updating until this is resolved (#47741)
maintainers mcalhoun openmaintainer
categories devel
platforms darwin
@@ -19,13 +22,15 @@
homepage http://www.freedesktop.org/Software/dbus
master_sites http://dbus.freedesktop.org/releases/dbus
-checksums rmd160 96215bbd9d2ba322d8ddfe7b2fde74e37ed44671 \
- sha256 36f2eb9c777a3c71562573da36a147e900a642afcd44d2b0470d992a4898c4f2
+checksums rmd160 afaac55b06050bd4b80f7557fe69029dc3a820b0 \
+ sha256 b5fefa08a77edd76cd64d872db949eebc02cf6f3f8be82e4bbc641742af5d35f
# See r59386
# See r68276
+# poll is always broken
patchfiles patch-bus-system.conf.in.diff \
- patch-dbus-dbus-sysdeps-unix.c.diff
+ patch-dbus-dbus-sysdeps-unix.c.diff \
+ patch-configure.diff
# See #43203
if { ${os.major} < 11 } {
@@ -39,7 +44,7 @@
if { [variant_isset no_root] } {
set dbus_user ${install.user}
set dbus_group ${install.group}
-
+
# look for place to install startup files
if { [tbool startupitem.install] } {
# See #28121 and #42994
@@ -59,7 +64,7 @@
ui_debug "Unable to find a valid home directory, but user disallows startup items."
} else {
ui_warn "Unable to find a valid home directory even though user requested startup items be installed."
- }
+ }
}
}
} else {
@@ -69,7 +74,7 @@
set dbus_user messagebus
}
set dbus_group ${dbus_user}
-
+
if { [tbool startupitem.install] } {
set startup_root ""
}
@@ -118,7 +123,7 @@
ui_error "If you do not want to install the startup items, please change the global variable in ${prefix}/etc/macports/macports.conf"
ui_error "Note: this will affect other ports"
ui_error "See https://guide.macports.org/#reference.startupitems"
- return -code error "invalid obsolete variant"
+ return -code error "invalid obsolete variant"
} else {
ui_warn "You have requested an obsolete variant"
ui_warn "Installation of startup items are now determined by ${prefix}/etc/macports/macports.conf"
@@ -128,9 +133,6 @@
}
post-patch {
- reinplace "s|/usr/local|${prefix}|g" ${worksrcpath}/dbus/dbus-sysdeps-unix.c
- reinplace {s|broken_poll="no (cross compiling)"|broken_poll=yes|} ${worksrcpath}/configure
-
if { [tbool startupitem.create] } {
# Disable if installed into startup directory.
reinplace "s|</array>|</array>\\\n\\\n\\\t<key>Disabled</key>\\\n\\\t<true/>|" \
@@ -177,15 +179,15 @@
# See #15081
xinstall -d -m 0755 ${destroot}${plistDir}
set plist [open "${destroot}${plistFl}" w 0644]
-
+
puts ${plist} "<?xml version='1.0' encoding='UTF-8'?>"
puts ${plist} "<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\""
puts ${plist} "\"http://www.apple.com/DTDs/PropertyList-1.0.dtd\" >"
puts ${plist} "<plist version='1.0'>"
puts ${plist} "<dict>"
-
+
puts ${plist} "<key>Label</key><string>org.freedesktop.dbus-system</string>"
-
+
puts ${plist} "<key>ProgramArguments</key>"
puts ${plist} "<array>"
puts ${plist} "\t<string>${prefix}/bin/dbus-daemon</string>"
@@ -201,19 +203,19 @@
if { [tbool startupitem.install] } {
puts ${plist} "<key>Disabled</key><true/>"
}
-
+
puts ${plist} "</dict>"
puts ${plist} "</plist>"
-
+
close ${plist}
-
+
if { [info exists startup_root] } {
xinstall -d -m 0755 ${destroot}${startup_root}/Library/LaunchDaemons
xinstall -d -m 0755 ${destroot}${startup_root}/Library/LaunchAgents
ln -s ${plistFl} ${destroot}${startup_root}/Library/LaunchDaemons
ln -s ${prefix}/Library/LaunchAgents/org.freedesktop.dbus-session.plist ${destroot}${startup_root}/Library/LaunchAgents
}
-
+
system "env DYLD_LIBRARY_PATH=${destroot}${prefix}/lib ${destroot}${prefix}/bin/dbus-uuidgen --ensure=${destroot}${prefix}/var/lib/dbus/machine-id"
}
@@ -227,7 +229,7 @@
post-activate {
file attributes ${prefix}/var/run/dbus -group ${dbus_group} -owner ${dbus_user}
file attributes ${prefix}/libexec/dbus-daemon-launch-helper -group ${dbus_group}
-
+
if { [tbool startupitem.install] && ![variant_isset no_root] } {
file attributes ${prefix}/Library/LaunchAgents/org.freedesktop.dbus-session.plist -owner root -group wheel
file attributes ${prefix}/Library/LaunchDaemons/[file tail ${plistFl}] -owner root -group wheel
@@ -275,13 +277,19 @@
}
variant no_root conflicts underscore description {Run the DBUS daemon as MacPorts install user.} {
- pre-configure {
- if { ${install.user}=="root" || ${install.group}=="wheel" } {
+ pre-fetch {
+ ###########
+ # WARNING #
+ ###########
+ # Do not error out later than in the fetch phase. In MacPorts 2.3.3,
+ # add_users root trashes the root user in the extract phase. See
+ # #45737.
+ if {${install.user} eq "root" || ${install.group} eq "wheel"} {
ui_error "The DBUS daemon should not be run as root."
error "Please do not use this variant with your MacPorts configuration."
}
}
-
+
# Files are installed into user's startup directory.
if { [tbool startupitem.install] } {
destroot.violate_mtree yes
Copied: users/devans/GNOME-3/stable/dports/devel/dbus/files/patch-configure.diff (from rev 145292, trunk/dports/devel/dbus/files/patch-configure.diff)
===================================================================
--- users/devans/GNOME-3/stable/dports/devel/dbus/files/patch-configure.diff (rev 0)
+++ users/devans/GNOME-3/stable/dports/devel/dbus/files/patch-configure.diff 2016-01-31 04:05:33 UTC (rev 145293)
@@ -0,0 +1,11 @@
+--- configure.orig 2015-02-04 09:49:03.000000000 -0700
++++ configure 2016-01-30 19:46:48.000000000 -0700
+@@ -18761,7 +18761,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken poll" >&5
+ $as_echo_n "checking for broken poll... " >&6; }
+ if test "$cross_compiling" = yes; then :
+- broken_poll="no (cross compiling)"
++ broken_poll=yes
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160130/4b910853/attachment.html>
More information about the macports-changes
mailing list