Diff below brings filezilla to 3.45.1. Changelog can be found at https://svn.filezilla-project.org/filezilla/FileZilla3/trunk/NEWS?revision=9474&view=markup&pathrev=9474.
Security related bugfix or otherwise critical bugfix: - Filenames containing double-quotation marks were not escaped correctly when selected for opening/editing. Depending on the associated program, parts of the filename could be interpreted as commands. Note that this update depends on a newer version of libfilezilla than the one we have in ports. An update of the latter has been sent to ports@. 'make test' fails as cppunit>=1.13.0 is required, which we do not have. Run tested on amd64. It would be nice if this update would be tested on hppa and/or alpha... Comments/OK? diff --git Makefile Makefile index e70aa79b564..b12d56340da 100644 --- Makefile +++ Makefile @@ -4,11 +4,10 @@ COMMENT= fast FTP and SFTP GUI client with a lot of features BROKEN-hppa= serverpath.h:17:19: error: variable 'CServerPath final' has initializer but incomplete type BROKEN-alpha= serverpath.h:17:19: error: variable 'CServerPath final' has initializer but incomplete type -V= 3.41.2 +V= 3.45.1 PKGNAME= filezilla-$V DISTNAME= FileZilla_$V_src EXTRACT_SUFX= .tar.bz2 -REVISION= 1 CATEGORIES= net @@ -19,8 +18,8 @@ HOMEPAGE= https://www.filezilla-project.org/ PERMIT_PACKAGE= Yes WANTLIB += ${COMPILER_LIBCXX} ICE SDL2 SM X11 Xcomposite Xcursor -WANTLIB += Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm -WANTLIB += atk-1.0 atk-bridge-2.0 atspi c cairo cairo-gobject +WANTLIB += Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender Xss +WANTLIB += Xxf86vm atk-1.0 atk-bridge-2.0 c cairo cairo-gobject WANTLIB += dbus-1 epoxy expat ffi filezilla fontconfig freetype WANTLIB += fribidi gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 WANTLIB += gmp gnutls gobject-2.0 graphite2 gthread-2.0 gtk-3 @@ -37,7 +36,7 @@ COMPILER = base-clang ports-gcc LIB_DEPENDS= databases/sqlite3 \ devel/harfbuzz \ devel/libidn \ - net/libfilezilla \ + net/libfilezilla>=0.18.2 \ security/gnutls \ textproc/pugixml \ x11/dbus \ @@ -50,8 +49,10 @@ RUN_DEPENDS= devel/desktop-file-utils \ devel/xdg-utils \ x11/gtk+3,-guic -SEPARATE_BUILD= Yes -CONFIGURE_STYLE=gnu +SEPARATE_BUILD= Yes +USE_GMAKE= Yes + +CONFIGURE_STYLE=autoreconf CONFIGURE_ARGS+=--with-dbus \ --with-tinyxml=builtin \ --disable-manualupdatecheck @@ -60,11 +61,14 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GREP=/usr/bin/grep \ SED=/usr/bin/sed -USE_GMAKE= Yes +AUTOCONF_VERSION = 2.69 +AUTOMAKE_VERSION = 1.15 + WRKDIST= ${WRKDIR}/filezilla-$V FAKE_FLAGS+= docsdir="${PREFIX}/share/examples/filezilla/" +#XXX tests fail as cppunit>=1.13.0 is required. do-test: @cd ${WRKBUILD}/tests && ${MAKE_PROGRAM} check-TESTS diff --git distinfo distinfo index 6fead29135a..1364b21e5c8 100644 --- distinfo +++ distinfo @@ -1,2 +1,2 @@ -SHA256 (FileZilla_3.41.2_src.tar.bz2) = wjviSDHxFXSLT9LBJoQPAxjltNpc09obA9qu+fff8Bc= -SIZE (FileZilla_3.41.2_src.tar.bz2) = 4994803 +SHA256 (FileZilla_3.45.1_src.tar.bz2) = iJwIpyR/BVB8pL129OLNDgUE3rGBXHoqKNjPvaqdHsI= +SIZE (FileZilla_3.45.1_src.tar.bz2) = 4649083 diff --git patches/patch-configure_ac patches/patch-configure_ac new file mode 100644 index 00000000000..8d614f732fb --- /dev/null +++ patches/patch-configure_ac @@ -0,0 +1,15 @@ +$OpenBSD$ + +Index: configure.ac +--- configure.ac.orig ++++ configure.ac +@@ -37,9 +37,7 @@ if ! test "$localesonly" = "yes"; then + + if test "X$GCC" = Xyes; then + AX_APPEND_FLAG(-Wall, CFLAGS) +- AX_APPEND_FLAG(-g, CFLAGS) + AX_APPEND_FLAG(-Wall, CXXFLAGS) +- AX_APPEND_FLAG(-g, CXXFLAGS) + fi + + # Do this early: Compiler and linker flags to work around a nasty bug in Xcode. diff --git patches/patch-src_interface_file_utils_cpp patches/patch-src_interface_file_utils_cpp index c81a1f243d3..cbe6e7b91eb 100644 --- patches/patch-src_interface_file_utils_cpp +++ patches/patch-src_interface_file_utils_cpp @@ -3,8 +3,8 @@ Index: src/interface/file_utils.cpp --- src/interface/file_utils.cpp.orig +++ src/interface/file_utils.cpp @@ -7,8 +7,8 @@ - #include <wx/dynlib.h> // Used by GetDownloadDir #include <knownfolders.h> + #include <shlobj.h> #else +#include <glob.h> #include <wx/textfile.h> @@ -12,7 +12,7 @@ Index: src/interface/file_utils.cpp #endif std::wstring GetAsURL(std::wstring const& dir) -@@ -359,12 +359,12 @@ wxString ShellUnescape(wxString const& path) +@@ -370,12 +370,12 @@ wxString ShellUnescape(wxString const& path) const wxWX2MBbuf buf = path.mb_str(); if (buf && *buf) { diff --git pkg/PLIST pkg/PLIST index dfcb94c2806..8a822e1c5d7 100644 --- pkg/PLIST +++ pkg/PLIST @@ -728,12 +728,9 @@ share/filezilla/resources/tango/theme.xml share/filezilla/resources/xrc/ share/filezilla/resources/xrc/certificate.xrc share/filezilla/resources/xrc/dialogs.xrc -share/filezilla/resources/xrc/inputdialog.xrc share/filezilla/resources/xrc/netconfwizard.xrc share/filezilla/resources/xrc/settings.xrc -share/filezilla/resources/xrc/sitemanager.xrc share/filezilla/resources/xrc/storj.xrc -share/filezilla/resources/xrc/update.xrc share/icons/hicolor/16x16/apps/filezilla.png share/icons/hicolor/32x32/apps/filezilla.png share/icons/hicolor/480x480/ @@ -744,18 +741,10 @@ share/icons/hicolor/scalable/apps/filezilla.svg share/locale/an/LC_MESSAGES/filezilla.mo share/locale/ar/LC_MESSAGES/filezilla.mo share/locale/az/LC_MESSAGES/filezilla.mo -share/locale/bg_BG/ -share/locale/bg_BG/LC_MESSAGES/ share/locale/bg_BG/LC_MESSAGES/filezilla.mo share/locale/ca/LC_MESSAGES/filezilla.mo -share/locale/ca_ES@valencia/ -share/locale/ca_ES@valencia/LC_MESSAGES/ share/locale/ca_ES@valencia/LC_MESSAGES/filezilla.mo -share/locale/co/ -share/locale/co/LC_MESSAGES/ share/locale/co/LC_MESSAGES/filezilla.mo -share/locale/cs_CZ/ -share/locale/cs_CZ/LC_MESSAGES/ share/locale/cs_CZ/LC_MESSAGES/filezilla.mo share/locale/cy/LC_MESSAGES/filezilla.mo share/locale/da/LC_MESSAGES/filezilla.mo @@ -764,93 +753,48 @@ share/locale/el/LC_MESSAGES/filezilla.mo share/locale/es/LC_MESSAGES/filezilla.mo share/locale/et/LC_MESSAGES/filezilla.mo share/locale/eu/LC_MESSAGES/filezilla.mo -share/locale/fa_IR/ -share/locale/fa_IR/LC_MESSAGES/ share/locale/fa_IR/LC_MESSAGES/filezilla.mo -share/locale/fi_FI/ -share/locale/fi_FI/LC_MESSAGES/ share/locale/fi_FI/LC_MESSAGES/filezilla.mo share/locale/fr/LC_MESSAGES/filezilla.mo -share/locale/gl_ES/ -share/locale/gl_ES/LC_MESSAGES/ share/locale/gl_ES/LC_MESSAGES/filezilla.mo -share/locale/he_IL/ -share/locale/he_IL/LC_MESSAGES/ share/locale/he_IL/LC_MESSAGES/filezilla.mo share/locale/hr/LC_MESSAGES/filezilla.mo -share/locale/hu_HU/ -share/locale/hu_HU/LC_MESSAGES/ share/locale/hu_HU/LC_MESSAGES/filezilla.mo share/locale/hy/LC_MESSAGES/filezilla.mo -share/locale/id_ID/ -share/locale/id_ID/LC_MESSAGES/ share/locale/id_ID/LC_MESSAGES/filezilla.mo share/locale/is/LC_MESSAGES/filezilla.mo share/locale/it/LC_MESSAGES/filezilla.mo -share/locale/ja_JP/ -share/locale/ja_JP/LC_MESSAGES/ share/locale/ja_JP/LC_MESSAGES/filezilla.mo share/locale/ka/LC_MESSAGES/filezilla.mo -share/locale/kab/ -share/locale/kab/LC_MESSAGES/ share/locale/kab/LC_MESSAGES/filezilla.mo share/locale/km_KH/ share/locale/km_KH/LC_MESSAGES/ share/locale/km_KH/LC_MESSAGES/filezilla.mo -share/locale/ko_KR/ -share/locale/ko_KR/LC_MESSAGES/ share/locale/ko_KR/LC_MESSAGES/filezilla.mo share/locale/ku/LC_MESSAGES/filezilla.mo share/locale/ky/LC_MESSAGES/filezilla.mo -share/locale/lo_LA/ -share/locale/lo_LA/LC_MESSAGES/ share/locale/lo_LA/LC_MESSAGES/filezilla.mo -share/locale/lt_LT/ -share/locale/lt_LT/LC_MESSAGES/ share/locale/lt_LT/LC_MESSAGES/filezilla.mo -share/locale/lv_LV/ -share/locale/lv_LV/LC_MESSAGES/ share/locale/lv_LV/LC_MESSAGES/filezilla.mo -share/locale/mk_MK/ -share/locale/mk_MK/LC_MESSAGES/ share/locale/mk_MK/LC_MESSAGES/filezilla.mo -share/locale/nb_NO/ -share/locale/nb_NO/LC_MESSAGES/ share/locale/nb_NO/LC_MESSAGES/filezilla.mo share/locale/ne/LC_MESSAGES/filezilla.mo share/locale/nl/LC_MESSAGES/filezilla.mo -share/locale/nn_NO/ -share/locale/nn_NO/LC_MESSAGES/ share/locale/nn_NO/LC_MESSAGES/filezilla.mo share/locale/oc/LC_MESSAGES/filezilla.mo -share/locale/pl_PL/ -share/locale/pl_PL/LC_MESSAGES/ share/locale/pl_PL/LC_MESSAGES/filezilla.mo share/locale/pt_BR/LC_MESSAGES/filezilla.mo -share/locale/pt_PT/ -share/locale/pt_PT/LC_MESSAGES/ share/locale/pt_PT/LC_MESSAGES/filezilla.mo -share/locale/ro_RO/ -share/locale/ro_RO/LC_MESSAGES/ share/locale/ro_RO/LC_MESSAGES/filezilla.mo share/locale/ru/LC_MESSAGES/filezilla.mo -share/locale/sk_SK/ -share/locale/sk_SK/LC_MESSAGES/ share/locale/sk_SK/LC_MESSAGES/filezilla.mo -share/locale/sl_SI/ -share/locale/sl_SI/LC_MESSAGES/ share/locale/sl_SI/LC_MESSAGES/filezilla.mo share/locale/sr/LC_MESSAGES/filezilla.mo share/locale/sv/LC_MESSAGES/filezilla.mo -share/locale/th_TH/ -share/locale/th_TH/LC_MESSAGES/ +share/locale/ta/LC_MESSAGES/filezilla.mo share/locale/th_TH/LC_MESSAGES/filezilla.mo share/locale/tr/LC_MESSAGES/filezilla.mo -share/locale/uk_UA/ -share/locale/uk_UA/LC_MESSAGES/ share/locale/uk_UA/LC_MESSAGES/filezilla.mo -share/locale/vi_VN/ -share/locale/vi_VN/LC_MESSAGES/ share/locale/vi_VN/LC_MESSAGES/filezilla.mo share/locale/zh_CN/LC_MESSAGES/filezilla.mo share/locale/zh_TW/LC_MESSAGES/filezilla.mo
