From 7a86c6d81a212a2da81b3af5f5671d2100504794 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 20 Feb 2021 20:20:11 -0800 Subject: [PATCH] loudmouth: update to 1.5.4 Remove upstreamed patches. Fix license. Use AUTORELEASE to avoid bumping the release. Signed-off-by: Rosen Penev --- libs/loudmouth/Makefile | 8 +- .../patches/001-allow-disable-libidn.patch | 37 --- .../patches/002-fix-comparison.patch | 11 - libs/loudmouth/patches/010-add-private.patch | 271 ------------------ .../patches/020-openssl-deprecated.patch | 14 - 5 files changed, 4 insertions(+), 337 deletions(-) delete mode 100644 libs/loudmouth/patches/001-allow-disable-libidn.patch delete mode 100644 libs/loudmouth/patches/002-fix-comparison.patch delete mode 100644 libs/loudmouth/patches/010-add-private.patch delete mode 100644 libs/loudmouth/patches/020-openssl-deprecated.patch diff --git a/libs/loudmouth/Makefile b/libs/loudmouth/Makefile index 24c531b65..ff9cabd19 100644 --- a/libs/loudmouth/Makefile +++ b/libs/loudmouth/Makefile @@ -8,15 +8,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=loudmouth -PKG_VERSION:=1.5.3 -PKG_RELEASE:=4 +PKG_VERSION:=1.5.4 +PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/mcabber/loudmouth/tar.gz/$(PKG_VERSION)? -PKG_HASH:=12972fcffd9bbcc4a3b2b9fbf4b0e549f7b4caf0f11c8d2af2059087ce4e8792 +PKG_HASH:=d1f66d479bb9a2794c52e997a9db9271f7fd004e264fe1ff4302607deb083375 PKG_MAINTAINER:=W. Michael Petullo -PKG_LICENSE:=LGPLv2.1 +PKG_LICENSE:=LGPL-2.1-or-later PKG_LICENSE_FILES:=COPYING PKG_FIXUP:=autoreconf diff --git a/libs/loudmouth/patches/001-allow-disable-libidn.patch b/libs/loudmouth/patches/001-allow-disable-libidn.patch deleted file mode 100644 index 6519ec7e3..000000000 --- a/libs/loudmouth/patches/001-allow-disable-libidn.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -109,9 +109,22 @@ else - fi - AC_SUBST([TEST_DIRS]) - --PKG_CHECK_MODULES(LIBIDN, libidn, have_idn=yes, have_idn=no) --if test "x$have_idn" = "xyes"; then -- AC_DEFINE(HAVE_IDN, 1, [Define if IDN support is included]) -+dnl +--------------------------------------------------------+ -+dnl | Checking for libidn support |- -+dnl +--------------------------------------------------------+ -+AC_ARG_WITH(idn, -+ AS_HELP_STRING([--with-idn=@<:@auto|no@:>@], -+ [Whether to use libidn [[default=auto]]]), -+ ac_idn=$withval, -+ ac_idn=auto) -+ -+if test "x$ac_idn" = "xauto"; then -+ PKG_CHECK_MODULES(LIBIDN, libidn, enable_idn=yes, enable_idn=no) -+ if test "x$enable_idn" = "xyes"; then -+ AC_DEFINE(HAVE_IDN, 1, [Define if IDN support is included]) -+ fi -+else -+ enable_idn=no - fi - - dnl Gtk doc -@@ -323,7 +336,7 @@ echo " - - prefix: ${prefix} - compiler: ${CC} -- Have IDN support: ${have_idn} -+ Enable IDN support: ${enable_idn} - Enable SSL: ${enable_ssl} - Asynchronous DNS: ${enable_asyncns} - Linux TCP keepalives: ${use_keepalives} diff --git a/libs/loudmouth/patches/002-fix-comparison.patch b/libs/loudmouth/patches/002-fix-comparison.patch deleted file mode 100644 index 104a07854..000000000 --- a/libs/loudmouth/patches/002-fix-comparison.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/loudmouth/lm-sasl.c -+++ b/loudmouth/lm-sasl.c -@@ -529,7 +529,7 @@ sasl_md5_prepare_response (LmSASL *sasl, - } - - nonce = g_hash_table_lookup (challenge, "nonce"); -- if (nonce == NULL || nonce == '\0') { -+ if (nonce == NULL || *nonce == '\0') { - g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_SASL, - "%s: server didn't provide a nonce in the challenge", - G_STRFUNC); diff --git a/libs/loudmouth/patches/010-add-private.patch b/libs/loudmouth/patches/010-add-private.patch deleted file mode 100644 index 670cdaac6..000000000 --- a/libs/loudmouth/patches/010-add-private.patch +++ /dev/null @@ -1,271 +0,0 @@ -From 110bd9800bb9cb3afdd724e4e4a3292d29c817a1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= -Date: Thu, 27 Sep 2018 21:29:29 +0200 -Subject: [PATCH] Move away from g_type_class_add_private() - -g_type_class_add_private() will be deprecated in GLib 2.58. Replace: - - - g_type_class_add_private() with G_DEFINE_TYPE_WITH_PRIVATE() - - G_TYPE_INSTANCE_GET_PRIVATE() with *_get_instance_private() ---- - loudmouth/lm-blocking-resolver.c | 17 +++++++---------- - loudmouth/lm-feature-ping.c | 22 ++++++++++------------ - loudmouth/lm-resolver.c | 28 +++++++++++++--------------- - 3 files changed, 30 insertions(+), 37 deletions(-) - ---- a/loudmouth/lm-blocking-resolver.c -+++ b/loudmouth/lm-blocking-resolver.c -@@ -38,10 +38,10 @@ - - #define SRV_LEN 8192 - --#define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), LM_TYPE_BLOCKING_RESOLVER, LmBlockingResolverPriv)) -+#define GET_PRIV(obj) (lm_blocking_resolver_get_instance_private (LM_BLOCKING_RESOLVER(obj))) - --typedef struct LmBlockingResolverPriv LmBlockingResolverPriv; --struct LmBlockingResolverPriv { -+typedef struct LmBlockingResolverPrivate LmBlockingResolverPrivate; -+struct LmBlockingResolverPrivate { - GSource *idle_source; - }; - -@@ -49,7 +49,7 @@ static void blocking_resolver_finali - static void blocking_resolver_lookup (LmResolver *resolver); - static void blocking_resolver_cancel (LmResolver *resolver); - --G_DEFINE_TYPE (LmBlockingResolver, lm_blocking_resolver, LM_TYPE_RESOLVER) -+G_DEFINE_TYPE_WITH_PRIVATE (LmBlockingResolver, lm_blocking_resolver, LM_TYPE_RESOLVER) - - static void - lm_blocking_resolver_class_init (LmBlockingResolverClass *class) -@@ -61,9 +61,6 @@ lm_blocking_resolver_class_init (LmBlock - - resolver_class->lookup = blocking_resolver_lookup; - resolver_class->cancel = blocking_resolver_cancel; -- -- g_type_class_add_private (object_class, -- sizeof (LmBlockingResolverPriv)); - } - - static void -@@ -194,7 +191,7 @@ blocking_resolver_lookup_service (LmBloc - static gboolean - blocking_resolver_idle_lookup (LmBlockingResolver *resolver) - { -- LmBlockingResolverPriv *priv = GET_PRIV (resolver); -+ LmBlockingResolverPrivate *priv = GET_PRIV (resolver); - gint type; - - /* Start the DNS querying */ -@@ -219,7 +216,7 @@ blocking_resolver_idle_lookup (LmBlockin - static void - blocking_resolver_lookup (LmResolver *resolver) - { -- LmBlockingResolverPriv *priv; -+ LmBlockingResolverPrivate *priv; - GMainContext *context; - - g_return_if_fail (LM_IS_BLOCKING_RESOLVER (resolver)); -@@ -236,7 +233,7 @@ blocking_resolver_lookup (LmResolver *re - static void - blocking_resolver_cancel (LmResolver *resolver) - { -- LmBlockingResolverPriv *priv; -+ LmBlockingResolverPrivate *priv; - - g_return_if_fail (LM_IS_BLOCKING_RESOLVER (resolver)); - ---- a/loudmouth/lm-feature-ping.c -+++ b/loudmouth/lm-feature-ping.c -@@ -28,10 +28,10 @@ - - #define XMPP_NS_PING "urn:xmpp:ping" - --#define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), LM_TYPE_FEATURE_PING, LmFeaturePingPriv)) -+#define GET_PRIV(obj) (lm_feature_ping_get_instance_private (LM_FEATURE_PING(obj))) - --typedef struct LmFeaturePingPriv LmFeaturePingPriv; --struct LmFeaturePingPriv { -+typedef struct LmFeaturePingPrivate LmFeaturePingPrivate; -+struct LmFeaturePingPrivate { - LmConnection *connection; - guint keep_alive_rate; - GSource *keep_alive_source; -@@ -55,7 +55,7 @@ feature_ping_keep_alive_reply - gpointer user_data); - static gboolean feature_ping_send_keep_alive (LmFeaturePing *fp); - --G_DEFINE_TYPE (LmFeaturePing, lm_feature_ping, G_TYPE_OBJECT) -+G_DEFINE_TYPE_WITH_PRIVATE (LmFeaturePing, lm_feature_ping, G_TYPE_OBJECT) - - enum { - PROP_0, -@@ -103,8 +103,6 @@ lm_feature_ping_class_init (LmFeaturePin - NULL, NULL, - _lm_marshal_VOID__VOID, - G_TYPE_NONE, 0); -- -- g_type_class_add_private (object_class, sizeof (LmFeaturePingPriv)); - } - - static void -@@ -127,7 +125,7 @@ feature_ping_get_property (GObject *o - GValue *value, - GParamSpec *pspec) - { -- LmFeaturePingPriv *priv; -+ LmFeaturePingPrivate *priv; - - priv = GET_PRIV (object); - -@@ -147,7 +145,7 @@ feature_ping_set_property (GObject - const GValue *value, - GParamSpec *pspec) - { -- LmFeaturePingPriv *priv; -+ LmFeaturePingPrivate *priv; - - priv = GET_PRIV (object); - -@@ -171,7 +169,7 @@ feature_ping_keep_alive_reply (LmMessage - LmMessage *m, - gpointer user_data) - { -- LmFeaturePingPriv *priv; -+ LmFeaturePingPrivate *priv; - - priv = GET_PRIV (user_data); - -@@ -183,7 +181,7 @@ feature_ping_keep_alive_reply (LmMessage - static gboolean - feature_ping_send_keep_alive (LmFeaturePing *fp) - { -- LmFeaturePingPriv *priv; -+ LmFeaturePingPrivate *priv; - LmMessage *ping; - LmMessageNode *ping_node; - LmMessageHandler *keep_alive_handler; -@@ -237,7 +235,7 @@ feature_ping_send_keep_alive (LmFeatureP - void - lm_feature_ping_start (LmFeaturePing *fp) - { -- LmFeaturePingPriv *priv; -+ LmFeaturePingPrivate *priv; - - g_return_if_fail (LM_IS_FEATURE_PING (fp)); - -@@ -260,7 +258,7 @@ lm_feature_ping_start (LmFeaturePing *fp - void - lm_feature_ping_stop (LmFeaturePing *fp) - { -- LmFeaturePingPriv *priv; -+ LmFeaturePingPrivate *priv; - - g_return_if_fail (LM_IS_FEATURE_PING (fp)); - ---- a/loudmouth/lm-resolver.c -+++ b/loudmouth/lm-resolver.c -@@ -36,10 +36,10 @@ - #include "lm-marshal.h" - #include "lm-resolver.h" - --#define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), LM_TYPE_RESOLVER, LmResolverPriv)) -+#define GET_PRIV(obj) (lm_resolver_get_instance_private (LM_RESOLVER(obj))) - --typedef struct LmResolverPriv LmResolverPriv; --struct LmResolverPriv { -+typedef struct LmResolverPrivate LmResolverPrivate; -+struct LmResolverPrivate { - GMainContext *context; - - LmResolverCallback callback; -@@ -71,7 +71,7 @@ static void resolver_set_property - const GValue *value, - GParamSpec *pspec); - --G_DEFINE_TYPE (LmResolver, lm_resolver, G_TYPE_OBJECT) -+G_DEFINE_TYPE_WITH_PRIVATE (LmResolver, lm_resolver, G_TYPE_OBJECT) - - enum { - PROP_0, -@@ -151,8 +151,6 @@ lm_resolver_class_init (LmResolverClass - "Protocol for SRV lookup", - NULL, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); -- -- g_type_class_add_private (object_class, sizeof (LmResolverPriv)); - } - - static void -@@ -164,7 +162,7 @@ lm_resolver_init (LmResolver *resolver) - static void - resolver_finalize (GObject *object) - { -- LmResolverPriv *priv; -+ LmResolverPrivate *priv; - - priv = GET_PRIV (object); - -@@ -190,7 +188,7 @@ resolver_get_property (GObject *objec - GValue *value, - GParamSpec *pspec) - { -- LmResolverPriv *priv; -+ LmResolverPrivate *priv; - - priv = GET_PRIV (object); - -@@ -228,7 +226,7 @@ resolver_set_property (GObject *obj - const GValue *value, - GParamSpec *pspec) - { -- LmResolverPriv *priv; -+ LmResolverPrivate *priv; - - priv = GET_PRIV (object); - -@@ -301,7 +299,7 @@ lm_resolver_new_for_host (const gchar - gpointer user_data) - { - LmResolver *resolver; -- LmResolverPriv *priv; -+ LmResolverPrivate *priv; - - g_return_val_if_fail (host != NULL, NULL); - g_return_val_if_fail (callback != NULL, NULL); -@@ -327,7 +325,7 @@ lm_resolver_new_for_service (const gchar - gpointer user_data) - { - LmResolver *resolver; -- LmResolverPriv *priv; -+ LmResolverPrivate *priv; - - g_return_val_if_fail (domain != NULL, NULL); - g_return_val_if_fail (service != NULL, NULL); -@@ -373,7 +371,7 @@ lm_resolver_cancel (LmResolver *resolver - struct addrinfo * - lm_resolver_results_get_next (LmResolver *resolver) - { -- LmResolverPriv *priv; -+ LmResolverPrivate *priv; - struct addrinfo *ret_val; - - g_return_val_if_fail (LM_IS_RESOLVER (resolver), NULL); -@@ -401,7 +399,7 @@ skipresult: - void - lm_resolver_results_reset (LmResolver *resolver) - { -- LmResolverPriv *priv; -+ LmResolverPrivate *priv; - - g_return_if_fail (LM_IS_RESOLVER (resolver)); - -@@ -427,7 +425,7 @@ _lm_resolver_set_result (LmResolver - LmResolverResult result, - struct addrinfo *results) - { -- LmResolverPriv *priv; -+ LmResolverPrivate *priv; - - g_return_if_fail (LM_IS_RESOLVER (resolver)); - diff --git a/libs/loudmouth/patches/020-openssl-deprecated.patch b/libs/loudmouth/patches/020-openssl-deprecated.patch deleted file mode 100644 index 976d9b916..000000000 --- a/libs/loudmouth/patches/020-openssl-deprecated.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/loudmouth/lm-ssl-openssl.c -+++ b/loudmouth/lm-ssl-openssl.c -@@ -345,9 +345,11 @@ _lm_ssl_initialize (LmSSL *ssl) - /*const char *cert_file = NULL;*/ - - if (!initialized) { -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - SSL_library_init(); - /* FIXME: Is this needed when we are not in debug? */ - SSL_load_error_strings(); -+#endif - initialized = TRUE; - } -