diff --git a/dev-libs/libfilezilla/libfilezilla-0.49.0.recipe b/dev-libs/libfilezilla/libfilezilla-0.51.1.recipe similarity index 94% rename from dev-libs/libfilezilla/libfilezilla-0.49.0.recipe rename to dev-libs/libfilezilla/libfilezilla-0.51.1.recipe index 62acd291b..19df870eb 100644 --- a/dev-libs/libfilezilla/libfilezilla-0.49.0.recipe +++ b/dev-libs/libfilezilla/libfilezilla-0.51.1.recipe @@ -8,17 +8,17 @@ extremely efficient which simplifies dealing with timestamps originating from different sources - Simple process handling for spawning child processes with redirected I/O" HOMEPAGE="https://lib.filezilla-project.org/" -COPYRIGHT="2015-2024 Tim Kosse" +COPYRIGHT="2015-2025 Tim Kosse" LICENSE="GNU GPL v2" REVISION="1" SOURCE_URI="https://dev.gentoo.org/~dlan/distfiles/libfilezilla/libfilezilla-$portVersion.tar.xz" -CHECKSUM_SHA256="79ff30e5124068c116c8dc8fc4581922afa2d3720f7b6bee9c8f8fe419617488" +CHECKSUM_SHA256="9a4c88931711f4b9d31702af3555501151b2b9fa46d07f350597a3bc9d5832e6" PATCHES="libfilezilla-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" -libVersion="46.0.0" +libVersion="48.1.0" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" diff --git a/dev-libs/libfilezilla/patches/libfilezilla-0.49.0.patchset b/dev-libs/libfilezilla/patches/libfilezilla-0.49.0.patchset deleted file mode 100644 index 5e3be157c..000000000 --- a/dev-libs/libfilezilla/patches/libfilezilla-0.49.0.patchset +++ /dev/null @@ -1,142 +0,0 @@ -From 437e8221404f7e8153769f191b96baa0ada544ab Mon Sep 17 00:00:00 2001 -From: David Karoly -Date: Sun, 20 Nov 2022 10:35:55 +0100 -Subject: fix includes on Haiku - - -diff --git a/lib/local_filesys.cpp b/lib/local_filesys.cpp -index 239f709..d49541f 100644 ---- a/lib/local_filesys.cpp -+++ b/lib/local_filesys.cpp -@@ -9,7 +9,7 @@ - #include - #else - #include --#include -+#include - #include - #include - #include -diff --git a/lib/process.cpp b/lib/process.cpp -index b15ce7c..3a13feb 100644 ---- a/lib/process.cpp -+++ b/lib/process.cpp -@@ -609,7 +609,9 @@ private: - #include - #include - #include -+#ifndef __HAIKU__ - #include -+#endif - #include - #include - #include --- -2.37.3 - - -From f3e7cfc88429e9af5dafc5688e2cf5a539285ab4 Mon Sep 17 00:00:00 2001 -From: David Karoly -Date: Sun, 20 Nov 2022 10:35:55 +0100 -Subject: Haiku: use crypt() instead of crypt_r() - - -diff --git a/lib/impersonation.cpp b/lib/impersonation.cpp -index 2c5cb55..4dd5f25 100644 ---- a/lib/impersonation.cpp -+++ b/lib/impersonation.cpp -@@ -193,8 +193,13 @@ bool check_auth(native_string const& username, native_string const& password) - #if FZ_UNIX - auto shadow = get_shadow(username); - if (shadow.shadow_) { -+#ifdef __HAIKU__ -+ //FIXME -+ char* encrypted = crypt(password.c_str(), shadow.shadow_->sp_pwdp); -+#else - struct crypt_data data{}; - char* encrypted = crypt_r(password.c_str(), shadow.shadow_->sp_pwdp, &data); -+#endif - if (encrypted && !strcmp(encrypted, shadow.shadow_->sp_pwdp)) { - return true; - } --- -2.37.3 - - -From aa02bc63254d88f1191cffbde2d9ed6a020483ab Mon Sep 17 00:00:00 2001 -From: David Karoly -Date: Sun, 20 Nov 2022 10:35:55 +0100 -Subject: configure: detect crypt.h and -lcrypt - - -diff --git a/configure.ac b/configure.ac -index 3546967..6d84301 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -117,6 +117,11 @@ CHECK_CLOCK_GETTIME - - AC_CHECK_DECLS([pthread_condattr_setclock], [], [], [[#include ]]) - -+if test "$unix" = "1"; then -+ AC_CHECK_HEADERS([crypt.h]) -+ AC_SEARCH_LIBS([crypt], [crypt]) -+fi -+ - if test "$windows" = "1"; then - libdeps="-lws2_32 -liphlpapi" - else -diff --git a/lib/Makefile.am b/lib/Makefile.am -index 492b26c..8d7dae0 100644 ---- a/lib/Makefile.am -+++ b/lib/Makefile.am -@@ -160,10 +160,6 @@ if FZ_MAC - libfilezilla_la_LDFLAGS += -framework CoreServices - endif - --if FZ_UNIX --libfilezilla_la_LDFLAGS += -lcrypt --endif -- - libfilezilla_la_CPPFLAGS = $(AM_CPPFLAGS) - libfilezilla_la_CPPFLAGS += -I$(top_builddir)/config - libfilezilla_la_CPPFLAGS += -DBUILDING_LIBFILEZILLA -diff --git a/lib/impersonation.cpp b/lib/impersonation.cpp -index 4dd5f25..ce18547 100644 ---- a/lib/impersonation.cpp -+++ b/lib/impersonation.cpp -@@ -8,7 +8,9 @@ - #include - - #if FZ_UNIX -+#ifdef HAVE_CRYPT_H - #include -+#endif - #include - #endif - #include --- -2.37.3 - - -From 211bc87356d728f661c0c9be5683bc1a6044afa5 Mon Sep 17 00:00:00 2001 -From: David Karoly -Date: Sun, 20 Nov 2022 10:35:55 +0100 -Subject: configure: detect -lnetwork - - -diff --git a/configure.ac b/configure.ac -index 6d84301..c07f18e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -122,6 +122,8 @@ if test "$unix" = "1"; then - AC_SEARCH_LIBS([crypt], [crypt]) - fi - -+AC_SEARCH_LIBS([socket], [network]) -+ - if test "$windows" = "1"; then - libdeps="-lws2_32 -liphlpapi" - else --- -2.37.3 - diff --git a/dev-libs/libfilezilla/patches/libfilezilla-0.51.1.patchset b/dev-libs/libfilezilla/patches/libfilezilla-0.51.1.patchset new file mode 100644 index 000000000..80d8a6f23 --- /dev/null +++ b/dev-libs/libfilezilla/patches/libfilezilla-0.51.1.patchset @@ -0,0 +1,249 @@ +From 50f80d453c35b9d932e9d000b8a868858a2da1a8 Mon Sep 17 00:00:00 2001 +From: David Karoly +Date: Sun, 20 Nov 2022 10:35:55 +0100 +Subject: fix includes on Haiku + + +diff --git a/lib/local_filesys.cpp b/lib/local_filesys.cpp +index 22e9122..101be74 100644 +--- a/lib/local_filesys.cpp ++++ b/lib/local_filesys.cpp +@@ -10,7 +10,7 @@ + #include + #else + #include +-#include ++#include + #include + #include + #include +diff --git a/lib/process.cpp b/lib/process.cpp +index 5f24b96..92bf378 100644 +--- a/lib/process.cpp ++++ b/lib/process.cpp +@@ -568,7 +568,9 @@ private: + #include + #include + #include ++#ifndef __HAIKU__ + #include ++#endif + #include + #include + #include +-- +2.51.0 + + +From 3e41cca1dbf4339ec56209863a553f09030e9f5d Mon Sep 17 00:00:00 2001 +From: David Karoly +Date: Sun, 20 Nov 2022 10:35:55 +0100 +Subject: Haiku: use crypt() instead of crypt_r() + + +diff --git a/lib/impersonation.cpp b/lib/impersonation.cpp +index 2e7b20a..03c3f3e 100644 +--- a/lib/impersonation.cpp ++++ b/lib/impersonation.cpp +@@ -206,8 +206,13 @@ bool check_auth(native_string const& username, native_string const& password) + #if FZ_UNIX + auto shadow = get_shadow(username); + if (shadow.shadow_) { ++#ifdef __HAIKU__ ++ //FIXME ++ char* encrypted = crypt(password.c_str(), shadow.shadow_->sp_pwdp); ++#else + struct crypt_data data{}; + char* encrypted = crypt_r(password.c_str(), shadow.shadow_->sp_pwdp, &data); ++#endif + if (encrypted && !strcmp(encrypted, shadow.shadow_->sp_pwdp)) { + return true; + } +-- +2.51.0 + + +From a4dcb4bb4f364e444646913059860cb8978afce5 Mon Sep 17 00:00:00 2001 +From: David Karoly +Date: Sun, 20 Nov 2022 10:35:55 +0100 +Subject: configure: detect crypt.h and -lcrypt + + +diff --git a/configure.ac b/configure.ac +index 2207a6a..b3385df 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -129,6 +129,11 @@ CHECK_STRUCT_STAT_ST_MTIM + + AC_CHECK_DECLS([pthread_condattr_setclock], [], [], [[#include ]]) + ++if test "$unix" = "1"; then ++ AC_CHECK_HEADERS([crypt.h]) ++ AC_SEARCH_LIBS([crypt], [crypt]) ++fi ++ + if test "$windows" = "1"; then + libdeps="-lws2_32 -liphlpapi" + else +diff --git a/lib/Makefile.am b/lib/Makefile.am +index b157b08..466636b 100644 +--- a/lib/Makefile.am ++++ b/lib/Makefile.am +@@ -164,10 +164,6 @@ if FZ_MAC + libfilezilla_la_LDFLAGS += -framework CoreServices + endif + +-if FZ_UNIX +-libfilezilla_la_LDFLAGS += -lcrypt +-endif +- + libfilezilla_la_CPPFLAGS = $(AM_CPPFLAGS) + libfilezilla_la_CPPFLAGS += -I$(top_builddir)/config + libfilezilla_la_CPPFLAGS += -DBUILDING_LIBFILEZILLA +diff --git a/lib/impersonation.cpp b/lib/impersonation.cpp +index 03c3f3e..8f7160d 100644 +--- a/lib/impersonation.cpp ++++ b/lib/impersonation.cpp +@@ -28,7 +28,9 @@ impersonation_token::impersonation_token(fz::native_string const& username, impe + #include + + #if FZ_UNIX ++#ifdef HAVE_CRYPT_H + #include ++#endif + #include + #endif + #include +-- +2.51.0 + + +From 4718a33704f11f1cb9c49ad127b21c798ee31e5a Mon Sep 17 00:00:00 2001 +From: David Karoly +Date: Sun, 20 Nov 2022 10:35:55 +0100 +Subject: configure: detect -lnetwork + + +diff --git a/configure.ac b/configure.ac +index b3385df..d3c95f2 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -134,6 +134,8 @@ if test "$unix" = "1"; then + AC_SEARCH_LIBS([crypt], [crypt]) + fi + ++AC_SEARCH_LIBS([socket], [network]) ++ + if test "$windows" = "1"; then + libdeps="-lws2_32 -liphlpapi" + else +-- +2.51.0 + + +From 770de93a096e94c9f7e0fee75107ba4364ec40b3 Mon Sep 17 00:00:00 2001 +From: Luc Schrijvers +Date: Fri, 31 Oct 2025 10:36:50 +0100 +Subject: Haiku (beta5) doesn't have ESOCKTNOSUPPORT + + +diff --git a/lib/socket_errors.cpp b/lib/socket_errors.cpp +index 3c1f090..53f165b 100644 +--- a/lib/socket_errors.cpp ++++ b/lib/socket_errors.cpp +@@ -107,7 +107,9 @@ std::unordered_map const& get_errors() + #ifdef EADDRNOTAVAIL + insert(EADDRNOTAVAIL, fztranslate_mark("Cannot assign requested address")); + #endif ++#ifndef __HAIKU__ + insert(ESOCKTNOSUPPORT, fztranslate_mark("Socket type not supported")); ++#endif + + // Codes that have no POSIX equivalence + #ifdef FZ_WINDOWS +-- +2.51.0 + + +From 9b30da3954013efc40204655b7c163d8b1acb4d0 Mon Sep 17 00:00:00 2001 +From: Begasus +Date: Fri, 31 Oct 2025 12:05:39 +0100 +Subject: applying patch gcc13.patch + + +diff --git a/lib/libfilezilla/buffer.hpp b/lib/libfilezilla/buffer.hpp +index 51e2de3..c583508 100644 +--- a/lib/libfilezilla/buffer.hpp ++++ b/lib/libfilezilla/buffer.hpp +@@ -5,6 +5,7 @@ + + #include + #include ++#include + + /** \file + * \brief Declares fz::buffer +diff --git a/lib/libfilezilla/encode.hpp b/lib/libfilezilla/encode.hpp +index f5af0e3..ed4fa93 100644 +--- a/lib/libfilezilla/encode.hpp ++++ b/lib/libfilezilla/encode.hpp +@@ -5,6 +5,7 @@ + + #include + #include ++#include + + /** \file + * \brief Functions to encode/decode strings +diff --git a/lib/libfilezilla/encryption.hpp b/lib/libfilezilla/encryption.hpp +index 722dab6..198c5e4 100644 +--- a/lib/libfilezilla/encryption.hpp ++++ b/lib/libfilezilla/encryption.hpp +@@ -14,6 +14,7 @@ + + #include + #include ++#include + + namespace fz { + +diff --git a/lib/libfilezilla/hash.hpp b/lib/libfilezilla/hash.hpp +index d5f4ebb..1c30681 100644 +--- a/lib/libfilezilla/hash.hpp ++++ b/lib/libfilezilla/hash.hpp +@@ -9,6 +9,7 @@ + + #include + #include ++#include + + namespace fz { + +diff --git a/lib/libfilezilla/nonowning_buffer.hpp b/lib/libfilezilla/nonowning_buffer.hpp +index 6e63094..3cb288b 100644 +--- a/lib/libfilezilla/nonowning_buffer.hpp ++++ b/lib/libfilezilla/nonowning_buffer.hpp +@@ -3,6 +3,8 @@ + + #include "libfilezilla.hpp" + ++#include ++ + /** \file + * \brief Declares fz::nonowning_buffer + */ +diff --git a/lib/libfilezilla/signature.hpp b/lib/libfilezilla/signature.hpp +index f95afc0..bd7f4b6 100644 +--- a/lib/libfilezilla/signature.hpp ++++ b/lib/libfilezilla/signature.hpp +@@ -11,6 +11,7 @@ + + #include + #include ++#include + + namespace fz { + +-- +2.51.0 +