Sun Oct 12 11:46:30 2008 UTC ()
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


(rtr)
diff -r1.32 -r1.32.2.1 pkgsrc/sysutils/dbus/Makefile
diff -r1.26 -r1.26.2.1 pkgsrc/sysutils/dbus/distinfo
diff -r1.8 -r1.8.2.1 pkgsrc/sysutils/dbus/files/dbus.sh
diff -r1.13 -r1.13.4.1 pkgsrc/sysutils/dbus/patches/patch-ab
cvs diff -r1.32 -r1.32.2.1 pkgsrc/sysutils/dbus/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/dbus/Makefile 2008/09/24 11:37:31 1.32
+++ pkgsrc/sysutils/dbus/Makefile 2008/10/12 11:46:29 1.32.2.1
@@ -1,18 +1,16 @@ @@ -1,18 +1,16 @@
1# $NetBSD: Makefile,v 1.32 2008/09/24 11:37:31 taca Exp $ 1# $NetBSD: Makefile,v 1.32.2.1 2008/10/12 11:46:29 rtr Exp $
2# 
3 2
4DISTNAME= dbus-1.2.3 3DISTNAME= dbus-1.2.4
5PKGREVISION= 1 
6CATEGORIES= sysutils 4CATEGORIES= sysutils
7MASTER_SITES= http://dbus.freedesktop.org/releases/dbus/ 5MASTER_SITES= http://dbus.freedesktop.org/releases/dbus/
8 6
9MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.freedesktop.org/Software/dbus 8HOMEPAGE= http://www.freedesktop.org/Software/dbus
11COMMENT= Message bus system 9COMMENT= Message bus system
12 10
13PKG_DESTDIR_SUPPORT= user-destdir 11PKG_DESTDIR_SUPPORT= user-destdir
14 12
15CONFLICTS+= dbus-glib<0.71 13CONFLICTS+= dbus-glib<0.71
16CONFLICTS+= py*-dbus<0.71 14CONFLICTS+= py*-dbus<0.71
17 15
18GNU_CONFIGURE= YES 16GNU_CONFIGURE= YES
cvs diff -r1.26 -r1.26.2.1 pkgsrc/sysutils/dbus/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/dbus/distinfo 2008/09/24 11:37:31 1.26
+++ pkgsrc/sysutils/dbus/distinfo 2008/10/12 11:46:29 1.26.2.1
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.26 2008/09/24 11:37:31 taca Exp $ 1$NetBSD: distinfo,v 1.26.2.1 2008/10/12 11:46:29 rtr Exp $
2 2
3SHA1 (dbus-1.2.3.tar.gz) = ceb8d496bc1a9c2dcdbe559515c01ec9c0cdcf81 3SHA1 (dbus-1.2.4.tar.gz) = 913d796b79802b6ee6ca2b0ef59c670f3fd79774
4RMD160 (dbus-1.2.3.tar.gz) = d1a207b2a4c744f27c9c01388e80cebdb61f43f0 4RMD160 (dbus-1.2.4.tar.gz) = 0441eb8b668ed70250e484b02fe6a83c05c9a088
5Size (dbus-1.2.3.tar.gz) = 1564475 bytes 5Size (dbus-1.2.4.tar.gz) = 1564370 bytes
6SHA1 (patch-aa) = e81529adf01e9e6153fc401c903bd4136d592192 6SHA1 (patch-aa) = e81529adf01e9e6153fc401c903bd4136d592192
7SHA1 (patch-ab) = 139feeab7d469140384a30f49d70da80fa4c03bc 7SHA1 (patch-ab) = 773d4c8e6c3feed90e24eb563c6389c8592925a2
8SHA1 (patch-ac) = afec419973f339e846dc109866148529f80998b3 8SHA1 (patch-ac) = afec419973f339e846dc109866148529f80998b3
9SHA1 (patch-ag) = 999071b782982c12329025ea8e393bfed940b654 9SHA1 (patch-ag) = 999071b782982c12329025ea8e393bfed940b654
10SHA1 (patch-ai) = a45bd8d29955e9c14a4d8b3f44b42242d70c1cd8 10SHA1 (patch-ai) = a45bd8d29955e9c14a4d8b3f44b42242d70c1cd8
11SHA1 (patch-ak) = 56c0a917e770b8d6ffc37ec7ab8beb631dd8ef72 11SHA1 (patch-ak) = 56c0a917e770b8d6ffc37ec7ab8beb631dd8ef72
12SHA1 (patch-al) = fad2f4df4537b2a3e21aaef29138060724ba8286 12SHA1 (patch-al) = fad2f4df4537b2a3e21aaef29138060724ba8286
cvs diff -r1.8 -r1.8.2.1 pkgsrc/sysutils/dbus/files/dbus.sh (expand / switch to unified diff)

