[145393] trunk/dports/devel/dbus

[mcalhoun at macports.org]

Revision: 145393
          https://trac.macports.org/changeset/145393
Author:   mcalhoun at macports.org
Date:     2016-02-03 19:03:38 -0800 (Wed, 03 Feb 2016)
Log Message:
-----------
dbus: update version 1.8.16 -> 1.10.6 (fixes #47741)

Modified Paths:
--------------
    trunk/dports/devel/dbus/Portfile
    trunk/dports/devel/dbus/files/patch-configure.diff

Removed Paths:
-------------
    trunk/dports/devel/dbus/files/patch-bus-dir-watch-kqueue.c.diff

Modified: trunk/dports/devel/dbus/Portfile
===================================================================
--- trunk/dports/devel/dbus/Portfile	2016-02-04 02:46:05 UTC (rev 145392)
+++ trunk/dports/devel/dbus/Portfile	2016-02-04 03:03:38 UTC (rev 145393)
@@ -6,10 +6,7 @@
 
 name            dbus
 conflicts       dbus-devel
-# 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)
-version         1.8.16
+version         1.10.6
 maintainers     mcalhoun openmaintainer
 categories      devel
 platforms       darwin
@@ -22,21 +19,18 @@
 homepage        http://www.freedesktop.org/Software/dbus
 master_sites    http://dbus.freedesktop.org/releases/dbus
 
-checksums           rmd160  c333f4e5808fc4c5b6a5d77f06bd473971411e60 \
-                    sha256  7f795268efd343ff0498786acb35097564390d40b1b6158daf1b4f742b522b07
+checksums       rmd160  afaac55b06050bd4b80f7557fe69029dc3a820b0 \
+                sha256  b5fefa08a77edd76cd64d872db949eebc02cf6f3f8be82e4bbc641742af5d35f
 
 # See r59386
 # See r68276
-# poll is always broken
+# For configure
+#    poll is always broken
+#    see https://trac.macports.org/ticket/47741#comment:12 for EXTERNAL authentication
 patchfiles      patch-bus-system.conf.in.diff \
                 patch-dbus-dbus-sysdeps-unix.c.diff \
                 patch-configure.diff
 
-# See #43203
-if { ${os.major} < 11 } {
-    patchfiles-append patch-bus-dir-watch-kqueue.c.diff
-}
-
 depends_build       \
     port:pkgconfig
 
@@ -85,6 +79,7 @@
 
 configure.args  --disable-doxygen-docs \
                 --disable-xml-docs \
+                --disable-ducktype-docs \
                 --without-x \
                 --enable-launchd \
                 --with-launchd-agent-dir=${prefix}/Library/LaunchAgents \

Deleted: trunk/dports/devel/dbus/files/patch-bus-dir-watch-kqueue.c.diff
===================================================================
--- trunk/dports/devel/dbus/files/patch-bus-dir-watch-kqueue.c.diff	2016-02-04 02:46:05 UTC (rev 145392)
+++ trunk/dports/devel/dbus/files/patch-bus-dir-watch-kqueue.c.diff	2016-02-04 03:03:38 UTC (rev 145393)
@@ -1,19 +0,0 @@
---- bus/dir-watch-kqueue.c.orig	2014-01-06 09:02:19.000000000 -0700
-+++ bus/dir-watch-kqueue.c	2014-04-05 06:07:05.000000000 -0700
-@@ -259,7 +259,7 @@
-           /* FIXME - less lame error handling for failing to add a watch;
-            * we may need to sleep.
-            */
--          fd = open (new_dirs[i], O_RDONLY | O_CLOEXEC);
-+          fd = open (new_dirs[i], O_RDONLY);
-           if (fd < 0)
-             {
-               if (errno != ENOENT)
-@@ -274,6 +274,7 @@
-                   continue;
-                 }
-             }
-+          _dbus_fd_set_close_on_exec(fd);
- 
-           EV_SET (&ev, fd, EVFILT_VNODE, EV_ADD | EV_ENABLE | EV_CLEAR,
-                   NOTE_DELETE | NOTE_EXTEND | NOTE_WRITE | NOTE_RENAME, 0, 0);

Modified: trunk/dports/devel/dbus/files/patch-configure.diff
===================================================================
--- trunk/dports/devel/dbus/files/patch-configure.diff	2016-02-04 02:46:05 UTC (rev 145392)
+++ trunk/dports/devel/dbus/files/patch-configure.diff	2016-02-04 03:03:38 UTC (rev 145393)
@@ -1,6 +1,34 @@
---- configure.orig	2015-02-04 09:49:03.000000000 -0700
-+++ configure	2016-01-30 19:46:48.000000000 -0700
-@@ -18761,7 +18761,7 @@
+--- configure.orig	2015-12-01 10:19:30.000000000 -0800
++++ configure	2016-02-03 14:26:27.000000000 -0800
+@@ -16755,6 +16755,7 @@
+ dbus_win=no
+ dbus_cygwin=no
+ dbus_unix=no
++dbus_darwin=no
+ case "${host}" in
+     *-mingw32ce*)
+         dbus_win=yes
+@@ -16767,6 +16768,10 @@
+         dbus_cygwin=yes
+         dbus_unix=yes
+         ;;
++    *darwin*)
++        dbus_darwin=yes
++        dbus_unix=yes
++       ;;
+     *)
+         dbus_unix=yes
+        ;;
+@@ -16903,7 +16908,7 @@
+ 
+ # For best security, assume that all non-Windows platforms can do
+ # credentials-passing.
+-if test "$dbus_win" = yes; then :
++if test "$dbus_win" = yes || test "$dbus_darwin" = yes ; then :
+   DBUS_SESSION_CONF_MAYBE_AUTH_EXTERNAL="<!--<auth>EXTERNAL</auth>-->"
+ else
+   DBUS_SESSION_CONF_MAYBE_AUTH_EXTERNAL="<auth>EXTERNAL</auth>"
+@@ -18940,7 +18945,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 :
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160203/18c0e146/attachment.html>