summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /net-misc/aria2/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'net-misc/aria2/files')
-rw-r--r--net-misc/aria2/files/aria2-1.18.5-fix-gnutls-2.x-compatibility.patch37
1 files changed, 37 insertions, 0 deletions
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
+