On Sat 16/11/2019 17:31, Björn Ketelaars wrote:
> 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?
Slightly updated diff (no need for 'do-test'). 'make test' runs¬
successful with the update of cppunit [0].¬
¬
OK?¬
¬
[0] https://marc.info/?l=openbsd-ports&m=157445228006211&w=2]¬
diff --git Makefile Makefile
index e70aa79b564..9fe36d0a42a 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,12 +36,13 @@ 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 \
x11/wxWidgets>=3.0.4
+# XXX regression tests depend on cppunit>=1.13.0
BUILD_DEPENDS= devel/cppunit \
devel/gettext,-tools \
devel/xdg-utils
@@ -50,8 +50,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,12 +62,11 @@ 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/"
-do-test:
- @cd ${WRKBUILD}/tests && ${MAKE_PROGRAM} check-TESTS
-
.include <bsd.port.mk>
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
No comments:
Post a Comment