diff options
| author |   Kacper Kowalik <xarthisius@gentoo.org> | 2011-10-30 09:06:00 +0000 |
|---|---|---|
| committer | Kacper Kowalik <xarthisius@gentoo.org> | 2011-10-30 09:06:00 +0000 |
| commit | 36754e9f05bfab8893f86d58b1b718950517368b (patch) | |
| tree | d826a04aa1af0fcffa277512c51da03ae7a2996a /net-libs/net6 | |
| parent | Prepare for icedtea VMHANDLE change. (diff) | |
| download | gentoo-2-36754e9f05bfab8893f86d58b1b718950517368b.tar.gz gentoo-2-36754e9f05bfab8893f86d58b1b718950517368b.tar.bz2 gentoo-2-36754e9f05bfab8893f86d58b1b718950517368b.zip | |
Backport upstream patch to fix building with gnutls-3. Fixes bug #388897 by Lars Wendler <polynomial-c@gentoo.org>
(Portage version: 2.2.0_alpha71/cvs/Linux x86_64)
Diffstat (limited to 'net-libs/net6')
| -rw-r--r-- | net-libs/net6/files/net6-1.3.13-gnutls3.patch | 35 | ||||
| -rw-r--r-- | net-libs/net6/net6-1.3.13.ebuild | 8 |
2 files changed, 41 insertions, 2 deletions
diff --git a/net-libs/net6/files/net6-1.3.13-gnutls3.patch b/net-libs/net6/files/net6-1.3.13-gnutls3.patch new file mode 100644 index 000000000000..4e2757b339bc --- /dev/null +++ b/net-libs/net6/files/net6-1.3.13-gnutls3.patch @@ -0,0 +1,35 @@ +Backporting upstream patch to fix build failure with gnutls-3 + +https://bugs.gentoo.org/show_bug.cgi?id=388897 + +--- a/inc/encrypt.hpp ++++ b/inc/encrypt.hpp +@@ -34,7 +34,6 @@ + typedef gnutls_anon_server_credentials gnutls_anon_server_credentials_t; + typedef gnutls_transport_ptr gnutls_transport_ptr_t; + typedef gnutls_dh_params gnutls_dh_params_t; +-typedef gnutls_connection_end gnutls_connection_end_t; + + class dh_params: private net6::non_copyable + { +--- a/src/encrypt.cpp ++++ b/src/encrypt.cpp +@@ -25,7 +25,7 @@ + { + const unsigned int DH_BITS = 1024; + +- net6::gnutls_session_t create_session(net6::gnutls_connection_end_t end) ++ net6::gnutls_session_t create_session(gnutls_connection_end_t end) + { + net6::gnutls_session_t session; + gnutls_init(&session, end); +@@ -202,7 +202,9 @@ + ); + #endif + ++#if GNUTLS_VERSION_NUMBER < 0x030003 + gnutls_transport_set_lowat(session, 0); ++#endif + } + + net6::tcp_encrypted_socket_base::~tcp_encrypted_socket_base() diff --git a/net-libs/net6/net6-1.3.13.ebuild b/net-libs/net6/net6-1.3.13.ebuild index 1d28a6d8360a..2a36b2e16704 100644 --- a/net-libs/net6/net6-1.3.13.ebuild +++ b/net-libs/net6/net6-1.3.13.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/net6/net6-1.3.13.ebuild,v 1.2 2011/09/22 16:52:32 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/net6/net6-1.3.13.ebuild,v 1.3 2011/10/30 09:06:00 xarthisius Exp $ EAPI=4 -inherit multilib +inherit eutils multilib DESCRIPTION="Network access framework for IPv4/IPv6 written in C++" HOMEPAGE="http://gobby.0x539.de/" @@ -23,6 +23,10 @@ DEPEND="${RDEPEND} DOCS=( AUTHORS ChangeLog NEWS README ) +src_prepare() { + epatch "${FILESDIR}"/${P}-gnutls3.patch +} + src_configure() { econf $(use_enable nls) \ $(use_enable static-libs static) |