Updated filezilla to 3.17.0.

3.17.0 (2016-04-21)

- *nix: Removed a label on the filter dialog that doesn't apply to *nix builds
- Fix compilation if Nettle is installed in a custom location
- Fix potential issues with destruction order when closing FileZilla

3.17.0-rc1 (2016-04-15)

+ Recursivly queuing local files for upload now displays the progress below the local file list
+ MSW: Use dynamic TCP send buffer sizes to improve upload speeds on high-latency connections
+ SFTP: Use hardware-accelerated AES on x86_64 CPUs if available by using the AES implementation from Nettle instead of PuTTY
+ Building FileZilla now depends on the Nettle library, version 3.1 or later
+ Building FileZilla now depends on libfilezilla >= 0.5.0 (https://lib.filezilla-project.org/).
- MSW: The installer now warns if it detects old versions of FileZilla outside of the installation directory
- Improve compatibility with directory listings where midnight is represented as 24:00:00 of the prior day
- SFTP: Failed downloads due to write failures, e.g. due to a full disk, no longer show up as successful
- SFTP: Fix transfer failures if multiple transfers try to list the same directory
- SFTP: Updated PuTTY components
- FTP over TLS: Debug logs now contain additional information about the TLS handshake


3.16.1 (2016-03-16)

! MSW: Updated installer to NSIS 3.0b3 to prevent DLL hijacking
- MSW: Fix string conversion functions of MinGW runtime libraries
- Updated PuTTY components
- Updated translations
- Official binaries now link against GnuTLS 3.4.10
- Official binaries now link against SQLite 3.11.1

3.16.0 (2016-02-29)

- Small fix for remembering queue completion actions

3.16.0-rc1 (2016-02-21)

+ Make notification bubble on queue completion configurable though the queue's context menu
+ Selected queue completion action is now remembered, excluding the system shutdown/sleep actions.
+ Added new servertype to the Site Manager for servers using MS-DOS style paths with forward slashes as separators
+ Building FileZilla now depends on libfilezilla >= 0.4.0 (https://lib.filezilla-project.org/).
- Fixes for network configuration wizard leading to incorrect test result
- MSW: Installer now removes leftover files from improperly uninstalled previous versions

3.15.0.2 (2016-02-10)

- MSW: Binaries are now also signed using a SHA256 signature and certificate.
- OS X: Move location of COPYING file containing the GPL to a different location in the bundle. On some systems OS X cannot verify the bundle with the file at the old location
- Restore focused item if changing directory listing sort order
- Fix restoring the column widths of the failed transfers tab in the queue when starting FileZilla
- MSW: Double-clicking a divider between a list header in the queue now adjust the sizes in the other tabs just as dragging the width would

3.15.0.1 (2016-02-02)

- Fix for search dialog not displaying the results from the last visited directory of a search

3.15.0 (2016-01-30)

+ MSW: Display notification bubble if FileZilla isn't in the forgeground and all active transfers have finished.

3.15.0-rc1 (2016-01-23)

- Fix regression from 3.16.0-beta1 where extra data being appended to some downloaded files
- Fix setting initial pane sizes when creating new tabs
- OS X: Fix display of issuer and subject details in certificate verification dialog
- Updated SFTP components from PuTTY
- Official binaries now link against GnuTLS 3.4.8
- Official binaries now link against SQLite 3.10.2

3.15.0-beta1 (2016-01-13)

+ Building FileZilla now depends on libfilezilla 0.3.0 (https://lib.filezilla-project.org/).
+ Added support for downloading and deleting multiple unrelated directories from the search dialog
+ *nix: Vastly speed up line-ending conversion when downloading files using the ASCII data type
+ Improved compatibility with broken servers omitting the mandatory 1yz reply to transfer commands
- Fix handling of SFTP keyfiles with non-ASCII characters in their paths
- Add missing directory comparison checkbox to new bookmark dialog
- MSW: Installer now sets appid on desktop icon
- Updated built-in pugixml

3.14.1 (2015-10-16)

+ For third-party builds, add configure flag to allow using system ciphers for FTP over TLS. Display a warning if an insecure cipher is negotiated as result of using system ciphers.
- Fixed loading of the directory comparison flag for bookmakrs in the Site Manager
- Changing the interface layout and icon theme no longer results in an inconsistent UI state
- Some SFTP servers send additional information on errors. This information is now shown in the message log
- If the local file cannot be opened on SFTP transfers FileZilla no longer automatically retries
- Updated SFTP components from PuTTY

3.14.0 (2015-09-16)

- When connecting using SFTP, show an error message instead of silently failing when encountering an insecure cipher

3.14.0-rc2 (2015-09-09)

- Removing selected queue items is now faster
- Reduced memory usage of queue
- When connecting to hostnames with multiple IPs, reset timeout if trying the next address

3.14.0-rc1 (2015-09-04)

+ Add support for password-protected SSH private keys
+ SSH private keys not in PuTTY's native format no longer need to be converted if they aren't password-protected
+ When using synchronized browsing, changing to a directory that does not exist on both sides now asks whether the missing directory should be created
- SSH1 support for SFTP has been disabled

3.13.1 (2015-08-24)

- Fix SFTP component crashing on some combinations of encryption and key exchange algorithm
- Fixed Ctrl+Shift+I shortcut to toggle filters
- OS X: Fixed Ctrl+, shortcut to open settings dialog
- Optimizations to reduce memory footprint
- Build system fixes

3.13.0 (2015-08-15)

+ Display home directory instead of root directory if the last used directory does not exist
+ Larger initial size of main window if there is no stored size
+ Slightly increased size of page selection box in settings dialog
- Fix assertion in directory listing parser
- Fix drag&drop of remote files which broke in 3.13.0-rc1

3.13.0-rc2 (2015-08-10)

- Updated SFTP components from PuTTY
- Official binaries now link against GnuTLS 3.4.4
- Official binaries now link against SQLite 3.8.11.1

3.13.0-rc1 (2015-08-05)

+ For SFTP servers the private key file to use can now be specified in the Site Manager
+ The contents of each queue tab can now be exported through the context menu
+ MSW: The installer now registers the App Path so that FileZilla is recognized in the Win+R dialog
+ FileZilla now uses pugixml instead of TinyXML to parse and create XML files
+ Several performance improvements
+ Code cleanup and modernization, building FileZilla now requires a C++14 compiler
- Fixed an assert loading sitemanager.xml created by an old version
- If password saving is disabled, specifying a password on the command-line no longer leads to extraneous password prompts when transferring files
- If deleting remote directories via the directory tree, navigate out of the directory tree that is to be deleted

3.12.0.2 (2015-07-09)

- Fix regression on servers that have MLSD facts disabled by default

3.12.0.1 (2015-07-09)

- Fix detection of UTF-8 support
- Fix location of file list status bar, it was shifted by one pixel

5 files changed, 13 insertions, 51 deletions

diff --git a/net/filezilla/Makefile b/net/filezilla/Makefile
index 12c6c07dd21..b3fe0c593ce 100644
--- a/net/filezilla/Makefile
+++ b/net/filezilla/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.66 2016/04/11 19:01:59 ryoon Exp $
+# $NetBSD: Makefile,v 1.67 2016/04/29 12:03:31 wiz Exp $
 
-VERSION=	3.12.0
+VERSION=	3.17.0
 DISTNAME=	FileZilla_${VERSION}_src
 PKGNAME=	filezilla-${VERSION}
-PKGREVISION=	3
 CATEGORIES=	net x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=filezilla/}
 EXTRACT_SUFX=	.tar.bz2
@@ -22,17 +21,18 @@ CONFIGURE_ARGS+=	--disable-autoupdatecheck
 # avoid xdg-utils dependency
 CONFIGURE_ENV+=		ac_cv_path_xdgopen=firefox
 
-# GCC 4.7 is required to support C++11.
-GCC_REQD+=		4.7
+# GCC 4.9 is required to support C++14.
+GCC_REQD+=		4.9
 
 .include "options.mk"
 
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/libidn/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../net/libfilezilla/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 BUILDLINK_API_DEPENDS.tinyxml+=	tinyxml>=2.6.2nb1
-.include "../../textproc/tinyxml/buildlink3.mk"
+.include "../../textproc/pugixml/buildlink3.mk"
 .include "../../x11/wxGTK30/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/filezilla/PLIST b/net/filezilla/PLIST
index 3b7c7c0a7a1..e5e72505b52 100644
--- a/net/filezilla/PLIST
+++ b/net/filezilla/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2015/07/08 16:46:43 richard Exp $
+@comment $NetBSD: PLIST,v 1.15 2016/04/29 12:03:31 wiz Exp $
 bin/filezilla
 bin/fzputtygen
 bin/fzsftp
@@ -663,7 +663,7 @@ share/locale/ca_ES@valencia/LC_MESSAGES/filezilla.mo
 share/locale/co/LC_MESSAGES/filezilla.mo
 share/locale/cs_CZ/LC_MESSAGES/filezilla.mo
 share/locale/cy/LC_MESSAGES/filezilla.mo
-share/locale/da_DK/LC_MESSAGES/filezilla.mo
+share/locale/da/LC_MESSAGES/filezilla.mo
 share/locale/de/LC_MESSAGES/filezilla.mo
 share/locale/el/LC_MESSAGES/filezilla.mo
 share/locale/es/LC_MESSAGES/filezilla.mo
diff --git a/net/filezilla/distinfo b/net/filezilla/distinfo
index 050f751d760..bbc71ca75b9 100644
--- a/net/filezilla/distinfo
+++ b/net/filezilla/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.26 2015/11/04 00:35:00 agc Exp $
+$NetBSD: distinfo,v 1.27 2016/04/29 12:03:31 wiz Exp $
 
-SHA1 (FileZilla_3.12.0_src.tar.bz2) = a0d3be9c19e15a14473f3103063dbf7eb1b8ed77
-RMD160 (FileZilla_3.12.0_src.tar.bz2) = dd6f80326b1d2d77d9e25e5bb64647576d3ba9a6
-SHA512 (FileZilla_3.12.0_src.tar.bz2) = 2f137ded716901673249aea8f2603322dd5210289743db20a10d2e6dd3c1dce87357c9589cf2855cb280963f481ca4b1b715e6892abb7da20e9cc70d9a558167
-Size (FileZilla_3.12.0_src.tar.bz2) = 4438133 bytes
-SHA1 (patch-src_engine_ControlSocket.cpp) = efb71dde8ad35c8a7424ac6f0383c79950f6e495
-SHA1 (patch-src_engine_socket.cpp) = 5abbd66d0cb93fc2cf3293bcd91e413934bffe74
+SHA1 (FileZilla_3.17.0_src.tar.bz2) = a0dad3c91a8e6b6edac7ee3599794cdcdf9a3cf8
+RMD160 (FileZilla_3.17.0_src.tar.bz2) = 7a9eaa0837d1defa8e1df3f861f57008d3ba43d0
+SHA512 (FileZilla_3.17.0_src.tar.bz2) = 05f0f1bc2a457cdbe19ecb3b56a12ea709214571fdb24d5d428ca0b21cecfd038826da608393f7383ba6f47c82ca0c3a9826f359295cb7229ffe1532c1b6e7bd
+Size (FileZilla_3.17.0_src.tar.bz2) = 4399584 bytes
 SHA1 (patch-src_putty_unix_uxshare.c) = 0c3102c10b742c461fe032f081d1a642c6fd6a59
diff --git a/net/filezilla/patches/patch-src_engine_ControlSocket.cpp b/net/filezilla/patches/patch-src_engine_ControlSocket.cpp
deleted file mode 100644
index 517802394db..00000000000
--- a/net/filezilla/patches/patch-src_engine_ControlSocket.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_engine_ControlSocket.cpp,v 1.1 2015/07/08 16:46:43 richard Exp $
-upstream workaround for clash with 'struct mutex' on SunOS
-
---- src/engine/ControlSocket.cpp.orig	2015-03-28 04:30:03.000000000 +0000
-+++ src/engine/ControlSocket.cpp
-@@ -14,7 +14,9 @@
- #include <wx/filename.h>
- 
- #ifndef __WXMSW__
-+	#define mutex mutex_override // Sadly on some platforms system headers include conflicting names
- 	#include <netdb.h>
-+	#undef mutex
- 	#ifndef AI_IDN
- 		#include <idna.h>
- 		extern "C" {
diff --git a/net/filezilla/patches/patch-src_engine_socket.cpp b/net/filezilla/patches/patch-src_engine_socket.cpp
deleted file mode 100644
index c34e227b4e5..00000000000
--- a/net/filezilla/patches/patch-src_engine_socket.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-src_engine_socket.cpp,v 1.1 2015/07/08 16:46:43 richard Exp $
-upstream workaround for clash with 'struct mutex' on SunOS
-
---- src/engine/socket.cpp.orig	2015-03-20 04:30:04.000000000 +0000
-+++ src/engine/socket.cpp
-@@ -19,6 +19,7 @@
- #include "mutex.h"
- #include "socket.h"
- #ifndef __WXMSW__
-+  #define mutex mutex_override // Sadly on some platforms system headers include conflicting names
-   #include <sys/types.h>
-   #include <sys/socket.h>
-   #include <netdb.h>
-@@ -29,6 +30,7 @@
-   #if !defined(MSG_NOSIGNAL) && !defined(SO_NOSIGPIPE)
-     #include <signal.h>
-   #endif
-+  #undef mutex
- #endif
- 
- // Fixups needed on FreeBSD