From 3ec702e49eef648cee8de286677bbe9aed4a3cc5 Mon Sep 17 00:00:00 2001 From: Jiri Skala Date: Mon, 2 May 2011 10:45:41 +0200 Subject: [PATCH] updated to latest upstream 4.2.3 --- .gitignore | 1 + lftp-4.2.0-man.patch | 31 ++++++++++++++++--------------- lftp.spec | 5 ++++- sources | 2 +- 4 files changed, 22 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 6455c1c..04ca245 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ lftp-4.0.10.tar.xz /lftp-4.1.3.tar.xz /lftp-4.2.1.tar.xz /lftp-4.2.2.tar.xz +/lftp-4.2.3.tar.xz diff --git a/lftp-4.2.0-man.patch b/lftp-4.2.0-man.patch index fecd56c..1c7b5db 100644 --- a/lftp-4.2.0-man.patch +++ b/lftp-4.2.0-man.patch @@ -1,6 +1,6 @@ -diff -up lftp-4.2.1/doc/lftp.1.man lftp-4.2.1/doc/lftp.1 ---- lftp-4.2.1/doc/lftp.1.man 2011-03-25 17:05:43.000000000 +0100 -+++ lftp-4.2.1/doc/lftp.1 2011-03-30 15:00:09.031652504 +0200 +diff -up lftp-4.2.3/doc/lftp.1.man lftp-4.2.3/doc/lftp.1 +--- lftp-4.2.3/doc/lftp.1.man 2011-04-29 13:05:01.000000000 +0200 ++++ lftp-4.2.3/doc/lftp.1 2011-05-02 10:34:56.602904819 +0200 @@ -1,5 +1,5 @@ .\" -.\" lftp.1 - Sophisticated ftp program @@ -9,7 +9,7 @@ diff -up lftp-4.2.1/doc/lftp.1.man lftp-4.2.1/doc/lftp.1 .\" This file is part of lftp. .\" @@ -62,28 +62,28 @@ lftp \- Sophisticated file transfer prog - This man page documents lftp version 4.2.1. + This man page documents lftp version 4.2.3. .SH "DESCRIPTION" -\fBlftp\fR is a file transfer program that allows sophisticated ftp, http @@ -23,8 +23,9 @@ diff -up lftp-4.2.1/doc/lftp.1.man lftp-4.2.1/doc/lftp.1 +\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 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 ++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 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 @@ -37,7 +38,7 @@ diff -up lftp-4.2.1/doc/lftp.1.man lftp-4.2.1/doc/lftp.1 .PP -Every operation in \fBlftp\fP is reliable, that is any not fatal error is -+Every operation in \fBlftp\fP is reliable, that is any non-fatal error is ++Every operation in \fBlftp\fP is reliable, that is any not-fatal error is ignored and the operation is repeated. So if downloading breaks, it -will be restarted from the point automatically. Even if ftp server -does not support REST command, \fBlftp\fP will try to retrieve the file from @@ -349,7 +350,7 @@ diff -up lftp-4.2.1/doc/lftp.1.man lftp-4.2.1/doc/lftp.1 .TP .BR http:user-agent " (string)" the string lftp sends in User-Agent header of HTTP request. -@@ -1532,7 +1532,7 @@ contains comma separated list of domains +@@ -1535,7 +1535,7 @@ contains comma separated list of domains Default is taken from environment variable \fBno_proxy\fP. .TP .BR net:persist-retries " (number)" @@ -358,7 +359,7 @@ diff -up lftp-4.2.1/doc/lftp.1.man lftp-4.2.1/doc/lftp.1 reply 5xx when there is too many users. .TP .BR net:reconnect-interval-base \ (seconds) -@@ -1542,12 +1542,12 @@ operation. +@@ -1545,12 +1545,12 @@ operation. .TP .BR net:reconnect-interval-max \ (seconds) sets maximum reconnect interval. When current interval after multiplication @@ -373,7 +374,7 @@ diff -up lftp-4.2.1/doc/lftp.1.man lftp-4.2.1/doc/lftp.1 to base value. See net:reconnect-interval-base and net:reconnect-interval-max. .TP .BR net:socket-bind-ipv4 " (ipv4 address)" -@@ -1565,7 +1565,7 @@ default. +@@ -1568,7 +1568,7 @@ default. .TP .BR net:socket-maxseg \ (bytes) use given size for TCP_MAXSEG socket option. Not all operating systems support @@ -382,7 +383,7 @@ diff -up lftp-4.2.1/doc/lftp.1.man lftp-4.2.1/doc/lftp.1 .TP .BR net:timeout " (time interval)" sets the network protocol timeout. -@@ -1578,9 +1578,9 @@ save pget transfer status this often. Se +@@ -1581,9 +1581,9 @@ save pget transfer status this often. Se The status is saved to a file with suffix \fI.lftp-pget-status\fP. .TP .BR sftp:charset \ (string) @@ -394,7 +395,7 @@ diff -up lftp-4.2.1/doc/lftp.1.man lftp-4.2.1/doc/lftp.1 .TP .BR sftp:connect-program \ (string) the program to use for connecting to remote server. It should support `\-l' option -@@ -1603,7 +1603,7 @@ Default is `sftp'. You can use rsh as tr +@@ -1606,7 +1606,7 @@ Default is `sftp'. You can use rsh as tr set sftp:connect-program rsh set sftp:server-program /usr/libexec/openssh/sftp-server .De @@ -403,7 +404,7 @@ diff -up lftp-4.2.1/doc/lftp.1.man lftp-4.2.1/doc/lftp.1 .TP .BR sftp:size-read \ (number) Block size for reading. Default is 0x8000. -@@ -1638,7 +1638,7 @@ if set to yes, then verify server's cert +@@ -1641,7 +1641,7 @@ if set to yes, then verify server's cert Certificate Authority and not be on Certificate Revocation List. .TP .BR torrent:ip " (ipv4 address)" @@ -412,7 +413,7 @@ diff -up lftp-4.2.1/doc/lftp.1.man lftp-4.2.1/doc/lftp.1 .TP .BR torrent:ipv6 " (ipv6 address)" IPv6 address to send to the tracker. Specify it if the tracker has IPv4 address. -@@ -1734,7 +1734,7 @@ They can also have a prefix: 0 - octal, +@@ -1737,7 +1737,7 @@ They can also have a prefix: 0 - octal, .SS FTP asynchronous mode (pipelining) .PP .B Lftp @@ -421,7 +422,7 @@ diff -up lftp-4.2.1/doc/lftp.1.man lftp-4.2.1/doc/lftp.1 then checking all the responses. See ftp:sync-mode variable. Sometimes 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 -@@ -1744,7 +1744,7 @@ incorrectly in the case of several FTP c +@@ -1747,7 +1747,7 @@ incorrectly in the case of several FTP c RFC959 says: ``The user-process sending another command before the completion reply would be in violation of protocol; but server-FTP processes should queue any commands that arrive while a preceding @@ -430,7 +431,7 @@ diff -up lftp-4.2.1/doc/lftp.1.man lftp-4.2.1/doc/lftp.1 NOT assume any correspondence between READ boundaries on the control connection and the Telnet EOL sequences (CR LF).'' and ``a single READ from the control connection may include more than one FTP command''. -@@ -1826,7 +1826,7 @@ command. +@@ -1829,7 +1829,7 @@ command. The file is used to store last working directories for each site visited. .TP .I "~/.netrc" diff --git a/lftp.spec b/lftp.spec index 2ee2116..43e7d63 100644 --- a/lftp.spec +++ b/lftp.spec @@ -1,6 +1,6 @@ Summary: A sophisticated file transfer program Name: lftp -Version: 4.2.2 +Version: 4.2.3 Release: 1%{?dist} License: GPLv3+ Group: Applications/Internet @@ -94,6 +94,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon May 02 2011 Jiri Skala - 4.2.3-1 +- updated to latest upstream 4.2.3 + * Tue Apr 12 2011 Jiri Skala - 4.2.2-1 - updated to latest upstream 4.2.2 diff --git a/sources b/sources index 4c754ca..6b8f478 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8aefd6b051654904cc9d4b198e954d38 lftp-4.2.2.tar.xz +7815af15e05472ac3ffbd5699ab842d4 lftp-4.2.3.tar.xz