From nobody Sat Apr 20 08:27:51 2024 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VM4QH6Rznz5HJth; Sat, 20 Apr 2024 08:27:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VM4QH5Zqzz46Bc; Sat, 20 Apr 2024 08:27:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713601671; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SYU4gATl+ClA5rLrW7YPP0vkA7uhaEqfYW0xMJaSkDE=; b=ZgMcF+/Uq8V2/tBqaJs7Ls8fiPI7i8nyDcBCEFiLM0lPtEnQTKyZd+p6LKA1NE9GUQjH4/ xkc80jDxS7di48EU1+KHNTu4qXf4tUutNjUGA8WVTGUQT89hSnPJaTcj4vsunYfuJMt9Uu N/8CO+Twu0EJhRKbkZwQriyqivu4tY0J1FImoWYVYrguxLJXICWZW74RBxLViU36NPBB6X Tc9bl4CE/rU86UDxt7avdmWPRYh3AsbiUpWVnRPfEHwYyelWOUAxFA0PxrhEp9NIQIoNKH yk+Y5iBIv7a+8P3vWQNIR0im6F+s3nd8Jxq6EHSN9AhPVWqAcyO7H4hctYmOwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713601671; a=rsa-sha256; cv=none; b=NnRmTHYAQlf/Uz/18lrmr/Efnrm7z4sz5sQp7zq16Jqo8vmTIwH8mRJCQNmC60AA3ttBi6 88FdKBoENQnImiYfC/On1Hlq0/Pfz+bwlbQfzlSMyMrR8fRkpfnFPAmF8JqXY5MaJfQOtK uIwjQTIaT1pq0NH2c2BjGUgCNyfCE2NwDU2OBkRqDzHcH/WkvabPzzmhkJwYHAVbUYUF/T AHV/58JMTjBmDYYyQXFjIkyZP4UERSMgHecWya8pnPpbDnho0pWunyzET3MxApdD7U7vDC IJt4Bj9ip+KCZO+rseylrqprO8DEvf9OFpvTC7zLhex6NZqPIF2aDBJ57HUeKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713601671; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SYU4gATl+ClA5rLrW7YPP0vkA7uhaEqfYW0xMJaSkDE=; b=BtdLT16cNmXbMgIv/MKPu5QGZCFY3RhOvIzWfyb0mA3NBcmKlx9zisQFtnAf9r+5y+aR26 EeXQ+AdxSoPnAn5wMKw0SrIdnvY78Uo7VSmipeC/nDtk1E/qdGNR8tQ/Vr2zM1I0qrp6gI ZCPSWrQIf9uP6nr1fL4mVZcM7ST7y+6ZAvr2GbY9SOavel5988Hr8AAa3sL/E9mY+Mu3OA eSsorBzTYbpI1UH8GZSQ1cMyGa39l6kZqZpnY1oXGqNd1zLpx0yClF/I+TWX6u+Ibgw0uX CSkKNiHOeuZQ5SNLSjyZK5muQl46QsUNTcT5kYXV5AX8A8gXib+DwyPEDR2nRA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VM4QH5B5hzVPl; Sat, 20 Apr 2024 08:27:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43K8RpiI091391; Sat, 20 Apr 2024 08:27:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43K8Rpn1091388; Sat, 20 Apr 2024 08:27:51 GMT (envelope-from git) Date: Sat, 20 Apr 2024 08:27:51 GMT Message-Id: <202404200827.43K8Rpn1091388@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Kurt Jaeger Subject: git: 65c2ec36654f - 2024Q2 - ftp/filezilla: update 3.55.1 -> 3.67.0, includes security fix List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pi X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q2 X-Git-Reftype: branch X-Git-Commit: 65c2ec36654fb4095c74686e82f7d2a85a868622 Auto-Submitted: auto-generated The branch 2024Q2 has been updated by pi: URL: https://cgit.FreeBSD.org/ports/commit/?id=65c2ec36654fb4095c74686e82f7d2a85a868622 commit 65c2ec36654fb4095c74686e82f7d2a85a868622 Author: Matthias Andree AuthorDate: 2024-04-20 08:21:02 +0000 Commit: Kurt Jaeger 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 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 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