Mailinglist Archive: opensuse-commit (832 mails)
| < Previous | Next > |
commit loudmouth for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Sat, 13 Feb 2010 11:08:57 +0100
- Message-id: <20100213100857.2A790202A7@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package loudmouth for openSUSE:Factory
checked in at Sat Feb 13 11:08:57 CET 2010.
--------
--- loudmouth/loudmouth.changes 2008-12-23 23:47:21.000000000 +0100
+++ /mounts/work_src_done/STABLE/loudmouth/loudmouth.changes 2010-02-12
03:18:37.000000000 +0100
@@ -1,0 +2,16 @@
+Fri Feb 12 02:51:47 CET 2010 - vuntz@xxxxxxxxxxxx
+
+- Add patches from Debian:
+ + loudmouth-fix-sasl-md5-digest-uri.patch: use the right URI for
+ SASL md5 digest.
+ + loudmouth-fix-async-resolving.patch: do not check for sync DNS
+ failures when using async DNS.
+ + loudmouth-drop-stanzas-on-fail.patch: ignore stanza that we
+ can't parse.
+ + loudmouth-use-pkg-config-for-gnutls.patch: use pkg-config to
+ detect gnutls. Fix build on Factory.
+- Remove AutoReqProv: it's default now.
+- Use makeinstall macro.
+- Remove .la files.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
loudmouth-drop-stanzas-on-fail.patch
loudmouth-fix-async-resolving.patch
loudmouth-fix-sasl-md5-digest-uri.patch
loudmouth-use-pkg-config-for-gnutls.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ loudmouth.spec ++++++
--- /var/tmp/diff_new_pack.1GWZQ5/_old 2010-02-13 11:08:48.000000000 +0100
+++ /var/tmp/diff_new_pack.1GWZQ5/_new 2010-02-13 11:08:48.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package loudmouth (Version 1.4.3)
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -21,13 +21,20 @@
Name: loudmouth
BuildRequires: check-devel glib2-devel gnutls-devel gtk-doc sgml-skel
Version: 1.4.3
-Release: 1
+Release: 2
Url: http://www.loudmouth-project.org/
Group: Productivity/Networking/Other
-License: LGPL v2.1 or later
+License: LGPLv2.1+
Summary: Jabber Client Library Written in C
Source:
http://ftp.imendio.com/pub/imendio/%{name}/src/%{name}-%{version}.tar.bz2
-AutoReqProv: on
+# PATCH-FIX-UPSTREAM loudmouth-fix-sasl-md5-digest-uri.patch
vuntz@xxxxxxxxxxxx -- Taken from Debian, fix sasl md5 digest URI
+Patch0: loudmouth-fix-sasl-md5-digest-uri.patch
+# PATCH-FIX-UPSTREAM loudmouth-fix-async-resolving.patch vuntz@xxxxxxxxxxxx --
Taken from Debian, don't check for sync dns failures when using asyncns
+Patch1: loudmouth-fix-async-resolving.patch
+# PATCH-FIX-UPSTREAM loudmouth-drop-stanzas-on-fail.patch vuntz@xxxxxxxxxxxx
-- Taken from Debian, ignore stanza that can't be parsed
+Patch2: loudmouth-drop-stanzas-on-fail.patch
+# PATCH-FIX-UPSTREAM loudmouth-use-pkg-config-for-gnutls.patch
vuntz@xxxxxxxxxxxx -- Taken from Debian, use pkg-config to detect gnutls
+Patch3: loudmouth-use-pkg-config-for-gnutls.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define debug_package_requires libloudmouth-1-0 = %{version}-%{release}
@@ -36,15 +43,9 @@
with the Jabber protocol. It is designed to be easy to get started with
and yet extensible to let you do anything the Jabber protocol allows.
-
-
-Authors:
---------
- Mikael Hallendal <micke@xxxxxxxxxxx>
-
%package -n libloudmouth-1-0
Group: Productivity/Networking/Other
-License: LGPL v2.1 or later
+License: LGPLv2.1+
Summary: Jabber Client Library Written in C
%description -n libloudmouth-1-0
@@ -52,14 +53,8 @@
with the Jabber protocol. It is designed to be easy to get started with
and yet extensible to let you do anything the Jabber protocol allows.
-
-
-Authors:
---------
- Mikael Hallendal <micke@xxxxxxxxxxx>
-
%package devel
-License: LGPL v2.1 or later
+License: LGPLv2.1+
Group: Productivity/Networking/Other
Summary: Jabber Client Library Written in C
Requires: libloudmouth-1-0 = %{version} glibc-devel glib2-devel
gnutls-devel
@@ -69,14 +64,8 @@
with the Jabber protocol. It's designed to be easy to get started with
and yet extensible to let you do anything the Jabber protocol allows.
-
-
-Authors:
---------
- Mikael Hallendal <micke@xxxxxxxxxxx>
-
%package doc
-License: LGPL v2.1 or later
+License: LGPLv2.1+
Group: Productivity/Networking/Other
Summary: Jabber Client Library Written in C
Requires: libloudmouth-1-0 = %{version}
@@ -86,14 +75,12 @@
with the Jabber protocol. It's designed to be easy to get started with
and yet extensible to let you do anything the Jabber protocol allows.
-
-
-Authors:
---------
- Mikael Hallendal <micke@xxxxxxxxxxx>
-
%prep
%setup
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
%build
autoreconf -f -i
@@ -103,7 +90,8 @@
make %{?jobs:-j%jobs}
%install
-make DESTDIR=$RPM_BUILD_ROOT install
+%makeinstall
+find %{buildroot} -type f -name "*.la" -delete -print
%clean
rm -rf $RPM_BUILD_ROOT
@@ -120,7 +108,6 @@
%files devel
%defattr (-, root, root)
%{_libdir}/*.so
-%{_libdir}/*.*a
%{_libdir}/pkgconfig/*.pc
%{_includedir}/loudmouth-1.0
++++++ loudmouth-drop-stanzas-on-fail.patch ++++++
From: Sjoerd Simons <sjoerd.simons@xxxxxxxxxxxxxxx>
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
++++++ loudmouth-fix-async-resolving.patch ++++++
commit fc21de5fd06bee1714d38f92c60a2af75a7b5c29
Author: Senko Rasic <senko.rasic@xxxxxxxxxxxxxxx>
Date: Sun Nov 30 10:20:08 2008 +0100
Don't check for sync dns problems when using asyncns [#33]
lm_socket_create() checks for sync DNS failure, but the check is
executed even if Loudmouth is using asyncns, in which case Loudmouth
crashes.
diff --git a/loudmouth/lm-socket.c b/loudmouth/lm-socket.c
index 63ef84f..8add572 100644
--- a/loudmouth/lm-socket.c
+++ b/loudmouth/lm-socket.c
@@ -1022,7 +1022,7 @@ _lm_socket_create_phase2 (LmSocket *socket, struct
addrinfo *ans)
if (socket->connect_func) {
(socket->connect_func) (socket, FALSE,
socket->user_data);
}
- g_free (socket->connect_data);
+ g_free (socket->connect_data);
socket->connect_data = NULL;
return;
}
@@ -1107,6 +1107,10 @@ lm_socket_create (GMainContext *context,
_lm_socket_create_phase1 (socket, NULL, 0);
}
+#ifndef HAVE_ASYNCNS
+ /* Only do this check if we are not using asyncns or it will crash.
+ * Report and patch by Senko.
+ */
if (socket->connect_data == NULL) {
/* Open failed synchronously, probably a DNS lookup problem */
lm_socket_unref(socket);
@@ -1118,6 +1122,7 @@ lm_socket_create (GMainContext *context,
return NULL;
}
+#endif /* HAVE_ASYNCNS */
/* If the connection fails synchronously, we don't want to call the
++++++ loudmouth-fix-sasl-md5-digest-uri.patch ++++++
Index: loudmouth-1.4.3/loudmouth/lm-connection.c
===================================================================
--- loudmouth-1.4.3.orig/loudmouth/lm-connection.c
+++ loudmouth-1.4.3/loudmouth/lm-connection.c
@@ -1442,10 +1442,17 @@ lm_connection_authenticate (LmConnection
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,
++++++ loudmouth-use-pkg-config-for-gnutls.patch ++++++
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
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |