diff --git a/dev-libs/libfilezilla/libfilezilla-0.30.0.recipe b/dev-libs/libfilezilla/libfilezilla-0.39.2.recipe similarity index 88% rename from dev-libs/libfilezilla/libfilezilla-0.30.0.recipe rename to dev-libs/libfilezilla/libfilezilla-0.39.2.recipe index b7a5a3ba9..d2a0ff2e0 100644 --- a/dev-libs/libfilezilla/libfilezilla-0.30.0.recipe +++ b/dev-libs/libfilezilla/libfilezilla-0.39.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-2021 Tim Kosse" +COPYRIGHT="2015-2022 Tim Kosse" LICENSE="GNU GPL v2" REVISION="1" SOURCE_URI="https://download.filezilla-project.org/libfilezilla/libfilezilla-$portVersion.tar.bz2" -CHECKSUM_SHA256="c16df6dacdb2ded4f6e05141b4681eda91a5a1ba052900a24a9f84e65a50dc40" +CHECKSUM_SHA256="59a9d4ed6a00bb55ec111d0630f85cfdb3fbb11fb0c2006ab2b7ed7a6f8f59f4" PATCHES="libfilezilla-$portVersion.patchset" -ARCHITECTURES="all ?x86_gcc2" +ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" -libVersion="15.0.0" +libVersion="32.0.0" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" @@ -27,6 +27,7 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix + lib:libgmp$secondaryArchSuffix lib:libgnutls$secondaryArchSuffix lib:libiconv$secondaryArchSuffix lib:libnettle$secondaryArchSuffix @@ -70,13 +71,16 @@ BUILD() export LDFLAGS="-lbsd" autoreconf -vfi - runConfigure ./configure + + mkdir -p build + cd build + runConfigure ../configure make $jobArgs } INSTALL() { - make install + make -C build install rm -f $libDir/libfilezilla.la diff --git a/dev-libs/libfilezilla/patches/libfilezilla-0.30.0.patchset b/dev-libs/libfilezilla/patches/libfilezilla-0.30.0.patchset deleted file mode 100644 index ba7715ba5..000000000 --- a/dev-libs/libfilezilla/patches/libfilezilla-0.30.0.patchset +++ /dev/null @@ -1,22 +0,0 @@ -From a271486149b4bcec752fa10f58c50399be2ac82b Mon Sep 17 00:00:00 2001 -From: David Karoly -Date: Fri, 12 Nov 2021 16:18:06 +0000 -Subject: fix include fcntl.h - - -diff --git a/lib/local_filesys.cpp b/lib/local_filesys.cpp -index 5ec962d..ba7d583 100644 ---- a/lib/local_filesys.cpp -+++ b/lib/local_filesys.cpp -@@ -7,7 +7,7 @@ - #include "windows/security_descriptor_builder.hpp" - #else - #include --#include -+#include - #include - #include - #include --- -2.30.2 - diff --git a/dev-libs/libfilezilla/patches/libfilezilla-0.39.2.patchset b/dev-libs/libfilezilla/patches/libfilezilla-0.39.2.patchset new file mode 100644 index 000000000..877494c0f --- /dev/null +++ b/dev-libs/libfilezilla/patches/libfilezilla-0.39.2.patchset @@ -0,0 +1,138 @@ +From 2cffda87a2ad75c7bb994804d298c24dae2a6790 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 42056a9..0c6f7ad 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 e2aca7f8c4b9e312ab74bd95377bd3bcd16e4e87 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 +--- 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) + #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 3ce4064bcc01f91c5aaa736f8545bd4c6f1919e2 Mon Sep 17 00:00:00 2001 +From: David Karoly +Date: Sun, 20 Nov 2022 10:35:55 +0100 +Subject: configure: detect -lcrypt + + +diff --git a/configure.ac b/configure.ac +index 6d5da67..bb9b6eb 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -117,6 +117,10 @@ CHECK_CLOCK_GETTIME + + AC_CHECK_DECLS([pthread_condattr_setclock], [], [], [[#include ]]) + ++if test "$unix" = "1"; then ++ 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 f88c30a..f28c700 100644 +--- a/lib/Makefile.am ++++ b/lib/Makefile.am +@@ -144,10 +144,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 +-- +2.37.3 + + +From 74535abc7439dac0f8ad800b70a27f6d249a012d 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 bb9b6eb..fde02a5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -121,6 +121,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 +