Re: [PR PATCH] [Updated] profanity: update to 0.10.0

[tibequadorian <tibequadorian@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 464 bytes --]

There is an updated pull request by tibequadorian against master on the void-packages repository

https://github.com/tibequadorian/void-packages profanity
https://github.com/void-linux/void-packages/pull/27992

profanity: update to 0.10.0
libstrophe: update to 0.10.1
because profanity 0.10.0 depends on libstrophe >= 0.10.0.

I've tested basic functionality on x86_64.

A patch file from https://github.com/void-linux/void-packages/pull/27992.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-profanity-27992.patch --]
[-- Type: text/x-diff, Size: 4818 bytes --]

From a2144512d996de3d7a3a9d040b23ca2af6cb0d47 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 17 Jan 2021 21:49:38 +0100
Subject: [PATCH 1/2] libstrophe: update to 0.10.1.

removed libressl patch because its supported upstream now
added build option for new c-ares support
added build option for tls
---
 srcpkgs/libstrophe/patches/fix-libressl.patch | 40 -------------------
 srcpkgs/libstrophe/template                   | 14 +++++--
 2 files changed, 10 insertions(+), 44 deletions(-)
 delete mode 100644 srcpkgs/libstrophe/patches/fix-libressl.patch

diff --git a/srcpkgs/libstrophe/patches/fix-libressl.patch b/srcpkgs/libstrophe/patches/fix-libressl.patch
deleted file mode 100644
index a356285ee75..00000000000
--- a/srcpkgs/libstrophe/patches/fix-libressl.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Source: maxice8
-Upstream: not upstreamable
-Reason: Fixes compilation with LibreSSL
-
---- src/tls_openssl.c
-+++ src/tls_openssl.c
-@@ -51,12 +51,8 @@ static void _tls_log_error(xmpp_ctx_t *ctx);
- 
- void tls_initialize(void)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-     SSL_library_init();
-     SSL_load_error_strings();
--#else
--    OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS, NULL);
--#endif
- }
- 
- void tls_shutdown(void)
-@@ -120,20 +116,6 @@ tls_t *tls_new(xmpp_conn_t *conn)
-         /* Trust server's certificate when user sets the flag explicitly. */
-         mode = conn->tls_trust ? SSL_VERIFY_NONE : SSL_VERIFY_PEER;
-         SSL_set_verify(tls->ssl, mode, 0);
--#if OPENSSL_VERSION_NUMBER >= 0x10002000L
--        /* Hostname verification is supported in OpenSSL 1.0.2 and newer. */
--        X509_VERIFY_PARAM *param = SSL_get0_param(tls->ssl);
--
--        /*
--         * Allow only complete wildcards.  RFC 6125 discourages wildcard usage
--         * completely, and lists internationalized domain names as a reason
--         * against partial wildcards.
--         * See https://tools.ietf.org/html/rfc6125#section-7.2 for more information.
--         */
--        X509_VERIFY_PARAM_set_hostflags(param, X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
--        X509_VERIFY_PARAM_set1_host(param, conn->domain, 0);
--#endif
--
-         ret = SSL_set_fd(tls->ssl, conn->sock);
-         if (ret <= 0)
-             goto err_free_ssl;
diff --git a/srcpkgs/libstrophe/template b/srcpkgs/libstrophe/template
index 08b98ba8067..4d90ded8f47 100644
--- a/srcpkgs/libstrophe/template
+++ b/srcpkgs/libstrophe/template
@@ -1,16 +1,22 @@
 # Template file for 'libstrophe'
 pkgname=libstrophe
-version=0.9.3
-revision=2
+version=0.10.1
+revision=1
 build_style=gnu-configure
+configure_args="$(vopt_enable cares) $(vopt_enable tls)"
 hostmakedepends="automake libtool pkg-config"
-makedepends="expat-devel libressl-devel zlib-devel"
+makedepends="$(vopt_if cares c-ares-devel) expat-devel
+ $(vopt_if tls libressl-devel) zlib-devel"
 short_desc="Minimal XMPP library written in C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="http://strophe.im/libstrophe/"
+changelog="https://raw.githubusercontent.com/strophe/libstrophe/master/ChangeLog"
 distfiles="https://github.com/strophe/libstrophe/archive/${version}.tar.gz"
-checksum=8a3b79f62177ed59c01d4d4108357ff20bd933d53b845ee4e350d304c051a4fe
+checksum=5bf0bbc555cb6059008f1b748370d4d2ee1e1fabd3eeab68475263556405ba39
+
+build_options="cares tls"
+build_options_default="tls"
 
 pre_configure() {
 	NOCONFIGURE=1 ./bootstrap.sh

From bad2db0afaba84e165890868ff235559de8b2cd9 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 17 Jan 2021 22:03:00 +0100
Subject: [PATCH 2/2] profanity: update to 0.10.0.

---
 srcpkgs/profanity/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/profanity/template b/srcpkgs/profanity/template
index 88c75ab5f2f..338e3092a67 100644
--- a/srcpkgs/profanity/template
+++ b/srcpkgs/profanity/template
@@ -1,7 +1,7 @@
 # Template file for 'profanity'
 pkgname=profanity
-version=0.9.5
-revision=3
+version=0.10.0
+revision=1
 build_style=gnu-configure
 configure_args="$(vopt_enable notify notifications) $(vopt_enable otr)
  $(vopt_enable pgp) $(vopt_enable python python-plugins) $(vopt_enable plugins)
@@ -18,8 +18,9 @@ short_desc="Console based XMPP client"
 maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-3.0-or-later"
 homepage="https://profanity-im.github.io/"
+changelog="https://raw.githubusercontent.com/profanity-im/profanity/master/CHANGELOG"
 distfiles="https://github.com/boothj5/profanity/releases/download/${version}/profanity-${version}.tar.gz"
-checksum=23f7b2e5c6cf85913b9e7a228802bca9ecb1d1cf3bf8f8f285e9676176a24902
+checksum=4a05e32590f9ec38430e33735bd02cfa199b257922b4116613f23912ca39ff8c
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*)