hexchat: => 2.12.1

6 files changed, 34 insertions, 42 deletions

diff --git a/chat-irc/hexchat/CONFIGURE b/chat-irc/hexchat/CONFIGURE
index 656a3409db..41a4c02f03 100755
--- a/chat-irc/hexchat/CONFIGURE
+++ b/chat-irc/hexchat/CONFIGURE
@@ -9,10 +9,8 @@ list_remove HEXCHAT_OPTS '--enable-mmx' &&
 list_remove HEXCHAT_OPTS '--disable-mmx' &&
 list_remove HEXCHAT_OPTS '--enable-sasl' &&
 list_remove HEXCHAT_OPTS '--disable-sasl' &&
-
-config_query_option HEXCHAT_OPTS "Enable IPv6?" y \
-                                 "--enable-ipv6" \
-                                 "--disable-ipv6" &&
+list_remove HEXCHAT_OPTS '--enable-ipv6' &&
+list_remove HEXCHAT_OPTS '--disable-ipv6' &&
 
 config_query_option HEXCHAT_OPTS "Build the text frontend?" n \
                                  "--enable-textfe" \
diff --git a/chat-irc/hexchat/DEPENDS b/chat-irc/hexchat/DEPENDS
index c9be841ff6..a120e1aa6c 100755
--- a/chat-irc/hexchat/DEPENDS
+++ b/chat-irc/hexchat/DEPENDS
@@ -5,7 +5,7 @@ optional_depends gettext \
                  "--disable-nls" \
                  "for Native Language Support" &&
 
-optional_depends openssl \
+optional_depends SSL \
                  "--enable-openssl=/usr/bin/openssl" \
                  "--disable-openssl" \
                  "to enable use of openSSL" &&
@@ -21,15 +21,32 @@ if list_find "$HEXCHAT_OPTS" "--disable-textfe" && ! is_depends_enabled $SPELL g
 fi &&
 
 if list_find "$HEXCHAT_OPTS" "--enable-plugin"; then
-  optional_depends python \
-                  "--enable-python=python2" \
-                  "--disable-python" \
-                  "for Python scripting support" &&
+  config_query_list HEXCHAT_PYTHON "Which version do you want for Python scripting support?" \
+                                   none \
+                                   python2 \
+                                   python3 &&
+
+  case $HEXCHAT_PYTHON in
+    none)
+      list_add HEXCHAT_OPTS '--disable-python'
+    ;;
+    python2)
+      depends python '--enable-python=python2'
+    ;;
+    python3)
+      depends python3 '--enable-python=python3'
+    ;;
+  esac &&
 
   optional_depends perl \
                    "--enable-perl" \
                    "--disable-perl" \
-                   "for Perl scripting support"
+                   "for Perl scripting support" &&
+
+  optional_depends LUA \
+                   "--enable-lua" \
+                   "--disable-lua" \
+                   "for Lua scripting support"
 else
   list_add HEXCHAT_OPTS '--disable-python' &&
   list_add HEXCHAT_OPTS '--disable-perl'
@@ -55,11 +72,6 @@ optional_depends libcanberra \
                  "--disable-libcanberra" \
                  "for libcanberra support" &&
 
-optional_depends libntlm \
-                 "--enable-ntlm" \
-                 "--disable-ntlm" \
-                 "for Microsoft's NTLM auth library support" &&
-
 optional_depends libproxy \
                  "--enable-libproxy" \
                  "--disable-libproxy" \
diff --git a/chat-irc/hexchat/DETAILS b/chat-irc/hexchat/DETAILS
index 3f2087af66..78ebec7d80 100755
--- a/chat-irc/hexchat/DETAILS
+++ b/chat-irc/hexchat/DETAILS
@@ -1,11 +1,9 @@
            SPELL=hexchat
-         VERSION=2.10.2
+         VERSION=2.12.1
           SOURCE=$SPELL-$VERSION.tar.xz
          SOURCE2=$SOURCE.asc
    SOURCE_URL[0]=https://dl.hexchat.net/$SPELL/$SOURCE
   SOURCE2_URL[0]=$SOURCE_URL.asc
-    SOURCE_HINTS="no-check-certificate"
-   SOURCE2_HINTS="$SOURCE_HINTS"
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
       SOURCE_GPG=hexchat.gpg:$SOURCE2:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
diff --git a/chat-irc/hexchat/HISTORY b/chat-irc/hexchat/HISTORY
index c3f570f30b..ca2e9422e2 100644
--- a/chat-irc/hexchat/HISTORY
+++ b/chat-irc/hexchat/HISTORY
@@ -1,3 +1,11 @@
+2016-08-18 Vlad Glagolev <stealth@sourcemage.org>
+	* DETAILS: updated spell to 2.12.1; dropped hints workaround
+	* CONFIGURE: dropped deprecated ipv6 options
+	* DEPENDS: removed libntlm option; added Lua support; switched to SSL
+	  provider; use Python 2/3 switch
+	* PRE_BUILD: dropped, not needed
+	* openssl-09.patch: dropped, fixed by upstream
+
 2014-10-26 Vlad Glagolev <stealth@sourcemage.org>
 	* DETAILS: updated spell to 2.10.2; added SOURCE_HINTS
 	* PRE_BUILD: added, to apply the patch
diff --git a/chat-irc/hexchat/PRE_BUILD b/chat-irc/hexchat/PRE_BUILD
deleted file mode 100755
index 7a9829b69f..0000000000
--- a/chat-irc/hexchat/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-patch -p0 < "$SPELL_DIRECTORY/openssl-09.patch"
diff --git a/chat-irc/hexchat/openssl-09.patch b/chat-irc/hexchat/openssl-09.patch
deleted file mode 100644
index 540925516b..0000000000
--- a/chat-irc/hexchat/openssl-09.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/common/ssl.c.orig	2014-11-25 20:42:31.000000000 +0300
-+++ src/common/ssl.c	2014-11-26 12:45:44.000000000 +0300
-@@ -92,11 +92,17 @@
- 	SSL_CTX_set_session_cache_mode (ctx, SSL_SESS_CACHE_BOTH);
- 	SSL_CTX_set_timeout (ctx, 300);
- 	SSL_CTX_set_options (ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3
-+#ifdef SSL_OP_NO_COMPRESSION
- 							  |SSL_OP_NO_COMPRESSION
-+#endif
- 							  |SSL_OP_SINGLE_DH_USE|SSL_OP_SINGLE_ECDH_USE
- 							  |SSL_OP_NO_TICKET
- 							  |SSL_OP_CIPHER_SERVER_PREFERENCE);
- 
-+#if OPENSSL_VERSION_NUMBER >= 0x00908000L /* workaround for OpenSSL 0.9.8 */
-+	sk_SSL_COMP_zero(SSL_COMP_get_compression_methods());
-+#endif
-+
- 	/* used in SSL_connect(), SSL_accept() */
- 	SSL_CTX_set_info_callback (ctx, info_cb_func);
-