diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2014-10-14 08:56:58 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2014-10-14 08:56:58 +0000 |
| commit | 93103830c450dacc912eaa5b8bdff922f6a6e61f (patch) | |
| tree | fef727bb427dd6f1b94e8cb1fc5ebe39b1d1d971 /net-ftp | |
| parent | sys-kernel/aufs-sources: Correct patches, #525340 (diff) | |
| download | gentoo-2-93103830c450dacc912eaa5b8bdff922f6a6e61f.tar.gz gentoo-2-93103830c450dacc912eaa5b8bdff922f6a6e61f.tar.bz2 gentoo-2-93103830c450dacc912eaa5b8bdff922f6a6e61f.zip | |
Fix building against <net-libs/gnutls-3.
(Portage version: 2.2.14_rc1/cvs/Linux i686, signed Manifest commit with key A792A613)
Diffstat (limited to 'net-ftp')
| -rw-r--r-- | net-ftp/lftp/ChangeLog | 6 | ||||
| -rw-r--r-- | net-ftp/lftp/files/lftp-4.6.0-gnutls-2-compat.patch | 15 | ||||
| -rw-r--r-- | net-ftp/lftp/lftp-4.6.0.ebuild | 5 |
3 files changed, 23 insertions, 3 deletions
diff --git a/net-ftp/lftp/ChangeLog b/net-ftp/lftp/ChangeLog index 79d9be7f4445..a10c3e62e724 100644 --- a/net-ftp/lftp/ChangeLog +++ b/net-ftp/lftp/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-ftp/lftp # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.488 2014/10/13 19:28:18 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.489 2014/10/14 08:56:58 jer Exp $ + + 14 Oct 2014; Jeroen Roovers <jer@gentoo.org> lftp-4.6.0.ebuild, + +files/lftp-4.6.0-gnutls-2-compat.patch: + Fix building against <net-libs/gnutls-3. *lftp-4.6.0 (13 Oct 2014) diff --git a/net-ftp/lftp/files/lftp-4.6.0-gnutls-2-compat.patch b/net-ftp/lftp/files/lftp-4.6.0-gnutls-2-compat.patch new file mode 100644 index 000000000000..3fe6a9db21d9 --- /dev/null +++ b/net-ftp/lftp/files/lftp-4.6.0-gnutls-2-compat.patch @@ -0,0 +1,15 @@ +--- a/src/lftp_ssl.cc ++++ b/src/lftp_ssl.cc +@@ -560,7 +560,11 @@ + { + if(res==GNUTLS_E_AGAIN || res==GNUTLS_E_INTERRUPTED) + return RETRY; +- else if(res==GNUTLS_E_UNEXPECTED_PACKET_LENGTH || res==GNUTLS_E_PREMATURE_TERMINATION) ++ else if(res==GNUTLS_E_UNEXPECTED_PACKET_LENGTH ++#if LFTP_LIBGNUTLS_VERSION_CODE >= 0x030000 ++ || res==GNUTLS_E_PREMATURE_TERMINATION ++#endif /* LFTP_LIBGNUTLS_VERSION_CODE */ ++ ) + { + Log::global->Format(7,"gnutls_record_recv: %s Assuming EOF.\n",gnutls_strerror(res)); + return 0; diff --git a/net-ftp/lftp/lftp-4.6.0.ebuild b/net-ftp/lftp/lftp-4.6.0.ebuild index a9638189855a..0c2b74cf97f9 100644 --- a/net-ftp/lftp/lftp-4.6.0.ebuild +++ b/net-ftp/lftp/lftp-4.6.0.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-ftp/lftp/lftp-4.6.0.ebuild,v 1.1 2014/10/13 19:28:18 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-4.6.0.ebuild,v 1.2 2014/10/14 08:56:58 jer Exp $ EAPI=5 inherit autotools eutils libtool @@ -60,7 +60,8 @@ src_prepare() { "${FILESDIR}"/${PN}-4.0.2.91-lafile.patch \ "${FILESDIR}"/${PN}-4.3.8-gets.patch \ "${FILESDIR}"/${PN}-4.5.3-autopoint.patch \ - "${FILESDIR}"/${PN}-4.5.5-am_config_header.patch + "${FILESDIR}"/${PN}-4.5.5-am_config_header.patch \ + "${FILESDIR}"/${PN}-4.6.0-gnutls-2-compat.patch eautoreconf elibtoolize # for Darwin bundles |