[59386] trunk/dports/devel/dbus

[sharky at macports.org]

Revision: 59386
          http://trac.macports.org/changeset/59386
Author:   sharky at macports.org
Date:     2009-10-14 06:31:43 -0700 (Wed, 14 Oct 2009)
Log Message:
-----------
dbus: don't try to dup STDIN if it's already closed

This was preventing kdeinit4 from communicating with klauncher.

Modified Paths:
--------------
    trunk/dports/devel/dbus/Portfile

Added Paths:
-----------
    trunk/dports/devel/dbus/files/0005-dont-dup-closed-stdin.patch

Modified: trunk/dports/devel/dbus/Portfile
===================================================================
--- trunk/dports/devel/dbus/Portfile	2009-10-14 13:06:36 UTC (rev 59385)
+++ trunk/dports/devel/dbus/Portfile	2009-10-14 13:31:43 UTC (rev 59386)
@@ -6,6 +6,7 @@
 
 name            dbus
 version         1.2.16
+revision        1
 maintainers     mcalhoun openmaintainer
 categories      devel
 platforms       darwin
@@ -25,7 +26,8 @@
 patchfiles      0001-make-session-bus-listen-tag-configurable.patch \
                 0002-add-launchd-implementation.patch \
                 0003-look-up-DISPLAY-from-launchd-if-not-initialized.patch \
-                0004-enable-launchd.patch
+                0004-enable-launchd.patch \
+                0005-dont-dup-closed-stdin.patch
 patch.pre_args  -p1
 
 use_autoreconf  yes

Added: trunk/dports/devel/dbus/files/0005-dont-dup-closed-stdin.patch
===================================================================
--- trunk/dports/devel/dbus/files/0005-dont-dup-closed-stdin.patch	                        (rev 0)
+++ trunk/dports/devel/dbus/files/0005-dont-dup-closed-stdin.patch	2009-10-14 13:31:43 UTC (rev 59386)
@@ -0,0 +1,13 @@
+Index: dbus-1.2.16/dbus/dbus-sysdeps-unix.c
+===================================================================
+--- dbus-1.2.16.orig/dbus/dbus-sysdeps-unix.c	2009-10-14 14:43:57.000000000 +0200
++++ dbus-1.2.16/dbus/dbus-sysdeps-unix.c	2009-10-14 14:44:39.000000000 +0200
+@@ -2968,7 +2968,7 @@
+       close (1);                /* close stdout */
+       close (2);                /* close stderr */
+ 
+-      if (dup2 (fd, 0) == -1)
++      if (fd != 0 && dup2 (fd, 0) == -1)
+         _exit (1);
+       if (dup2 (result_pipe[WRITE_END], 1) == -1)
+         _exit (1);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091014/c65bfd0f/attachment.html>