From 7527997f04b2afaa90790076e4c0f22c83d30ef5 Mon Sep 17 00:00:00 2001 From: nros Date: Thu, 2 Nov 2023 13:30:46 +0000 Subject: [PATCH] Update libstrophe to version 0.12.3 profanity 0.14.0 needs this new version. pkgsrc changes: remove patch-configure.ac, applied in this version. changes from changelog: 0.12.3 - Improve TCP-connection establishment (#221) - Handle case where the server doesn't provide the `bind` feature (#224) - Fix configure script for non-bash shells (#218) - Parse JID's according to RFC7622 (#219) - Fix potential memory leak in internal DNS resolver (#219) - Fix potential memory leaks in `xmpp_conn_set_cafile()` and `xmpp_conn_set_capath()` (#219) - Internal improvements (#219) 0.12.2 - Fix reconnect issues when Stream Management is enabled (#211) - Fix resolver ... this time for real hopefully (fixup of #200) (#214) - Fix clearing of password cache on resumed connection (#214) - Improve detection&implementation of `va_copy` (#213) - Fix Valgrind CI builds against LibreSSL (#212) - Fix perf example on platforms where an `rdtsc()` equivalent isn't implemented (#212) 0.12.1 - Fix compilation in buildroot (#207) - Fixes regarding OpenSSL (#208) - Fix some build steps when builddir != srcdir (#208) - Allow the user to disable build of examples (#209) - CI builds against OpenSSL 3 (#206) - Change the call signature of the following API: - xmpp_conn_set_client_cert() - the PKCS#12 file has now to be passed via the `cert` parameter. Originally it was via `key`. Currently both styles are supported, but in a future release only passing via `cert` will be accepted. --- chat/libstrophe/Makefile | 5 ++--- chat/libstrophe/buildlink3.mk | 4 ++-- chat/libstrophe/distinfo | 9 ++++----- chat/libstrophe/patches/patch-configure.ac | 15 --------------- 4 files changed, 8 insertions(+), 25 deletions(-) delete mode 100644 chat/libstrophe/patches/patch-configure.ac diff --git a/chat/libstrophe/Makefile b/chat/libstrophe/Makefile index 3920abdccf75..da422b547123 100644 --- a/chat/libstrophe/Makefile +++ b/chat/libstrophe/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.2 2023/10/24 22:08:21 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2023/11/02 13:30:46 nros Exp $ -DISTNAME= libstrophe-0.12.0 -PKGREVISION= 1 +DISTNAME= libstrophe-0.12.3 CATEGORIES= chat MASTER_SITES= ${MASTER_SITE_GITHUB:=strophe/} GITHUB_PROJECT= libstrophe diff --git a/chat/libstrophe/buildlink3.mk b/chat/libstrophe/buildlink3.mk index 089aa23bb455..040c28888cd1 100644 --- a/chat/libstrophe/buildlink3.mk +++ b/chat/libstrophe/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2023/10/24 22:08:21 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2023/11/02 13:30:46 nros Exp $ BUILDLINK_TREE+= libstrophe @@ -6,7 +6,7 @@ BUILDLINK_TREE+= libstrophe LIBSTROPHE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libstrophe+= libstrophe>=0.12.0 -BUILDLINK_ABI_DEPENDS.libstrophe?= libstrophe>=0.12.0nb1 +BUILDLINK_ABI_DEPENDS.libstrophe?= libstrophe>=0.12.3 BUILDLINK_PKGSRCDIR.libstrophe?= ../../chat/libstrophe .include "../../textproc/expat/buildlink3.mk" diff --git a/chat/libstrophe/distinfo b/chat/libstrophe/distinfo index f873fb33f52c..2b6c5b06ee89 100644 --- a/chat/libstrophe/distinfo +++ b/chat/libstrophe/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.1 2022/05/15 19:12:11 nia Exp $ +$NetBSD: distinfo,v 1.2 2023/11/02 13:30:46 nros Exp $ -BLAKE2s (libstrophe-0.12.0.tar.gz) = 933826f3853df7c9320e9ec051c9884cb8845615088f1a82e3bd5631c3415aed -SHA512 (libstrophe-0.12.0.tar.gz) = cfd47f4cd7737cb18a4c0d7a5aa7819035466f2c81de3919d406ac599f322cde69cec82bfa6832d29c4cf74e0053bf5ee358ee0559881a6d02540ca413f21aee -Size (libstrophe-0.12.0.tar.gz) = 576407 bytes -SHA1 (patch-configure.ac) = 5c3a8a29234c9b2b81f1add61cf48f3b37ee8c21 +BLAKE2s (libstrophe-0.12.3.tar.gz) = a42324cadea62698314283ff33ad7fb7782ad2b1799a8b2d3372695c6fd65b1e +SHA512 (libstrophe-0.12.3.tar.gz) = 2859e01a3d2f96613695c8e324ec04da9f4ab59b17dd5f6161f14bb1906c2e6a010d055f5d4466c354cf42df922ceeee8263e4a23f5b615e531beef13ab11060 +Size (libstrophe-0.12.3.tar.gz) = 579381 bytes diff --git a/chat/libstrophe/patches/patch-configure.ac b/chat/libstrophe/patches/patch-configure.ac deleted file mode 100644 index 3d2d6b52b2a8..000000000000 --- a/chat/libstrophe/patches/patch-configure.ac +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-configure.ac,v 1.1 2022/05/15 19:12:11 nia Exp $ - -Shell portability. - ---- configure.ac.orig 2022-05-09 13:40:28.000000000 +0000 -+++ configure.ac -@@ -84,7 +84,7 @@ AC_SEARCH_LIBS([socket], [network socket - AC_CHECK_FUNCS([snprintf vsnprintf], [], [have_snprintf=no]) - AC_CHECK_DECLS([va_copy], [], [], [#include ]) - --if test "x$enable_tls" != xno -a "x$with_gnutls" == xyes; then -+if test "x$enable_tls" != xno -a "x$with_gnutls" = xyes; then - PKG_CHECK_MODULES([gnutls], [gnutls], - [PC_REQUIRES="gnutls ${PC_REQUIRES}"], - [AC_CHECK_HEADER([gnutls/gnutls.h],