From 78f7d73f9ec9074a18c093b7cfebafd13271424c Mon Sep 17 00:00:00 2001
From: Florian Franzmann
Date: Sat, 9 Jan 2021 21:03:59 +0100
Subject: chat-libs/libstrophe: version 0.10.1

---
 chat-libs/libstrophe/DEPENDS        |  7 ++++++-
 chat-libs/libstrophe/DETAILS        |  4 ++--
 chat-libs/libstrophe/HISTORY        |  5 +++++
 chat-libs/libstrophe/PRE_BUILD      |  8 --------
 chat-libs/libstrophe/libressl.patch | 38 -------------------------------------
 5 files changed, 13 insertions(+), 49 deletions(-)
 delete mode 100755 chat-libs/libstrophe/PRE_BUILD
 delete mode 100644 chat-libs/libstrophe/libressl.patch

(limited to 'chat-libs')

diff --git a/chat-libs/libstrophe/DEPENDS b/chat-libs/libstrophe/DEPENDS
index e49e09f7a1..b4e01dd486 100755
--- a/chat-libs/libstrophe/DEPENDS
+++ b/chat-libs/libstrophe/DEPENDS
@@ -10,4 +10,9 @@ fi &&
 optional_depends SSL \
                  "--enable-tls" \
                  "--disable-tls" \
-                 "for TLS support"
+                 "for TLS support" &&
+
+optional_depends c-ares \
+                 "--enable-cares" \
+                 "--disable-cares" \
+                 "for DNS support"
diff --git a/chat-libs/libstrophe/DETAILS b/chat-libs/libstrophe/DETAILS
index 591aff2e7b..b2738d3796 100755
--- a/chat-libs/libstrophe/DETAILS
+++ b/chat-libs/libstrophe/DETAILS
@@ -10,10 +10,10 @@ case "${LIBSTROPHE_BRANCH}" in
    SOURCE_IGNORE=volatile
   ;;
   stable)
-         VERSION=0.9.3
+         VERSION=0.10.1
           SOURCE=${SPELL}-${VERSION}.tar.bz2
       SOURCE_URL=https://github.com/strophe/${SPELL}/releases/download/${VERSION}/${SOURCE}
-     SOURCE_HASH=sha512:e790fd327ba7dac3dcf3acca6716881cd72e899e15a4902a5e477b1419aad857c200554696205201a05281e31a2f7c4050020742bbc48893477e171048721aef
+     SOURCE_HASH=sha512:67df5aa7a72a477d3121198f56100d740a583a264855e4e890cb07c3c6f8176407788abdf8da46011ef9e49a7164219326893e2a70bd91f5a7bf82c85b433e61
   ;;
 esac
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
diff --git a/chat-libs/libstrophe/HISTORY b/chat-libs/libstrophe/HISTORY
index 8f619492d0..7a0297ff06 100644
--- a/chat-libs/libstrophe/HISTORY
+++ b/chat-libs/libstrophe/HISTORY
@@ -1,3 +1,8 @@
+2021-01-09 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+	* DETAILS: version 0.10.1
+	* DEPENDS: add optional dependency on c-ares
+	* libressl.patch, PRE_BUILD: remove obsolete patch
+
 2020-01-06 Vlad Glagolev <stealth@sourcemage.org>
 	* DETAILS: updated spell to 0.9.3
 
diff --git a/chat-libs/libstrophe/PRE_BUILD b/chat-libs/libstrophe/PRE_BUILD
deleted file mode 100755
index 8671ce9077..0000000000
--- a/chat-libs/libstrophe/PRE_BUILD
+++ /dev/null
@@ -1,8 +0,0 @@
-default_pre_build &&
-cd "${SOURCE_DIRECTORY}" &&
-
-patch -p0 < "${SPELL_DIRECTORY}/libressl.patch" &&
-
-if [ ${LIBSTROPHE_BRANCH} = "scm" ]; then
-  ./bootstrap.sh
-fi
diff --git a/chat-libs/libstrophe/libressl.patch b/chat-libs/libstrophe/libressl.patch
deleted file mode 100644
index bf18a063f1..0000000000
--- a/chat-libs/libstrophe/libressl.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- src/tls_openssl.c.orig
-+++ src/tls_openssl.c
-@@ -52,7 +52,7 @@ static void _tls_dump_cert_info(tls_t *tls);
- 
- void tls_initialize(void)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     SSL_library_init();
-     SSL_load_error_strings();
- #else
-@@ -67,14 +67,14 @@ void tls_shutdown(void)
-      * openssl after libstrophe finalization. Maybe better leak some fixed
-      * memory rather than cause random crashes of the main program.
-      */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     ERR_free_strings();
-     EVP_cleanup();
-     CRYPTO_cleanup_all_ex_data();
--#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
-     SSL_COMP_free_compression_methods();
- #endif
--#if OPENSSL_VERSION_NUMBER < 0x10000000L
-+#if OPENSSL_VERSION_NUMBER < 0x10000000L || defined(LIBRESSL_VERSION_NUMBER)
-     ERR_remove_state(0);
- #else
-     ERR_remove_thread_state(NULL);
-@@ -121,7 +121,7 @@ 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
-+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
-         /* Hostname verification is supported in OpenSSL 1.0.2 and newer. */
-         X509_VERIFY_PARAM *param = SSL_get0_param(tls->ssl);
- 
-- 
cgit v1.2.3