diff --git a/dev-libs/libfilezilla/libfilezilla-0.40.0.recipe b/dev-libs/libfilezilla/libfilezilla-0.42.2.recipe similarity index 91% rename from dev-libs/libfilezilla/libfilezilla-0.40.0.recipe rename to dev-libs/libfilezilla/libfilezilla-0.42.2.recipe index b686e4257..fa145aee2 100644 --- a/dev-libs/libfilezilla/libfilezilla-0.40.0.recipe +++ b/dev-libs/libfilezilla/libfilezilla-0.42.2.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-2022 Tim Kosse" +COPYRIGHT="2015-2023 Tim Kosse" LICENSE="GNU GPL v2" -REVISION="2" -SOURCE_URI="https://download.filezilla-project.org/libfilezilla/libfilezilla-$portVersion.tar.bz2" -CHECKSUM_SHA256="c0843c62d1512f6aec57c6a27806b491ec8cf40b8c2ed259faba9f6907820c72" +REVISION="1" +SOURCE_URI="https://download.filezilla-project.org/libfilezilla/libfilezilla-$portVersion.tar.xz" +CHECKSUM_SHA256="4f9981a171919d3f3f4742fd50c0265947e67c531aff66fa46c7511a2629ce91" PATCHES="libfilezilla-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" -libVersion="33.0.0" +libVersion="36.2.0" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" @@ -93,5 +93,5 @@ INSTALL() TEST() { - make check + make -C build check } diff --git a/dev-libs/libfilezilla/patches/libfilezilla-0.40.0.patchset b/dev-libs/libfilezilla/patches/libfilezilla-0.42.2.patchset similarity index 76% rename from dev-libs/libfilezilla/patches/libfilezilla-0.40.0.patchset rename to dev-libs/libfilezilla/patches/libfilezilla-0.42.2.patchset index 061dbb6c4..5e3be157c 100644 --- a/dev-libs/libfilezilla/patches/libfilezilla-0.40.0.patchset +++ b/dev-libs/libfilezilla/patches/libfilezilla-0.42.2.patchset @@ -1,4 +1,4 @@ -From 57a1af2ab16edfdf046e5cd0d4d64828166bcf56 Mon Sep 17 00:00:00 2001 +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 @@ -18,7 +18,7 @@ index 239f709..d49541f 100644 #include #include diff --git a/lib/process.cpp b/lib/process.cpp -index 42056a9..0c6f7ad 100644 +index b15ce7c..3a13feb 100644 --- a/lib/process.cpp +++ b/lib/process.cpp @@ -609,7 +609,9 @@ private: @@ -35,28 +35,17 @@ index 42056a9..0c6f7ad 100644 2.37.3 -From 64c55770b148c9d60cbacd02a8de3111cd6293e7 Mon Sep 17 00:00:00 2001 +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..30764a6 100644 +index 2c5cb55..4dd5f25 100644 --- a/lib/impersonation.cpp +++ b/lib/impersonation.cpp -@@ -8,7 +8,10 @@ - #include - - #if FZ_UNIX -+#ifndef __HAIKU__ - #include -+#endif -+ - #include - #endif - #include -@@ -193,8 +196,13 @@ bool check_auth(native_string const& username, native_string const& password) +@@ -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_) { @@ -74,21 +63,22 @@ index 2c5cb55..30764a6 100644 2.37.3 -From 4764b37a902835c4fe2909d67a67f99425daa7d7 Mon Sep 17 00:00:00 2001 +From aa02bc63254d88f1191cffbde2d9ed6a020483ab Mon Sep 17 00:00:00 2001 From: David Karoly Date: Sun, 20 Nov 2022 10:35:55 +0100 -Subject: configure: detect -lcrypt +Subject: configure: detect crypt.h and -lcrypt diff --git a/configure.ac b/configure.ac -index ece1b13..1b4d469 100644 +index 3546967..6d84301 100644 --- a/configure.ac +++ b/configure.ac -@@ -117,6 +117,10 @@ CHECK_CLOCK_GETTIME +@@ -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 + @@ -96,10 +86,10 @@ index ece1b13..1b4d469 100644 libdeps="-lws2_32 -liphlpapi" else diff --git a/lib/Makefile.am b/lib/Makefile.am -index f88c30a..f28c700 100644 +index 492b26c..8d7dae0 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am -@@ -144,10 +144,6 @@ if FZ_MAC +@@ -160,10 +160,6 @@ if FZ_MAC libfilezilla_la_LDFLAGS += -framework CoreServices endif @@ -110,21 +100,35 @@ index f88c30a..f28c700 100644 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 e1c4095d8477d42abc82ebe5a7c33caf37fec023 Mon Sep 17 00:00:00 2001 +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 1b4d469..e11a12e 100644 +index 6d84301..c07f18e 100644 --- a/configure.ac +++ b/configure.ac -@@ -121,6 +121,8 @@ if test "$unix" = "1"; then +@@ -122,6 +122,8 @@ if test "$unix" = "1"; then AC_SEARCH_LIBS([crypt], [crypt]) fi