rpms/loudmouth/F-8 loudmouth-gnutls-compression.patch, NONE, 1.1 loudmouth.spec, 1.30, 1.31
Brian Pepple (bpepple)
fedora-extras-commits at redhat.com
Fri Nov 16 03:24:03 UTC 2007
Author: bpepple
Update of /cvs/pkgs/rpms/loudmouth/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13091
Modified Files:
loudmouth.spec
Added Files:
loudmouth-gnutls-compression.patch
Log Message:
* Thu Nov 15 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.2.3-5
- Add patch to use gnutls compression.
loudmouth-gnutls-compression.patch:
--- NEW FILE loudmouth-gnutls-compression.patch ---
diff --git a/loudmouth/lm-ssl-gnutls.c b/loudmouth/lm-ssl-gnutls.c
index 73e6faf..c114391 100644
--- a/loudmouth/lm-ssl-gnutls.c
+++ b/loudmouth/lm-ssl-gnutls.c
@@ -23,6 +23,7 @@
#include <string.h>
#include <glib.h>
+#include "lm-debug.h"
#include "lm-error.h"
#include "lm-ssl-base.h"
#include "lm-ssl-internals.h"
@@ -172,13 +173,17 @@ _lm_ssl_begin (LmSSL *ssl, gint fd, const gchar *server, GError **error)
{
int ret;
gboolean auth_ok = TRUE;
- const int cert_type_priority[2] =
- { GNUTLS_CRT_X509, GNUTLS_CRT_OPENPGP };
+ const int cert_type_priority[] =
+ { GNUTLS_CRT_X509, GNUTLS_CRT_OPENPGP, 0 };
+ const int compression_priority[] =
+ { GNUTLS_COMP_DEFLATE, GNUTLS_COMP_NULL, 0 };
gnutls_init (&ssl->gnutls_session, GNUTLS_CLIENT);
gnutls_set_default_priority (ssl->gnutls_session);
gnutls_certificate_type_set_priority (ssl->gnutls_session,
cert_type_priority);
+ gnutls_compression_set_priority (ssl->gnutls_session,
+ compression_priority);
gnutls_credentials_set (ssl->gnutls_session,
GNUTLS_CRD_CERTIFICATE,
ssl->gnutls_xcred);
@@ -209,7 +214,11 @@ _lm_ssl_begin (LmSSL *ssl, gint fd, const gchar *server, GError **error)
return FALSE;
}
-
+
+ lm_verbose ("GNUTLS negotiated compression: %s",
+ gnutls_compression_get_name (gnutls_compression_get
+ (ssl->gnutls_session)));
+
return TRUE;
}
Index: loudmouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/loudmouth/F-8/loudmouth.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- loudmouth.spec 13 Nov 2007 01:48:41 -0000 1.30
+++ loudmouth.spec 16 Nov 2007 03:23:29 -0000 1.31
@@ -2,7 +2,7 @@
Name: loudmouth
Version: 1.2.3
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Loudmouth is a Jabber programming library written in C
Group: System Environment/Libraries
@@ -10,6 +10,7 @@
URL: http://www.imendio.com/projects/loudmouth
Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}.tar.bz2
Patch0: %{name}-reconnect-failure.patch
+Patch1: %{name}-gnutls-compression.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: glib2-devel >= 2.4.0
@@ -48,6 +49,7 @@
%prep
%setup -q
%patch0 -p1 -b .reconnect
+%patch1 -p1 -b .gnutls
%build
%configure --enable-gtk-doc \
@@ -92,6 +94,9 @@
%changelog
+* Thu Nov 15 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.2.3-5
+- Add patch to use gnutls compression.
+
* Mon Nov 12 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.2.3-4
- Add reconnect-failure patch. Thanks to Robert McQueen.
More information about the scm-commits
mailing list