[pkg-lynx-commits] [lynx-cur] 04/04: Drop work-around-gnutls_protocol_set_priority-removal.patch; new upstream release

[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 372d3af25de67644ae819c5b0b92f9be256a78c2
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Wed Apr 27 09:58:53 2016 +0200

    Drop work-around-gnutls_protocol_set_priority-removal.patch; new upstream release
    
    Issue has been fixed upstream, see CHANGES.
---
 debian/changelog                                   |  5 ++-
 debian/patches/series                              |  1 -
 ...ound-gnutls_protocol_set_priority-removal.patch | 48 ----------------------
 3 files changed, 4 insertions(+), 50 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 826d62c..ec4dc21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,12 @@
-lynx (2.8.9dev8-5) UNRELEASED; urgency=medium
+lynx (2.8.9dev9-1) UNRELEASED; urgency=medium
 
   [ Andreas Metzler ]
   * Fix arch-indep only build. Closes: #814436
 
   [ Axel Beckert ]
+  * Import new upstream version 2.8.9dev9.
+    + Drop work-around-gnutls_protocol_set_priority-removal.patch, fixed
+      upstream.
   * Reorder URLs in watch file so that the mirrors come second. Recent
     versions of uscan otherwise won't download new versions but just
     report them.
diff --git a/debian/patches/series b/debian/patches/series
index 679717b..7317b0e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@ 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
deleted file mode 100644
index 377483b..0000000
--- a/debian/patches/work-around-gnutls_protocol_set_priority-removal.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-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
-
---- 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;
- }
- 
--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,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_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