[pkg-lynx-commits] [lynx-cur] 01/01: Add patch to fix FTBFS against GnuTLS ≥ 3.4.0

[Axel Beckert]

This is an automated email from the git hooks/post-receive script.

abe pushed a commit to branch renaming-back
in repository lynx-cur.

commit d6dca8ec22ce1eef6bad69a2a99d869bda801a53
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Sat Jan 23 20:11:21 2016 +0100

    Add patch to fix FTBFS against GnuTLS ≥ 3.4.0
---
 debian/changelog                                   |  6 +++
 debian/patches/series                              |  1 +
 ...ound-gnutls_protocol_set_priority-removal.patch | 48 ++++++++++++++++++++++
 3 files changed, 55 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8f5abb3..800c2b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+lynx (2.8.9dev8-3) UNRELEASED; urgency=low
+
+  * Add patch to fix FTBFS against GnuTLS ≥ 3.4.0 (Closes: #TODO)
+
+ -- Axel Beckert <abe at debian.org>  Sat, 23 Jan 2016 20:10:47 +0100
+
 lynx (2.8.9dev8-2) experimental; urgency=low
 
   [ Axel Beckert ]
diff --git a/debian/patches/series b/debian/patches/series
index 7317b0e..679717b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ lynxcfg.patch
 aboutlynx.patch
 21_do_not_strip_-g.diff
 nested_tables.patch
+work-around-gnutls_protocol_set_priority-removal.patch
diff --git a/debian/patches/work-around-gnutls_protocol_set_priority-removal.patch b/debian/patches/work-around-gnutls_protocol_set_priority-removal.patch
new file mode 100644
index 0000000..ccf8c7e
--- /dev/null
+++ b/debian/patches/work-around-gnutls_protocol_set_priority-removal.patch
@@ -0,0 +1,48 @@
+Description: FTBFS with GnuTLS >= 3.4.0 due to removed gnutls_protocol_set_priority
+Author: Axel Beckert <abe at debian.org>
+Forwarded: not-yet
+Bug-Debian: TODO (bug filed, but mail transport chain to the BTS currently interrupted due to UBC downtime)
+
+Index: lynx/src/tidy_tls.c
+===================================================================
+--- lynx.orig/src/tidy_tls.c	2015-12-21 10:11:11.719618478 +0100
++++ lynx/src/tidy_tls.c	2016-01-23 20:01:04.100447994 +0100
+@@ -262,27 +262,6 @@
+     ctx->verify_callback = verify_callback;
+ }
+ 
+-static void RemoveProtocol(SSL * ssl, int protocol)
+-{
+-    int j, k;
+-    int changed = 0;
+-    int *protocols = ssl->ctx->method->priority.protocol;
+-
+-    for (j = k = 0; j < GNUTLS_MAX_ALGORITHM_NUM;) {
+-	if (protocols[k] == protocol) {
+-	    if (++k >= GNUTLS_MAX_ALGORITHM_NUM)
+-		break;
+-	    changed = 1;
+-	} else {
+-	    protocols[j++] = protocols[k++];
+-	}
+-    }
+-
+-    if (changed) {
+-	gnutls_protocol_set_priority(ssl->gnutls_state, protocols);
+-    }
+-}
+-
+ /*
+  * Initiate the TLS/SSL handshake with an TLS/SSL server.
+  */
+@@ -294,9 +273,7 @@
+     const char *aname;
+ 
+     if (ssl->options & SSL_OP_NO_TLSv1)
+-	RemoveProtocol(ssl, GNUTLS_TLS1);
+-    if (ssl->options & SSL_OP_NO_SSLv3)
+-	RemoveProtocol(ssl, GNUTLS_SSL3);
++	gnutls_priority_set(ssl->gnutls_state, "VERS-TLS1.0!");
+ 
+     while ((rc = gnutls_handshake(ssl->gnutls_state)) < 0 &&
+ 	   !gnutls_error_is_fatal(rc)) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-lynx/lynx-cur.git