From 349dd40b78164fb0b3b9351f826d55dfbca4e052 Mon Sep 17 00:00:00 2001 From: Till Maas Date: Nov 15 2015 13:25:17 +0000 Subject: Update to 1.5.1 --- diff --git a/.gitignore b/.gitignore index cc33f01..ea3c84d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ loudmouth-1.4.3.tar.bz2 +/loudmouth-1.5.1.tar.bz2 +/loudmouth-1.5.1.tar.bz2.asc diff --git a/0001-Drop-stanzas-when-failing-to-convert-them-to-LmMessa.patch b/0001-Drop-stanzas-when-failing-to-convert-them-to-LmMessa.patch deleted file mode 100644 index 87b86a9..0000000 --- a/0001-Drop-stanzas-when-failing-to-convert-them-to-LmMessa.patch +++ /dev/null @@ -1,45 +0,0 @@ -From: Sjoerd Simons -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. ---- - 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 - diff --git a/gpgkey-EACADFF156849BC89653139E3C2900DEACB7FC95.gpg b/gpgkey-EACADFF156849BC89653139E3C2900DEACB7FC95.gpg new file mode 100644 index 0000000..1705c37 Binary files /dev/null and b/gpgkey-EACADFF156849BC89653139E3C2900DEACB7FC95.gpg differ diff --git a/loudmouth-1.4.3-certs_location.patch b/loudmouth-1.4.3-certs_location.patch deleted file mode 100644 index 2cf90c6..0000000 --- a/loudmouth-1.4.3-certs_location.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 - --#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~ diff --git a/loudmouth-1.4.3-fix-sasl-md5-digest-uri.patch b/loudmouth-1.4.3-fix-sasl-md5-digest-uri.patch deleted file mode 100644 index 50c796e..0000000 --- a/loudmouth-1.4.3-fix-sasl-md5-digest-uri.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -urp loudmouth-1.4.3.OLD/loudmouth/lm-connection.c loudmouth-1.4.3/loudmouth/lm-connection.c ---- loudmouth-1.4.3.OLD/loudmouth/lm-connection.c 2008-10-29 16:38:26.000000000 -0400 -+++ loudmouth-1.4.3/loudmouth/lm-connection.c 2009-06-12 19:13:03.183960144 -0400 -@@ -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, diff --git a/loudmouth-1.4.3-glib-compile-fix.patch b/loudmouth-1.4.3-glib-compile-fix.patch deleted file mode 100644 index 03d04e7..0000000 --- a/loudmouth-1.4.3-glib-compile-fix.patch +++ /dev/null @@ -1,17 +0,0 @@ -Fix compile against new glib. - -From: Daniel Drake - -Index: loudmouth-1.4.3/loudmouth/lm-error.c -=================================================================== ---- loudmouth-1.4.3.orig/loudmouth/lm-error.c -+++ loudmouth-1.4.3/loudmouth/lm-error.c -@@ -19,7 +19,7 @@ - */ - - #include --#include -+#include - #include "lm-error.h" - - /** diff --git a/loudmouth-1.4.3-libidn.patch b/loudmouth-1.4.3-libidn.patch deleted file mode 100644 index a0f7d90..0000000 --- a/loudmouth-1.4.3-libidn.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- loudmouth-1.4.3/loudmouth-1.0.pc.in 2008-10-29 23:19:05.000000000 +1000 -+++ loudmouth-1.4.3/loudmouth-1.0.pc.in 2012-07-20 10:54:45.319815966 +1000 -@@ -7,5 +7,6 @@ - Description: libloudmouth - Requires: glib-2.0 - Version: @VERSION@ --Libs: -L${libdir} -lloudmouth-1 @LIBIDN_LIBS@ -+Libs.private: @LIBIDN_LIBS@ -+Libs: -L${libdir} -lloudmouth-1 - Cflags: -I${includedir}/loudmouth-1.0 diff --git a/loudmouth-1.5.1-certs_location.patch b/loudmouth-1.5.1-certs_location.patch new file mode 100644 index 0000000..c78eeeb --- /dev/null +++ b/loudmouth-1.5.1-certs_location.patch @@ -0,0 +1,12 @@ +diff -up loudmouth-1.5.1/loudmouth/lm-ssl-gnutls.c.certs loudmouth-1.5.1/loudmouth/lm-ssl-gnutls.c +--- loudmouth-1.5.1/loudmouth/lm-ssl-gnutls.c.certs 2015-11-12 19:44:11.562536061 +0100 ++++ loudmouth-1.5.1/loudmouth/lm-ssl-gnutls.c 2015-11-12 19:45:25.044746540 +0100 +@@ -37,7 +37,7 @@ + + #include + +-#define CA_PEM_FILE "/etc/ssl/certs/ca-certificates.crt" ++#define CA_PEM_FILE "/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem" + + struct _LmSSL { + LmSSLBase base; diff --git a/loudmouth.spec b/loudmouth.spec index 69f4d21..de0ef2e 100644 --- a/loudmouth.spec +++ b/loudmouth.spec @@ -1,27 +1,24 @@ Name: loudmouth -Version: 1.4.3 -Release: 18%{?dist} +Version: 1.5.1 +Release: 1%{?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 +URL: https://github.com/mcabber/loudmouth/ +Source0: https://mcabber.com/files/loudmouth/loudmouth-%{version}.tar.bz2 +Source1: https://mcabber.com/files/loudmouth/loudmouth-%{version}.tar.bz2.asc +# Not verified, trust on first use +Source2: gpgkey-EACADFF156849BC89653139E3C2900DEACB7FC95.gpg # Fedora specific -Patch0: %{name}-1.4.3-certs_location.patch +Patch0: %{name}-1.5.1-certs_location.patch # unclear status, does not apply to latest upstream Patch1: %{name}-1.4.3-async_assertion.patch -# upstreamed -Patch2: %{name}-1.4.3-fix-sasl-md5-digest-uri.patch -# upstreamed -Patch3: 0001-Drop-stanzas-when-failing-to-convert-them-to-LmMessa.patch -# upstreamed -Patch4: %{name}-1.4.3-glib-compile-fix.patch -# upstream pull request: https://github.com/mcabber/loudmouth/pull/18 -Patch5: %{name}-1.4.3-libidn.patch BuildRequires: check-devel BuildRequires: glib2-devel +# for gpg source verification +BuildRequires: gpg BuildRequires: openssl-devel BuildRequires: libasyncns-devel BuildRequires: libidn-devel @@ -49,17 +46,13 @@ developing applications that use %{name}. %prep +gpgv --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0} %setup -q %patch0 -p1 -b .certs -%patch1 -p1 -b .async -%patch2 -p1 -b .uri -%patch3 -p1 -b .stanza -%patch4 -p1 -b .glibincl -%patch5 -p1 -b .idn %build -%configure --enable-static=no --with-asyncns=yes --with-ssl=openssl +%configure --enable-static=no --with-asyncns=yes --with-ssl=openssl --enable-gtk-doc make %{?_smp_mflags} @@ -97,6 +90,10 @@ make check %changelog +* Sun Nov 15 2015 Till Maas - 1.5.1-1 +- Update to new release +- Verify source + * Wed Oct 28 2015 Till Maas - 1.4.3-18 - Do not mix tab and space indenting - Add patch upstream status diff --git a/sources b/sources index e5b5139..6165c6a 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -55339ca42494690c3942ee1465a96937 loudmouth-1.4.3.tar.bz2 +fbc70329b85a93d9ad1c8df271ae04fc loudmouth-1.5.1.tar.bz2 +1f6bb2fdfd885bf9cbb0cff473eedd9e loudmouth-1.5.1.tar.bz2.asc