From 747aa5e45fd16aaad5be944fbf51c28ad025e1d9 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Nov 11 2013 14:35:29 +0000
Subject: New upstream version


---

diff --git a/.gitignore b/.gitignore
index 4489cbc..552f56f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
 /dbus-1.6.6.tar.gz
 /dbus-1.6.8.tar.gz
 /dbus-1.6.12.tar.gz
+/dbus-1.6.18.tar.gz
diff --git a/0001-test-marshal-Ensure-we-use-suitably-aligned-buffers.patch b/0001-test-marshal-Ensure-we-use-suitably-aligned-buffers.patch
deleted file mode 100644
index d7cea52..0000000
--- a/0001-test-marshal-Ensure-we-use-suitably-aligned-buffers.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 1a09d46b3cad370e4bd2c59ec6215fbf65351834 Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters@verbum.org>
-Date: Wed, 24 Jul 2013 21:48:58 +0100
-Subject: [PATCH] test/marshal: Ensure we use suitably aligned buffers
-
-This test was failing on s390; though it could fail
-on other platforms too.  Basically we need to be sure
-we're passing at least word-aligned buffers to the
-demarshalling code.  malloc() will do that for us.
----
- test/marshal.c | 27 ++++++++++++++++++++++-----
- 1 file changed, 22 insertions(+), 5 deletions(-)
-
-diff --git a/test/marshal.c b/test/marshal.c
-index e9ac7e3..e65ee7c 100644
---- a/test/marshal.c
-+++ b/test/marshal.c
-@@ -27,6 +27,7 @@
- #include <config.h>
- 
- #include <glib.h>
-+#include <string.h>
- 
- #include <dbus/dbus.h>
- #include <dbus/dbus-glib-lowlevel.h>
-@@ -244,14 +245,30 @@ int
- main (int argc,
-     char **argv)
- {
-+  int ret;
-+  char *aligned_le_blob;
-+  char *aligned_be_blob;
-+
-   g_test_init (&argc, &argv, NULL);
- 
--  g_test_add ("/demarshal/le", Fixture, le_blob, setup, test_endian, teardown);
--  g_test_add ("/demarshal/be", Fixture, be_blob, setup, test_endian, teardown);
--  g_test_add ("/demarshal/needed/le", Fixture, le_blob, setup, test_needed,
-+  /* We have to pass in a buffer that's at least "default aligned",
-+   * i.e.  on GNU systems to 8 or 16.  The linker may have only given
-+   * us byte-alignment for the char[] static variables.
-+   */
-+  aligned_le_blob = g_malloc (sizeof (le_blob));
-+  memcpy (aligned_le_blob, le_blob, sizeof (le_blob));
-+  aligned_be_blob = g_malloc (sizeof (be_blob));
-+  memcpy (aligned_be_blob, be_blob, sizeof (be_blob));  
-+
-+  g_test_add ("/demarshal/le", Fixture, aligned_le_blob, setup, test_endian, teardown);
-+  g_test_add ("/demarshal/be", Fixture, aligned_be_blob, setup, test_endian, teardown);
-+  g_test_add ("/demarshal/needed/le", Fixture, aligned_le_blob, setup, test_needed,
-       teardown);
--  g_test_add ("/demarshal/needed/be", Fixture, be_blob, setup, test_needed,
-+  g_test_add ("/demarshal/needed/be", Fixture, aligned_be_blob, setup, test_needed,
-       teardown);
- 
--  return g_test_run ();
-+  ret = g_test_run ();
-+  g_free (aligned_le_blob);
-+  g_free (aligned_be_blob);
-+  return ret;
- }
--- 
-1.8.1.4
-
diff --git a/dbus.spec b/dbus.spec
index 530552b..d5ee64f 100644
--- a/dbus.spec
+++ b/dbus.spec
@@ -12,8 +12,8 @@
 Summary: D-BUS message bus
 Name: dbus
 Epoch: 1
-Version: 1.6.12
-Release: 4%{?dist}
+Version: 1.6.18
+Release: 1%{?dist}
 URL: http://www.freedesktop.org/software/dbus/
 #VCS: git:git://git.freedesktop.org/git/dbus/dbus
 Source0: http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz
@@ -51,7 +51,6 @@ BuildRequires: /usr/bin/Xvfb
 # FIXME this should be upstreamed; need --daemon-bindir=/bin and --bindir=/usr/bin or something?
 Patch0: bindir.patch
 Patch1: 0001-name-test-Don-t-run-test-autolaunch-if-we-don-t-have.patch
-Patch2: 0001-test-marshal-Ensure-we-use-suitably-aligned-buffers.patch
 
 %description
 D-BUS is a system for sending messages between applications. It is
@@ -102,7 +101,6 @@ in this separate package so server systems need not install X.
 
 %patch0 -p1 -b .bindir
 %patch1 -p1
-%patch2 -p1
 
 %build
 if test -f autogen.sh; then env NOCONFIGURE=1 ./autogen.sh; else autoreconf -v -f -i; fi
@@ -246,6 +244,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Mon Nov 11 2013 Colin Walters <walters@verbum.org> - 1:1.6.18-1
+- New upstream version
+
 * Wed Jul 24 2013 Colin Walters <walters@verbum.org> - 1:1.6.12-4
 - Add patch to fix test-marshal on s390.
 
diff --git a/sources b/sources
index 260dc42..1526523 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a70edc50524f258eaf5c9a9994ed8748  dbus-1.6.12.tar.gz
+b02e9c95027a416987b81f9893831061  dbus-1.6.18.tar.gz