[arch-commits] Commit in loudmouth/repos (16 files)
Andreas Radke
andyrtr at archlinux.org
Fri Apr 17 20:41:03 UTC 2015
Date: Friday, April 17, 2015 @ 22:41:03
Author: andyrtr
Revision: 237323
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
loudmouth/repos/staging-i686/
loudmouth/repos/staging-i686/01-fix-sasl-md5-digest-uri.patch
(from rev 237322, loudmouth/trunk/01-fix-sasl-md5-digest-uri.patch)
loudmouth/repos/staging-i686/03-drop-stanzas-on-fail.patch
(from rev 237322, loudmouth/trunk/03-drop-stanzas-on-fail.patch)
loudmouth/repos/staging-i686/04-use-pkg-config-for-gnutls.patch
(from rev 237322, loudmouth/trunk/04-use-pkg-config-for-gnutls.patch)
loudmouth/repos/staging-i686/07-glib-single-include.patch
(from rev 237322, loudmouth/trunk/07-glib-single-include.patch)
loudmouth/repos/staging-i686/08-fix-ipv6-connect.patch
(from rev 237322, loudmouth/trunk/08-fix-ipv6-connect.patch)
loudmouth/repos/staging-i686/PKGBUILD
(from rev 237322, loudmouth/trunk/PKGBUILD)
loudmouth/repos/staging-i686/gnutls-3.4.0.patch
(from rev 237322, loudmouth/trunk/gnutls-3.4.0.patch)
loudmouth/repos/staging-x86_64/
loudmouth/repos/staging-x86_64/01-fix-sasl-md5-digest-uri.patch
(from rev 237322, loudmouth/trunk/01-fix-sasl-md5-digest-uri.patch)
loudmouth/repos/staging-x86_64/03-drop-stanzas-on-fail.patch
(from rev 237322, loudmouth/trunk/03-drop-stanzas-on-fail.patch)
loudmouth/repos/staging-x86_64/04-use-pkg-config-for-gnutls.patch
(from rev 237322, loudmouth/trunk/04-use-pkg-config-for-gnutls.patch)
loudmouth/repos/staging-x86_64/07-glib-single-include.patch
(from rev 237322, loudmouth/trunk/07-glib-single-include.patch)
loudmouth/repos/staging-x86_64/08-fix-ipv6-connect.patch
(from rev 237322, loudmouth/trunk/08-fix-ipv6-connect.patch)
loudmouth/repos/staging-x86_64/PKGBUILD
(from rev 237322, loudmouth/trunk/PKGBUILD)
loudmouth/repos/staging-x86_64/gnutls-3.4.0.patch
(from rev 237322, loudmouth/trunk/gnutls-3.4.0.patch)
---------------------------------------------------+
staging-i686/01-fix-sasl-md5-digest-uri.patch | 24 +++++++++
staging-i686/03-drop-stanzas-on-fail.patch | 45 +++++++++++++++++
staging-i686/04-use-pkg-config-for-gnutls.patch | 23 ++++++++
staging-i686/07-glib-single-include.patch | 17 ++++++
staging-i686/08-fix-ipv6-connect.patch | 28 ++++++++++
staging-i686/PKGBUILD | 52 ++++++++++++++++++++
staging-i686/gnutls-3.4.0.patch | 20 +++++++
staging-x86_64/01-fix-sasl-md5-digest-uri.patch | 24 +++++++++
staging-x86_64/03-drop-stanzas-on-fail.patch | 45 +++++++++++++++++
staging-x86_64/04-use-pkg-config-for-gnutls.patch | 23 ++++++++
staging-x86_64/07-glib-single-include.patch | 17 ++++++
staging-x86_64/08-fix-ipv6-connect.patch | 28 ++++++++++
staging-x86_64/PKGBUILD | 52 ++++++++++++++++++++
staging-x86_64/gnutls-3.4.0.patch | 20 +++++++
14 files changed, 418 insertions(+)
Copied: loudmouth/repos/staging-i686/01-fix-sasl-md5-digest-uri.patch (from rev 237322, loudmouth/trunk/01-fix-sasl-md5-digest-uri.patch)
===================================================================
--- staging-i686/01-fix-sasl-md5-digest-uri.patch (rev 0)
+++ staging-i686/01-fix-sasl-md5-digest-uri.patch 2015-04-17 20:41:03 UTC (rev 237323)
@@ -0,0 +1,24 @@
+diff --git a/loudmouth/lm-connection.c b/loudmouth/lm-connection.c
+index 21c1bc2..ae8de94 100644
+--- a/loudmouth/lm-connection.c
++++ b/loudmouth/lm-connection.c
+@@ -1441,11 +1441,18 @@ lm_connection_authenticate (LmConnection *connection,
+ connection->effective_jid = g_strdup_printf ("%s/%s",
+ connection->jid, connection->resource);
+
+ if (connection->use_sasl) {
++ gchar *domain = NULL;
++
++ if (!connection_get_server_from_jid (connection->jid, &domain)) {
++ domain = g_strdup (connection->server);
++ }
++
+ lm_sasl_authenticate (connection->sasl,
+ username, password,
+- connection->server,
++ domain,
+ connection_sasl_auth_finished);
++ g_free (domain);
+
+ connection->features_cb =
+ lm_message_handler_new (connection_features_cb,
Copied: loudmouth/repos/staging-i686/03-drop-stanzas-on-fail.patch (from rev 237322, loudmouth/trunk/03-drop-stanzas-on-fail.patch)
===================================================================
--- staging-i686/03-drop-stanzas-on-fail.patch (rev 0)
+++ staging-i686/03-drop-stanzas-on-fail.patch 2015-04-17 20:41:03 UTC (rev 237323)
@@ -0,0 +1,45 @@
+From: Sjoerd Simons <sjoerd.simons at collabora.co.uk>
+Date: Tue, 13 Jan 2009 11:28:44 +0000
+Subject: [PATCH] Drop stanzas when failing to convert them to LmMessages
+
+when a stanza comes in that for some reason can't be parsed into an LmMessage,
+just drop them on the floor instead of blocking the parser. I've seen this
+issue happen in practise because some (buggy?) client sending an iq with a
+prefix e.g. <client:iq xmlns:client="jabber:client" ... />
+---
+ loudmouth/lm-parser.c | 15 ++++++---------
+ 1 files changed, 6 insertions(+), 9 deletions(-)
+
+diff --git a/loudmouth/lm-parser.c b/loudmouth/lm-parser.c
+index 1938d56..89f6675 100644
+--- a/loudmouth/lm-parser.c
++++ b/loudmouth/lm-parser.c
+@@ -151,19 +151,16 @@ parser_end_node_cb (GMarkupParseContext *context,
+ if (!m) {
+ g_warning ("Couldn't create message: %s\n",
+ parser->cur_root->name);
+- return;
+- }
+-
+- g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_PARSER,
++ } else {
++ g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_PARSER,
+ "Have a new message\n");
+- if (parser->function) {
+- (* parser->function) (parser, m, parser->user_data);
++ if (parser->function) {
++ (* parser->function) (parser, m, parser->user_data);
++ }
++ lm_message_unref (m);
+ }
+
+- lm_message_unref (m);
+ lm_message_node_unref (parser->cur_root);
+-
+-
+ parser->cur_node = parser->cur_root = NULL;
+ } else {
+ LmMessageNode *tmp_node;
+--
+1.5.6.5
+
Copied: loudmouth/repos/staging-i686/04-use-pkg-config-for-gnutls.patch (from rev 237322, loudmouth/trunk/04-use-pkg-config-for-gnutls.patch)
===================================================================
--- staging-i686/04-use-pkg-config-for-gnutls.patch (rev 0)
+++ staging-i686/04-use-pkg-config-for-gnutls.patch 2015-04-17 20:41:03 UTC (rev 237323)
@@ -0,0 +1,23 @@
+Description: use pkg-config to detect gnutls
+Debian: http://bugs.debian.org/529835
+Origin: http://groups.google.com/group/loudmouth-dev/browse_thread/thread/3f78255837048daf#
+
+--- a/configure.ac.orig 2009-08-16 20:29:36.000000000 +0200
++++ b/configure.ac 2009-08-16 20:30:43.000000000 +0200
+@@ -146,10 +146,12 @@ AC_ARG_WITH(openssl-libs,
+ enable_ssl=no
+ if test "x$ac_ssl" = "xgnutls"; then
+ dnl Look for GnuTLS
+- AM_PATH_LM_LIBGNUTLS($GNUTLS_REQUIRED, have_libgnutls=yes, have_libgnutls=no)
+- if test "x$have_libgnutls" = "xyes"; then
+- CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
+- LIBS="$LIBS $LIBGNUTLS_LIBS"
++ PKG_CHECK_MODULES(GNUTLS, gnutls >= $GNUTLS_REQUIRED, have_gnutls=yes, have_gnutls=no)
++ if test "x$have_gnutls" = "xyes"; then
++ AC_SUBST(ASYNCNS_CFLAGS)
++ AC_SUBST(ASYNCNS_LIBS)
++ CFLAGS="$CFLAGS $GNUTLS_CFLAGS"
++ LIBS="$LIBS $GNUTLS_LIBS"
+ AC_DEFINE(HAVE_GNUTLS, 1, [whether to use GnuTSL support.])
+ enable_ssl=GnuTLS
+ else
Copied: loudmouth/repos/staging-i686/07-glib-single-include.patch (from rev 237322, loudmouth/trunk/07-glib-single-include.patch)
===================================================================
--- staging-i686/07-glib-single-include.patch (rev 0)
+++ staging-i686/07-glib-single-include.patch 2015-04-17 20:41:03 UTC (rev 237323)
@@ -0,0 +1,17 @@
+Description: Fix build failure with glib 2.32
+ where including individual glib headers is no longer allowed.
+Author: Michael Biebl <biebl at debian.org>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=665576
+Index: loudmouth-1.4.3/loudmouth/lm-error.c
+===================================================================
+--- loudmouth-1.4.3.orig/loudmouth/lm-error.c 2008-10-29 21:48:15.000000000 +0100
++++ loudmouth-1.4.3/loudmouth/lm-error.c 2012-03-26 00:24:19.518939657 +0200
+@@ -19,7 +19,7 @@
+ */
+
+ #include <config.h>
+-#include <glib/gerror.h>
++#include <glib.h>
+ #include "lm-error.h"
+
+ /**
Copied: loudmouth/repos/staging-i686/08-fix-ipv6-connect.patch (from rev 237322, loudmouth/trunk/08-fix-ipv6-connect.patch)
===================================================================
--- staging-i686/08-fix-ipv6-connect.patch (rev 0)
+++ staging-i686/08-fix-ipv6-connect.patch 2015-04-17 20:41:03 UTC (rev 237323)
@@ -0,0 +1,28 @@
+Description: fix crash when falling back from IPv6 to IPv4
+ Previously, loudmouth would set socket->watch_connect to NULL when
+ encountering an error. When the connection attempt (to a different IPv6)
+ succeeded later on, _lm_socket_succeeded would therefore not remove the
+ socket_connect_cb watcher, leading to socket_connect_cb being called upon
+ socket activity and segfaulting the program.
+Author: Michael Stapelberg <stapelberg at debian.org>
+Bug-Debian: http://bugs.debian.org/631729
+Forwarded: no
+Last-Update: 2013-02-03
+--- a/loudmouth/lm-socket.c
++++ b/loudmouth/lm-socket.c
+@@ -529,7 +529,6 @@
+ /* error condition, but might be possible to recover
+ * from it (by connecting to the next host) */
+ if (!_lm_socket_failed_with_error (connect_data, err)) {
+- socket->watch_connect = NULL;
+ goto out;
+ }
+ }
+@@ -560,7 +559,6 @@
+ _lm_sock_close (connect_data->fd);
+ _lm_socket_failed_with_error (connect_data, err);
+
+- socket->watch_connect = NULL;
+ goto out;
+ }
+ }
Copied: loudmouth/repos/staging-i686/PKGBUILD (from rev 237322, loudmouth/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2015-04-17 20:41:03 UTC (rev 237323)
@@ -0,0 +1,52 @@
+# $Id
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: damir <damir at archlinux.org>
+# Contributor: Brice Carpentier <brice.carpentier at orange.fr>
+
+pkgname=loudmouth
+pkgver=1.4.3
+pkgrel=5
+pkgdesc="A lightweight Jabber client library written in C/Glib"
+arch=('i686' 'x86_64')
+license=('LGPL')
+url="http://groups.google.com/group/loudmouth-dev"
+depends=('glib2' 'gnutls' 'libidn')
+makedepends=('intltool' 'pkgconfig' 'gtk-doc')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.4/${pkgname}-${pkgver}.tar.bz2
+ 01-fix-sasl-md5-digest-uri.patch
+ 03-drop-stanzas-on-fail.patch
+ 04-use-pkg-config-for-gnutls.patch
+ 07-glib-single-include.patch
+ 08-fix-ipv6-connect.patch
+ gnutls-3.4.0.patch)
+md5sums=('55339ca42494690c3942ee1465a96937'
+ 'dc799cea18b24847b1e008c7424010a3'
+ 'b7b2d81b01a5eee5fd5e21cae67b4af7'
+ 'bffb25b9551df43255fe1706588582f3'
+ 'd1546ed54740de536f6bb79a18c5dccb'
+ '8e3071299776d32b9be27bba7d3f9ae0'
+ '868f08345d9c7a42f19290d8caf8aff1')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np1 -i ../01-fix-sasl-md5-digest-uri.patch
+ patch -Np1 -i ../03-drop-stanzas-on-fail.patch
+ patch -Np1 -i ../04-use-pkg-config-for-gnutls.patch
+ patch -Np1 -i ../07-glib-single-include.patch
+ patch -Np1 -i ../08-fix-ipv6-connect.patch
+ patch -Np0 -i ../gnutls-3.4.0.patch
+ libtoolize --force
+ aclocal
+ autoconf
+ automake --add-missing
+}
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure --prefix=/usr --disable-static
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
Copied: loudmouth/repos/staging-i686/gnutls-3.4.0.patch (from rev 237322, loudmouth/trunk/gnutls-3.4.0.patch)
===================================================================
--- staging-i686/gnutls-3.4.0.patch (rev 0)
+++ staging-i686/gnutls-3.4.0.patch 2015-04-17 20:41:03 UTC (rev 237323)
@@ -0,0 +1,20 @@
+--- loudmouth/lm-ssl-gnutls.c 2008-10-29 14:45:10.000000000 +0100
++++ loudmouth/lm-ssl-gnutls.c.new 2015-04-17 22:35:06.703672306 +0200
+@@ -196,17 +196,9 @@
+ {
+ int ret;
+ gboolean auth_ok = TRUE;
+- 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);
Copied: loudmouth/repos/staging-x86_64/01-fix-sasl-md5-digest-uri.patch (from rev 237322, loudmouth/trunk/01-fix-sasl-md5-digest-uri.patch)
===================================================================
--- staging-x86_64/01-fix-sasl-md5-digest-uri.patch (rev 0)
+++ staging-x86_64/01-fix-sasl-md5-digest-uri.patch 2015-04-17 20:41:03 UTC (rev 237323)
@@ -0,0 +1,24 @@
+diff --git a/loudmouth/lm-connection.c b/loudmouth/lm-connection.c
+index 21c1bc2..ae8de94 100644
+--- a/loudmouth/lm-connection.c
++++ b/loudmouth/lm-connection.c
+@@ -1441,11 +1441,18 @@ lm_connection_authenticate (LmConnection *connection,
+ connection->effective_jid = g_strdup_printf ("%s/%s",
+ connection->jid, connection->resource);
+
+ if (connection->use_sasl) {
++ gchar *domain = NULL;
++
++ if (!connection_get_server_from_jid (connection->jid, &domain)) {
++ domain = g_strdup (connection->server);
++ }
++
+ lm_sasl_authenticate (connection->sasl,
+ username, password,
+- connection->server,
++ domain,
+ connection_sasl_auth_finished);
++ g_free (domain);
+
+ connection->features_cb =
+ lm_message_handler_new (connection_features_cb,
Copied: loudmouth/repos/staging-x86_64/03-drop-stanzas-on-fail.patch (from rev 237322, loudmouth/trunk/03-drop-stanzas-on-fail.patch)
===================================================================
--- staging-x86_64/03-drop-stanzas-on-fail.patch (rev 0)
+++ staging-x86_64/03-drop-stanzas-on-fail.patch 2015-04-17 20:41:03 UTC (rev 237323)
@@ -0,0 +1,45 @@
+From: Sjoerd Simons <sjoerd.simons at collabora.co.uk>
+Date: Tue, 13 Jan 2009 11:28:44 +0000
+Subject: [PATCH] Drop stanzas when failing to convert them to LmMessages
+
+when a stanza comes in that for some reason can't be parsed into an LmMessage,
+just drop them on the floor instead of blocking the parser. I've seen this
+issue happen in practise because some (buggy?) client sending an iq with a
+prefix e.g. <client:iq xmlns:client="jabber:client" ... />
+---
+ loudmouth/lm-parser.c | 15 ++++++---------
+ 1 files changed, 6 insertions(+), 9 deletions(-)
+
+diff --git a/loudmouth/lm-parser.c b/loudmouth/lm-parser.c
+index 1938d56..89f6675 100644
+--- a/loudmouth/lm-parser.c
++++ b/loudmouth/lm-parser.c
+@@ -151,19 +151,16 @@ parser_end_node_cb (GMarkupParseContext *context,
+ if (!m) {
+ g_warning ("Couldn't create message: %s\n",
+ parser->cur_root->name);
+- return;
+- }
+-
+- g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_PARSER,
++ } else {
++ g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_PARSER,
+ "Have a new message\n");
+- if (parser->function) {
+- (* parser->function) (parser, m, parser->user_data);
++ if (parser->function) {
++ (* parser->function) (parser, m, parser->user_data);
++ }
++ lm_message_unref (m);
+ }
+
+- lm_message_unref (m);
+ lm_message_node_unref (parser->cur_root);
+-
+-
+ parser->cur_node = parser->cur_root = NULL;
+ } else {
+ LmMessageNode *tmp_node;
+--
+1.5.6.5
+
Copied: loudmouth/repos/staging-x86_64/04-use-pkg-config-for-gnutls.patch (from rev 237322, loudmouth/trunk/04-use-pkg-config-for-gnutls.patch)
===================================================================
--- staging-x86_64/04-use-pkg-config-for-gnutls.patch (rev 0)
+++ staging-x86_64/04-use-pkg-config-for-gnutls.patch 2015-04-17 20:41:03 UTC (rev 237323)
@@ -0,0 +1,23 @@
+Description: use pkg-config to detect gnutls
+Debian: http://bugs.debian.org/529835
+Origin: http://groups.google.com/group/loudmouth-dev/browse_thread/thread/3f78255837048daf#
+
+--- a/configure.ac.orig 2009-08-16 20:29:36.000000000 +0200
++++ b/configure.ac 2009-08-16 20:30:43.000000000 +0200
+@@ -146,10 +146,12 @@ AC_ARG_WITH(openssl-libs,
+ enable_ssl=no
+ if test "x$ac_ssl" = "xgnutls"; then
+ dnl Look for GnuTLS
+- AM_PATH_LM_LIBGNUTLS($GNUTLS_REQUIRED, have_libgnutls=yes, have_libgnutls=no)
+- if test "x$have_libgnutls" = "xyes"; then
+- CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
+- LIBS="$LIBS $LIBGNUTLS_LIBS"
++ PKG_CHECK_MODULES(GNUTLS, gnutls >= $GNUTLS_REQUIRED, have_gnutls=yes, have_gnutls=no)
++ if test "x$have_gnutls" = "xyes"; then
++ AC_SUBST(ASYNCNS_CFLAGS)
++ AC_SUBST(ASYNCNS_LIBS)
++ CFLAGS="$CFLAGS $GNUTLS_CFLAGS"
++ LIBS="$LIBS $GNUTLS_LIBS"
+ AC_DEFINE(HAVE_GNUTLS, 1, [whether to use GnuTSL support.])
+ enable_ssl=GnuTLS
+ else
Copied: loudmouth/repos/staging-x86_64/07-glib-single-include.patch (from rev 237322, loudmouth/trunk/07-glib-single-include.patch)
===================================================================
--- staging-x86_64/07-glib-single-include.patch (rev 0)
+++ staging-x86_64/07-glib-single-include.patch 2015-04-17 20:41:03 UTC (rev 237323)
@@ -0,0 +1,17 @@
+Description: Fix build failure with glib 2.32
+ where including individual glib headers is no longer allowed.
+Author: Michael Biebl <biebl at debian.org>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=665576
+Index: loudmouth-1.4.3/loudmouth/lm-error.c
+===================================================================
+--- loudmouth-1.4.3.orig/loudmouth/lm-error.c 2008-10-29 21:48:15.000000000 +0100
++++ loudmouth-1.4.3/loudmouth/lm-error.c 2012-03-26 00:24:19.518939657 +0200
+@@ -19,7 +19,7 @@
+ */
+
+ #include <config.h>
+-#include <glib/gerror.h>
++#include <glib.h>
+ #include "lm-error.h"
+
+ /**
Copied: loudmouth/repos/staging-x86_64/08-fix-ipv6-connect.patch (from rev 237322, loudmouth/trunk/08-fix-ipv6-connect.patch)
===================================================================
--- staging-x86_64/08-fix-ipv6-connect.patch (rev 0)
+++ staging-x86_64/08-fix-ipv6-connect.patch 2015-04-17 20:41:03 UTC (rev 237323)
@@ -0,0 +1,28 @@
+Description: fix crash when falling back from IPv6 to IPv4
+ Previously, loudmouth would set socket->watch_connect to NULL when
+ encountering an error. When the connection attempt (to a different IPv6)
+ succeeded later on, _lm_socket_succeeded would therefore not remove the
+ socket_connect_cb watcher, leading to socket_connect_cb being called upon
+ socket activity and segfaulting the program.
+Author: Michael Stapelberg <stapelberg at debian.org>
+Bug-Debian: http://bugs.debian.org/631729
+Forwarded: no
+Last-Update: 2013-02-03
+--- a/loudmouth/lm-socket.c
++++ b/loudmouth/lm-socket.c
+@@ -529,7 +529,6 @@
+ /* error condition, but might be possible to recover
+ * from it (by connecting to the next host) */
+ if (!_lm_socket_failed_with_error (connect_data, err)) {
+- socket->watch_connect = NULL;
+ goto out;
+ }
+ }
+@@ -560,7 +559,6 @@
+ _lm_sock_close (connect_data->fd);
+ _lm_socket_failed_with_error (connect_data, err);
+
+- socket->watch_connect = NULL;
+ goto out;
+ }
+ }
Copied: loudmouth/repos/staging-x86_64/PKGBUILD (from rev 237322, loudmouth/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2015-04-17 20:41:03 UTC (rev 237323)
@@ -0,0 +1,52 @@
+# $Id
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: damir <damir at archlinux.org>
+# Contributor: Brice Carpentier <brice.carpentier at orange.fr>
+
+pkgname=loudmouth
+pkgver=1.4.3
+pkgrel=5
+pkgdesc="A lightweight Jabber client library written in C/Glib"
+arch=('i686' 'x86_64')
+license=('LGPL')
+url="http://groups.google.com/group/loudmouth-dev"
+depends=('glib2' 'gnutls' 'libidn')
+makedepends=('intltool' 'pkgconfig' 'gtk-doc')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.4/${pkgname}-${pkgver}.tar.bz2
+ 01-fix-sasl-md5-digest-uri.patch
+ 03-drop-stanzas-on-fail.patch
+ 04-use-pkg-config-for-gnutls.patch
+ 07-glib-single-include.patch
+ 08-fix-ipv6-connect.patch
+ gnutls-3.4.0.patch)
+md5sums=('55339ca42494690c3942ee1465a96937'
+ 'dc799cea18b24847b1e008c7424010a3'
+ 'b7b2d81b01a5eee5fd5e21cae67b4af7'
+ 'bffb25b9551df43255fe1706588582f3'
+ 'd1546ed54740de536f6bb79a18c5dccb'
+ '8e3071299776d32b9be27bba7d3f9ae0'
+ '868f08345d9c7a42f19290d8caf8aff1')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np1 -i ../01-fix-sasl-md5-digest-uri.patch
+ patch -Np1 -i ../03-drop-stanzas-on-fail.patch
+ patch -Np1 -i ../04-use-pkg-config-for-gnutls.patch
+ patch -Np1 -i ../07-glib-single-include.patch
+ patch -Np1 -i ../08-fix-ipv6-connect.patch
+ patch -Np0 -i ../gnutls-3.4.0.patch
+ libtoolize --force
+ aclocal
+ autoconf
+ automake --add-missing
+}
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure --prefix=/usr --disable-static
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
Copied: loudmouth/repos/staging-x86_64/gnutls-3.4.0.patch (from rev 237322, loudmouth/trunk/gnutls-3.4.0.patch)
===================================================================
--- staging-x86_64/gnutls-3.4.0.patch (rev 0)
+++ staging-x86_64/gnutls-3.4.0.patch 2015-04-17 20:41:03 UTC (rev 237323)
@@ -0,0 +1,20 @@
+--- loudmouth/lm-ssl-gnutls.c 2008-10-29 14:45:10.000000000 +0100
++++ loudmouth/lm-ssl-gnutls.c.new 2015-04-17 22:35:06.703672306 +0200
+@@ -196,17 +196,9 @@
+ {
+ int ret;
+ gboolean auth_ok = TRUE;
+- 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);
More information about the arch-commits
mailing list