[mingw-dbus] Update to 1.6.28

[Erik van Pienbroek]

commit 81dfb19748688c921970ff6367751fd0747e0ebd
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Tue Dec 23 14:00:05 2014 +0100

    Update to 1.6.28

 .gitignore                                |    1 +
 dbus-iface-function-parameters.patch      |  292 -----------------------------
 dbus-improve-clock_getres-detection.patch |   21 ++
 mingw-dbus.spec                           |   19 ++-
 sources                                   |    2 +-
 5 files changed, 38 insertions(+), 297 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 11a9c29..dc0e873 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /dbus-1.6.4.tar.gz
 /dbus-1.6.8.tar.gz
 /dbus-1.6.12.tar.gz
+/dbus-1.6.28.tar.gz
diff --git a/dbus-improve-clock_getres-detection.patch b/dbus-improve-clock_getres-detection.patch
new file mode 100644
index 0000000..38ddde0
--- /dev/null
+++ b/dbus-improve-clock_getres-detection.patch
@@ -0,0 +1,21 @@
+--- configure.ac.orig	2014-12-23 13:43:18.629108562 +0100
++++ configure.ac	2014-12-23 13:55:53.482370730 +0100
+@@ -964,7 +964,17 @@
+ LIBS="$LIBS $THREAD_LIBS"
+ AC_CHECK_FUNC(pthread_condattr_setclock,have_pthread_condattr_setclock=true,have_pthread_condattr_setclock=false)
+ if test x$have_pthread_condattr_setclock = xtrue; then
+-    AC_SEARCH_LIBS([clock_getres],[rt],[THREAD_LIBS="$THREAD_LIBS -lrt"])
++    AC_CHECK_FUNCS(clock_getres, [], [
++        AC_CHECK_LIB(rt, clock_getres, [
++            AC_DEFINE(HAVE_CLOCK_GETRES, 1)
++            THREAD_LIBS="$THREAD_LIBS -lrt"
++        ], [
++            AC_CHECK_LIB(pthread, clock_getres, [
++                AC_DEFINE(HAVE_CLOCK_GETRES, 1)
++                THREAD_LIBS="$THREAD_LIBS -lpthread"
++            ])
++        ])
++    ])
+     AC_MSG_CHECKING([for CLOCK_MONOTONIC])
+     AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <time.h>
+ #include <pthread.h>
diff --git a/mingw-dbus.spec b/mingw-dbus.spec
index f467fa5..0752e11 100644
--- a/mingw-dbus.spec
+++ b/mingw-dbus.spec
@@ -1,8 +1,8 @@
 %?mingw_package_header
 
 Name:           mingw-dbus
-Version:        1.6.12
-Release:        2%{?dist}
+Version:        1.6.28
+Release:        1%{?dist}
 Summary:        MinGW Windows port of D-Bus
 
 License:        GPLv2+ or AFL
@@ -10,7 +10,8 @@ Group:          Development/Libraries
 URL:            http://www.freedesktop.org/wiki/Software/dbus
 Source0:        http://dbus.freedesktop.org/releases/dbus/dbus-%{version}.tar.gz
 
-Patch0:         dbus-iface-function-parameters.patch
+# The configure script isn't able to properly winpthreads yet
+Patch0:         dbus-improve-clock_getres-detection.patch
 
 BuildArch:      noarch
 
@@ -84,7 +85,9 @@ Static version of MinGW Windows port of DBus library
 
 %prep
 %setup -q -n dbus-%{version}
-%patch0 -p1
+%patch0 -p0
+autoreconf -i --force
+
 
 %build
 %mingw_configure --with-xml=libxml
@@ -146,6 +149,14 @@ rm -r $RPM_BUILD_ROOT%{mingw64_sysconfdir}/rc.d/init.d/messagebus
 
 
 %changelog
+* Tue Dec 22 2014 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.6.28-1
+- Update to 1.6.28
+- Fixes CVE-2014-7824 (RHBZ #1173557)
+- Fixes CVE-2014-3638 CVE-2014-3639 CVE-2014-3636
+  CVE-2014-3637 and CVE-2014-3635 (RHBZ #1142582)
+- Fixes CVE-2014-3477 (RHBZ #1117395)
+- Fixes CVE-2014-3533 CVE-2014-3532 (RHBZ #1115637)
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.12-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index 260dc42..84c47b4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a70edc50524f258eaf5c9a9994ed8748  dbus-1.6.12.tar.gz
+80935a10a64620f1d0bded39735430a6  dbus-1.6.28.tar.gz