Update to 4.6.3a

* Update MASTER_SITES.

Changelog:
Version 4.6.3 - 2015-06-17

* new mirror setting mirror:overwrite and options --overwrite/--no-overwrite.
* new mirror option --upload-older.
* new mirror option --recursion={always,never,missing,newer}.
* try to download zero sized files as they may be non-empty.
* torrent: new options --only-new, --only-incomplete.
* torrent: fixed endless loop in FD deallocation.
* fixed a memleak when parsing a directory listing with special files.
* fixed one byte buffer overflow in cls.
* fixed cmd:fail-exit description in the man page.
* fixed large stack usage when parsing fish directory listings.

Version 4.6.2 - 2015-04-16

* new command "edit" instead of the edit alias.
* new setting ssl:priority for disabling selected protocols.
* new settings fish:auto-confirm and sftp:auto-confirm.
* new setting file:use-lock to lock local files before accessing.
* ftp: fixed disconnecting on timeout (broken in 4.6.0).
* http: enclose ipv6 address in brackets in URLs and Host header.
* fixed mirror for http protocol with redirections.
* fixed `bookmark edit' to use correct XDG path if XDG is used.
* fixed a wildcard certificate validation vulnerability (CVE-2014-0139).
* fixed proxy authentication for CONNECT method.
* fixed exit code of `help' command.
* fixed sftp to show file names with slashes.
* fixed pget status display when all chunks are done except the first one.
* Ukrainian translation updated (Yuri Chornoivan).
* Russian translation updated.

Version 4.6.1 - 2014-12-29

* new mirror option --scan-all-first.
* mirror --Remove-source-files now removes files already present at the target.
* added a workaround for FUSE with HadoopFS I/O error during rename(2).
* fixed du to round file size up to block size.
* fixed compilation with libressl.
* fixed OPTS MLST, removed trailing semicolon.
* fixed put to sftp with special files (like /dev/stdin).
* fixed ftp to copy SID properly with GnuTLS (Tim Kosse).
* fixed mirror to follow redirections to files (Tomas Hozza).

Version 4.6.0 - 2014-10-13

* new torrent --share option.
* new setting mirror:require-source.
* new settings xfer:use-temp-file and xfer:temp-file-name.
* ftp: wait for QUIT reply before closing control socket.

Version 4.5.6 - 2014-10-13

* display valid IDN in URLs without percent encoding.
* ftp: shutdown SSL connection before closing control socket.
* ftp: avoid duplication of PROT command.
* fixed debug -o to append to the log file.
* fixed compilation without SSL.
* http: don't uncompress files ending with .gz, .Z or .tgz
* http: fixed inflation of some files.
* minor fixes in torrent protocol.

Version 4.5.5 - 2014-09-04

* added support for internationalized domain names.
* added lftp --norc option.
* added mirror "Finished" message.
* added ftp:catch-size setting.
* fixed net:max-retries setting.
* fixed byte counters in mirror status.
* fixed a segfault in ftps.
* fixed a spurious error message in fxp and ftp.

Version 4.5.4 - 2014-08-07

* new setting mirror:sort-by (name, size, date).
* torrent: reduced cpu and memory usage.
* fixed occasional "BUG:deadlock" message.
* fixed a segfault when a directory contains duplicate file names.
* fixed a memory leak in torrent.
* fixed byte counters in mirror --depth-first.
* fixed timeout checks in FISH.
* translations updated (pl).

Version 4.5.3 - 2014-07-06

* new setting ftp:site.
* don't uncompress http body when Contrent-Type is compressed.
* check source address of DHT replies.
* discard disconnected torrent peers only after a timeout.

Version 4.5.2 - 2014-06-11

* fixed a coredump on startup when compiled with certain gcc versions.
* mkdir -q option for quiet operation.
* glob --exist and --not-exist options.
* improved torrent status, show piece availability statistics.
* remove unconnectable torrent peers on trackerless torrents.

Version 4.5.1 - 2014-06-02

* show piece availabilty in torrent status.
* fixed a coredump in ftp when data connection fails.
* fixed default values of some settings.
* fixed http redirection handling.
* fixed compilation with gcc-4.8.3.

Version 4.5.0 - 2014-05-23

* optimized cpu usage for 10Gb/s transfers by using better data structures
  and algorithms.
* new open option --env-password to take password from LFTP_PASSWORD
  environment variable.