--- pkgsrc/sysutils/dbus/files/dbus.sh 2008/09/24 11:37:31 1.8
+++ pkgsrc/sysutils/dbus/files/dbus.sh 2008/10/12 11:46:30 1.8.2.1
@@ -1,30 +1,29 @@ @@ -1,30 +1,29 @@
1#!@RCD_SCRIPTS_SHELL@ 1#!@RCD_SCRIPTS_SHELL@
2# 2#
3# $NetBSD: dbus.sh,v 1.8 2008/09/24 11:37:31 taca Exp $ 3# $NetBSD: dbus.sh,v 1.8.2.1 2008/10/12 11:46:30 rtr Exp $
4# 4#
5# PROVIDE: dbus 5# PROVIDE: dbus
6# REQUIRE: DAEMON 6# REQUIRE: DAEMON
7# KEYWORD: shutdown 7# KEYWORD: shutdown
8 8
9. /etc/rc.subr 9. /etc/rc.subr
10 10
11name="dbus" 11name="dbus"
12rcvar=$name 12rcvar=$name
13command="@PREFIX@/bin/dbus-daemon" 13command="@PREFIX@/bin/dbus-daemon"
14command_args="--system" 14command_args="--system"
15pidfile="@VARBASE@/run/dbus/pid" 15pidfile="@VARBASE@/run/dbus/pid"
16start_precmd=dbus_prestart 16start_precmd=dbus_prestart
17 17
18dbus_prestart() { 18dbus_prestart() {
19 dir="@VARBASE@/run/dbus" 19 dir="@VARBASE@/run/dbus"
20 if @TEST@ ! -d $dir; then 20 if @TEST@ ! -d $dir; then
21 @MKDIR@ $dir 21 @MKDIR@ $dir
22 @CHMOD@ 0755 $dir 22 @CHMOD@ 0755 $dir
23 @CHOWN@ @DBUS_USER@:@DBUS_GROUP@ $dir 23 @CHOWN@ @DBUS_USER@:@DBUS_GROUP@ $dir
24 fi 24 fi
25 done 
26 @PREFIX@/bin/dbus-uuidgen --ensure 25 @PREFIX@/bin/dbus-uuidgen --ensure
27} 26}
28 27
29load_rc_config $name 28load_rc_config $name
30run_rc_command "$1" 29run_rc_command "$1"
cvs diff -r1.13 -r1.13.4.1 pkgsrc/sysutils/dbus/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/sysutils/dbus/patches/Attic/patch-ab 2008/08/15 12:15:17 1.13
+++ pkgsrc/sysutils/dbus/patches/Attic/patch-ab 2008/10/12 11:46:30 1.13.4.1
@@ -1,74 +1,63 @@ @@ -1,74 +1,63 @@
1$NetBSD: patch-ab,v 1.13 2008/08/15 12:15:17 wiz Exp $ 1$NetBSD: patch-ab,v 1.13.4.1 2008/10/12 11:46:30 rtr Exp $
2 2
3--- dbus/dbus-sysdeps-unix.c.orig 2008-08-06 17:00:29.000000000 +0000 3--- dbus/dbus-sysdeps-unix.c.orig 2008-10-06 22:14:50.000000000 +0100
4+++ dbus/dbus-sysdeps-unix.c 4+++ dbus/dbus-sysdeps-unix.c 2008-10-12 12:01:54.000000000 +0100
5@@ -35,6 +35,9 @@ 5@@ -35,6 +35,9 @@
6 #include "dbus-list.h" 6 #include "dbus-list.h"
7 #include "dbus-credentials.h" 7 #include "dbus-credentials.h"
8  8
9+#ifdef HAVE_NETBSD_ATOMIC_OPS 9+#ifdef HAVE_NETBSD_ATOMIC_OPS
10+#include <sys/atomic.h> 10+#include <sys/atomic.h>
11+#endif 11+#endif
12 #include <sys/types.h> 12 #include <sys/types.h>
13 #include <stdlib.h> 13 #include <stdlib.h>
14 #include <string.h> 14 #include <string.h>
15@@ -79,8 +82,8 @@ 15@@ -1826,7 +1829,26 @@
16 #define O_BINARY 0 
17 #endif 
18  
19-#ifndef _AI_ADDRCONFIG 
20-#define _AI_ADDRCONFIG 0 
21+#ifndef AI_ADDRCONFIG 
22+#define AI_ADDRCONFIG 0 
23 #endif 
24  
25 #ifndef HAVE_SOCKLEN_T 
26@@ -1822,7 +1825,26 @@ _dbus_parse_uid (const DBusString * 
27 return TRUE; 16 return TRUE;
28 } 17 }
29  18
30+#ifdef HAVE_NETBSD_ATOMIC_OPS 19+#ifdef HAVE_NETBSD_ATOMIC_OPS
31+dbus_int32_t 20+dbus_int32_t
32+_dbus_atomic_inc (DBusAtomic *atomic) 21+_dbus_atomic_inc (DBusAtomic *atomic)
33+{ 22+{
34+ register dbus_int32_t old = atomic->value; 23+ register dbus_int32_t old = atomic->value;
35+ 24+
36+ atomic_inc_uint((unsigned *)&atomic->value); 25+ atomic_inc_uint((unsigned *)&atomic->value);
37+ return old; 26+ return old;
38+} 27+}
39+ 28+
40+dbus_int32_t 29+dbus_int32_t
41+_dbus_atomic_dec (DBusAtomic *atomic) 30+_dbus_atomic_dec (DBusAtomic *atomic)
42+{ 31+{
43+ register dbus_int32_t old = atomic->value; 32+ register dbus_int32_t old = atomic->value;
44  33
45+ atomic_dec_uint((unsigned *)&atomic->value); 34+ atomic_dec_uint((unsigned *)&atomic->value);
46+ return old; 35+ return old;
47+} 36+}
48+_DBUS_DEFINE_GLOBAL_LOCK (atomic); 37+_DBUS_DEFINE_GLOBAL_LOCK (atomic);
49+#else 38+#else
50 _DBUS_DEFINE_GLOBAL_LOCK (atomic); 39 _DBUS_DEFINE_GLOBAL_LOCK (atomic);
51  40
52 #if DBUS_USE_ATOMIC_INT_486_COND 41 #if DBUS_USE_ATOMIC_INT_486_COND
53@@ -1887,6 +1909,7 @@ _dbus_atomic_dec (DBusAtomic *atomic) 42@@ -1891,6 +1913,7 @@
54 return res; 43 return res;
55 #endif 44 #endif
56 } 45 }
57+#endif /* HAVE_NETBSD_ATOMIC_OPS */ 46+#endif /* HAVE_NETBSD_ATOMIC_OPS */
58  47
59 #ifdef DBUS_BUILD_TESTS 48 #ifdef DBUS_BUILD_TESTS
60 /** Gets our GID 49 /** Gets our GID
61@@ -2780,8 +2803,18 @@ int 50@@ -2793,8 +2816,18 @@
62 _dbus_printf_string_upper_bound (const char *format, 51 _dbus_printf_string_upper_bound (const char *format,
63 va_list args) 52 va_list args)
64 { 53 {
65+#if defined(__hpux) || defined(__sgi) 54+#if defined(__hpux) || defined(__sgi)
66+/* this code from libnbcompat's vsnprintf */ 55+/* this code from libnbcompat's vsnprintf */
67+ static FILE *devnull = 0; 56+ static FILE *devnull = 0;
68+ if (!devnull) { 57+ if (!devnull) {
69+ devnull = fopen("/dev/null", "w"); 58+ devnull = fopen("/dev/null", "w");
70+ if (!devnull) return -1; 59+ if (!devnull) return -1;
71+ } 60+ }
72+ return vfprintf(devnull, format, args); 61+ return vfprintf(devnull, format, args);
73+#else 62+#else
74 char c; 63 char c;