Wed Jan 7 19:11:36 2009 UTC ()
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


(wiz)
diff -r1.39 -r1.40 pkgsrc/sysutils/dbus/Makefile
diff -r1.31 -r1.32 pkgsrc/sysutils/dbus/distinfo
diff -r1.9 -r1.10 pkgsrc/sysutils/dbus/patches/patch-aa
diff -r0 -r1.5 pkgsrc/sysutils/dbus/patches/patch-ad
cvs diff -r1.39 -r1.40 pkgsrc/sysutils/dbus/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/dbus/Makefile 2009/01/06 19:00:50 1.39
+++ pkgsrc/sysutils/dbus/Makefile 2009/01/07 19:11:36 1.40
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.39 2009/01/06 19:00:50 hasso Exp $ 1# $NetBSD: Makefile,v 1.40 2009/01/07 19:11:36 wiz Exp $
2 2
3DISTNAME= dbus-1.2.4 3DISTNAME= dbus-1.2.4.2permissive
4PKGREVISION= 4 4PKGNAME= dbus-1.2.4.2
5CATEGORIES= sysutils 5CATEGORIES= sysutils
6MASTER_SITES= http://dbus.freedesktop.org/releases/dbus/ 6MASTER_SITES= http://dbus.freedesktop.org/releases/dbus/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.freedesktop.org/Software/dbus 9HOMEPAGE= http://www.freedesktop.org/Software/dbus
10COMMENT= Message bus system 10COMMENT= Message bus system
11 11
12PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
13 13
14CONFLICTS+= dbus-glib<0.71 14CONFLICTS+= dbus-glib<0.71
15CONFLICTS+= py*-dbus<0.71 15CONFLICTS+= py*-dbus<0.71
16 16
17GNU_CONFIGURE= YES 17GNU_CONFIGURE= YES
cvs diff -r1.31 -r1.32 pkgsrc/sysutils/dbus/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/dbus/distinfo 2009/01/06 19:00:50 1.31
+++ pkgsrc/sysutils/dbus/distinfo 2009/01/07 19:11:36 1.32
@@ -1,13 +1,14 @@ @@ -1,13 +1,14 @@
1$NetBSD: distinfo,v 1.31 2009/01/06 19:00:50 hasso Exp $ 1$NetBSD: distinfo,v 1.32 2009/01/07 19:11:36 wiz Exp $
2 2
3SHA1 (dbus-1.2.4.tar.gz) = 913d796b79802b6ee6ca2b0ef59c670f3fd79774 3SHA1 (dbus-1.2.4.2permissive.tar.gz) = eefcff01a368717f3a3516ae97856a224930fe70
4RMD160 (dbus-1.2.4.tar.gz) = 0441eb8b668ed70250e484b02fe6a83c05c9a088 4RMD160 (dbus-1.2.4.2permissive.tar.gz) = 21db1a10f33e7b9f86d06e7b33ae43b97674ec6b
5Size (dbus-1.2.4.tar.gz) = 1564370 bytes 5Size (dbus-1.2.4.2permissive.tar.gz) = 1574034 bytes
6SHA1 (patch-aa) = 2486dfe8a9c80cf10e099ce20f60d14de84e8adb 6SHA1 (patch-aa) = fd7cc2e11e15e13885e882e8de51e17af8a63d70
7SHA1 (patch-ab) = c05559aa0a473d2009f44dd5b65955a9b37e3ab7 7SHA1 (patch-ab) = c05559aa0a473d2009f44dd5b65955a9b37e3ab7
8SHA1 (patch-ac) = afec419973f339e846dc109866148529f80998b3 8SHA1 (patch-ac) = afec419973f339e846dc109866148529f80998b3
 9SHA1 (patch-ad) = d537acca7285868ef8f6e8dee3a20717b1e5b4b2