* new `exit parent' subcommand.
* new settings http:accept-encoding, http:decode.
* new setting xfer:max-log-size to limit transfer log size.
* show last disconnect cause for a few seconds in the session status.
* improved mirror status to display real-time aggregated byte count and rate.
* save torrent matadata on disk and load if available when needed.
* improved torrent DHT search.
* fixed exit behavior to flush buffered commands.
* fixed transfer rate reporting for mirror --parallel.

Version 4.4.16 - 2014-05-07

* fixed mirror --loop to re-check base directory contents.
* fixed sftp and fish authentication by password with FreeBSD server.
* fixed directory index parsing for some http servers.
* fixed find command output to avoid extra slash for plain files.
* fixed several bugs which could cause segfault.

Version 4.4.15 - 2014-01-21

* new setting pget:min-chunk-size.
* improved DHT search by preferring responded nodes.
* allow UTC timezone in http timestamps.
* fixed WebDAV rmdir operation.
* fixed torrent hang on shutdown when a tracker is unresposive.
* fixed adding too many slashes to URLs in http.

Version 4.4.14 - 2013-12-13

* fixed HEAD/PROPFIND handling in http.
* a minor memory leak fixed.

Version 4.4.13 - 2013-11-26

* fixed a bug in file size checking code.

Version 4.4.12 - 2013-11-26

* new option -l (--ls) for find command.
* improve workaround for single NL replies from an FTP server.
* Ukrainian translation updated (Yuri Chornoivan).
* fixed spinning in "get" when no remote session is open.
* don't pre-fetch file information in "get" when not needed.
* fixed handling of 400/501 http codes for PROPFIND to switch to HEAD.
* fixed a crash after cls.
* added file size decrease checking.
* used a newer libtool for ppc64le platform.

Version 4.4.11 - 2013-11-11

* fixed a slow down in mirror from http (thanks to OGAWA Hirofumi).
* fixed a coredump in sftp when accessing an inexistent file.

Version 4.4.10 - 2013-10-11

* mirror new option --file/-f to mirror a single file.
* mirror new option -O for get/put similarity.
* WebDAV fixes and improvements.
* new setting ftp:use-utf8 to disable utf-8 activation.
* fixed handling of incorrect encoding of file names.
* fixed compilation without libiconv.
* fixed occasional hang in mirror.
* kill ssh when terminating fish or sftp connection.

Version 4.4.9 - 2013-08-23

* implemented support for mirror -L in sftp.
* pass all 3 std file descriptors when attaching to lftp instance.
* ftp: added a workaround for incorrectly formatted multiline replies.
* sftp: added a workaround for RouterOS v6.
* fixed mirror --no-empty-dirs to skip directories with no included files.
* fixed segfault when there is no TERM environment variable.
* fixed torrent for meta-info files with % in their names.
* fixed compilation when IPV6_V6ONLY if not defined.
* fixed compilation with older zlib.
* fixed FD_CLOEXEC flag on cwd and transfer_log.
* fixed MLSD parsing for semicolons in file names.
* new translation: Ukrainian (thanks to Yuri Chornoivan).
* man page updated.

Version 4.4.8 - 2013-05-29

* add support for redirections in torrent metainfo fetching.
* add support for gzip Content-Encoding in http.
* fixed an endless loop in mirror from sftp.

Version 4.4.7 - 2013-05-23

* translations update (pl, cs).
* fixed "get -c" looping in some cases.
* fixed translations encoding (pl, it, es, pt_BR).
* fixed occasional file corruption and garbage logging in Fish protocol.

6 files changed, 17 insertions, 51 deletions

diff --git a/net/lftp/Makefile b/net/lftp/Makefile
index 976431570b2..8c0c6230e9b 100644
--- a/net/lftp/Makefile
+++ b/net/lftp/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.110 2015/06/12 10:50:42 wiz Exp $
+# $NetBSD: Makefile,v 1.111 2015/07/25 03:29:57 ryoon Exp $
 
-DISTNAME=	lftp-4.4.6
-PKGREVISION=	5
+DISTNAME=	lftp-4.6.3a
 CATEGORIES=	net
-MASTER_SITES=	http://ftp.yar.ru/pub/source/lftp/ \
+MASTER_SITES=	http://lftp.yar.ru/ftp/ \
 		ftp://ftp.tuwien.ac.at/infosys/browsers/ftp/lftp/ \
 		ftp://ftp.cs.tu-berlin.de/pub/net/ftp/lftp/ \
 		ftp://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/ \
diff --git a/net/lftp/PLIST b/net/lftp/PLIST
index 4311d6327ab..48bba966297 100644
--- a/net/lftp/PLIST
+++ b/net/lftp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2013/05/18 20:23:03 adam Exp $
+@comment $NetBSD: PLIST,v 1.19 2015/07/25 03:29:57 ryoon Exp $
 bin/lftp
 bin/lftpget
 @comment belongs to libiconv: lib/charset.alias
@@ -33,6 +33,7 @@ share/locale/ko/LC_MESSAGES/lftp.mo
 share/locale/pl/LC_MESSAGES/lftp.mo
 share/locale/pt_BR/LC_MESSAGES/lftp.mo
 share/locale/ru/LC_MESSAGES/lftp.mo
+share/locale/uk/LC_MESSAGES/lftp.mo
 share/locale/zh_CN/LC_MESSAGES/lftp.mo
 share/locale/zh_HK/LC_MESSAGES/lftp.mo
 share/locale/zh_TW/LC_MESSAGES/lftp.mo
diff --git a/net/lftp/distinfo b/net/lftp/distinfo
index 2d3d1f231df..1afce5294c0 100644
--- a/net/lftp/distinfo
+++ b/net/lftp/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.62 2015/03/21 20:04:39 bsiegert Exp $
+$NetBSD: distinfo,v 1.63 2015/07/25 03:29:57 ryoon Exp $
 
-SHA1 (lftp-4.4.6.tar.xz) = 76a61015adec55c0d6d5eb013d4cf3f108fd96a0
-RMD160 (lftp-4.4.6.tar.xz) = 14ed0f6f5076750cb0661364a6e0a751d4512697
-Size (lftp-4.4.6.tar.xz) = 1429480 bytes
+SHA1 (lftp-4.6.3a.tar.xz) = 25c743dc45dd494a2eafa57f2418c0e351973e10
+RMD160 (lftp-4.6.3a.tar.xz) = c6598c914093669c84ddfeeb07341cd0d073102e
+Size (lftp-4.6.3a.tar.xz) = 1505164 bytes
 SHA1 (patch-aa) = 988f4f2f5b9469d3c645ffa984d5449a219229bb
 SHA1 (patch-ab) = cbf428fb51c64431eb32d25160303333ce695b5a
 SHA1 (patch-ac) = 8aa2ddc582bbc87cd0a5e8662f328dd2ac8dea90
 SHA1 (patch-ad) = daf9867bf3d42d82c6abe9200f3e8db8f91319e9
 SHA1 (patch-ae) = 4e2506bbadbda97feeabb208cd43c0dff70ed7d3
-SHA1 (patch-configure.ac) = 3264108e79adf637fa631dfe3787aa64c6f84743
-SHA1 (patch-lib_inttypes.in.h) = 36d4cabc7fd9beef8f93973370ef5125c38ca121
-SHA1 (patch-src_SSH__Access.cc) = 6f5f340f625bad1358b19dfdf5280ab4fef61586
+SHA1 (patch-configure.ac) = 36bec002fc0f97d0cb2cd2820fdb094c9694ab38
+SHA1 (patch-lib_inttypes.in.h) = 608380392b04f84db756fcd6bf8ef35d72cd35fd
+SHA1 (patch-src_SSH__Access.cc) = 77967fd8e64f6f1a58afef82b04fcf520c95d21f
 SHA1 (patch-src_module.cc) = 236fe2ce4ff215ddfe44fc86ed43ed00849280b8
diff --git a/net/lftp/patches/patch-configure.ac b/net/lftp/patches/patch-configure.ac
deleted file mode 100644
index 3ff18cba5ff..00000000000
--- a/net/lftp/patches/patch-configure.ac
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-configure.ac,v 1.1 2013/05/18 20:23:03 adam Exp $
-
-GNU lib tests must be run with C compiler.
-
---- configure.ac.orig	2013-05-18 20:01:23.000000000 +0000
-+++ configure.ac
-@@ -237,9 +237,9 @@ fi
- AM_PROG_LIBTOOL
- LIBTOOL="$LIBTOOL --silent"
- 
--AC_LANG_PUSH(C++)
-+AC_LANG_PUSH(C)
- gl_INIT
--AC_LANG_POP(C++)
-+AC_LANG_POP(C)
- 
- if test x$ac_cv_func_wcwidth != xyes || test x$REPLACE_WCWIDTH = x1; then
-    gl_LIBOBJ([wcwidth])
diff --git a/net/lftp/patches/patch-lib_inttypes.in.h b/net/lftp/patches/patch-lib_inttypes.in.h
index 6c16c07e465..73374259a22 100644
--- a/net/lftp/patches/patch-lib_inttypes.in.h
+++ b/net/lftp/patches/patch-lib_inttypes.in.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-lib_inttypes.in.h,v 1.1 2013/05/18 20:23:03 adam Exp $
+$NetBSD: patch-lib_inttypes.in.h,v 1.2 2015/07/25 03:29:57 ryoon Exp $
 
 Poratbility obstacle.
 
---- lib/inttypes.in.h.orig	2013-05-18 20:12:09.000000000 +0000
+--- lib/inttypes.in.h.orig	2015-05-27 08:37:01.000000000 +0000
 +++ lib/inttypes.in.h
-@@ -52,9 +52,6 @@
- /* Get CHAR_BIT.  */
- #include <limits.h>
+@@ -56,9 +56,6 @@
+ # include <stdio.h>
+ #endif
  
 -#if !(INT_MIN == INT32_MIN && INT_MAX == INT32_MAX)
 -# error "This file assumes that 'int' has exactly 32 bits. Please report your platform and compiler to <bug-gnulib@gnu.org>."
diff --git a/net/lftp/patches/patch-src_SSH__Access.cc b/net/lftp/patches/patch-src_SSH__Access.cc
deleted file mode 100644
index a77b155c926..00000000000
--- a/net/lftp/patches/patch-src_SSH__Access.cc
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_SSH__Access.cc,v 1.1 2015/03/21 20:04:39 bsiegert Exp $
-
-Do not save fingerprints of unknown hosts.
---- src/SSH_Access.cc.orig	2015-03-21 19:58:58.000000000 +0000
-+++ src/SSH_Access.cc
-@@ -69,8 +69,8 @@ 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");
-+	 pty_recv_buf->Put("no\n");
-+	 pty_send_buf->Put("no\n");
- 	 return m;
-       }
-       if(!received_greeting && recv_buf->Size()>0)