Update to 1.2.4.2 on the "permissive" branch.

This addresses the security problem CVE-2008-4311. For more
details, read
http://lists.freedesktop.org/archives/dbus/2008-December/010769.html

4 files changed, 28 insertions, 13 deletions

diff --git a/sysutils/dbus/Makefile b/sysutils/dbus/Makefile
index 42fca3ab29c..87fe6da051c 100644
--- a/sysutils/dbus/Makefile
+++ b/sysutils/dbus/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2009/01/06 19:00:50 hasso Exp $
+# $NetBSD: Makefile,v 1.40 2009/01/07 19:11:36 wiz Exp $
 
-DISTNAME=	dbus-1.2.4
-PKGREVISION=	4
+DISTNAME=	dbus-1.2.4.2permissive
+PKGNAME=	dbus-1.2.4.2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus/
 
diff --git a/sysutils/dbus/distinfo b/sysutils/dbus/distinfo
index 5c4e26ed0b7..c026e7bc04c 100644
--- a/sysutils/dbus/distinfo
+++ b/sysutils/dbus/distinfo
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.31 2009/01/06 19:00:50 hasso Exp $
+$NetBSD: distinfo,v 1.32 2009/01/07 19:11:36 wiz Exp $
 
-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) = 2486dfe8a9c80cf10e099ce20f60d14de84e8adb
+SHA1 (dbus-1.2.4.2permissive.tar.gz) = eefcff01a368717f3a3516ae97856a224930fe70
+RMD160 (dbus-1.2.4.2permissive.tar.gz) = 21db1a10f33e7b9f86d06e7b33ae43b97674ec6b
+Size (dbus-1.2.4.2permissive.tar.gz) = 1574034 bytes
+SHA1 (patch-aa) = fd7cc2e11e15e13885e882e8de51e17af8a63d70
 SHA1 (patch-ab) = c05559aa0a473d2009f44dd5b65955a9b37e3ab7
 SHA1 (patch-ac) = afec419973f339e846dc109866148529f80998b3
+SHA1 (patch-ad) = d537acca7285868ef8f6e8dee3a20717b1e5b4b2
 SHA1 (patch-ag) = 999071b782982c12329025ea8e393bfed940b654
 SHA1 (patch-ai) = a45bd8d29955e9c14a4d8b3f44b42242d70c1cd8
 SHA1 (patch-ak) = 56c0a917e770b8d6ffc37ec7ab8beb631dd8ef72
diff --git a/sysutils/dbus/patches/patch-aa b/sysutils/dbus/patches/patch-aa
index 8ddadbafb56..0ec861ca7c9 100644
--- a/sysutils/dbus/patches/patch-aa
+++ b/sysutils/dbus/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.9 2008/11/21 21:27:36 wiz Exp $
+$NetBSD: patch-aa,v 1.10 2009/01/07 19:11:36 wiz Exp $
 
---- bus/Makefile.in.orig	2008-10-06 21:20:15.000000000 +0000
+--- bus/Makefile.in.orig	2008-12-18 21:47:13.000000000 +0100
 +++ bus/Makefile.in
-@@ -412,9 +412,10 @@ target_os = @target_os@
- target_vendor = @target_vendor@
+@@ -415,9 +415,10 @@ target_vendor = @target_vendor@
+ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
 -configdir = $(sysconfdir)/dbus-1
@@ -15,7 +15,7 @@ $NetBSD: patch-aa,v 1.9 2008/11/21 21:27:36 wiz Exp $
  	-DDAEMON_NAME=\"dbus-daemon\"  -DDBUS_COMPILATION
  
  EFENCE = 
-@@ -1291,16 +1292,13 @@ install-data-hook:
+@@ -1294,16 +1295,13 @@ install-data-hook:
  		chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \
  	fi
  	$(INSTALL_PROGRAM) dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR)
diff --git a/sysutils/dbus/patches/patch-ad b/sysutils/dbus/patches/patch-ad
new file mode 100644
index 00000000000..14f5bec1b7b
--- /dev/null
+++ b/sysutils/dbus/patches/patch-ad
@@ -0,0 +1,14 @@
+$NetBSD: patch-ad,v 1.5 2009/01/07 19:11:36 wiz Exp $
+
+for openlog(), already reported upstream
+
+--- dbus/dbus-sysdeps-util-unix.c.orig	2008-12-18 21:39:04.000000000 +0100
++++ dbus/dbus-sysdeps-util-unix.c
+@@ -43,6 +43,7 @@
+ #include <sys/socket.h>
+ #include <dirent.h>
+ #include <sys/un.h>
++#include <syslog.h>
+ #ifdef HAVE_LIBAUDIT
+ #include <sys/prctl.h>
+ #include <sys/capability.h>