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
This commit is contained in:
tibequadorian 2021-01-17 21:49:38 +01:00 committed by Érico Nogueira Rolim
parent 88287e9036
commit f9eeed2087
2 changed files with 10 additions and 44 deletions

View file

@ -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;

View file

@ -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