dev-zero 14/07/04 14:26:13 Added: aria2-1.18.5-fix-gnutls-2.x-compatibility.patch Log: Add backported gnutls-2.x compatibility fix (bug #516226). (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x1A5D023975B0583D!)
Revision Changes Path 1.1 net-misc/aria2/files/aria2-1.18.5-fix-gnutls-2.x-compatibility.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/aria2/files/aria2-1.18.5-fix-gnutls-2.x-compatibility.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/aria2/files/aria2-1.18.5-fix-gnutls-2.x-compatibility.patch?rev=1.1&content-type=text/plain Index: aria2-1.18.5-fix-gnutls-2.x-compatibility.patch =================================================================== >From 13a202df070dd58bb930549c62627dcd97b02b86 Mon Sep 17 00:00:00 2001 From: Nils Maier <[email protected]> Date: Sat, 12 Apr 2014 02:51:21 +0200 Subject: [PATCH] Fix GnuTLS 2.x compatiblity Closes GH-216 --- src/LibgnutlsTLSSession.cc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/LibgnutlsTLSSession.cc b/src/LibgnutlsTLSSession.cc index 61c4550..94abf6f 100644 --- a/src/LibgnutlsTLSSession.cc +++ b/src/LibgnutlsTLSSession.cc @@ -75,6 +75,7 @@ GnuTLSSession::~GnuTLSSession() int GnuTLSSession::init(sock_t sockfd) { +#if GNUTLS_VERSION_NUMBER >= 0x030000 unsigned int flags = tlsContext_->getSide() == TLS_CLIENT ? GNUTLS_CLIENT : GNUTLS_SERVER; #ifdef A2_DISABLE_OCSP @@ -84,6 +85,11 @@ int GnuTLSSession::init(sock_t sockfd) #endif // A2_DISABLE_OCSP rv_ = gnutls_init(&sslSession_, flags); +#else // GNUTLS_VERSION_NUMBER >= 0x030000 + rv_ = gnutls_init( + &sslSession_, + tlsContext_->getSide() == TLS_CLIENT ? GNUTLS_CLIENT : GNUTLS_SERVER); +#endif // GNUTLS_VERSION_NUMBER >= 0x030000 if(rv_ != GNUTLS_E_SUCCESS) { return TLS_ERR_ERROR; } -- 1.9.3
