filezilla: update to 3.48.1.

3.48.1 (2020-05-18)

- If FileZilla is configured to restore open tabs on startup, the directory trees no longer shrink in size

3.48.1-rc1 (2020-05-12)


! MSW: The settings directory is now initially created with tight permissions restricted to the user's account. Previously the directory could have had inherited too wide permissions if a custom location outside the user's profile directory had been preconfigured.
+ Redesigned certificate dialog
+ During directory comparison and comparative search, Ctrl+Shift+A can now be used to select only the highlighted files
- Fixed import of settings
- Fixed local file editing if the option to track local file changes had been disabled
- Fixes to storing associations

3.48.0 (2020-04-27)

! Custom associations for file extensions containing spaces were not saved correctly

3.48.0-rc1 (2020-04-20)

+ Overhaul of file associations for editing files. The setting to inherit system associations has been removed. When first editing a type of file with no default editor set, a dialog is shown asking which editor to use. The system associatio, if it exists, is a choice in this dialog.
- SFTP: Re-added support for AES-GCM which was accidentally removed in 3.46.1
- Fixes for comparative search leaving the program in an inconsistent state when closing the dialog during an ongoing search
- Building and running FileZilla now depends on libfilezilla >= 0.20.0 (https://lib.filezilla-project.org/)

4 files changed, 12 insertions, 13 deletions

diff --git a/net/filezilla/Makefile b/net/filezilla/Makefile
index d866e396dfe..5e27750301c 100644
--- a/net/filezilla/Makefile
+++ b/net/filezilla/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.128 2020/06/02 08:24:30 adam Exp $
+# $NetBSD: Makefile,v 1.129 2020/06/10 15:22:32 wiz Exp $
 
-VERSION=	3.47.2.1
+VERSION=	3.48.1
 DISTNAME=	FileZilla_${VERSION}_src
 PKGNAME=	filezilla-${VERSION}
-PKGREVISION=	3
 CATEGORIES=	net x11
 MASTER_SITES=	https://download.filezilla-project.org/client/
 EXTRACT_SUFX=	.tar.bz2
@@ -37,7 +36,7 @@ CXXFLAGS+=	-march=i586
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/libidn/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libfilezilla+=	libfilezilla>=0.20.2
+BUILDLINK_API_DEPENDS.libfilezilla+=	libfilezilla>=0.22
 .include "../../net/libfilezilla/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gnutls+=	gnutls>=3.4.0
 .include "../../security/gnutls/buildlink3.mk"
diff --git a/net/filezilla/PLIST b/net/filezilla/PLIST
index 05ec5de3491..f04235c8d2b 100644
--- a/net/filezilla/PLIST
+++ b/net/filezilla/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2019/10/10 12:18:01 wiz Exp $
+@comment $NetBSD: PLIST,v 1.22 2020/06/10 15:22:32 wiz Exp $
 bin/filezilla
 bin/fzputtygen
 bin/fzsftp
@@ -681,7 +681,6 @@ share/filezilla/resources/tango/48x48/unknown.png
 share/filezilla/resources/tango/48x48/upload.png
 share/filezilla/resources/tango/48x48/uploadadd.png
 share/filezilla/resources/tango/theme.xml
-share/filezilla/resources/xrc/certificate.xrc
 share/filezilla/resources/xrc/dialogs.xrc
 share/filezilla/resources/xrc/netconfwizard.xrc
 share/filezilla/resources/xrc/settings.xrc
diff --git a/net/filezilla/distinfo b/net/filezilla/distinfo
index 0724b3d4c6a..093a815e15f 100644
--- a/net/filezilla/distinfo
+++ b/net/filezilla/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.57 2020/03/13 16:25:53 mef Exp $
+$NetBSD: distinfo,v 1.58 2020/06/10 15:22:32 wiz Exp $
 
-SHA1 (FileZilla_3.47.2.1_src.tar.bz2) = dff865aa90c12effef359a777bf0cdb5ac5fbb2d
-RMD160 (FileZilla_3.47.2.1_src.tar.bz2) = 7d6d947a323f21f769e57d8b1a47f382b310154b
-SHA512 (FileZilla_3.47.2.1_src.tar.bz2) = 8919eab7762e0e30241637a8978fbf61f02ac4c52aac293191315b931d52b41ae228b753f4e3b7530835578836dfee7f91772841273e9fc2bdf75ff7ed48fafc
-Size (FileZilla_3.47.2.1_src.tar.bz2) = 4733941 bytes
-SHA1 (patch-configure) = 8bf5736d17ed78fe0a1d4f910194bba9f03c854e
+SHA1 (FileZilla_3.48.1_src.tar.bz2) = 746ac692f3c454045a4933a68081b7af7e678c83
+RMD160 (FileZilla_3.48.1_src.tar.bz2) = 7d52dc1c1550f04b129240dd09c6a605b7ff14b4
+SHA512 (FileZilla_3.48.1_src.tar.bz2) = 58792f92bb4f6102166924abaf843c023faeca7f2979aaa47c26f2bb3f8449902b4a43c50a800d56584d39c9ddf64a6d3334558e46f56bda3b8515c7a3ff0a12
+Size (FileZilla_3.48.1_src.tar.bz2) = 4774251 bytes
+SHA1 (patch-configure) = 2d6520abe8ec4fe33b790d29c07bcc8d53379dac
diff --git a/net/filezilla/patches/patch-configure b/net/filezilla/patches/patch-configure
index 8a5ec4bde53..7328cf82c4a 100644
--- a/net/filezilla/patches/patch-configure
+++ b/net/filezilla/patches/patch-configure
@@ -1,6 +1,7 @@
-$NetBSD: patch-configure,v 1.2 2017/05/29 12:51:52 wiz Exp $
+$NetBSD: patch-configure,v 1.3 2020/06/10 15:22:32 wiz Exp $
 
 Fix unportable test(1) operator.
+https://trac.filezilla-project.org/ticket/12201
 
 --- configure.orig	2017-04-30 11:12:36.000000000 +0000
 +++ configure