From 56bd759df1d0c750a065b8c845e93d5dfa6b549d Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sat, 8 Aug 2015 13:49:04 -0700 Subject: proj/gentoo: Initial commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 X-Thanks: Alec Warner - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring - wrote much python to improve cvs2svn X-Thanks: Rich Freeman - validation scripts X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed --- ...aria2-1.18.5-fix-gnutls-2.x-compatibility.patch | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 net-misc/aria2/files/aria2-1.18.5-fix-gnutls-2.x-compatibility.patch (limited to 'net-misc/aria2/files') 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 +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 + -- cgit v1.2.3-65-gdbad