rpms/loudmouth/devel loudmouth-1.4.3-async_assertion.patch, NONE, 1.1 loudmouth-1.4.3-certs_location.patch, NONE, 1.1 loudmouth.spec, 1.44, 1.45

[Brian Pepple]

Author: bpepple

Update of /cvs/pkgs/rpms/loudmouth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23525

Modified Files:
	loudmouth.spec 
Added Files:
	loudmouth-1.4.3-async_assertion.patch 
	loudmouth-1.4.3-certs_location.patch 
Log Message:
* Fri Nov 28 2008 Brian Pepple <bpepple at fedoraproject.org> - 1.4.3-3
- Add patch to search correct location for ssl certs. (#473458)
- Add patch to fix async assertion. (#473436)


loudmouth-1.4.3-async_assertion.patch:

--- NEW FILE loudmouth-1.4.3-async_assertion.patch ---
diff -urp loudmouth-1.4.3.OLD/loudmouth/lm-socket.c loudmouth-1.4.3/loudmouth/lm-socket.c
--- loudmouth-1.4.3.OLD/loudmouth/lm-socket.c	2008-10-29 12:29:16.000000000 -0400
+++ loudmouth-1.4.3/loudmouth/lm-socket.c	2008-11-28 19:24:04.000000000 -0500
@@ -1107,6 +1107,7 @@ lm_socket_create (GMainContext      *con
 		_lm_socket_create_phase1 (socket, NULL, 0);
 	}
 
+#ifndef HAVE_ASYNCNS
 	if (socket->connect_data == NULL) {
 		/* Open failed synchronously, probably a DNS lookup problem */
 		lm_socket_unref(socket);
@@ -1118,6 +1119,7 @@ lm_socket_create (GMainContext      *con
 		
 		return NULL;
 	}
+#endif
 		
 
 	/* If the connection fails synchronously, we don't want to call the

loudmouth-1.4.3-certs_location.patch:

--- NEW FILE loudmouth-1.4.3-certs_location.patch ---
diff -urp loudmouth-1.4.3.OLD/loudmouth/lm-ssl-gnutls.c loudmouth-1.4.3/loudmouth/lm-ssl-gnutls.c
--- loudmouth-1.4.3.OLD/loudmouth/lm-ssl-gnutls.c	2008-10-29 09:45:10.000000000 -0400
+++ loudmouth-1.4.3/loudmouth/lm-ssl-gnutls.c	2008-11-28 19:01:41.000000000 -0500
@@ -32,7 +32,7 @@
 
 #include <gnutls/x509.h>
 
-#define CA_PEM_FILE "/etc/ssl/certs/ca-certificates.crt"
+#define CA_PEM_FILE "/etc/pki/tls/certs/ca-bundle.crt"
 
 struct _LmSSL {
 	LmSSLBase base;
Only in loudmouth-1.4.3/loudmouth: lm-ssl-gnutls.c~


Index: loudmouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/loudmouth/devel/loudmouth.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- loudmouth.spec	22 Nov 2008 18:19:16 -0000	1.44
+++ loudmouth.spec	29 Nov 2008 00:35:44 -0000	1.45
@@ -3,14 +3,15 @@
 
 Name:           loudmouth
 Version:        1.4.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        XMPP/Jabber C programming library
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://www.loudmouth-project.org/
 Source0:        http://ftp.imendio.com/pub/imendio/%{name}/src/%{name}-%{version}.tar.bz2
-
+Patch0:		%{name}-1.4.3-certs_location.patch
+Patch1:		%{name}-1.4.3-async_assertion.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel >= 2.4.0
@@ -47,6 +48,8 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .certs
+%patch1 -p1 -b .async
 
 
 %build
@@ -101,6 +104,10 @@
 
 
 %changelog
+* Fri Nov 28 2008 Brian Pepple <bpepple at fedoraproject.org> - 1.4.3-3
+- Add patch to search correct location for ssl certs. (#473458)
+- Add patch to fix async assertion. (#473436)
+
 * Sat Nov 22 2008 Brian Pepple <bpepple at fedoraproject.org> - 1.4.3-2
 - Simplify sumary & description.