rpms/lftp
7
0
Fork 0
Code Issues Pull Requests Releases Activity

updated to latest upstream 4.2.1

Browse Source
This commit is contained in:
Jiri Skala 2011-03-30 15:03:14 +02:00
parent a9b25736ed
commit 23dbefcf13
5 changed files with 33 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -4,3 +4,4 @@ lftp-4.0.10.tar.xz
/lftp-4.1.1.tar.xz /lftp-4.1.1.tar.xz
/lftp-4.1.2.tar.xz /lftp-4.1.2.tar.xz
/lftp-4.1.3.tar.xz /lftp-4.1.3.tar.xz
/lftp-4.2.1.tar.xz

14
lftp-4.0.9-date_fmt.patch
View File

@ -1,6 +1,6 @@
diff -up lftp-4.0.9/src/Http.cc.date_fmt lftp-4.0.9/src/Http.cc diff -up lftp-4.2.1/src/Http.cc.date_fmt lftp-4.2.1/src/Http.cc
--- lftp-4.0.9/src/Http.cc.date_fmt 2009-07-17 14:52:26.000000000 +0200 --- lftp-4.2.1/src/Http.cc.date_fmt 2011-03-25 15:35:42.000000000 +0100
+++ lftp-4.0.9/src/Http.cc 2010-06-30 08:07:00.818994525 +0200 +++ lftp-4.2.1/src/Http.cc 2011-03-30 14:40:54.170096624 +0200
@@ -29,6 +29,7 @@ @@ -29,6 +29,7 @@
#include <errno.h> #include <errno.h>
#include <stdarg.h> #include <stdarg.h>
@ -9,21 +9,21 @@ diff -up lftp-4.0.9/src/Http.cc.date_fmt lftp-4.0.9/src/Http.cc
#include <fnmatch.h> #include <fnmatch.h>
#include <locale.h> #include <locale.h>
#include <assert.h> #include <assert.h>
@@ -562,16 +563,10 @@ void Http::SendRequest(const char *conne @@ -565,15 +566,10 @@ void Http::SendRequest(const char *conne
(long long)((limit==FILE_END || limit>entity_size ? entity_size : limit)-1), (long long)((limit==FILE_END || limit>entity_size ? entity_size : limit)-1),
(long long)entity_size); (long long)entity_size);
} }
- if(entity_date!=NO_DATE) - if(entity_date!=NO_DATE)
+ if(entity_date!=NO_DATE && entity_date>0L && entity_date<INT_MAX) + if(entity_date!=NO_DATE && entity_date>0L && entity_date<INT_MAX)
{ {
char d[256];
- static const char weekday_names[][4]={ - static const char weekday_names[][4]={
- "Sun","Mon","Tue","Wed","Thu","Fri","Sat" - "Sun","Mon","Tue","Wed","Thu","Fri","Sat"
- }; - };
- struct tm *t=gmtime(&entity_date); - const struct tm *t=gmtime(&entity_date);
- sprintf(d,"%s, %2d %s %04d %02d:%02d:%02d GMT", - const char *d=xstring::format("%s, %2d %s %04d %02d:%02d:%02d GMT",
- weekday_names[t->tm_wday],t->tm_mday,month_names[t->tm_mon], - weekday_names[t->tm_wday],t->tm_mday,month_names[t->tm_mon],
- t->tm_year+1900,t->tm_hour,t->tm_min,t->tm_sec); - t->tm_year+1900,t->tm_hour,t->tm_min,t->tm_sec);
+ char d[256];
+ strftime(d, sizeof(d), "%a, %d %b %H:%M:%S %Y GMT", gmtime(&entity_date)); + strftime(d, sizeof(d), "%a, %d %b %H:%M:%S %Y GMT", gmtime(&entity_date));
Send("Last-Modified: %s\r\n",d); Send("Last-Modified: %s\r\n",d);
} }

51
lftp-4.2.0-man.patch
View File

