[libgadu] fix crash in resolver test on i686

[Dominik Mierzejewski]

commit d2accf5a20e738f0fe0894ba8ed9082f7f54cf1c
Author: Dominik Mierzejewski <rpm at greysector.net>
Date:   Fri May 23 23:33:47 2014 +0200

    fix crash in resolver test on i686

 libgadu-crash.patch |   22 ++++++++++++++++++++++
 libgadu.spec        |    3 +++
 2 files changed, 25 insertions(+), 0 deletions(-)
---
diff --git a/libgadu-crash.patch b/libgadu-crash.patch
new file mode 100644
index 0000000..71fbbe8
--- /dev/null
+++ b/libgadu-crash.patch
@@ -0,0 +1,22 @@
+diff -up libgadu-1.12.0-rc3/src/resolver.c.resolver-crash libgadu-1.12.0-rc3/src/resolver.c
+--- libgadu-1.12.0-rc3/src/resolver.c.resolver-crash	2014-05-06 21:15:17.000000000 +0200
++++ libgadu-1.12.0-rc3/src/resolver.c	2014-05-23 16:28:07.833779052 +0200
+@@ -507,6 +507,9 @@ static void gg_resolver_pthread_cleanup(
+ {
+ 	struct gg_resolver_pthread_data *data;
+ 
++	gg_debug(GG_DEBUG_FUNCTION, "** gg_resolver_pthread_cleanup(%p [%p], %d);\n",
++		priv_data, (priv_data ? *priv_data : NULL), force);
++
+ 	if (priv_data == NULL || *priv_data == NULL)
+ 		return;
+ 
+@@ -532,6 +535,8 @@ static void *gg_resolver_pthread_thread(
+ {
+ 	struct gg_resolver_pthread_data *data = arg;
+ 
++	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
++
+ 	if (gg_resolver_run(data->wfd, data->hostname, 1) == -1)
+ 		pthread_exit((void*) -1);
+ 	else
diff --git a/libgadu.spec b/libgadu.spec
index 8a975fb..074f702 100644
--- a/libgadu.spec
+++ b/libgadu.spec
@@ -7,6 +7,7 @@ Summary:	A Gadu-gadu protocol compatible communications library
 License:	LGPLv2
 Source0:	https://github.com/wojtekka/libgadu/releases/download/%{version}%{?rcver}/libgadu-%{version}%{?rcver}.tar.gz
 Patch0:		libgadu-open.patch
+Patch1:		libgadu-crash.patch
 URL:		http://libgadu.net/
 BuildRequires:	doxygen
 BuildRequires:	gnutls-devel
@@ -57,6 +58,7 @@ Pakiet libgadu-doc zawiera dokumentację biblioteki libgadu.
 %prep
 %setup -q -n %{name}-%{version}%{?rcver}
 %patch0 -p1 -b .open
+%patch1 -p1 -b .resolver-crash
 
 %build
 %configure \
@@ -94,6 +96,7 @@ make check
 * Thu May 22 2014 Dominik Mierzejewski <rpm at greysector.net> - 1.12.0-0.4.rc3
 - update to 1.12.0-rc3 (fixes CVE-2014-3775)
 - fix hash testcase compilation
+- fix crash in resolver test on i686
 
 * Tue Feb 11 2014 Dominik Mierzejewski <rpm at greysector.net> - 1.12.0-0.3.rc2
 - update to 1.12.0-rc2 (fixes CVE-2013-6487)