pullup ticket #2554 - requested by tron

dbus: update package for security fix

revisions pulled up:
pkgsrc/sysutils/dbus/Makefile		1.33, 1.34
pkgsrc/sysutils/dbus/files/dbus.sh	1.9
pkgsrc/sysutils/dbus/distinfo		1.27
pkgsrc/sysutils/dbus/patches/patch-ab	1.14

   Modified Files:
           pkgsrc/sysutils/dbus: Makefile
           pkgsrc/sysutils/dbus/files: dbus.sh

   Log Message:
   When removing a loop, remove both the beginning _and_ the end.
   Bump PKGREVISION.  Noted by Cem Kayali in pkgsrc-users@

   ------------------------------------------------------------------------

   Module Name:    pkgsrc
   Committed By:   tron
   Date:           Sun Oct 12 11:15:22 UTC 2008

   Modified Files:
           pkgsrc/sysutils/dbus: Makefile distinfo
           pkgsrc/sysutils/dbus/patches: patch-ab

   Log Message:
   Update "dbus" package to version 1.2.4. Changes since 1.2.3:
   - Security fix for CVE-2008-3834
   - A small number of compilation and portability fixes

4 files changed, 14 insertions, 28 deletions

diff --git a/sysutils/dbus/Makefile b/sysutils/dbus/Makefile
index d96e803ddfd..cf73ca564e8 100644
--- a/sysutils/dbus/Makefile
+++ b/sysutils/dbus/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.32 2008/09/24 11:37:31 taca Exp $
-#
+# $NetBSD: Makefile,v 1.32.2.1 2008/10/12 11:46:29 rtr Exp $
 
-DISTNAME=	dbus-1.2.3
-PKGREVISION=	1
+DISTNAME=	dbus-1.2.4
 CATEGORIES=	sysutils
 MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus/
 
diff --git a/sysutils/dbus/distinfo b/sysutils/dbus/distinfo
index 70997e09f08..eeebace1e29 100644
--- a/sysutils/dbus/distinfo
+++ b/sysutils/dbus/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.26 2008/09/24 11:37:31 taca Exp $
+$NetBSD: distinfo,v 1.26.2.1 2008/10/12 11:46:29 rtr Exp $
 
-SHA1 (dbus-1.2.3.tar.gz) = ceb8d496bc1a9c2dcdbe559515c01ec9c0cdcf81
-RMD160 (dbus-1.2.3.tar.gz) = d1a207b2a4c744f27c9c01388e80cebdb61f43f0
-Size (dbus-1.2.3.tar.gz) = 1564475 bytes
+SHA1 (dbus-1.2.4.tar.gz) = 913d796b79802b6ee6ca2b0ef59c670f3fd79774
+RMD160 (dbus-1.2.4.tar.gz) = 0441eb8b668ed70250e484b02fe6a83c05c9a088
+Size (dbus-1.2.4.tar.gz) = 1564370 bytes
 SHA1 (patch-aa) = e81529adf01e9e6153fc401c903bd4136d592192
-SHA1 (patch-ab) = 139feeab7d469140384a30f49d70da80fa4c03bc
+SHA1 (patch-ab) = 773d4c8e6c3feed90e24eb563c6389c8592925a2
 SHA1 (patch-ac) = afec419973f339e846dc109866148529f80998b3
 SHA1 (patch-ag) = 999071b782982c12329025ea8e393bfed940b654
 SHA1 (patch-ai) = a45bd8d29955e9c14a4d8b3f44b42242d70c1cd8
diff --git a/sysutils/dbus/files/dbus.sh b/sysutils/dbus/files/dbus.sh
index 928841a56df..82711a0b27c 100644
--- a/sysutils/dbus/files/dbus.sh
+++ b/sysutils/dbus/files/dbus.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: dbus.sh,v 1.8 2008/09/24 11:37:31 taca Exp $
+# $NetBSD: dbus.sh,v 1.8.2.1 2008/10/12 11:46:30 rtr Exp $
 #
 # PROVIDE: dbus
 # REQUIRE: DAEMON
@@ -22,7 +22,6 @@ dbus_prestart() {
 		@CHMOD@ 0755 $dir
 		@CHOWN@ @DBUS_USER@:@DBUS_GROUP@ $dir
 	fi
-	done
 	@PREFIX@/bin/dbus-uuidgen --ensure
 }
 
diff --git a/sysutils/dbus/patches/patch-ab b/sysutils/dbus/patches/patch-ab
index 507b923bde2..53099e2cf66 100644
--- a/sysutils/dbus/patches/patch-ab
+++ b/sysutils/dbus/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.13 2008/08/15 12:15:17 wiz Exp $
+$NetBSD: patch-ab,v 1.13.4.1 2008/10/12 11:46:30 rtr Exp $
 
---- dbus/dbus-sysdeps-unix.c.orig	2008-08-06 17:00:29.000000000 +0000
-+++ dbus/dbus-sysdeps-unix.c
+--- dbus/dbus-sysdeps-unix.c.orig	2008-10-06 22:14:50.000000000 +0100
++++ dbus/dbus-sysdeps-unix.c	2008-10-12 12:01:54.000000000 +0100
 @@ -35,6 +35,9 @@
  #include "dbus-list.h"
  #include "dbus-credentials.h"
@@ -12,18 +12,7 @@ $NetBSD: patch-ab,v 1.13 2008/08/15 12:15:17 wiz Exp $
  #include <sys/types.h>
  #include <stdlib.h>
  #include <string.h>
-@@ -79,8 +82,8 @@
- #define O_BINARY 0
- #endif
- 
--#ifndef _AI_ADDRCONFIG
--#define _AI_ADDRCONFIG 0
-+#ifndef AI_ADDRCONFIG
-+#define AI_ADDRCONFIG 0
- #endif
- 
- #ifndef HAVE_SOCKLEN_T
-@@ -1822,7 +1825,26 @@ _dbus_parse_uid (const DBusString      *
+@@ -1826,7 +1829,26 @@
    return TRUE;
  }
  
@@ -50,7 +39,7 @@ $NetBSD: patch-ab,v 1.13 2008/08/15 12:15:17 wiz Exp $
  _DBUS_DEFINE_GLOBAL_LOCK (atomic);
  
  #if DBUS_USE_ATOMIC_INT_486_COND
-@@ -1887,6 +1909,7 @@ _dbus_atomic_dec (DBusAtomic *atomic)
+@@ -1891,6 +1913,7 @@
    return res;
  #endif
  }
@@ -58,7 +47,7 @@ $NetBSD: patch-ab,v 1.13 2008/08/15 12:15:17 wiz Exp $
  
  #ifdef DBUS_BUILD_TESTS
  /** Gets our GID
-@@ -2780,8 +2803,18 @@ int
+@@ -2793,8 +2816,18 @@
  _dbus_printf_string_upper_bound (const char *format,
                                   va_list     args)
  {