new version 4.6.4
This commit is contained in:
Luboš Uhliarik
parent
2d910016c7
commit
8364431cb2
1
.gitignore
vendored
1
.gitignore
vendored
@ -36,3 +36,4 @@ lftp-4.0.10.tar.xz
|
||||
/lftp-4.5.4.tar.xz
|
||||
/lftp-4.6.0.tar.xz
|
||||
/lftp-4.6.1.tar.xz
|
||||
/lftp-4.6.4.tar.xz
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
From ab5d5446bfee9190f9130f6dd8e40270fa9dc99e Mon Sep 17 00:00:00 2001
|
||||
From: "Alexander V. Lukyanov" <lavv17f@gmail.com>
|
||||
Date: Tue, 13 Jan 2015 09:12:45 +0300
|
||||
Subject: [PATCH] (Path::GetDirectory) new method to get directory when is_file
|
||||
is true.
|
||||
|
||||
---
|
||||
src/FileAccess.h | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/FileAccess.h b/src/FileAccess.h
|
||||
index 90c9b0f..821f1d7 100644
|
||||
--- a/src/FileAccess.h
|
||||
+++ b/src/FileAccess.h
|
||||
@@ -90,6 +90,7 @@ public:
|
||||
void Set(const char *new_path,bool new_is_file=false,const char *new_url=0,int device_prefix_len=0);
|
||||
void SetURL(const char *u) { url.set(u); }
|
||||
void Change(const char *new_path,bool new_is_file=false,const char *new_path_enc=0,int device_prefix_len=0);
|
||||
+ const xstring& GetDirectory() const { return is_file?dirname(path):path; }
|
||||
void ExpandTilde(const Path &home);
|
||||
static void Optimize(xstring& p,int dev_prefix=0);
|
||||
void Optimize() { Optimize(path,device_prefix_len); }
|
||||
--
|
||||
2.1.0
|
||||
|
||||
@ -1,35 +0,0 @@
|
||||
From b06344f2da1dfc68b1aa06e8186af174776f363b Mon Sep 17 00:00:00 2001
|
||||
From: "Alexander V. Lukyanov" <lavv17f@gmail.com>
|
||||
Date: Tue, 13 Jan 2015 09:13:36 +0300
|
||||
Subject: [PATCH] mirror: use directory path when the index is a file (after
|
||||
redirect).
|
||||
|
||||
---
|
||||
src/MirrorJob.cc | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/MirrorJob.cc b/src/MirrorJob.cc
|
||||
index 54b1465..7f89e11 100644
|
||||
--- a/src/MirrorJob.cc
|
||||
+++ b/src/MirrorJob.cc
|
||||
@@ -773,7 +773,7 @@ int MirrorJob::Do()
|
||||
if(source_session->IsOpen())
|
||||
return m;
|
||||
|
||||
- source_dir.set(source_session->GetCwd());
|
||||
+ source_dir.set(source_session->GetCwd().GetDirectory());
|
||||
|
||||
pre_MAKE_TARGET_DIR:
|
||||
{
|
||||
@@ -856,7 +856,7 @@ int MirrorJob::Do()
|
||||
return m;
|
||||
create_target_dir=false;
|
||||
|
||||
- target_dir.set(target_session->GetCwd());
|
||||
+ target_dir.set(target_session->GetCwd().GetDirectory());
|
||||
|
||||
pre_GETTING_LIST_INFO:
|
||||
set_state(GETTING_LIST_INFO);
|
||||
--
|
||||
2.1.0
|
||||
|
||||
@ -1,78 +0,0 @@
|
||||
From bc7b476e782d77839765f56bbdb4cee9f36b54ec Mon Sep 17 00:00:00 2001
|
||||
From: "Alexander V. Lukyanov" <lavv17f@gmail.com>
|
||||
Date: Tue, 13 Jan 2015 15:33:54 +0300
|
||||
Subject: [PATCH] add settings fish:auto-confirm and sftp:auto-confirm
|
||||
|
||||
New host keys are now not confirmed by default, this should improve security.
|
||||
Suggested by Marcin Szewczyk <Marcin.Szewczyk@wodny.org>
|
||||
---
|
||||
doc/lftp.1 | 8 ++++++++
|
||||
src/SSH_Access.cc | 5 +++--
|
||||
src/resource.cc | 2 ++
|
||||
3 files changed, 13 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/doc/lftp.1 b/doc/lftp.1
|
||||
index cabc1be..ed6c388 100644
|
||||
--- a/doc/lftp.1
|
||||
+++ b/doc/lftp.1
|
||||
@@ -1384,6 +1384,10 @@ address family in dns:order.
|
||||
.BR file:charset \ (string)
|
||||
local character set. It is set from current locale initially.
|
||||
.TP
|
||||
+.BR fish:auto-confirm \ (boolean)
|
||||
+when true, lftp answers ``yes'' to all ssh questions, in particular to the
|
||||
+question about a new host key. Otherwise it answers ``no''.
|
||||
+.TP
|
||||
.BR fish:charset \ (string)
|
||||
the character set used by fish server in requests, replies and file listings.
|
||||
Default is empty which means the same as local.
|
||||
@@ -1952,6 +1956,10 @@ minimal chunk size to split the file to.
|
||||
save pget transfer status this often. Set to `never' to disable saving of the status file.
|
||||
The status is saved to a file with suffix \fI.lftp-pget-status\fP.
|
||||
.TP
|
||||
+.BR sftp:auto-confirm \ (boolean)
|
||||
+when true, lftp answers ``yes'' to all ssh questions, in particular to the
|
||||
+question about a new host key. Otherwise it answers ``no''.
|
||||
+.TP
|
||||
.BR sftp:charset \ (string)
|
||||
the character set used by SFTP server in file names and file listings.
|
||||
Default is empty which means the same as local. This setting is only used
|
||||
diff --git a/src/SSH_Access.cc b/src/SSH_Access.cc
|
||||
index 706fc6a..17c716d 100644
|
||||
--- a/src/SSH_Access.cc
|
||||
+++ b/src/SSH_Access.cc
|
||||
@@ -72,8 +72,9 @@ int SSH_Access::HandleSSHMessage()
|
||||
}
|
||||
if(s>=y_len && !strncasecmp(b+s-y_len,y,y_len))
|
||||
{
|
||||
- pty_recv_buf->Put("yes\n");
|
||||
- pty_send_buf->Put("yes\n");
|
||||
+ const char *answer=QueryBool("auto-confirm",hostname)?"yes\n":"no\n";
|
||||
+ pty_recv_buf->Put(answer);
|
||||
+ pty_send_buf->Put(answer);
|
||||
return m;
|
||||
}
|
||||
if(!received_greeting && recv_buf->Size()>0)
|
||||
diff --git a/src/resource.cc b/src/resource.cc
|
||||
index 91b2e60..3a5e8b9 100644
|
||||
--- a/src/resource.cc
|
||||
+++ b/src/resource.cc
|
||||
@@ -339,6 +339,7 @@ static ResType lftp_vars[] = {
|
||||
{"mirror:no-empty-dirs", "no", ResMgr::BoolValidate,ResMgr::NoClosure},
|
||||
{"mirror:require-source", "no", ResMgr::BoolValidate,ResMgr::NoClosure},
|
||||
|
||||
+ {"sftp:auto-confirm", "no", ResMgr::BoolValidate,0},
|
||||
{"sftp:max-packets-in-flight","16", ResMgr::UNumberValidate,0},
|
||||
{"sftp:protocol-version", "6", ResMgr::UNumberValidate,0},
|
||||
{"sftp:size-read", "32k", ResMgr::UNumberValidate,0},
|
||||
@@ -367,6 +368,7 @@ static ResType lftp_vars[] = {
|
||||
{"dns:strict-dnssec", "no", ResMgr::BoolValidate,0},
|
||||
#endif
|
||||
|
||||
+ {"fish:auto-confirm", "no", ResMgr::BoolValidate,0},
|
||||
{"fish:shell", "/bin/sh",0,0},
|
||||
{"fish:connect-program", "ssh -a -x",0,0},
|
||||
{"fish:charset", "", ResMgr::CharsetValidate,0},
|
||||
--
|
||||
2.1.0
|
||||
|
||||
13
lftp.spec
13
lftp.spec
@ -1,7 +1,7 @@
|
||||
Summary: A sophisticated file transfer program
|
||||
Name: lftp
|
||||
Version: 4.6.1
|
||||
Release: 6%{?dist}
|
||||
Version: 4.6.4
|
||||
Release: 1%{?dist}
|
||||
License: GPLv3+
|
||||
Group: Applications/Internet
|
||||
Source0: ftp://ftp.yar.ru/pub/source/%{name}/%{name}-%{version}.tar.xz
|
||||
@ -11,9 +11,6 @@ BuildRequires: ncurses-devel, gnutls-devel, pkgconfig, readline-devel, gettext
|
||||
BuildRequires: zlib-devel
|
||||
|
||||
Patch1: lftp-4.0.9-date_fmt.patch
|
||||
Patch2: lftp-4.0.9-mirror302-1.patch
|
||||
Patch3: lftp-4.0.9-mirror302-2.patch
|
||||
patch4: lftp-4.6.1-auto-confirm.patch
|
||||
|
||||
%description
|
||||
LFTP is a sophisticated ftp/http file transfer program. Like bash, it has job
|
||||
@ -34,9 +31,6 @@ Utility scripts for use with lftp.
|
||||
%setup -q
|
||||
|
||||
%patch1 -p1 -b .date_fmt
|
||||
%patch2 -p1 -b .mirror302-1
|
||||
%patch3 -p1 -b .mirror302-2
|
||||
%patch4 -p1 -b .auto-confirm
|
||||
|
||||
#sed -i.rpath -e '/lftp_cv_openssl/s|-R.*lib||' configure
|
||||
sed -i.norpath -e \
|
||||
@ -99,6 +93,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Aug 24 2015 Luboš Uhliarik <luhliari@redhat.com> - 4.6.4-1
|
||||
- new version 4.6.4
|
||||
|
||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.6.1-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user