[sipsak] Proper fix for rhbz #753372 now

[Peter Lemenkov]

commit a15a8216dbb34ceb5f26e22b464ee4f87ccf7812
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Wed Nov 16 23:52:25 2011 +0400

    Proper fix for rhbz #753372 now
    
    Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>

 ...-Fix-for-sudden-null-returned-from-c-ares.patch |   33 --------------------
 ...ong-arity-of-callback-function-for-c-ares.patch |   30 ++++++++++++++++++
 sipsak.spec                                        |    9 +++--
 3 files changed, 36 insertions(+), 36 deletions(-)
---
diff --git a/sipsak-0001-Fix-for-wrong-arity-of-callback-function-for-c-ares.patch b/sipsak-0001-Fix-for-wrong-arity-of-callback-function-for-c-ares.patch
new file mode 100644
index 0000000..d62ba0e
--- /dev/null
+++ b/sipsak-0001-Fix-for-wrong-arity-of-callback-function-for-c-ares.patch
@@ -0,0 +1,30 @@
+From eeeee47c6cb0e13619b76bc4109479e52b5dc441 Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov at gmail.com>
+Date: Tue, 15 Nov 2011 00:33:49 +0400
+Subject: [PATCH 1/1] Fix for wrong arity of callback function for c-ares
+
+See rhbz #753372 for further details
+
+https://bugzilla.redhat.com/753372
+
+Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
+---
+ helper.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/helper.c b/helper.c
+index c5dee06..976b73b 100644
+--- a/helper.c
++++ b/helper.c
+@@ -262,7 +262,7 @@ static const unsigned char *skip_query(const unsigned char *aptr, const unsigned
+ 	return aptr;
+ }
+ 
+-static void cares_callback(void *arg, int status, unsigned char *abuf, int alen) {
++static void cares_callback(void *arg, int status, int timeouts, unsigned char *abuf, int alen) {
+ 	int i;
+ 	unsigned int ancount, nscount, arcount;
+ 	const unsigned char *aptr;
+-- 
+1.7.7
+
diff --git a/sipsak.spec b/sipsak.spec
index 1ef7394..7be13f8 100644
--- a/sipsak.spec
+++ b/sipsak.spec
@@ -1,12 +1,12 @@
 Summary:	SIP swiss army knife
 Name:		sipsak
 Version:	0.9.6
-Release:	10%{?dist}
+Release:	11%{?dist}
 License:	GPLv2+
 Group:		Applications/Communications
 URL:		http://sipsak.org/
 Source0:	http://download.berlios.de/sipsak/%{name}-%{version}-1.tar.gz
-Patch1:		sipsak-0001-Fix-for-sudden-null-returned-from-c-ares.patch
+Patch1:		sipsak-0001-Fix-for-wrong-arity-of-callback-function-for-c-ares.patch
 BuildRequires:	openssl-devel
 #BuildRequires:	gnutls-devel
 #BuildRequires:	ruli-devel
@@ -21,7 +21,7 @@ devices.
 
 %prep
 %setup -q
-%patch1 -p1 -b .fix_null
+%patch1 -p1 -b .fix_arity
 
 %build
 %configure --disable-gnutls
@@ -42,6 +42,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/*
 
 %changelog
+* Wed Nov 16 2011 Peter Lemenkov <lemenkov at gmail.com> - 0.9.6-11
+- Proper fix for rhbz #753372 now
+
 * Tue Nov 15 2011 Peter Lemenkov <lemenkov at gmail.com> - 0.9.6-10
 - Fix rhbz #753372