Pullup ticket 1967 - requested by drochner

security fix for dbus

- pkgsrc/sysutils/dbus/Makefile			patch
- pkgsrc/sysutils/dbus/distinfo			patch
- pkgsrc/sysutils/dbus/patches/patch-ba		patch

   Apply security patch from dbus 1.0.2 to dbus 0.92 to fix CVE-2006-6107.

sysutils/dbus/Makefile

@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2006/08/28 08:28:57 jmmv Exp $
+# $NetBSD: Makefile,v 1.14.2.1 2006/12/20 17:15:36 ghen Exp $
 #
 
 DISTNAME=	dbus-0.92
+PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://freedesktop.org/software/dbus/releases/
 

sysutils/dbus/distinfo

@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2006/09/17 12:02:00 jmmv Exp $
+$NetBSD: distinfo,v 1.12.2.1 2006/12/20 17:15:36 ghen Exp $
 
 SHA1 (dbus-0.92.tar.gz) = 37edf2fd6c471b086261462b8b8d3dd2656e1bb4
 RMD160 (dbus-0.92.tar.gz) = 23de0396bf5565c02e2e710bebd95ad5de1832a8
@@ -7,3 +7,4 @@ SHA1 (patch-aa) = fbf728371c76c1daa267591cd76dec3138f30acf
 SHA1 (patch-ab) = ae2d4d3870acbb48088bc6b1eec4cf181f748493
 SHA1 (patch-ac) = 9ce70807b7d61bf653fa9a55097989958aef8d59
 SHA1 (patch-ae) = c73bed4ec4cca5e7bcdec749ac85ba2c56d8469a
+SHA1 (patch-ba) = c7a82d81026c78c2ba6678e03371c56cd0cd0943

sysutils/dbus/patches/patch-ba

@@ -0,0 +1,14 @@
+$NetBSD: patch-ba,v 1.1.2.1 2006/12/20 17:15:36 ghen Exp $
+
+--- bus/signals.c.orig	2005-11-22 21:37:00.000000000 +0100
++++ bus/signals.c
+@@ -1067,6 +1067,9 @@ match_rule_equal (BusMatchRule *a,
+   if (a->flags != b->flags)
+     return FALSE;
+
++  if (a->matches_go_to != b->matches_go_to)
++    return FALSE;
++
+   if ((a->flags & BUS_MATCH_MESSAGE_TYPE) &&
+       a->message_type != b->message_type)
+     return FALSE;