[pkg-lynx-commits] [lynx-cur] 01/02: Update work-around-gnutls_protocol_set_priority-removal.patch as suggested

[Axel Beckert]

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

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

commit 4037e6540d2e42f05e06150fd1a43d3e814a0b8d
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Mon Jan 25 20:22:05 2016 +0100

    Update work-around-gnutls_protocol_set_priority-removal.patch as suggested
    
    … by Andreas Metzler.
---
 debian/changelog                                           |  2 ++
 .../work-around-gnutls_protocol_set_priority-removal.patch | 14 +++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6132cc3..f07da39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ lynx (2.8.9dev8-4) UNRELEASED; urgency=medium
 
   * Add bug report number which was yet unknown at the time of the
     previous upload.
+  * Update work-around-gnutls_protocol_set_priority-removal.patch as
+    suggested by Andreas Metzler.
 
  -- Axel Beckert <abe at debian.org>  Sun, 24 Jan 2016 00:12:57 +0100
 
diff --git a/debian/patches/work-around-gnutls_protocol_set_priority-removal.patch b/debian/patches/work-around-gnutls_protocol_set_priority-removal.patch
index 53a06d9..377483b 100644
--- a/debian/patches/work-around-gnutls_protocol_set_priority-removal.patch
+++ b/debian/patches/work-around-gnutls_protocol_set_priority-removal.patch
@@ -1,13 +1,12 @@
 Description: FTBFS with GnuTLS >= 3.4.0 due to removed gnutls_protocol_set_priority
 Author: Axel Beckert <abe at debian.org>
+Reviewed-By: Andreas Metzler <ametzler at debian.org>
 Forwarded: https://lists.nongnu.org/archive/html/lynx-dev/2016-01/msg00021.html
 Bug-Debian: https://bugs.debian.org/812424
 
-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 @@
+--- a/src/tidy_tls.c
++++ b/src/tidy_tls.c
+@@ -262,27 +262,6 @@ void SSL_CTX_set_verify(SSL_CTX * ctx, i
      ctx->verify_callback = verify_callback;
  }
  
@@ -35,14 +34,15 @@ Index: lynx/src/tidy_tls.c
  /*
   * Initiate the TLS/SSL handshake with an TLS/SSL server.
   */
-@@ -294,9 +273,7 @@
+@@ -294,9 +273,8 @@ int SSL_connect(SSL * ssl)
      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!");
++	gnutls_priority_set_direct(ssl->gnutls_state,
++	    "NORMAL:-VERS-TLS1.0", NULL);
  
      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