[lftp] updated to latest upstream 4.3.3

Jiri Skala jskala at fedoraproject.org
Thu Oct 20 13:30:35 UTC 2011 

commit b9a0bc99daff98653981280627f59cf57d371afb
Author: Jiri Skala <jskala at redhat.com>
Date:   Thu Oct 20 15:30:26 2011 +0200

    updated to latest upstream 4.3.3

 .gitignore           |    1 +
 lftp-4.2.0-man.patch |  102 +++++++++++++++++--------------------------------
 lftp.spec            |    5 ++-
 sources              |    2 +-
 4 files changed, 42 insertions(+), 68 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0e14809..9aca1af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ lftp-4.0.10.tar.xz
 /lftp-4.3.0.tar.xz
 /lftp-4.3.1.tar.xz
 /lftp-4.3.2.tar.xz
+/lftp-4.3.3.tar.xz
diff --git a/lftp-4.2.0-man.patch b/lftp-4.2.0-man.patch
index 15d5cfd..aa7faf4 100644
--- a/lftp-4.2.0-man.patch
+++ b/lftp-4.2.0-man.patch
@@ -1,6 +1,6 @@
-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
+diff -up lftp-4.3.3/doc/lftp.1.man lftp-4.3.3/doc/lftp.1
+--- lftp-4.3.3/doc/lftp.1.man	2011-10-19 15:06:57.000000000 +0200
++++ lftp-4.3.3/doc/lftp.1	2011-10-20 15:27:30.394328377 +0200
 @@ -1,5 +1,5 @@
  .\"
 -.\" lftp.1 - Sophisticated ftp program
@@ -8,8 +8,8 @@ diff -up lftp-4.2.3/doc/lftp.1.man lftp-4.2.3/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.3.0.
+@@ -61,28 +61,28 @@ lftp \- Sophisticated file transfer prog
+ This man page documents lftp version 4.3.3.
  
  .SH "DESCRIPTION"
 -\fBlftp\fR is a file transfer program that allows sophisticated ftp, http
@@ -28,9 +28,8 @@ diff -up lftp-4.2.3/doc/lftp.1.man lftp-4.2.3/doc/lftp.1
 +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
+ over an ssh connection to a unix account. SFtp is a protocol implemented
 -in ssh2 as sftp subsystem.
-+over an ssh connection to a unix account. SFTP is a protocol implemented
 +in SSH2 as SFTP subsystem.
  .PP
  Besides FTP-like protocols, lftp has support for BitTorrent protocol
@@ -47,18 +46,18 @@ diff -up lftp-4.2.3/doc/lftp.1.man lftp-4.2.3/doc/lftp.1
  the very beginning until the file is transferred completely.
  
  \fBlftp\fP has shell-like command syntax allowing you to launch several
-@@ -96,8 +96,8 @@ commands allow redirecting their output 
+@@ -95,8 +95,8 @@ commands allow redirecting their output 
  pipe to external command. Commands can be executed conditionally based
  on termination status of previous command (&&, ||).
  .PP
 -If you exit \fBlftp\fP when some jobs are not finished yet, \fBlftp\fP will move
 -itself to nohup mode in background. The same happens when you have a
-+If you exit \fBlftp\fP before all jobs are finished, \fBlftp\fP will move
++If you exit \fBlftp\fP before all jobs are not finished yet, \fBlftp\fP will move
 +itself to nohup mode in background. The same thing happens with a
  real modem hangup or when you close an xterm.
  .PP
- \fBlftp\fP has builtin mirror which can download or update a whole directory
-@@ -120,7 +120,7 @@ all variables and their values or `set \
+ \fBlftp\fP has built-in mirror which can download or update a whole directory
+@@ -119,7 +119,7 @@ all variables and their values or `set \
  Variable names can be abbreviated and prefix can be omitted unless the
  rest becomes ambiguous.
  .PP
