| 1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253 |
- Index: bus/Makefile.in
- --- bus/Makefile.in.orig 2010-02-02 16:32:08 +0100
- +++ bus/Makefile.in 2010-02-03 09:35:36 +0100
- @@ -355,8 +355,8 @@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PIC_CFLAGS = @PIC_CFLAGS@
- PIC_LDFLAGS = @PIC_LDFLAGS@
- -PIE_CFLAGS = @PIE_CFLAGS@
- -PIE_LDFLAGS = @PIE_LDFLAGS@
- +PIE_CFLAGS =
- +PIE_LDFLAGS =
- PKG_CONFIG = @PKG_CONFIG@
- RANLIB = @RANLIB@
- R_DYNAMIC_LDFLAG = @R_DYNAMIC_LDFLAG@
- @@ -504,7 +504,7 @@
- $(top_builddir)/dbus/libdbus-convenience.la \
- $(DBUS_BUS_LIBS)
-
- -dbus_daemon_LDFLAGS = @R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@ @PIE_LDFLAGS@
- +dbus_daemon_LDFLAGS = @R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@
- LAUNCH_HELPER_SOURCES = \
- $(XML_SOURCES) \
- config-parser-common.c \
- Index: dbus/dbus-internals.c
- --- dbus/dbus-internals.c.orig 2010-02-01 23:28:05 +0100
- +++ dbus/dbus-internals.c 2010-02-03 09:35:36 +0100
- @@ -516,6 +516,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 2010-02-01 23:28:05 +0100
- +++ dbus/dbus-sysdeps-util-unix.c 2010-02-03 09:35:36 +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>
|
