diff -ruN lftp-3.1.1/NEWS lftp-3.1.2/NEWS --- lftp-3.1.1/NEWS Wed Mar 23 00:42:00 2005 +++ lftp-3.1.2/NEWS Mon Apr 4 11:35:42 2005 @@ -1,3 +1,14 @@ +Version 3.1.2 - 2005-04-04 + +* cache negative results, new setting cache:expire-negative. +* set http:use-propfind and http:use-mkcol automatically if those methods + are unsupported, so that they will not be retried. +* handle DAV:creator-displayname in PROPFIND parser. +* parse incorrect XML returned for PROPFIND requests as HTML. +* fixed coredump and href handling in PROPFIND result parsing. +* fixed sftp transfer of growing files. +* fixed compilation with socks5 on freebsd. + Version 3.1.1 - 2005-03-23 * new setting ftp:ignore-pasv-address. diff -ruN lftp-3.1.1/configure lftp-3.1.2/configure --- lftp-3.1.1/configure Wed Mar 23 00:44:05 2005 +++ lftp-3.1.2/configure Thu Mar 31 18:29:01 2005 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for lftp 3.1.1. +# Generated by GNU Autoconf 2.59 for lftp 3.1.2. # # Report bugs to . # @@ -423,8 +423,8 @@ # Identity of this package. PACKAGE_NAME='lftp' PACKAGE_TARNAME='lftp' -PACKAGE_VERSION='3.1.1' -PACKAGE_STRING='lftp 3.1.1' +PACKAGE_VERSION='3.1.2' +PACKAGE_STRING='lftp 3.1.2' PACKAGE_BUGREPORT='lftp-bugs@lftp.yar.ru' ac_config_libobj_dir=lib @@ -956,7 +956,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures lftp 3.1.1 to adapt to many kinds of systems. +\`configure' configures lftp 3.1.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1022,7 +1022,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of lftp 3.1.1:";; + short | recursive ) echo "Configuration of lftp 3.1.2:";; esac cat <<\_ACEOF @@ -1179,7 +1179,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -lftp configure 3.1.1 +lftp configure 3.1.2 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1193,7 +1193,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by lftp $as_me 3.1.1, which was +It was created by lftp $as_me 3.1.2, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1836,7 +1836,7 @@ # Define the identity of the package. PACKAGE='lftp' - VERSION='3.1.1' + VERSION='3.1.2' cat >>confdefs.h <<_ACEOF @@ -33049,7 +33049,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by lftp $as_me 3.1.1, which was +This file was extended by lftp $as_me 3.1.2, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -33115,7 +33115,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -lftp config.status 3.1.1 +lftp config.status 3.1.2 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -ruN lftp-3.1.1/configure.ac lftp-3.1.2/configure.ac --- lftp-3.1.1/configure.ac Wed Mar 23 00:04:12 2005 +++ lftp-3.1.2/configure.ac Thu Mar 31 18:27:59 2005 @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.53) -AC_INIT([lftp], [3.1.1], [lftp-bugs@lftp.yar.ru]) +AC_INIT([lftp], [3.1.2], [lftp-bugs@lftp.yar.ru]) AM_INIT_AUTOMAKE AC_CONFIG_LIBOBJ_DIR(lib) AC_CONFIG_SRCDIR([src/ftpclass.cc]) diff -ruN lftp-3.1.1/doc/ChangeLog lftp-3.1.2/doc/ChangeLog --- lftp-3.1.1/doc/ChangeLog Sat Mar 5 10:06:06 2005 +++ lftp-3.1.2/doc/ChangeLog Mon Apr 4 14:25:43 2005 @@ -1,3 +1,7 @@ +2005-04-04 Alexander V. Lukyanov + + * lftp.1: document cache: settings, cmd:verify-path-cached. + 2005-02-25 Alexander V. Lukyanov * lftp.1: document ftp:ignore-pasv-address. diff -ruN lftp-3.1.1/doc/lftp.1 lftp-3.1.2/doc/lftp.1 --- lftp-3.1.1/doc/lftp.1 Sat Mar 5 10:06:15 2005 +++ lftp-3.1.2/doc/lftp.1 Mon Apr 4 14:25:53 2005 @@ -17,7 +17,7 @@ .\" along with this program; see the file COPYING. If not, write to .\" the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. .\" -.\" $Id: lftp.1,v 1.99 2005/03/05 07:06:15 lav Exp $ +.\" $Id: lftp.1,v 1.100 2005/04/04 10:25:53 lav Exp $ .\" .\"------- .\" Sp space down the interparagraph distance @@ -42,7 +42,7 @@ .fi .in .. -.TH lftp 1 "05 Mar 2005" +.TH lftp 1 "04 Apr 2005" .SH NAME lftp \- Sophisticated file transfer program .SH SYNTAX @@ -59,7 +59,7 @@ .B lftp \-\-help .SH VERSION -This man page documents lftp version 3.1.1. +This man page documents lftp version 3.1.2. .SH "DESCRIPTION" \fBlftp\fR is a file transfer program that allows sophisticated ftp, http @@ -849,6 +849,21 @@ .RE .TP +.BR cache:cache-empty-listings \ (boolean) +When false, empty listings are not cached. +.TP +.BR cache:enable \ (boolean) +When false, cache is disabled. +.TP +.BR cache:expire " (time interval)" +Positive cache entries expire in this time interval. +.TP +.BR cache:expire-negative " (time interval)" +Negative cache entries expire in this time interval. +.TP +.BR cache:size " (number)" +Maximum cache size. When exceeded, oldest cache entries will be removed from cache. +.TP .BR cmd:remote-completion \ (boolean) a boolean to control whether or not lftp uses remote completion. .TP @@ -866,6 +881,10 @@ set cmd:verify-path/hftp://* false cd directory & .De +.TP +.BR cmd:verify-path-cached \ (boolean) +When false, `cd' to a directory known from cache as existent will succeed immediately. +Otherwise the verification will depend on cmd:verify-path setting. .TP .BR dns:SRV-query \ (boolean) query for SRV records and use them before gethostbyname. The SRV records diff -ruN lftp-3.1.1/include/ChangeLog lftp-3.1.2/include/ChangeLog --- lftp-3.1.1/include/ChangeLog Wed Jun 9 09:34:06 2004 +++ lftp-3.1.2/include/ChangeLog Thu Mar 24 10:42:23 2005 @@ -1,3 +1,7 @@ +2005-03-24 Dmitry A. Yanko + + * post-config.h: fixed compilation with socks5. + 2004-06-09 Alexander V. Lukyanov * xstring.h: fixed DECL checks. diff -ruN lftp-3.1.1/include/post-config.h lftp-3.1.2/include/post-config.h --- lftp-3.1.1/include/post-config.h Tue Jun 8 16:45:13 2004 +++ lftp-3.1.2/include/post-config.h Thu Mar 24 19:41:45 2005 @@ -47,6 +47,8 @@ && defined(HAVE_GETNAMEINFO) \ && defined(HAVE_GETADDRINFO)) +#define USE_EXPAT (defined(HAVE_EXPAT_H) && defined(HAVE_LIBEXPAT)) + #if defined(SOCKS4) || defined(SOCKS_DANTE) # define connect Rconnect # define getsockname Rgetsockname @@ -80,6 +82,7 @@ #ifdef SOCKS5 # define SOCKS # include +# undef getc /* fix a problem with redefined getc */ #endif #include diff -ruN lftp-3.1.1/lftp.lsm lftp-3.1.2/lftp.lsm --- lftp-3.1.1/lftp.lsm Wed Mar 23 01:04:26 2005 +++ lftp-3.1.2/lftp.lsm Mon Apr 4 14:29:24 2005 @@ -1,7 +1,7 @@ Begin3 Title: LFTP command line file transfer program -Version: 3.1.1 -Entered-date: 2005-03-23 +Version: 3.1.2 +Entered-date: 2005-04-04 Description: LFTP is a shell-like command line file transfer program. It is reliable: can retry operations and does reget automatically. It can do several transfers simultaneously in background. @@ -22,7 +22,7 @@ Author: lav@yars.free.net (Alexander V. Lukyanov) Maintained-by: lav@yars.free.net (Alexander V. Lukyanov) Primary-site: ftp.yars.free.net /pub/software/unix/net/ftp/client/lftp - 1629 kB lftp-3.1.1.tar.gz + 1631 kB lftp-3.1.2.tar.gz Alternate-site: metalab.unc.edu /pub/Linux/system/network/file-transfer Platforms: Unix, G++ Copying-policy: GNU GPL diff -ruN lftp-3.1.1/lftp.spec lftp-3.1.2/lftp.spec --- lftp-3.1.1/lftp.spec Wed Mar 23 01:04:16 2005 +++ lftp-3.1.2/lftp.spec Mon Apr 4 14:29:19 2005 @@ -1,4 +1,4 @@ -%define version 3.1.1 +%define version 3.1.2 %define release 1 %define use_modules 0 Binary files lftp-3.1.1/po/de.gmo and lftp-3.1.2/po/de.gmo differ diff -ruN lftp-3.1.1/po/de.po lftp-3.1.2/po/de.po --- lftp-3.1.1/po/de.po Wed Mar 16 00:15:36 2005 +++ lftp-3.1.2/po/de.po Mon Apr 4 14:27:27 2005 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-16 00:15+0300\n" +"POT-Creation-Date: 2005-04-04 14:27+0400\n" "PO-Revision-Date: 2004-05-21 12:53+0200\n" "Last-Translator: Moritz Moeller-Herrmann \n" "Language-Team: deutsch \n" @@ -50,7 +50,7 @@ msgid "%s: received redirection to `%s'\n" msgstr "%s: Umleitung nach »%s« empfangen\n" -#: src/CmdExec.cc:394 src/FileCopy.cc:990 +#: src/CmdExec.cc:394 src/FileCopy.cc:996 msgid "Too many redirections" msgstr "Zu viele Umleitungen" @@ -150,6 +150,11 @@ msgid "File moved to `%s'" msgstr "Datei verschoben nach »%s«" +#: src/FileAccess.cc:1053 +#, c-format +msgid "%s [cached]" +msgstr "" + #: src/GetJob.cc:92 #, c-format msgid "%s: %s: file already exists and xfer:clobber is unset\n" @@ -162,38 +167,38 @@ msgid "[%d] Done (%s)" msgstr "[%d] Fertig (%s)" -#: src/LsCache.cc:195 +#: src/LsCache.cc:209 msgid "Cache is on" msgstr "Cache ist an" -#: src/LsCache.cc:197 +#: src/LsCache.cc:211 msgid "Cache is off" msgstr "Cache ist aus" -#: src/LsCache.cc:203 +#: src/LsCache.cc:217 #, c-format msgid "%ld $#l#byte|bytes$ cached" msgstr "%ld $#l#Byte|Bytes$ zwischengespeichert" -#: src/LsCache.cc:206 +#: src/LsCache.cc:220 msgid ", no size limit" msgstr ", keine Größenbegrenzung" -#: src/LsCache.cc:208 +#: src/LsCache.cc:222 #, c-format msgid ", maximum size %ld\n" msgstr ", Maximalgröße %ld\n" -#: src/LsCache.cc:211 +#: src/LsCache.cc:225 msgid "Cache entries do not expire" msgstr "Cache Einträge verfallen nicht" -#: src/LsCache.cc:213 +#: src/LsCache.cc:227 #, c-format msgid "Cache entries expire in %ld $#l#second|seconds$\n" msgstr "Einträge im Zwischenspeicher verfallen in %ld $#l#Sekunde|Sekunden$\n" -#: src/LsCache.cc:218 +#: src/LsCache.cc:232 #, c-format msgid "Cache entries expire in %ld $#l#minute|minutes$\n" msgstr "Einträge im Zwischenspeicher verfallen in %ld $#l#Minute|Minuten$\n" @@ -280,18 +285,18 @@ msgid "%s: regular expression `%s': %s\n" msgstr "%s: Regulärer Ausdruck (regular expression) %s: %s\n" -#: src/MirrorJob.cc:1349 src/commands.cc:976 src/commands.cc:1064 -#: src/commands.cc:1456 src/commands.cc:1490 src/commands.cc:1589 -#: src/commands.cc:1879 src/commands.cc:2075 src/commands.cc:2248 -#: src/commands.cc:2255 src/commands.cc:2437 src/commands.cc:2464 -#: src/commands.cc:2471 src/commands.cc:2795 src/commands.cc:3076 +#: src/MirrorJob.cc:1349 src/commands.cc:982 src/commands.cc:1070 +#: src/commands.cc:1462 src/commands.cc:1496 src/commands.cc:1595 +#: src/commands.cc:1885 src/commands.cc:2081 src/commands.cc:2254 +#: src/commands.cc:2261 src/commands.cc:2443 src/commands.cc:2470 +#: src/commands.cc:2477 src/commands.cc:2801 src/commands.cc:3082 #: src/SleepJob.cc:139 #, c-format msgid "Try `help %s' for more information.\n" msgstr "»help %s« gibt mehr Informationen aus.\n" -#: src/MirrorJob.cc:1383 src/MirrorJob.cc:1399 src/commands.cc:841 -#: src/commands.cc:1970 src/DummyProto.cc:73 +#: src/MirrorJob.cc:1383 src/MirrorJob.cc:1399 src/commands.cc:847 +#: src/commands.cc:1976 src/DummyProto.cc:73 msgid " - not supported protocol" msgstr " - Protokoll nicht unterstützt" @@ -327,7 +332,7 @@ msgid "Invalid time format. Format is