@@ -67,7 +66,7 @@ diff -up lftp-4.2.3/doc/lftp.1.man lftp-4.2.3/doc/lftp.1
  by the OpenSSL Project for use in the OpenSSL Toolkit. (http://www.openssl.org/)
  
  .SS Commands
-@@ -225,11 +225,11 @@ the debug output to a file.
+@@ -232,11 +232,11 @@ the debug output to a file.
  
  .BR echo " [" \-n "] \fIstring\fR"
  .PP
@@ -81,7 +80,7 @@ diff -up lftp-4.2.3/doc/lftp.1.man lftp-4.2.3/doc/lftp.1
  are transformed into a new command. The format can contain plain text and
  placeholders $0...$9 and $@, corresponding to the arguments.
  
-@@ -268,7 +268,7 @@ put ftp://...
+@@ -275,7 +275,7 @@ put ftp://...
  mput ftp://.../*
  mget \-O ftp://... ftp://.../*
  .De
@@ -90,7 +89,7 @@ diff -up lftp-4.2.3/doc/lftp.1.man lftp-4.2.3/doc/lftp.1
  lftp would fallback to plain copy (via client) if FXP transfer cannot be
  initiated or ftp:use-fxp is false.
  
-@@ -458,7 +458,7 @@ not match to excludes after the include,
+@@ -566,7 +566,7 @@ not match to excludes after the include,
  and the first check is exclude. Directories are matched with a slash appended.
  .PP
  Note that symbolic links are not created when uploading to remote server,
@@ -99,7 +98,7 @@ diff -up lftp-4.2.3/doc/lftp.1.man lftp-4.2.3/doc/lftp.1
  to, use `mirror \-RL' command (treat symbolic links as files).
  .PP
  For option \-\-newer\-than you can either specify a file or time specification
-@@ -478,9 +478,9 @@ Verbosity level can be selected using \-
+@@ -586,9 +586,9 @@ Verbosity level can be selected using \-
  only newer files even if size is different. By default older files are transferred and replace newer ones.
  .PP
  You can mirror between two servers if you specify URLs instead of directories.
@@ -111,7 +110,7 @@ diff -up lftp-4.2.3/doc/lftp.1.man lftp-4.2.3/doc/lftp.1
  them only when LIST command is used with \-a option. In such case try to use
  `set ftp:list-options \-a'.
  
-@@ -538,7 +538,7 @@ List remote file names
+@@ -654,7 +654,7 @@ List remote file names
  .BR "[" \-u " \fIuser\fP[", "\fIpass\fP]]"
  .BR "[" \-p " \fIport\fP] \fIhost\fP|\fIurl\fP"
  .PP
@@ -120,7 +119,7 @@ diff -up lftp-4.2.3/doc/lftp.1.man lftp-4.2.3/doc/lftp.1
  
  .B pget
  .RI [ OPTS ]
-@@ -807,7 +807,7 @@ Print \fBlftp\fR version.
+@@ -964,7 +964,7 @@ Print \fBlftp\fR version.
  Wait for specified job to terminate. If jobno is omitted, wait for last
  backgrounded job.
  .PP
@@ -129,7 +128,7 @@ diff -up lftp-4.2.3/doc/lftp.1.man lftp-4.2.3/doc/lftp.1
  
  .B zcat
  \fIfiles\fP
-@@ -1084,23 +1084,23 @@ Send this string in ACCT command after l
+@@ -1244,23 +1244,23 @@ Send this string in ACCT command after l
  The closure for this setting has format \fIuser at host\fP.
  .TP
  .BR ftp:anon-pass \ (string)
@@ -157,7 +156,7 @@ diff -up lftp-4.2.3/doc/lftp.1.man lftp-4.2.3/doc/lftp.1
  If it is empty, then no CLNT command will be sent.
  .TP
  .BR ftp:bind-data-socket \ (boolean)
-@@ -1115,14 +1115,14 @@ instead of the one returned by PASV comm
+@@ -1275,14 +1275,14 @@ instead of the one returned by PASV comm
  Default is true.
  .TP
  .BR ftp:fxp-passive-source \ (boolean)
@@ -174,7 +173,7 @@ diff -up lftp-4.2.3/doc/lftp.1.man lftp-4.2.3/doc/lftp.1
  has format \fIuser at host\fP.
  .TP
  .BR ftp:ignore-pasv-address \ (boolean)
-@@ -1141,11 +1141,11 @@ Default is empty.
+@@ -1301,11 +1301,11 @@ Default is empty.
  .TP
  .BR ftp:nop-interval \ (seconds)
  delay between NOOP commands when downloading tail of a file. This is useful
@@ -188,7 +187,7 @@ diff -up lftp-4.2.3/doc/lftp.1.man lftp-4.2.3/doc/lftp.1
  dumb masquerading router. In passive mode lftp uses PASV command, not the
  PORT command which is used in active mode. In passive mode lftp itself
  makes the data connection to the server; in active mode the server connects
-@@ -1163,13 +1163,13 @@ Format is min-max, or `full' or `any' to
+@@ -1323,13 +1323,13 @@ Format is min-max, or `full' or `any' to
  use EPSV as preferred passive mode. Default is `false'.
  .TP
  .BR ftp:proxy \ (URL)
@@ -208,7 +207,7 @@ diff -up lftp-4.2.3/doc/lftp.1.man lftp-4.2.3/doc/lftp.1
  .TP
  .BR ftp:proxy-auth-type \ (string)
  When set to ``joined'', lftp sends ``user at proxy_user@ftp.example.org'' as
-@@ -1192,7 +1192,7 @@ then proxy password. The site user and p
+@@ -1352,7 +1352,7 @@ then proxy password. The site user and p
  .TP
  .BR ftp:rest-list \ (boolean)
  allow usage of REST command before LIST command. This might be useful for
@@ -217,7 +216,7 @@ diff -up lftp-4.2.3/doc/lftp.1.man lftp-4.2.3/doc/lftp.1
  .TP
  .BR ftp:rest-stor \ (boolean)
  if false, lftp will not try to use REST before STOR. This can be useful
-@@ -1219,8 +1219,8 @@ do not send plain text password over the
+@@ -1379,8 +1379,8 @@ do not send plain text password over the
  skey/opie is not available, assume failed login. Off by default.
  .TP
  .BR ftp:ssl-allow \ (boolean)
@@ -228,7 +227,7 @@ diff -up lftp-4.2.3/doc/lftp.1.man lftp-4.2.3/doc/lftp.1
  with an ssl/tls library.
  .TP
  .BR ftp:ssl-data-use-keys \ (boolean)
-@@ -1233,17 +1233,17 @@ if true, refuse to send password in clea
+@@ -1393,17 +1393,17 @@ if true, refuse to send password in clea
  Default is false.
  .TP
  .BR ftp:ssl-protect-data \ (boolean)
@@ -250,7 +249,7 @@ diff -up lftp-4.2.3/doc/lftp.1.man lftp-4.2.3/doc/lftp.1
  .TP
  .BR ftp:ssl-use-ccc \ (boolean)
  if true, lftp would issue CCC command after logon, thus disable
-@@ -1254,10 +1254,10 @@ interval between STAT commands. Default 
+@@ -1414,10 +1414,10 @@ interval between STAT commands. Default 
  .TP
  .BR ftp:sync-mode \ (boolean)
  if true, lftp will send one command at a time and wait for
@@ -263,36 +262,7 @@ diff -up lftp-4.2.3/doc/lftp.1.man lftp-4.2.3/doc/lftp.1
  troubles with it, so it is on by default.
  .TP
  .BR ftp:timezone \ (string)
-@@ -1339,24 +1339,24 @@ thus does not double 255 (0xFF, 0377) ch
- STAT commands with TELNET IP+SYNCH signal.
- .TP
- .BR ftp:use-quit " (boolean)"
--if true, lftp sends QUIT before disconnecting from ftp server. Default is true.
-+if true, lftp sends QUIT before disconnecting from FTP server. Default is true.
- .TP
- .BR ftp:verify-address \ (boolean)
- verify that data connection comes from the network address of control
- connection peer. This can possibly prevent data connection spoofing
- which can lead to data corruption. Unfortunately, this can fail
--for certain ftp servers with several network interfaces,
-+for certain FTP servers with several network interfaces,
- when they do not set outgoing address on data socket, so it is disabled by default.
- .TP
- .BR ftp:verify-port \ (boolean)
- verify that data connection has port 20 (ftp-data) on its remote end.
- This can possibly prevent data connection spoofing by users of remote
--host. Unfortunately, too many windows and even unix ftp servers forget
-+host. Unfortunately, too many windows and even Unix FTP servers forget
- to set proper port on data connection, thus this check is off by default.
- .TP
- .BR ftp:web-mode \ (boolean)
- disconnect after closing data connection. This can be useful for totally
--broken ftp servers. Default is false.
-+broken FTP servers. Default is false.
- .TP
- .BR ftps:initial-prot \ (string)
- specifies initial PROT setting for FTPS connections. Should be one of: C, S,
-@@ -1371,11 +1371,11 @@ allow server/proxy side caching for ftp-
+@@ -1536,11 +1536,11 @@ allow server/proxy side caching for ftp-
  specify corresponding HTTP request header.
  .TP
  .BR hftp:proxy \ (URL)
@@ -307,7 +277,7 @@ diff -up lftp-4.2.3/doc/lftp.1.man lftp-4.2.3/doc/lftp.1
  requires authentication, specify user name and password in the URL.
  .TP
  .BR hftp:use-authorization \ (boolean)
-@@ -1418,23 +1418,23 @@ send this cookie to server. A closure is
+@@ -1583,23 +1583,23 @@ send this cookie to server. A closure is
       set cookie/www.somehost.com "param=value"
  .TP
  .BR http:post-content-type " (string)"
@@ -336,7 +306,7 @@ diff -up lftp-4.2.3/doc/lftp.1.man lftp-4.2.3/doc/lftp.1
  to current directory URL. Default is `.'. Set to empty string to disable
  Referer header.
  .TP
-@@ -1443,11 +1443,11 @@ if true, lftp modifies http:cookie varia
+@@ -1608,11 +1608,11 @@ if true, lftp modifies http:cookie varia
  .TP
  .BR http:use-mkcol \ (boolean)
  if set to off, lftp will try to use `PUT' instead of `MKCOL' to create
@@ -350,7 +320,7 @@ diff -up lftp-4.2.3/doc/lftp.1.man lftp-4.2.3/doc/lftp.1
  .TP
  .BR http:user-agent " (string)"
  the string lftp sends in User-Agent header of HTTP request.
-@@ -1535,7 +1535,7 @@ contains comma separated list of domains
+@@ -1700,7 +1700,7 @@ contains comma separated list of domains
  Default is taken from environment variable \fBno_proxy\fP.
  .TP
  .BR net:persist-retries " (number)"
@@ -359,7 +329,7 @@ diff -up lftp-4.2.3/doc/lftp.1.man lftp-4.2.3/doc/lftp.1
  reply 5xx when there is too many users.
  .TP
  .BR net:reconnect-interval-base \ (seconds)
-@@ -1545,12 +1545,12 @@ operation.
+@@ -1710,12 +1710,12 @@ operation.
  .TP
  .BR net:reconnect-interval-max \ (seconds)
  sets maximum reconnect interval. When current interval after multiplication
@@ -374,7 +344,7 @@ diff -up lftp-4.2.3/doc/lftp.1.man lftp-4.2.3/doc/lftp.1
  to base value. See net:reconnect-interval-base and net:reconnect-interval-max.
  .TP
  .BR net:socket-bind-ipv4 " (ipv4 address)"
-@@ -1568,7 +1568,7 @@ default.
+@@ -1733,7 +1733,7 @@ default.
  .TP
  .BR net:socket-maxseg \ (bytes)
  use given size for TCP_MAXSEG socket option. Not all operating systems support
@@ -383,7 +353,7 @@ diff -up lftp-4.2.3/doc/lftp.1.man lftp-4.2.3/doc/lftp.1
  .TP
  .BR net:timeout " (time interval)"
  sets the network protocol timeout.
-@@ -1581,9 +1581,9 @@ save pget transfer status this often. Se
+@@ -1746,9 +1746,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)
@@ -395,7 +365,7 @@ diff -up lftp-4.2.3/doc/lftp.1.man lftp-4.2.3/doc/lftp.1
  .TP
  .BR sftp:connect-program \ (string)
  the program to use for connecting to remote server. It should support `\-l' option
-@@ -1606,7 +1606,7 @@ Default is `sftp'. You can use rsh as tr
+@@ -1771,7 +1771,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
@@ -404,7 +374,7 @@ diff -up lftp-4.2.3/doc/lftp.1.man lftp-4.2.3/doc/lftp.1
  .TP
  .BR sftp:size-read \ (number)
  Block size for reading. Default is 0x8000.
