hexchat: => 2.12.4

6 files changed, 67 insertions, 5 deletions

diff --git a/chat-irc/hexchat/CONFIGURE b/chat-irc/hexchat/CONFIGURE
index 41a4c02f03..cd4bb39d69 100755
--- a/chat-irc/hexchat/CONFIGURE
+++ b/chat-irc/hexchat/CONFIGURE
@@ -11,6 +11,8 @@ list_remove HEXCHAT_OPTS '--enable-sasl' &&
 list_remove HEXCHAT_OPTS '--disable-sasl' &&
 list_remove HEXCHAT_OPTS '--enable-ipv6' &&
 list_remove HEXCHAT_OPTS '--disable-ipv6' &&
+list_remove HEXCHAT_OPTS '--enable-doat' &&
+list_remove HEXCHAT_OPTS '--disable-doat' &&
 
 config_query_option HEXCHAT_OPTS "Build the text frontend?" n \
                                  "--enable-textfe" \
@@ -25,10 +27,6 @@ if list_find "$HEXCHAT_OPTS" "--enable-plugin"; then
                                    "--enable-checksum" \
                                    "--disable-checksum" &&
 
-  config_query_option HEXCHAT_OPTS "Enable Do At plugin?" y \
-                                   "--enable-doat" \
-                                   "--disable-doat" &&
-
   config_query_option HEXCHAT_OPTS "Enable FiSHLiM plugin?" y \
                                    "--enable-fishlim" \
                                    "--disable-fishlim" &&
diff --git a/chat-irc/hexchat/DEPENDS b/chat-irc/hexchat/DEPENDS
index a120e1aa6c..8e05a62f2b 100755
--- a/chat-irc/hexchat/DEPENDS
+++ b/chat-irc/hexchat/DEPENDS
@@ -1,4 +1,5 @@
 depends glib2 &&
+depends autoconf-archive &&
 
 optional_depends gettext \
                  "--enable-nls" \
diff --git a/chat-irc/hexchat/DETAILS b/chat-irc/hexchat/DETAILS
index d66c0f4620..16634c28d4 100755
--- a/chat-irc/hexchat/DETAILS
+++ b/chat-irc/hexchat/DETAILS
@@ -1,5 +1,5 @@
            SPELL=hexchat
-         VERSION=2.12.3
+         VERSION=2.12.4
           SOURCE=$SPELL-$VERSION.tar.xz
          SOURCE2=$SOURCE.asc
    SOURCE_URL[0]=https://dl.hexchat.net/$SPELL/$SOURCE
diff --git a/chat-irc/hexchat/HISTORY b/chat-irc/hexchat/HISTORY
index 913751c402..5885deb333 100644
--- a/chat-irc/hexchat/HISTORY
+++ b/chat-irc/hexchat/HISTORY
@@ -1,3 +1,9 @@
+2016-12-30 Vlad Glagolev <stealth@sourcemage.org>
+	* DETAILS: updated spell to 2.12.4
+	* DEPENDS: added autoconf-archive
+	* CONFIGURE: dropped flags for obsolete doat plugin
+	* PRE_BUILD: added, to apply patch and perform autoreconf
+
 2016-10-30 Vlad Glagolev <stealth@sourcemage.org>
 	* DETAILS: updated spell to 2.12.3
 
diff --git a/chat-irc/hexchat/PRE_BUILD b/chat-irc/hexchat/PRE_BUILD
new file mode 100755
index 0000000000..8209ed0b7b
--- /dev/null
+++ b/chat-irc/hexchat/PRE_BUILD
@@ -0,0 +1,8 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+if is_depends_enabled $SPELL $(get_spell_provider $SPELL SSL) && [[ $(get_spell_provider $SPELL SSL) == "libressl" ]]; then
+  patch -p0 < "$SPELL_DIRECTORY/libressl.patch"
+fi &&
+
+autoreconf -fi
diff --git a/chat-irc/hexchat/libressl.patch b/chat-irc/hexchat/libressl.patch
new file mode 100644
index 0000000000..284a484718
--- /dev/null
+++ b/chat-irc/hexchat/libressl.patch
@@ -0,0 +1,49 @@
+--- src/common/ssl.c.orig	2016-10-23 03:40:01.000000000 -0400
++++ src/common/ssl.c	2016-12-30 11:36:06.582192488 -0500
+@@ -176,7 +176,7 @@
+ 		return 1;
+ 
+ 	alg = OBJ_obj2nid (algor->algorithm);
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ 	sign_alg = OBJ_obj2nid (peer_cert->sig_alg->algorithm);
+ #else
+ 	sign_alg = X509_get_signature_nid (peer_cert);
+@@ -306,7 +306,7 @@
+ 
+ 	SSL_set_fd (ssl, sd);
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ 	method = ctx->method;
+ #else
+ 	method = SSL_CTX_get_ssl_method (ctx);
+--- plugins/fishlim/dh1080.c.orig	2016-10-23 03:40:01.000000000 -0400
++++ plugins/fishlim/dh1080.c	2016-12-30 11:41:45.356343478 -0500
+@@ -74,7 +74,7 @@
+ 
+ 		BN_set_word (g, 2);
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ 		g_dh->p = p;
+ 		g_dh->g = g;
+ #else
+@@ -162,7 +162,7 @@
+ 		return 0;
+ 	}
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ 	dh_pub_key = dh->pub_key;
+ 	dh_priv_key = dh->priv_key;
+ #else
+@@ -213,7 +213,7 @@
+ 
+ 	  	priv_key_data = dh1080_decode_b64 (priv_key, &priv_key_len);
+ 		priv_key_num = BN_bin2bn(priv_key_data, priv_key_len, NULL);
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ 		dh->priv_key = priv_key_num;
+ #else
+ 		DH_set0_key (dh, NULL, priv_key_num);