- up to 4.5.1

diff --git a/lftp-git.patch b/lftp-git.patch
deleted file mode 100644 (file)
index 2bdaa5d..0000000
--- a/lftp-git.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-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);
-commit c6c77d67316126c79d446baff27aa3b3a2f8baa8
-Author: Alexander V. Lukyanov <lav@yars.free.net>
-Date:   Mon May 26 11:02:40 2014 +0400
-
-    fixed redirection handling
-
-diff --git a/src/FileCopy.cc b/src/FileCopy.cc
-index f7e774c..30c2bdb 100644
---- a/src/FileCopy.cc
-+++ b/src/FileCopy.cc
-@@ -1134,7 +1134,7 @@ int FileCopyPeerFA::Get_LL(int len)
-           if(FAmode==FA::QUOTE_CMD)
-              FAmode=FA::RETRIEVE;
- 
--          xstring& loc=xstring::get_tmp(loc_c);
-+          xstring loc(loc_c);
-           session->Close(); // loc_c is no longer valid.
-           loc_c=0;
- 

diff --git a/lftp.spec b/lftp.spec
index d5436cfc0d1bad872df3717a512574aa9e1219da..b7e8dd52b537fb4e00e97f32117b1f3529e452d6 100644 (file)
--- 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.5.0
-Release:       2
+Version:       4.5.1
+Release:       1
 License:       GPL v3+
 Group:         Applications/Networking
 Source0:       http://lftp.yar.ru/ftp/%{name}-%{version}.tar.xz
-# Source0-md5: cddbbf3f958047f7ce5a2e4386b36fc8
+# Source0-md5: 1a43302f5bc3552741c329c6afe86c9a
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-man-pages.tar.bz2
 # Source1-md5: cdad8fb5342eebd9916eccefc98a855b
 Source2:       %{name}.desktop
@@ -39,7 +39,6 @@ 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
@@ -97,7 +96,6 @@ o arquivo FEATURES para uma lista mais detalhada.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 
 %{__rm} po/stamp-po