-@@ -1641,7 +1641,7 @@ if set to yes, then verify server's cert
+@@ -1806,7 +1806,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)"
@@ -413,7 +383,7 @@ diff -up lftp-4.2.3/doc/lftp.1.man lftp-4.2.3/doc/lftp.1
  .TP
  .BR torrent:ipv6 " (ipv6 address)"
  IPv6 address to send to the tracker. By default, first found global unicast address is used.
-@@ -1737,7 +1737,7 @@ They can also have a prefix: 0 - octal, 
+@@ -1904,7 +1904,7 @@ They can also have a prefix: 0 - octal, 
  .SS FTP asynchronous mode (pipelining)
  .PP
  .B Lftp
@@ -422,7 +392,7 @@ diff -up lftp-4.2.3/doc/lftp.1.man lftp-4.2.3/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
-@@ -1747,7 +1747,7 @@ incorrectly in the case of several FTP c
+@@ -1914,7 +1914,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
@@ -431,7 +401,7 @@ diff -up lftp-4.2.3/doc/lftp.1.man lftp-4.2.3/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''.
-@@ -1829,7 +1829,7 @@ command.
+@@ -2004,7 +2004,7 @@ The file is used to store last working d
  The directory is used to store named sockets for backgrounded lftp processes.
  .TP
  .I "~/.netrc"
diff --git a/lftp.spec b/lftp.spec
index a370c71..eab69c1 100644
--- a/lftp.spec
+++ b/lftp.spec
@@ -1,6 +1,6 @@
 Summary:	A sophisticated file transfer program
 Name:		lftp
-Version:	4.3.2
+Version:	4.3.3
 Release:	1%{?dist}
 License:	GPLv3+
 Group:		Applications/Internet
@@ -94,6 +94,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 20 2011 Jiri Skala <jskala at redhat.com> - 4.3.3-1
+- updated to latest upstream 4.3.3
+
 * Tue Sep 20 2011 Jiri Skala <jskala at redhat.com> - 4.3.2-1
 - updated to latest upstream 4.3.2
 
diff --git a/sources b/sources
index c4e791c..fa3cd8f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-015d15ecec41ee5e2d5642e16cd432b7  lftp-4.3.2.tar.xz
+7ff6217036e551020247ce74495f78c5  lftp-4.3.3.tar.xz

More information about the scm-commits mailing list