summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiziano Müller <dev-zero@gentoo.org>2014-07-04 14:26:13 +0000
committerTiziano Müller <dev-zero@gentoo.org>2014-07-04 14:26:13 +0000
commit7ce0430b9c9e44e4fe6958297ed3fac44f3c8886 (patch)
treefe2ea73e674bab532590a24a008b5823d1c5b5a5 /net-misc
parentxjavac-20110814: add ~ppc-aix keyword (diff)
downloadgentoo-2-7ce0430b9c9e44e4fe6958297ed3fac44f3c8886.tar.gz
gentoo-2-7ce0430b9c9e44e4fe6958297ed3fac44f3c8886.tar.bz2
gentoo-2-7ce0430b9c9e44e4fe6958297ed3fac44f3c8886.zip
Add backported gnutls-2.x compatibility fix (bug #516226).
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x1A5D023975B0583D!)
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/aria2/ChangeLog6
-rw-r--r--net-misc/aria2/aria2-1.18.5.ebuild3
-rw-r--r--net-misc/aria2/files/aria2-1.18.5-fix-gnutls-2.x-compatibility.patch37
3 files changed, 44 insertions, 2 deletions
diff --git a/net-misc/aria2/ChangeLog b/net-misc/aria2/ChangeLog
index ee98e36af3c8..678ff9bfacb9 100644
--- a/net-misc/aria2/ChangeLog
+++ b/net-misc/aria2/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-misc/aria2
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/aria2/ChangeLog,v 1.95 2014/06/27 13:16:09 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/aria2/ChangeLog,v 1.96 2014/07/04 14:26:13 dev-zero Exp $
+
+ 04 Jul 2014; Tiziano Müller <dev-zero@gentoo.org>
+ +files/aria2-1.18.5-fix-gnutls-2.x-compatibility.patch, aria2-1.18.5.ebuild:
+ Add backported gnutls-2.x compatibility fix (bug #516226).
*aria2-1.18.5 (27 Jun 2014)
diff --git a/net-misc/aria2/aria2-1.18.5.ebuild b/net-misc/aria2/aria2-1.18.5.ebuild
index 6ea5310e30b0..f7c8e485fe3c 100644
--- a/net-misc/aria2/aria2-1.18.5.ebuild
+++ b/net-misc/aria2/aria2-1.18.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/aria2/aria2-1.18.5.ebuild,v 1.1 2014/06/27 13:16:09 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/aria2/aria2-1.18.5.ebuild,v 1.2 2014/07/04 14:26:13 dev-zero Exp $
EAPI="5"
@@ -59,6 +59,7 @@ pkg_setup() {
}
src_prepare() {
+ epatch "${FILESDIR}/${P}-fix-gnutls-2.x-compatibility.patch"
epatch_user
sed -i -e "s|/tmp|${T}|" test/*.cc test/*.txt || die "sed failed"
}
diff --git a/net-misc/aria2/files/aria2-1.18.5-fix-gnutls-2.x-compatibility.patch b/net-misc/aria2/files/aria2-1.18.5-fix-gnutls-2.x-compatibility.patch
new file mode 100644
index 000000000000..2c3628c3473f
--- /dev/null
+++ b/net-misc/aria2/files/aria2-1.18.5-fix-gnutls-2.x-compatibility.patch
@@ -0,0 +1,37 @@
+From 13a202df070dd58bb930549c62627dcd97b02b86 Mon Sep 17 00:00:00 2001
+From: Nils Maier <maierman@web.de>
+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
+