9SHA1 (patch-ag) = 999071b782982c12329025ea8e393bfed940b654 10SHA1 (patch-ag) = 999071b782982c12329025ea8e393bfed940b654
10SHA1 (patch-ai) = a45bd8d29955e9c14a4d8b3f44b42242d70c1cd8 11SHA1 (patch-ai) = a45bd8d29955e9c14a4d8b3f44b42242d70c1cd8
11SHA1 (patch-ak) = 56c0a917e770b8d6ffc37ec7ab8beb631dd8ef72 12SHA1 (patch-ak) = 56c0a917e770b8d6ffc37ec7ab8beb631dd8ef72
12SHA1 (patch-al) = fad2f4df4537b2a3e21aaef29138060724ba8286 13SHA1 (patch-al) = fad2f4df4537b2a3e21aaef29138060724ba8286
13SHA1 (patch-am) = 8c794ff8b0981e90243ee20c26ae1ecc72e68de8 14SHA1 (patch-am) = 8c794ff8b0981e90243ee20c26ae1ecc72e68de8
cvs diff -r1.9 -r1.10 pkgsrc/sysutils/dbus/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/sysutils/dbus/patches/Attic/patch-aa 2008/11/21 21:27:36 1.9
+++ pkgsrc/sysutils/dbus/patches/Attic/patch-aa 2009/01/07 19:11:36 1.10
@@ -1,31 +1,31 @@ @@ -1,31 +1,31 @@
1$NetBSD: patch-aa,v 1.9 2008/11/21 21:27:36 wiz Exp $ 1$NetBSD: patch-aa,v 1.10 2009/01/07 19:11:36 wiz Exp $
2 2
3--- bus/Makefile.in.orig 2008-10-06 21:20:15.000000000 +0000 3--- bus/Makefile.in.orig 2008-12-18 21:47:13.000000000 +0100
4+++ bus/Makefile.in 4+++ bus/Makefile.in
5@@ -412,9 +412,10 @@ target_os = @target_os@ 5@@ -415,9 +415,10 @@ target_vendor = @target_vendor@
6 target_vendor = @target_vendor@ 6 top_build_prefix = @top_build_prefix@
7 top_builddir = @top_builddir@ 7 top_builddir = @top_builddir@
8 top_srcdir = @top_srcdir@ 8 top_srcdir = @top_srcdir@
9-configdir = $(sysconfdir)/dbus-1 9-configdir = $(sysconfdir)/dbus-1
10+etcconfigdir = $(sysconfdir)/dbus-1 10+etcconfigdir = $(sysconfdir)/dbus-1
11+configdir = $(datadir)/examples/@PACKAGE@ 11+configdir = $(datadir)/examples/@PACKAGE@
12 INCLUDES = -I$(top_srcdir) $(DBUS_BUS_CFLAGS) @PIE_CFLAGS@ \ 12 INCLUDES = -I$(top_srcdir) $(DBUS_BUS_CFLAGS) @PIE_CFLAGS@ \
13- -DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\" \ 13- -DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\" \
14+ -DDBUS_SYSTEM_CONFIG_FILE=\""$(etcconfigdir)/system.conf"\" \ 14+ -DDBUS_SYSTEM_CONFIG_FILE=\""$(etcconfigdir)/system.conf"\" \
15 -DDAEMON_NAME=\"dbus-daemon\" -DDBUS_COMPILATION 15 -DDAEMON_NAME=\"dbus-daemon\" -DDBUS_COMPILATION
16  16
17 EFENCE =  17 EFENCE =
18@@ -1291,16 +1292,13 @@ install-data-hook: 18@@ -1294,16 +1295,13 @@ install-data-hook:
19 chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \ 19 chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \
20 fi 20 fi
21 $(INSTALL_PROGRAM) dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR) 21 $(INSTALL_PROGRAM) dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR)
22- $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus 22- $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus
23- $(mkinstalldirs) $(DESTDIR)$(configdir)/system.d 23- $(mkinstalldirs) $(DESTDIR)$(configdir)/system.d
24- $(mkinstalldirs) $(DESTDIR)$(configdir)/session.d 24- $(mkinstalldirs) $(DESTDIR)$(configdir)/session.d
25 $(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services 25 $(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services
26 $(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/system-services 26 $(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/system-services
27 $(mkinstalldirs) $(DESTDIR)$(libexecdir)/dbus-1 27 $(mkinstalldirs) $(DESTDIR)$(libexecdir)/dbus-1
28 $(INSTALL_PROGRAM) dbus-daemon-launch-helper $(DESTDIR)$(libexecdir) 28 $(INSTALL_PROGRAM) dbus-daemon-launch-helper $(DESTDIR)$(libexecdir)
29 if test `id -u` -eq 0; then \ 29 if test `id -u` -eq 0; then \
30 chown root:$(DBUS_USER) $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper; \ 30 chown root:$(DBUS_USER) $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper; \
31- chmod 4750 $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper; \ 31- chmod 4750 $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper; \
File Added: pkgsrc/sysutils/dbus/patches/Attic/patch-ad
$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>