git: 65c2ec36654f - 2024Q2 - ftp/filezilla: update 3.55.1 -> 3.67.0, includes security fix

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Kurt Jaeger <pi_at_FreeBSD.org>
Date: Sat, 20 Apr 2024 08:27:51 UTC
The branch 2024Q2 has been updated by pi:

URL: https://cgit.FreeBSD.org/ports/commit/?id=65c2ec36654fb4095c74686e82f7d2a85a868622

commit 65c2ec36654fb4095c74686e82f7d2a85a868622
Author:     Matthias Andree <mandree@FreeBSD.org>
AuthorDate: 2024-04-20 08:21:02 +0000
Commit:     Kurt Jaeger <pi@FreeBSD.org>
CommitDate: 2024-04-20 08:27:34 +0000

    ftp/filezilla: update 3.55.1 -> 3.67.0, includes security fix
    
    - also update ftp/libfilezilla 0.31.1 -> 0.47.0
    
    PR:             278463
    Security:       CVE-2024-31497
    Author:         Matthias Andree <mandree@FreeBSD.org>
    Changes:        https://filezilla-project.org/versions.php
    MFH:            2024Q2
    (cherry picked from commit 8f0aec74837272d9888ce5fd220b0454b06f8a17)
---
 ftp/filezilla/Makefile     | 24 +++++++++++-------------
 ftp/filezilla/distinfo     |  6 +++---
 ftp/filezilla/pkg-plist    |  7 +++----
 ftp/libfilezilla/Makefile  |  7 ++++---
 ftp/libfilezilla/distinfo  |  6 +++---
 ftp/libfilezilla/pkg-plist | 21 ++++++++++++++++++---
 6 files changed, 42 insertions(+), 29 deletions(-)

diff --git a/ftp/filezilla/Makefile b/ftp/filezilla/Makefile
index 14257a4c1790..092919e93cc0 100644
--- a/ftp/filezilla/Makefile
+++ b/ftp/filezilla/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	filezilla
-PORTVERSION=	3.55.1
-PORTREVISION=	3
+PORTVERSION=	3.67.0
+PORTREVISION=	0
 CATEGORIES=	ftp
 MASTER_SITES=	https://download.filezilla-project.org/client/
 DISTNAME=	FileZilla_${PORTVERSION}_src
@@ -14,24 +14,26 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 LIB_DEPENDS=	libfilezilla.so:ftp/libfilezilla \
-		libfontconfig.so:x11-fonts/fontconfig \
-		libfreetype.so:print/freetype2 \
-		libgcrypt.so:security/libgcrypt \
-		libgnutls.so:security/gnutls \
+		libharfbuzz.so:print/harfbuzz \
 		libidn.so:dns/libidn \
 		libnettle.so:security/nettle \
 		libpugixml.so:textproc/pugixml
+
 RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
+TEST_DEPENDS=	cppunit-config:devel/cppunit
+TEST_TARGET=	check
+
 USES=		compiler:c++17-lang gmake gnome iconv:wchar_t libtool localbase \
-		pkgconfig sqlite tar:bzip2
-USE_GNOME=	cairo gtk30
+		pkgconfig sqlite tar:xz
+USE_GNOME=	cairo gtk30 gdkpixbuf2
 INSTALL_TARGET=	install-strip
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=--enable-fast-install
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-USE_WX=		3.0
+USE_WX=		3.2
 WX_CONF_ARGS=	relative
 
 OPTIONS_DEFINE=		DBUS NLS
@@ -49,8 +51,4 @@ NLS_CONFIGURE_OFF=	--disable-locales
 CONFIGURE_ARGS+=	--disable-manualupdatecheck
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -Ee 's|(dummy) wxrc|\1 ${WXRC_CMD:T}|' \
-		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-
 .include <bsd.port.mk>
diff --git a/ftp/filezilla/distinfo b/ftp/filezilla/distinfo
index fbb1e692c995..df2e87c95a85 100644
--- a/ftp/filezilla/distinfo
+++ b/ftp/filezilla/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1631620135
-SHA256 (FileZilla_3.55.1_src.tar.bz2) = 67f8d0e11f53fd23207d3cbfc942d03f3e23ee439ee48a14a2143c9950f776a5
-SIZE (FileZilla_3.55.1_src.tar.bz2) = 4910935
+TIMESTAMP = 1713539909
+SHA256 (FileZilla_3.67.0_src.tar.xz) = e5dadc807db999ceb464984f974d3ef59b562c59546658057e9b201183adaf9a
+SIZE (FileZilla_3.67.0_src.tar.xz) = 4058264
diff --git a/ftp/filezilla/pkg-plist b/ftp/filezilla/pkg-plist
index ecae7232a89e..8f4571784618 100644
--- a/ftp/filezilla/pkg-plist
+++ b/ftp/filezilla/pkg-plist
@@ -1,9 +1,9 @@
 bin/filezilla
 bin/fzputtygen
 bin/fzsftp
-lib/libfzclient-commonui-private-3.55.1.so
+lib/libfzclient-commonui-private-3.67.0.so
 lib/libfzclient-commonui-private.so
-lib/libfzclient-private-3.55.1.so
+lib/libfzclient-private-3.67.0.so
 lib/libfzclient-private.so
 share/man/man1/filezilla.1.gz
 share/man/man1/fzputtygen.1.gz
@@ -684,8 +684,6 @@ share/applications/filezilla.desktop
 %%DATADIR%%/resources/tango/48x48/upload.png
 %%DATADIR%%/resources/tango/48x48/uploadadd.png
 %%DATADIR%%/resources/tango/theme.xml
