From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Sat, 24 May 2014 18:15:52 +0000 (+0200)
Subject: - up to 4.5.0
X-Git-Tag: auto/th/lftp-4.5.0-1
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=274bde75f66f04e86e9b438495abfbb59784e316;p=packages%2Flftp.git

- up to 4.5.0
---

diff --git a/lftp-git.patch b/lftp-git.patch
new file mode 100644
index 0000000..a7c72e8
--- /dev/null
+++ b/lftp-git.patch
@@ -0,0 +1,54 @@
+commit 9bb2bb4b480369184ac5ffb6202b85cbd63810d1
+Author: Alexander V. Lukyanov <lav@yars.free.net>
+Date:   Fri May 23 18:35:01 2014 +0400
+
+    fixed a compile error and incorrect disconnect cause with unexpanded %s
+
+diff --git a/src/Torrent.cc b/src/Torrent.cc
+index 4eb1e4d..1ce4ea6 100644
+--- a/src/Torrent.cc
++++ b/src/Torrent.cc
+@@ -2861,14 +2861,17 @@ int TorrentPeer::Do()
+       if(s==UNPACK_NO_DATA_YET)
+ 	 return m;
+       if(s!=UNPACK_SUCCESS) {
+-	 const char *dc=0;
+ 	 if(s==UNPACK_PREMATURE_EOF) {
+-	    if(recv_buf->Size()>0)
+-	       LogError(2,dc=_("peer unexpectedly closed connection after %s"),recv_buf->Dump());
+-	    else
+-	       LogError(4,dc=_("peer closed connection (before handshake)"));
++	    if(recv_buf->Size()>0) {
++	       LogError(2,_("peer unexpectedly closed connection after %s"),recv_buf->Dump());
++	       Disconnect(_("peer unexpectedly closed connection"));
++	    } else {
++	       LogError(4,_("peer closed connection (before handshake)"));
++	       Disconnect(_("peer closed connection (before handshake)"));
++	    }
++	 } else {
++	    Disconnect(_("invalid peer response format"));
+ 	 }
+-	 Disconnect(dc);
+ 	 return MOVED;
+       }
+       if(!parent->HasMetadata() && !LTEPExtensionEnabled()) {
+@@ -2976,12 +2979,13 @@ int TorrentPeer::Do()
+       return m;
+    if(st!=UNPACK_SUCCESS)
+    {
+-      const char *dc=0;
+-      if(st==UNPACK_PREMATURE_EOF)
+-	 LogError(2,dc=_("peer unexpectedly closed connection after %s"),recv_buf->Dump());
+-      else
+-	 LogError(2,dc=_("invalid peer response format"));
+-      Disconnect(dc);
++      if(st==UNPACK_PREMATURE_EOF) {
++	 LogError(2,_("peer unexpectedly closed connection after %s"),recv_buf->Dump());
++	 Disconnect(_("peer unexpectedly closed connection"));
++      } else {
++	 LogError(2,_("invalid peer response format"));
++	 Disconnect(_("invalid peer response format"));
++      }
+       return MOVED;
+    }
+    reply->DropData(recv_buf);
diff --git a/lftp.spec b/lftp.spec
index e54d12a..8693dd5 100644
--- a/lftp.spec
+++ b/lftp.spec
@@ -22,12 +22,12 @@ Summary(pl.UTF-8):	Zaawansowany klient FTP/HTTP
 Summary(pt_BR.UTF-8):	Sofisticado programa de transferência de arquivos (cliente FTP/HTTP)
 Summary(zh_CN.UTF-8):	lftp 客户端程序
 Name:		lftp
-Version:	4.4.16
+Version:	4.5.0
 Release:	1
 License:	GPL v3+
 Group:		Applications/Networking
 Source0:	http://lftp.yar.ru/ftp/%{name}-%{version}.tar.xz
-# Source0-md5:	73e9084731e4ba9bd886a86fdccec519
+# Source0-md5:	cddbbf3f958047f7ce5a2e4386b36fc8
 Source1:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-man-pages.tar.bz2
 # Source1-md5:	cdad8fb5342eebd9916eccefc98a855b
 Source2:	%{name}.desktop
@@ -39,6 +39,7 @@ Patch2:		aliases.patch
 Patch3:		%{name}-pl.po-update.patch
 Patch4:		lftp-4.3.8-gets.patch
 Patch5:		%{name}-am.patch
+Patch6:		%{name}-git.patch
 URL:		http://lftp.yar.ru/
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake
@@ -93,9 +94,10 @@ o arquivo FEATURES para uma lista mais detalhada.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
+#%patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %{__rm} po/stamp-po