@ -1,6 +1,6 @@
diff -up lftp-4.2.0/doc/lftp.1.man lftp-4.2.0/doc/lftp.1 diff -up lftp-4.2.1/doc/lftp.1.man lftp-4.2.1/doc/lftp.1
--- lftp-4.2.0/doc/lftp.1.man 2011-03-03 21:09:16.000000000 +0100 --- lftp-4.2.1/doc/lftp.1.man 2011-03-25 17:05:43.000000000 +0100
+++ lftp-4.2.0/doc/lftp.1 2011-03-15 09:28:04.862009660 +0100 +++ lftp-4.2.1/doc/lftp.1 2011-03-30 15:00:09.031652504 +0200
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
.\" .\"
-.\" lftp.1 - Sophisticated ftp program -.\" lftp.1 - Sophisticated ftp program
@ -9,7 +9,7 @@ diff -up lftp-4.2.0/doc/lftp.1.man lftp-4.2.0/doc/lftp.1
.\" This file is part of lftp. .\" This file is part of lftp.
.\" .\"
@@ -62,28 +62,28 @@ lftp \- Sophisticated file transfer prog @@ -62,28 +62,28 @@ lftp \- Sophisticated file transfer prog
This man page documents lftp version 4.2.0. This man page documents lftp version 4.2.1.
.SH "DESCRIPTION" .SH "DESCRIPTION"
-\fBlftp\fR is a file transfer program that allows sophisticated ftp, http -\fBlftp\fR is a file transfer program that allows sophisticated ftp, http
@ -21,7 +21,7 @@ diff -up lftp-4.2.0/doc/lftp.1.man lftp-4.2.0/doc/lftp.1
-\fBlftp\fP can handle several file access methods - ftp, ftps, http, https, -\fBlftp\fP can handle several file access methods - ftp, ftps, http, https,
-hftp, fish, sftp and file (https and ftps are only available when lftp is -hftp, fish, sftp and file (https and ftps are only available when lftp is
+\fBlftp\fP can handle several file access methods - FTP, FTPS, HTTP, HTTPS, +\fBlftp\fP can handle several file access methods - FTP, FTPS, HTTP, HTTPS,
+hftp, fish, SFTP and file (HTTPS and FTPS are only available when lftp is +HFTP, FISH, SFTP and file (HTTPS and FTPS are only available when lftp is
compiled with GNU TLS or OpenSSL library). You can specify the method to use in `open compiled with GNU TLS or OpenSSL library). You can specify the method to use in `open
URL' command, e.g. `open http://www.us.kernel.org/pub/linux'. hftp is URL' command, e.g. `open http://www.us.kernel.org/pub/linux'. hftp is
-ftp-over-http-proxy protocol. It can be used automatically instead of ftp -ftp-over-http-proxy protocol. It can be used automatically instead of ftp
@ -29,7 +29,7 @@ diff -up lftp-4.2.0/doc/lftp.1.man lftp-4.2.0/doc/lftp.1
if ftp:proxy is set to `http://proxy[:port]'. Fish is a protocol working if ftp:proxy is set to `http://proxy[:port]'. Fish is a protocol working
-over an ssh connection to a unix account. SFtp is a protocol implemented -over an ssh connection to a unix account. SFtp is a protocol implemented
-in ssh2 as sftp subsystem. -in ssh2 as sftp subsystem.
+over an SSH connection to a unix account. SFTP is a protocol implemented +over an ssh connection to a unix account. SFTP is a protocol implemented
+in SSH2 as SFTP subsystem. +in SSH2 as SFTP subsystem.
.PP .PP
Besides FTP-like protocols, lftp has support for BitTorrent protocol Besides FTP-like protocols, lftp has support for BitTorrent protocol
@ -262,20 +262,7 @@ diff -up lftp-4.2.0/doc/lftp.1.man lftp-4.2.0/doc/lftp.1
troubles with it, so it is on by default. troubles with it, so it is on by default.
.TP .TP
.BR ftp:timezone \ (string) .BR ftp:timezone \ (string)
@@ -1284,10 +1284,10 @@ when true (default), lftp uses FEAT comm @@ -1339,24 +1339,24 @@ thus does not double 255 (0xFF, 0377) ch
ftp server.
.TP
.BR ftp:use-fxp \ (boolean)
-if true, lftp will try to set up direct connection between two ftp servers.
+if true, lftp will try to set up direct connection between two FTP servers.
.TP
.BR ftp:use-hftp \ (boolean)
-when ftp:proxy points to an http proxy, this setting selects hftp method (GET,
+when ftp:proxy points to a HTTP proxy, this setting selects hftp method (GET,
HEAD) when true, and CONNECT method when false. Default is true.
.TP
.BR ftp:lang \ (boolean)
@@ -1335,24 +1335,24 @@ thus does not double 255 (0xFF, 0377) ch
STAT commands with TELNET IP+SYNCH signal. STAT commands with TELNET IP+SYNCH signal.
.TP .TP
.BR ftp:use-quit " (boolean)" .BR ftp:use-quit " (boolean)"
@ -304,7 +291,7 @@ diff -up lftp-4.2.0/doc/lftp.1.man lftp-4.2.0/doc/lftp.1
.TP .TP
.BR ftps:initial-prot \ (string) .BR ftps:initial-prot \ (string)
specifies initial PROT setting for FTPS connections. Should be one of: C, S, specifies initial PROT setting for FTPS connections. Should be one of: C, S,
@@ -1367,11 +1367,11 @@ allow server/proxy side caching for ftp- @@ -1371,11 +1371,11 @@ allow server/proxy side caching for ftp-
specify corresponding HTTP request header. specify corresponding HTTP request header.
.TP .TP
.BR hftp:proxy \ (URL) .BR hftp:proxy \ (URL)
@ -319,7 +306,7 @@ diff -up lftp-4.2.0/doc/lftp.1.man lftp-4.2.0/doc/lftp.1
requires authentication, specify user name and password in the URL. requires authentication, specify user name and password in the URL.
.TP .TP
.BR hftp:use-authorization \ (boolean) .BR hftp:use-authorization \ (boolean)
@@ -1414,23 +1414,23 @@ send this cookie to server. A closure is @@ -1418,23 +1418,23 @@ send this cookie to server. A closure is
set cookie/www.somehost.com "param=value" set cookie/www.somehost.com "param=value"
.TP .TP
.BR http:post-content-type " (string)" .BR http:post-content-type " (string)"
@ -348,7 +335,7 @@ diff -up lftp-4.2.0/doc/lftp.1.man lftp-4.2.0/doc/lftp.1
to current directory URL. Default is `.'. Set to empty string to disable to current directory URL. Default is `.'. Set to empty string to disable
Referer header. Referer header.
.TP .TP
@@ -1439,11 +1439,11 @@ if true, lftp modifies http:cookie varia @@ -1443,11 +1443,11 @@ if true, lftp modifies http:cookie varia
.TP .TP
.BR http:use-mkcol \ (boolean) .BR http:use-mkcol \ (boolean)
if set to off, lftp will try to use `PUT' instead of `MKCOL' to create if set to off, lftp will try to use `PUT' instead of `MKCOL' to create
@ -362,7 +349,7 @@ diff -up lftp-4.2.0/doc/lftp.1.man lftp-4.2.0/doc/lftp.1
.TP .TP
.BR http:user-agent " (string)" .BR http:user-agent " (string)"
the string lftp sends in User-Agent header of HTTP request. the string lftp sends in User-Agent header of HTTP request.
@@ -1528,7 +1528,7 @@ contains comma separated list of domains @@ -1532,7 +1532,7 @@ contains comma separated list of domains
Default is taken from environment variable \fBno_proxy\fP. Default is taken from environment variable \fBno_proxy\fP.
.TP .TP
.BR net:persist-retries " (number)" .BR net:persist-retries " (number)"
@ -371,7 +358,7 @@ diff -up lftp-4.2.0/doc/lftp.1.man lftp-4.2.0/doc/lftp.1
reply 5xx when there is too many users. reply 5xx when there is too many users.
.TP .TP
.BR net:reconnect-interval-base \ (seconds) .BR net:reconnect-interval-base \ (seconds)
@@ -1538,12 +1538,12 @@ operation. @@ -1542,12 +1542,12 @@ operation.
.TP .TP
.BR net:reconnect-interval-max \ (seconds) .BR net:reconnect-interval-max \ (seconds)
sets maximum reconnect interval. When current interval after multiplication sets maximum reconnect interval. When current interval after multiplication
@ -386,7 +373,7 @@ diff -up lftp-4.2.0/doc/lftp.1.man lftp-4.2.0/doc/lftp.1
to base value. See net:reconnect-interval-base and net:reconnect-interval-max. to base value. See net:reconnect-interval-base and net:reconnect-interval-max.
.TP .TP
.BR net:socket-bind-ipv4 " (ipv4 address)" .BR net:socket-bind-ipv4 " (ipv4 address)"
@@ -1561,7 +1561,7 @@ default. @@ -1565,7 +1565,7 @@ default.
.TP .TP
.BR net:socket-maxseg \ (bytes) .BR net:socket-maxseg \ (bytes)
use given size for TCP_MAXSEG socket option. Not all operating systems support use given size for TCP_MAXSEG socket option. Not all operating systems support
@ -395,7 +382,7 @@ diff -up lftp-4.2.0/doc/lftp.1.man lftp-4.2.0/doc/lftp.1
.TP .TP
.BR net:timeout " (time interval)" .BR net:timeout " (time interval)"
sets the network protocol timeout. sets the network protocol timeout.
@@ -1574,9 +1574,9 @@ save pget transfer status this often. Se @@ -1578,9 +1578,9 @@ save pget transfer status this often. Se
The status is saved to a file with suffix \fI.lftp-pget-status\fP. The status is saved to a file with suffix \fI.lftp-pget-status\fP.
.TP .TP
.BR sftp:charset \ (string) .BR sftp:charset \ (string)
@ -407,7 +394,7 @@ diff -up lftp-4.2.0/doc/lftp.1.man lftp-4.2.0/doc/lftp.1
.TP .TP
.BR sftp:connect-program \ (string) .BR sftp:connect-program \ (string)
the program to use for connecting to remote server. It should support `\-l' option the program to use for connecting to remote server. It should support `\-l' option
@@ -1599,7 +1599,7 @@ Default is `sftp'. You can use rsh as tr @@ -1603,7 +1603,7 @@ Default is `sftp'. You can use rsh as tr
set sftp:connect-program rsh set sftp:connect-program rsh
set sftp:server-program /usr/libexec/openssh/sftp-server set sftp:server-program /usr/libexec/openssh/sftp-server
.De .De
@ -416,7 +403,7 @@ diff -up lftp-4.2.0/doc/lftp.1.man lftp-4.2.0/doc/lftp.1
.TP .TP
.BR sftp:size-read \ (number) .BR sftp:size-read \ (number)
Block size for reading. Default is 0x8000. Block size for reading. Default is 0x8000.
@@ -1634,7 +1634,7 @@ if set to yes, then verify server's cert @@ -1638,7 +1638,7 @@ if set to yes, then verify server's cert
Certificate Authority and not be on Certificate Revocation List. Certificate Authority and not be on Certificate Revocation List.
.TP .TP
.BR torrent:ip " (ipv4 address)" .BR torrent:ip " (ipv4 address)"
@ -425,7 +412,7 @@ diff -up lftp-4.2.0/doc/lftp.1.man lftp-4.2.0/doc/lftp.1
.TP .TP
.BR torrent:ipv6 " (ipv6 address)" .BR torrent:ipv6 " (ipv6 address)"
IPv6 address to send to the tracker. Specify it if the tracker has IPv4 address. IPv6 address to send to the tracker. Specify it if the tracker has IPv4 address.
@@ -1727,7 +1727,7 @@ They can also have a prefix: 0 - octal, @@ -1734,7 +1734,7 @@ They can also have a prefix: 0 - octal,
.SS FTP asynchronous mode (pipelining) .SS FTP asynchronous mode (pipelining)
.PP .PP
.B Lftp .B Lftp
@ -434,7 +421,7 @@ diff -up lftp-4.2.0/doc/lftp.1.man lftp-4.2.0/doc/lftp.1
then checking all the responses. See ftp:sync-mode variable. Sometimes then checking all the responses. See ftp:sync-mode variable. Sometimes
this does not work, thus synchronous mode is the default. You can try this does not work, thus synchronous mode is the default. You can try
to turn synchronous mode off and see if it works for you. It is known to turn synchronous mode off and see if it works for you. It is known
@@ -1737,7 +1737,7 @@ incorrectly in the case of several FTP c @@ -1744,7 +1744,7 @@ incorrectly in the case of several FTP c
RFC959 says: ``The user-process sending another command before the RFC959 says: ``The user-process sending another command before the
completion reply would be in violation of protocol; but server-FTP completion reply would be in violation of protocol; but server-FTP
processes should queue any commands that arrive while a preceding processes should queue any commands that arrive while a preceding
@ -443,7 +430,7 @@ diff -up lftp-4.2.0/doc/lftp.1.man lftp-4.2.0/doc/lftp.1
NOT assume any correspondence between READ boundaries on the control NOT assume any correspondence between READ boundaries on the control
connection and the Telnet EOL sequences (CR LF).'' and ``a single READ connection and the Telnet EOL sequences (CR LF).'' and ``a single READ
from the control connection may include more than one FTP command''. from the control connection may include more than one FTP command''.
@@ -1818,7 +1818,7 @@ command. @@ -1826,7 +1826,7 @@ command.
The file is used to store last working directories for each site visited. The file is used to store last working directories for each site visited.
.TP .TP
.I "~/.netrc" .I "~/.netrc"

5
lftp.spec
View File

@ -1,6 +1,6 @@
Summary: A sophisticated file transfer program Summary: A sophisticated file transfer program
Name: lftp Name: lftp
Version: 4.2.0 Version: 4.2.1
Release: 1%{?dist} Release: 1%{?dist}
License: GPLv3+ License: GPLv3+
Group: Applications/Internet Group: Applications/Internet
@ -94,6 +94,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Wed Mar 30 2011 Jiri Skala <jskala@redhat.com> - 4.2.1-1
- updated to latest upstream 4.2.1
* Mon Mar 14 2011 Jiri Skala <jskala@redhat.com> - 4.2.0-1 * Mon Mar 14 2011 Jiri Skala <jskala@redhat.com> - 4.2.0-1
- updated to latest upstream 4.2.0 - updated to latest upstream 4.2.0
- fixes #675126 man page corrections - fixes #675126 man page corrections

2
sources
View File

@ -1 +1 @@
0ba993d4edda8d975a78b7e8f0c687d0 lftp-4.2.0.tar.xz 737912baf3ea576f2ed52eeebb14491b lftp-4.2.1.tar.xz