head	1.3;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.3
	OPENPKG_E1_MP:1.3
	OPENPKG_E1_MP_2_STABLE:1.1.2.2
	OPENPKG_E1_FP:1.1.2.2
	OPENPKG_2_STABLE_MP:1.3
	OPENPKG_2_STABLE_20061018:1.1.2.2
	OPENPKG_2_STABLE:1.1.0.2;
locks; strict;
comment	@# @;


1.3
date	2006.11.18.11.39.47;	author rse;	state Exp;
branches;
next	1.2;
commitid	pU0xV76iZs6IT8Vr;

1.2
date	2006.11.10.23.35.16;	author rse;	state Exp;
branches;
next	1.1;
commitid	oYOCrAX4rgP47bUr;

1.1
date	2006.09.15.06.15.54;	author rse;	state Exp;
branches
	1.1.2.1;
next	;
commitid	xBLDFYccszN8aTMr;

1.1.2.1
date	2006.09.15.06.15.54;	author rse;	state dead;
branches;
next	1.1.2.2;
commitid	iZxwRSmmWscPXUQr;

1.1.2.2
date	2006.10.16.14.49.23;	author rse;	state Exp;
branches;
next	1.1.2.3;
commitid	iZxwRSmmWscPXUQr;

1.1.2.3
date	2006.12.21.09.57.04;	author rse;	state Exp;
branches;
next	;
commitid	bPogi7d3soLHgnZr;


desc
@@


1.3
log
@upgrading package: dbus 1.0.0 -> 1.0.1
@
text
@Index: dbus/dbus-internals.c
--- dbus/dbus-internals.c.orig	2006-11-17 20:12:18 +0100
+++ dbus/dbus-internals.c	2006-11-18 12:35:56 +0100
@@@@ -512,6 +512,14 @@@@
   uuid->as_uint32s[DBUS_UUID_LENGTH_WORDS - 1] = DBUS_UINT32_TO_BE (now);
   
   _dbus_generate_random_bytes_buffer (uuid->as_bytes, DBUS_UUID_LENGTH_BYTES - 4);
+
+  /* brand UUID as variant DCE 1.1 */
+  uuid->as_bytes[8] &= ~0xc0;
+  uuid->as_bytes[8] |= (0x02 << 6);
+
+  /* brand UUID as version 4 */
+  uuid->as_bytes[6] &= ~0xf0;
+  uuid->as_bytes[6] |= (0x04 << 4);
 }
 
 /**
Index: dbus/dbus-sysdeps-util-unix.c
--- dbus/dbus-sysdeps-util-unix.c.orig	2006-11-02 20:19:08 +0100
+++ dbus/dbus-sysdeps-util-unix.c	2006-11-18 12:33:22 +0100
@@@@ -31,6 +31,7 @@@@
 #include "dbus-test.h"
 
 #include <sys/types.h>
+#include <sys/param.h>
 #include <stdlib.h>
 #include <string.h>
 #include <signal.h>
@@@@ -526,6 +527,8 @@@@
 #   else
 #       if defined(NAME_MAX)
 	 name_max = NAME_MAX;
+#       elif defined(MAXPATHLEN)
+	 name_max = MAXPATHLEN;
 #       else
 #           error "buffer size for readdir_r cannot be determined"
 #       endif
@


1.2
log
@ok, the upstream vendor just doesn't get it that 'sticking to standards strictly or better not at all' is reasonable. But this doesn't have to mean we can't have more insight in OpenPKG, so brand the generated 'UUIDs' to be DCE 1.1 version 4 UUIDs in order to be at least really be real standardized UUIDs instead of just 128 bit of random data
@
text
@d2 4
a5 3
--- dbus/dbus-internals.c.orig	2006-10-24 22:25:01 +0200
+++ dbus/dbus-internals.c	2006-11-11 00:32:03 +0100
@@@@ -517,6 +517,14 @@@@
d7 1
a7 2
   _dbus_generate_random_bytes_buffer (p,
                                       sizeof (uuid->as_bytes) - ts_size);
d21 1
a21 1
+++ dbus/dbus-sysdeps-util-unix.c	2006-11-11 00:31:49 +0100
@


1.1
log
@upgrading package: dbus 0.92 -> 0.93
@
text
@d1 18
d20 3
a22 3
--- dbus/dbus-sysdeps-util-unix.c.orig	2006-09-14 07:41:41 +0200
+++ dbus/dbus-sysdeps-util-unix.c	2006-09-15 08:08:48 +0200
@@@@ -30,6 +30,7 @@@@
d30 1
a30 1
@@@@ -514,6 +515,8 @@@@
@


1.1.2.1
log
@file dbus.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:49:23 +0000
@
text
@d1 20
@


1.1.2.2
log
@Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class)
@
text
@a0 20
Index: dbus/dbus-sysdeps-util-unix.c
--- dbus/dbus-sysdeps-util-unix.c.orig	2006-09-14 07:41:41 +0200
+++ dbus/dbus-sysdeps-util-unix.c	2006-09-15 08:08:48 +0200
@@@@ -30,6 +30,7 @@@@
 #include "dbus-test.h"
 
 #include <sys/types.h>
+#include <sys/param.h>
 #include <stdlib.h>
 #include <string.h>
 #include <signal.h>
@@@@ -514,6 +515,8 @@@@
 #   else
 #       if defined(NAME_MAX)
 	 name_max = NAME_MAX;
+#       elif defined(MAXPATHLEN)
+	 name_max = MAXPATHLEN;
 #       else
 #           error "buffer size for readdir_r cannot be determined"
 #       endif
@


1.1.2.3
log
@MFC: latest security fixed version
@
text
@a0 18
Index: dbus/dbus-internals.c
--- dbus/dbus-internals.c.orig	2006-11-17 20:12:18 +0100
+++ dbus/dbus-internals.c	2006-11-18 12:35:56 +0100
@@@@ -512,6 +512,14 @@@@
   uuid->as_uint32s[DBUS_UUID_LENGTH_WORDS - 1] = DBUS_UINT32_TO_BE (now);
   
   _dbus_generate_random_bytes_buffer (uuid->as_bytes, DBUS_UUID_LENGTH_BYTES - 4);
+
+  /* brand UUID as variant DCE 1.1 */
+  uuid->as_bytes[8] &= ~0xc0;
+  uuid->as_bytes[8] |= (0x02 << 6);
+
+  /* brand UUID as version 4 */
+  uuid->as_bytes[6] &= ~0xf0;
+  uuid->as_bytes[6] |= (0x04 << 4);
 }
 
 /**
d2 3
a4 3
--- dbus/dbus-sysdeps-util-unix.c.orig	2006-11-02 20:19:08 +0100
+++ dbus/dbus-sysdeps-util-unix.c	2006-11-18 12:33:22 +0100
@@@@ -31,6 +31,7 @@@@
d12 1
a12 1
@@@@ -526,6 +527,8 @@@@
@