Ticket #17198: patch-devel-dbus-fix.diff

File patch-devel-dbus-fix.diff, 4.3 KB (added by yokota33@…, 15 years ago)

A fix. This passes 'port test' and the values of constants seem right. Can this go in?

  • dbus/Portfile 

    diff -uNr ../../dports/devel/dbus/Portfile dbus/Portfile
    old new  
    2222                    sha1    13de8dc28c9edae7b9d2928ff691549bb2bef21a \
    2323                    rmd160  779d76320f1343dae7447c82a683e372e6c11729
    2424
    25                
    2625patchfiles      patch-dbus-sysdeps-unix.c.diff \
    2726                patch-launchd-integration-dist.diff
    2827
    … …  
    4039                --enable-launchd
    4140
    4241platform darwin 7 {
    43     patchfiles              patch-dbus-launch-x11.c.diff \
    44                             patch-dbus-sysdeps-util-unix.c.diff
     42    patchfiles              patch-configure.diff \
     43                            patch-darwin7-dbus-sysdeps-unix.c.diff \
     44                            patch-darwin7-dbus-sysdeps-util-unix.c.diff
    4545
    4646    depends_lib-append      port:xorg-libX11
    4747

  • dbus/files/patch-configure.diff 

    diff -uNr ../../dports/devel/dbus/files/patch-configure.diff dbus/files/patch-configure.diff
    old new  
     1--- configure.orig      Thu Apr  2 13:44:23 2009
     2+++ configure   Thu Apr  2 13:45:37 2009
     3@@ -20980,10 +20980,6 @@
     4   *[\ \        ]-Wno-sign-compare[\ \  ]*) ;;
     5   *) CFLAGS="$CFLAGS -Wno-sign-compare" ;;
     6   esac
     7-  case " $CFLAGS " in
     8-  *[\ \        ]-Wno-pointer-sign[\ \  ]*) ;;
     9-  *) CFLAGS="$CFLAGS -Wno-pointer-sign" ;;
     10-  esac
     11 
     12   # http://bugs.freedesktop.org/show_bug.cgi?id=19195
     13   case " $CFLAGS " in

  • dbus/files/patch-darwin7-dbus-sysdeps-unix.c.diff 

    diff -uNr ../../dports/devel/dbus/files/patch-darwin7-dbus-sysdeps-unix.c.diff dbus/files/patch-darwin7-dbus-sysdeps-unix.c.diff
    old new  
     1--- dbus/dbus-sysdeps-unix.c.orig       Thu Apr  2 15:22:53 2009
     2+++ dbus/dbus-sysdeps-unix.c    Thu Apr  2 15:24:14 2009
     3@@ -1491,7 +1491,7 @@
     4     struct passwd p_str;
     5 
     6     /* retrieve maximum needed size for buf */
     7-    buflen = sysconf (_SC_GETPW_R_SIZE_MAX);
     8+    buflen = 4096;
     9 
     10     /* sysconf actually returns a long, but everything else expects size_t,
     11      * so just recast here.

  • dbus/files/patch-darwin7-dbus-sysdeps-util-unix.c.diff 

    diff -uNr ../../dports/devel/dbus/files/patch-darwin7-dbus-sysdeps-util-unix.c.diff dbus/files/patch-darwin7-dbus-sysdeps-util-unix.c.diff
    old new  
     1--- dbus/dbus-sysdeps-util-unix.c.orig  Wed Jan  7 07:52:23 2009
     2+++ dbus/dbus-sysdeps-util-unix.c       Thu Apr  2 15:51:29 2009
     3@@ -872,7 +872,7 @@
     4     dbus_bool_t b;
     5 
     6     /* retrieve maximum needed size for buf */
     7-    buflen = sysconf (_SC_GETGR_R_SIZE_MAX);
     8+    buflen = 4096;
     9 
     10     /* sysconf actually returns a long, but everything else expects size_t,
     11      * so just recast here.

  • dbus/files/patch-dbus-launch-x11.c.diff 

    diff -uNr ../../dports/devel/dbus/files/patch-dbus-launch-x11.c.diff dbus/files/patch-dbus-launch-x11.c.diff
    old new  
    1 --- ./tools/dbus-launch-x11.c.orig      2008-10-11 18:53:43.000000000 +0800
    2 +++ ./tools/dbus-launch-x11.c   2008-10-11 18:51:51.000000000 +0800
    3 @@ -143,7 +143,7 @@
    4     */
    5    for (p = display; *p; ++p)
    6      {
    7 -      if (*p == ':')
    8 +      if (*p == ':' || *p == '/')
    9          *p = '_';
    10      }
    11    

  • dbus/files/patch-dbus-sysdeps-util-unix.c.diff 

    diff -uNr ../../dports/devel/dbus/files/patch-dbus-sysdeps-util-unix.c.diff dbus/files/patch-dbus-sysdeps-util-unix.c.diff
    old new  
    1 --- dbus/dbus-sysdeps-util-unix.c.orig  2008-12-28 12:04:09.000000000 -0500
    2 +++ dbus/dbus-sysdeps-util-unix.c       2008-12-28 10:04:16.000000000 -0500
    3 @@ -43,6 +43,7 @@
    4  #include <sys/socket.h>
    5  #include <dirent.h>
    6  #include <sys/un.h>
    7 +#include <syslog.h>
    8  #ifdef HAVE_LIBAUDIT
    9  #include <sys/prctl.h>
    10  #include <sys/capability.h>
    11 @@ -1227,4 +1228,4 @@
    12    _dbus_string_free (&cmdline);
    13    _dbus_string_free (&path);
    14    return FALSE;
    15 -}
    16 \ No newline at end of file
    17 +}