From b1a73572388b57654a9d470ce52f7748b51ce4b9 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Mon, 26 Feb 2018 16:22:28 -0300 Subject: [PATCH] libstrophe: update to 0.9.2. Closes: #11922 [via git-merge-pr] --- srcpkgs/libstrophe/patches/fix-libressl.patch | 40 +++++++++++++++++++ srcpkgs/libstrophe/template | 6 +-- 2 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/libstrophe/patches/fix-libressl.patch diff --git a/srcpkgs/libstrophe/patches/fix-libressl.patch b/srcpkgs/libstrophe/patches/fix-libressl.patch new file mode 100644 index 00000000000..a356285ee75 --- /dev/null +++ b/srcpkgs/libstrophe/patches/fix-libressl.patch @@ -0,0 +1,40 @@ +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 aa9500a627b..7cdf8896174 100644 --- a/srcpkgs/libstrophe/template +++ b/srcpkgs/libstrophe/template @@ -1,7 +1,7 @@ # Template file for 'libstrophe' pkgname=libstrophe -version=0.9.1 -revision=3 +version=0.9.2 +revision=1 build_style=gnu-configure hostmakedepends="automake libtool pkg-config" makedepends="expat-devel zlib-devel libressl-devel" @@ -10,7 +10,7 @@ maintainer="Juan RP " license="GPL-3" homepage="http://strophe.im/libstrophe/" distfiles="https://github.com/strophe/libstrophe/archive/${version}.tar.gz" -checksum=c90493f986e5bd407132c5a3e174378c02cb80fa4eaee29875e06b4bba6afcc3 +checksum=158145bc1565a5fd0bbd7f57e3e15d768e58b8a460897ab5918a5a689d67ae6f pre_configure() { NOCONFIGURE=1 ./bootstrap.sh