-%%DATADIR%%/resources/xrc/dialogs.xrc
-%%DATADIR%%/resources/xrc/netconfwizard.xrc
 share/icons/hicolor/16x16/apps/filezilla.png
 share/icons/hicolor/32x32/apps/filezilla.png
 share/icons/hicolor/480x480/apps/filezilla.png
@@ -703,6 +701,7 @@ share/icons/hicolor/scalable/apps/filezilla.svg
 %%NLS%%share/locale/da/LC_MESSAGES/filezilla.mo
 %%NLS%%share/locale/de/LC_MESSAGES/filezilla.mo
 %%NLS%%share/locale/el/LC_MESSAGES/filezilla.mo
+%%NLS%%share/locale/en/LC_MESSAGES/filezilla.mo
 %%NLS%%share/locale/es/LC_MESSAGES/filezilla.mo
 %%NLS%%share/locale/et/LC_MESSAGES/filezilla.mo
 %%NLS%%share/locale/eu/LC_MESSAGES/filezilla.mo
diff --git a/ftp/libfilezilla/Makefile b/ftp/libfilezilla/Makefile
index ebe8b5c192b5..87306506b97f 100644
--- a/ftp/libfilezilla/Makefile
+++ b/ftp/libfilezilla/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	libfilezilla
-PORTVERSION=	0.31.1
+PORTVERSION=	0.47.0
 CATEGORIES=	ftp
 MASTER_SITES=	https://download.filezilla-project.org/${PORTNAME}/
 
@@ -10,11 +10,12 @@ WWW=		https://lib.filezilla-project.org/
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libgnutls.so:security/gnutls \
+LIB_DEPENDS=	libgmp.so:math/gmp \
+		libgnutls.so:security/gnutls \
 		libnettle.so:security/nettle
 
 USES=		compiler:c++17-lang gettext gmake iconv:wchar_t libtool \
-		localbase pathfix pkgconfig tar:bzip2
+		localbase pathfix pkgconfig tar:xz
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
diff --git a/ftp/libfilezilla/distinfo b/ftp/libfilezilla/distinfo
index 3fa7c275f8c8..b142fd53f8af 100644
--- a/ftp/libfilezilla/distinfo
+++ b/ftp/libfilezilla/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1631623924
-SHA256 (libfilezilla-0.31.1.tar.bz2) = 997d5887b6015f3869d375b0cbc4b4942fcb24dbe4b4346885c946cfe733166f
-SIZE (libfilezilla-0.31.1.tar.bz2) = 585070
+TIMESTAMP = 1713540004
+SHA256 (libfilezilla-0.47.0.tar.xz) = 618a586b613bef710a633c42bfdda61666cbb0fc8a92ad490361d0bc91c58341
+SIZE (libfilezilla-0.47.0.tar.xz) = 551484
diff --git a/ftp/libfilezilla/pkg-plist b/ftp/libfilezilla/pkg-plist
index de1b9e0cde5d..0aba8a734d84 100644
--- a/ftp/libfilezilla/pkg-plist
+++ b/ftp/libfilezilla/pkg-plist
@@ -1,4 +1,10 @@
+include/libfilezilla/aio/aio.hpp
+include/libfilezilla/aio/reader.hpp
+include/libfilezilla/aio/writer.hpp
+include/libfilezilla/aio/xml_writer.hpp
 include/libfilezilla/apply.hpp
+include/libfilezilla/ascii_layer.hpp
+include/libfilezilla/basic_tls_params.hpp
 include/libfilezilla/buffer.hpp
 include/libfilezilla/encode.hpp
 include/libfilezilla/encryption.hpp
@@ -7,12 +13,19 @@ include/libfilezilla/event_handler.hpp
 include/libfilezilla/event_loop.hpp
 include/libfilezilla/file.hpp
 include/libfilezilla/format.hpp
+include/libfilezilla/forward_like.hpp
+include/libfilezilla/fsresult.hpp
 include/libfilezilla/glue/unix.hpp
-include/libfilezilla/glue/windows.hpp
 include/libfilezilla/glue/wx.hpp
 include/libfilezilla/glue/wxinvoker.hpp
 include/libfilezilla/hash.hpp
 include/libfilezilla/hostname_lookup.hpp
+include/libfilezilla/http/client.hpp
+include/libfilezilla/http/client_request.hpp
+include/libfilezilla/http/client_response.hpp
+include/libfilezilla/http/digest.hpp
+include/libfilezilla/http/headers.hpp
+include/libfilezilla/impersonation.hpp
 include/libfilezilla/invoker.hpp
 include/libfilezilla/iputils.hpp
 include/libfilezilla/json.hpp
@@ -39,16 +52,18 @@ include/libfilezilla/thread_pool.hpp
 include/libfilezilla/time.hpp
 include/libfilezilla/tls_info.hpp
 include/libfilezilla/tls_layer.hpp
+include/libfilezilla/tls_params.hpp
 include/libfilezilla/tls_system_trust_store.hpp
 include/libfilezilla/translate.hpp
 include/libfilezilla/uri.hpp
 include/libfilezilla/util.hpp
 include/libfilezilla/version.hpp
 include/libfilezilla/visibility_helper.hpp
+include/libfilezilla/xml.hpp
 lib/libfilezilla.a
 lib/libfilezilla.so
-lib/libfilezilla.so.16
-lib/libfilezilla.so.16.1.0
+lib/libfilezilla.so.43
+lib/libfilezilla.so.43.0.0
 libdata/pkgconfig/libfilezilla.pc
 share/locale/an/LC_MESSAGES/libfilezilla.mo
 share/locale/ar/LC_MESSAGES/libfilezilla.mo