Sat Jun 14 10:24:52 2008 UTC ()
restore patch fragment that was lost in the recent update


(tnn)
diff -r1.21 -r1.22 pkgsrc/sysutils/dbus/distinfo
diff -r1.10 -r1.11 pkgsrc/sysutils/dbus/patches/patch-ab

cvs diff -r1.21 -r1.22 pkgsrc/sysutils/dbus/distinfo (expand / switch to context diff)
--- pkgsrc/sysutils/dbus/distinfo 2008/06/13 11:28:35 1.21
+++ pkgsrc/sysutils/dbus/distinfo 2008/06/14 10:24:52 1.22
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.21 2008/06/13 11:28:35 drochner Exp $
+$NetBSD: distinfo,v 1.22 2008/06/14 10:24:52 tnn Exp $
 
 SHA1 (dbus-1.2.1.tar.gz) = 2c5b38d51b486e0143faf7749d298e07a8c71223
 RMD160 (dbus-1.2.1.tar.gz) = 88b20e16251e10e205fece57e6b434a7aa43b615
 Size (dbus-1.2.1.tar.gz) = 1406833 bytes
 SHA1 (patch-aa) = e527a1a1f937781ce4204a325e3ff7f31fd6afa8
-SHA1 (patch-ab) = 20253f9730a1bd1e233240e6374e30e7fe0586c8
+SHA1 (patch-ab) = 586c1c459fd194ba5e26bd74caac1c26f890ec42
 SHA1 (patch-ac) = afec419973f339e846dc109866148529f80998b3
 SHA1 (patch-ag) = 9539b91fb496681b03854ebdc698b53ae43e6ba6
 SHA1 (patch-ai) = 046f3a78c465b28595abf278aac942f7f0d0a297

cvs diff -r1.10 -r1.11 pkgsrc/sysutils/dbus/patches/Attic/patch-ab (expand / switch to context diff)
--- pkgsrc/sysutils/dbus/patches/Attic/patch-ab 2008/06/13 11:28:35 1.10
+++ pkgsrc/sysutils/dbus/patches/Attic/patch-ab 2008/06/14 10:24:52 1.11
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.10 2008/06/13 11:28:35 drochner Exp $
+$NetBSD: patch-ab,v 1.11 2008/06/14 10:24:52 tnn Exp $
 
---- dbus/dbus-sysdeps-unix.c.orig	2008-04-04 11:24:08.000000000 -0400
+--- dbus/dbus-sysdeps-unix.c.orig	2008-04-04 17:24:08.000000000 +0200
 +++ dbus/dbus-sysdeps-unix.c
 @@ -35,6 +35,9 @@
  #include "dbus-list.h"
@@ -62,3 +62,22 @@
  
  #ifdef DBUS_BUILD_TESTS
  /** Gets our GID
+@@ -2711,8 +2733,18 @@ int
+ _dbus_printf_string_upper_bound (const char *format,
+                                  va_list     args)
+ {
++#if defined(__hpux) || defined(__sgi)
++/* this code from libnbcompat's vsnprintf */
++  static FILE *devnull = 0;
++  if (!devnull) {
++    devnull = fopen("/dev/null", "w");
++    if (!devnull) return -1;
++  }
++  return vfprintf(devnull, format, args);
++#else
+   char c;
+   return vsnprintf (&c, 1, format, args);
++#endif
+ }
+ 
+ /**