openbsd/ports
1
0
Fork 0
mirror of https://github.com/openbsd/ports.git synced 2026-06-17 23:13:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to filezilla-3.70.5

Browse Source 
Changes: https://filezilla-project.org/

Major bumps for libfzclient-private and fzclient-commonui-private
This commit is contained in:
bket
2026-05-28 17:17:58 +00:00
parent ce9caf3fdb
commit 2d409528ed
7 changed files with 28 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/filezilla/Makefile
+20 -19
View File
@@ -3,12 +3,12 @@ BROKEN-alpha= serverpath.h:17:19: error: variable 'CServerPath final' has initia
COMMENT= fast FTP and SFTP GUI client with a lot of features
V= 3.69.6
V= 3.70.5
PKGNAME= filezilla-$V
DISTNAME= FileZilla_$V_src
SHARED_LIBS+= fzclient-commonui-private 5.2
SHARED_LIBS+= fzclient-private 12.0
SHARED_LIBS+= fzclient-commonui-private 6.0
SHARED_LIBS+= fzclient-private 13.0
CATEGORIES= net
@@ -16,26 +16,26 @@ HOMEPAGE= https://www.filezilla-project.org/
MAINTAINER= Bjorn Ketelaars <bket@openbsd.org>
# GPLv2
# GPLv3+
PERMIT_PACKAGE= Yes
WANTLIB += ${COMPILER_LIBCXX} ICE Lerc SDL2 SM X11 Xau Xcomposite
WANTLIB += ${COMPILER_LIBCXX} ICE Lerc SDL2 SM X11 XRes Xau Xcomposite
WANTLIB += Xcursor Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr
WANTLIB += Xrender Xss Xtst Xxf86vm aspell atk-1.0 atk-bridge-2.0
WANTLIB += Xrender Xss Xtst Xxf86vm argon2 aspell atk-1.0 atk-bridge-2.0
WANTLIB += atspi c cairo cairo-gobject crypto curl dbus-1 enchant-2
WANTLIB += epoll-shim epoxy execinfo expat ffi filezilla fontconfig
WANTLIB += freetype fribidi gcrypt gdk-3 gdk_pixbuf-2.0 gio-2.0
WANTLIB += glib-2.0 gmodule-2.0 gmp gnutls gobject-2.0 gpg-error
WANTLIB += graphite2 gspell-1 gthread-2.0 gtk-3 harfbuzz hogweed
WANTLIB += iconv icudata icuuc idn idn2 intl jpeg lzma m mspack
WANTLIB += nettle nghttp2 nghttp3 ngtcp2 ngtcp2_crypto_libressl
WANTLIB += notify p11-kit pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pcre2-32 pcre2-8 pixman-1 png pugixml samplerate secret-1
WANTLIB += sndio sqlite3 ssl tasn1 tiff unistring usbhid wayland-client
WANTLIB += wayland-cursor wayland-egl wx_baseu-3.2 wx_baseu_xml-3.2
WANTLIB += wx_gtk3u_aui-3.2 wx_gtk3u_core-3.2 wx_gtk3u_html-3.2
WANTLIB += wx_gtk3u_xrc-3.2 xcb xcb-render xcb-shm xkbcommon z
WANTLIB += zstd
WANTLIB += freetype fribidi fzssh fzssh-client fzssh-crypt gcrypt
WANTLIB += gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gmp
WANTLIB += gnutls gobject-2.0 gpg-error graphite2 gspell-1 gthread-2.0
WANTLIB += gtk-3 harfbuzz hogweed iconv icudata icuuc idn idn2
WANTLIB += intl jpeg lzma m mspack nettle nghttp2 nghttp3 ngtcp2
WANTLIB += ngtcp2_crypto_libressl notify p11-kit pango-1.0 pangocairo-1.0
WANTLIB += pangoft2-1.0 pcre2-32 pcre2-8 pixman-1 png pugixml
WANTLIB += samplerate secret-1 sndio sqlite3 ssl tasn1 tiff unistring
WANTLIB += usbhid wayland-client wayland-cursor wayland-egl wx_baseu-3.2
WANTLIB += wx_baseu_xml-3.2 wx_gtk3u_aui-3.2 wx_gtk3u_core-3.2
WANTLIB += wx_gtk3u_html-3.2 wx_gtk3u_xrc-3.2 xcb xcb-render xcb-shm
WANTLIB += xkbcommon z zstd
# XXX it seems that it is no longer possible to link directly to the distfile
#SITES= https://download.filezilla-project.org/client/
@@ -48,7 +48,8 @@ COMPILER= base-clang ports-gcc
LIB_DEPENDS= databases/sqlite3 \
devel/harfbuzz \
devel/libidn \
net/libfilezilla>=0.54.1 \
net/fzssh>=1.2.1 \
net/libfilezilla>=0.55.5 \
security/gnutls \
textproc/pugixml \
x11/dbus \
net/filezilla/distinfo
+2 -2
View File
@@ -1,2 +1,2 @@
SHA256 (FileZilla_3.69.6_src.tar.xz) = aUl2oLgYjS9qpH8MVegTwva4VbQQCt3Mkn6v7Sdi4XQ=
SIZE (FileZilla_3.69.6_src.tar.xz) = 4166148
SHA256 (FileZilla_3.70.5_src.tar.xz) = d8FsJfsdlNUSlLAe/SDT5cwRmESFfktDmCrKa4mO5dY=
SIZE (FileZilla_3.70.5_src.tar.xz) = 3566656
net/filezilla/patches/patch-src_commonui_Makefile_am
+2 -2
View File
@@ -1,12 +1,12 @@
Index: src/commonui/Makefile.am
--- src/commonui/Makefile.am.orig
+++ src/commonui/Makefile.am
@@ -7,7 +7,7 @@ libfzclient_commonui_private_la_CPPFLAGS += $(LIBFILEZ
@@ -8,7 +8,7 @@ libfzclient_commonui_private_la_CPPFLAGS += $(LIBFZSSH
libfzclient_commonui_private_la_CPPFLAGS += -DBUILDING_FZ_COMMONUI
libfzclient_commonui_private_la_CXXFLAGS = -fvisibility=hidden
-libfzclient_commonui_private_la_LDFLAGS = -no-undefined -release $(PACKAGE_VERSION_MAJOR).$(PACKAGE_VERSION_MINOR).$(PACKAGE_VERSION_MICRO)
+libfzclient_commonui_private_la_LDFLAGS = -no-undefined
libfzclient_commonui_private_la_LDFLAGS += ../engine/libfzclient-private.la $(LIBFILEZILLA_LIBS) $(PUGIXML_LIBS)
libfzclient_commonui_private_la_LDFLAGS += ../engine/libfzclient-private.la $(LIBFILEZILLA_LIBS) $(PUGIXML_LIBS) $(LIBFZSSH_LIBS)
libfzclient_commonui_private_la_DEPENDENCIES = ../engine/libfzclient-private.la
net/filezilla/patches/patch-src_engine_Makefile_am
+2 -2
View File
@@ -1,12 +1,12 @@
Index: src/engine/Makefile.am
--- src/engine/Makefile.am.orig
+++ src/engine/Makefile.am
@@ -150,7 +150,7 @@ libfzclient_private_la_SOURCES += ../pugixml/pugixml.c
@@ -148,7 +148,7 @@ libfzclient_private_la_SOURCES += ../pugixml/pugixml.c
endif
libfzclient_private_la_CXXFLAGS = -fvisibility=hidden
-libfzclient_private_la_LDFLAGS = -no-undefined -release $(ENGINE_VERSION_MAJOR).$(ENGINE_VERSION_MINOR).$(ENGINE_VERSION_MICRO)
+libfzclient_private_la_LDFLAGS = -no-undefined
libfzclient_private_la_LDFLAGS += $(LIBFILEZILLA_LIBS)
libfzclient_private_la_LDFLAGS += $(LIBFZSSH_LIBS) $(LIBFILEZILLA_LIBS)
libfzclient_private_la_LDFLAGS += $(IDN_LIB)
net/filezilla/patches/patch-src_interface_Mainfrm_h
+2 -2
View File
@@ -1,8 +1,8 @@
Index: src/interface/Mainfrm.h
--- src/interface/Mainfrm.h.orig
+++ src/interface/Mainfrm.h
@@ -7,6 +7,7 @@
#include "serverdata.h"
@@ -6,6 +6,7 @@
#include "../include/notification.h"
#include <wx/timer.h>
+#include <list>
net/filezilla/patches/patch-src_putty_sshaes_c
-37
View File
@@ -1,37 +0,0 @@
Fix with nettle >=4
Index: src/putty/sshaes.c
--- src/putty/sshaes.c.orig
+++ src/putty/sshaes.c
@@ -11,6 +11,7 @@
#include <nettle/aes.h>
#include <nettle/gcm.h>
#include <nettle/memxor.h>
+#include <nettle/version.h>
/*
* Start by deciding whether we can support hardware AES at all.
@@ -313,7 +314,11 @@ static void aes128_gcm_mac_genresult(ssh2_mac *mac, un
{
struct AES128GCMContext *ctx = container_of(mac, struct AES128GCMContext, mac_if);
+#if NETTLE_VERSION_MAJOR > 3
+ nettle_gcm_aes128_digest(&ctx->ctx, blk);
+#else
nettle_gcm_aes128_digest(&ctx->ctx, 16, blk);
+#endif
increment_iv_step32(ctx->iv + 4, 2);
}
@@ -455,7 +460,11 @@ static void aes256_gcm_mac_genresult(ssh2_mac *mac, un
{
struct AES256GCMContext *ctx = container_of(mac, struct AES256GCMContext, mac_if);
+#if NETTLE_VERSION_MAJOR > 3
+ nettle_gcm_aes256_digest(&ctx->ctx, blk);
+#else
nettle_gcm_aes256_digest(&ctx->ctx, 16, blk);
+#endif
increment_iv_step32(ctx->iv + 4, 2);
}
net/filezilla/pkg/PLIST
-4
View File
@@ -1,6 +1,4 @@
@bin bin/filezilla
@bin bin/fzputtygen
@bin bin/fzsftp
@static-lib lib/libfzclient-commonui-private.a
lib/libfzclient-commonui-private.la
@lib lib/libfzclient-commonui-private.so.${LIBfzclient-commonui-private_VERSION}
@@ -8,8 +6,6 @@ lib/libfzclient-commonui-private.la
lib/libfzclient-private.la
@lib lib/libfzclient-private.so.${LIBfzclient-private_VERSION}
@man man/man1/filezilla.1
@man man/man1/fzputtygen.1
@man man/man1/fzsftp.1
@man man/man5/fzdefaults.xml.5
share/appdata/
share/appdata/filezilla.appdata.xml