public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in net-ftp/lftp/files: lftp-4.6.0-gnutls-2-compat.patch
@ 2014-10-14  8:56 Jeroen Roovers (jer)
  0 siblings, 0 replies; only message in thread
From: Jeroen Roovers (jer) @ 2014-10-14  8:56 UTC (permalink / raw
  To: gentoo-commits

jer         14/10/14 08:56:58

  Added:                lftp-4.6.0-gnutls-2-compat.patch
  Log:
  Fix building against <net-libs/gnutls-3.
  
  (Portage version: 2.2.14_rc1/cvs/Linux i686, signed Manifest commit with key A792A613)

Revision  Changes    Path
1.1                  net-ftp/lftp/files/lftp-4.6.0-gnutls-2-compat.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/lftp/files/lftp-4.6.0-gnutls-2-compat.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/lftp/files/lftp-4.6.0-gnutls-2-compat.patch?rev=1.1&content-type=text/plain

Index: lftp-4.6.0-gnutls-2-compat.patch
===================================================================
--- 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;





^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2014-10-14  8:57 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-14  8:56 [gentoo-commits] gentoo-x86 commit in net-ftp/lftp/files: lftp-4.6.0-gnutls-2-compat.patch Jeroen Roovers (jer)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox