OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 11-Nov-2006 00:35:18
Branch: HEAD Handle: 2006111023351600
Modified files:
openpkg-src/dbus dbus.patch dbus.spec
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
Summary:
Revision Changes Path
1.2 +22 -4 openpkg-src/dbus/dbus.patch
1.16 +1 -1 openpkg-src/dbus/dbus.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/dbus/dbus.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 dbus.patch
--- openpkg-src/dbus/dbus.patch 15 Sep 2006 06:15:54 -0000 1.1
+++ openpkg-src/dbus/dbus.patch 10 Nov 2006 23:35:16 -0000 1.2
@@ -1,7 +1,25 @@
+Index: dbus/dbus-internals.c
+--- 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 @@
+
+ _dbus_generate_random_bytes_buffer (p,
+ sizeof (uuid->as_bytes) - ts_size);
++
++ /* 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-09-14 07:41:41 +0200
-+++ dbus/dbus-sysdeps-util-unix.c 2006-09-15 08:08:48 +0200
-@@ -30,6 +30,7 @@
+--- dbus/dbus-sysdeps-util-unix.c.orig 2006-11-02 20:19:08 +0100
++++ dbus/dbus-sysdeps-util-unix.c 2006-11-11 00:31:49 +0100
+@@ -31,6 +31,7 @@
#include "dbus-test.h"
#include <sys/types.h>
@@ -9,7 +27,7 @@
#include <stdlib.h>
#include <string.h>
#include <signal.h>
-@@ -514,6 +515,8 @@
+@@ -526,6 +527,8 @@
# else
# if defined(NAME_MAX)
name_max = NAME_MAX;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/dbus/dbus.spec
============================================================================
$ cvs diff -u -r1.15 -r1.16 dbus.spec
--- openpkg-src/dbus/dbus.spec 10 Nov 2006 06:56:08 -0000 1.15
+++ openpkg-src/dbus/dbus.spec 10 Nov 2006 23:35:16 -0000 1.16
@@ -35,7 +35,7 @@
Group: RPC
License: AFL/GPL
Version: 1.0.0
-Release: 20061110
+Release: 20061111
# list of sources
Source0:
http://dbus.freedesktop.org/releases/dbus/dbus-%{version}.tar.gz
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
