From 68a51885895c1e0c86cf9be2afa73a09d75cb1b0 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Jun 17 2013 22:13:20 +0000
Subject: Merge branch 'master' into f19


Conflicts:
	dbus.spec

---

diff --git a/.gitignore b/.gitignore
index 7109942..4489cbc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 /dbus-1.6.0.tar.gz
 /dbus-1.6.6.tar.gz
 /dbus-1.6.8.tar.gz
+/dbus-1.6.12.tar.gz
diff --git a/dbus.spec b/dbus.spec
index 1155389..0bd4031 100644
--- a/dbus.spec
+++ b/dbus.spec
@@ -12,8 +12,8 @@
 Summary: D-BUS message bus
 Name: dbus
 Epoch: 1
-Version: 1.6.8
-Release: 5%{?dist}
+Version: 1.6.12
+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
@@ -225,6 +225,10 @@ fi
 %{_includedir}/*
 
 %changelog
+* Mon Jun 17 2013 Colin Walters <walters@verbum.org> - 1:1.6.12-1
+- New upstream release
+- CVE-2013-2168
+
 * Thu Apr 18 2013 Matthias Clasen <mclasen@redhat.com> - 1:1.6.8-5
 - Hardened build
 
diff --git a/sources b/sources
index 1348205..260dc42 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3bf059c7dd5eda5f539a1b7cfe7a14a2  dbus-1.6.8.tar.gz
+a70edc50524f258eaf5c9a9994ed8748  dbus-1.6.12.tar.gz