From b8cc1e48ac137c9c09240227b9320d9b1a2665b7 Mon Sep 17 00:00:00 2001 From: augiedoggie Date: Fri, 13 May 2022 21:39:48 -0600 Subject: [PATCH] lftp: update to 4.9.2 (#6918) fixes #6908 --- .../{lftp-4.8.4.recipe => lftp-4.9.2.recipe} | 65 ++++++++----------- net-ftp/lftp/patches/lftp-4.8.4.patchset | 22 ------- net-ftp/lftp/patches/lftp-4.9.2.patchset | 30 +++++++++ 3 files changed, 56 insertions(+), 61 deletions(-) rename net-ftp/lftp/{lftp-4.8.4.recipe => lftp-4.9.2.recipe} (57%) delete mode 100644 net-ftp/lftp/patches/lftp-4.8.4.patchset create mode 100644 net-ftp/lftp/patches/lftp-4.9.2.patchset diff --git a/net-ftp/lftp/lftp-4.8.4.recipe b/net-ftp/lftp/lftp-4.9.2.recipe similarity index 57% rename from net-ftp/lftp/lftp-4.8.4.recipe rename to net-ftp/lftp/lftp-4.9.2.recipe index 234c80796..e423c95e7 100644 --- a/net-ftp/lftp/lftp-4.8.4.recipe +++ b/net-ftp/lftp/lftp-4.9.2.recipe @@ -7,70 +7,58 @@ Low level stuff supported: ftp proxy, http proxy, ftp over http, opie/skey, \ fxp transfers, automatic retrying on non-fatal errors and timeouts, ipv6, \ socks, http/1.1, sftp v3-v6." HOMEPAGE="http://lftp.yar.ru" -COPYRIGHT="1996-2017 Alexander V. Lukyanov" +COPYRIGHT="1996-2020 Alexander V. Lukyanov" LICENSE="GNU GPL v3" -REVISION="4" +REVISION="1" SOURCE_URI="http://lftp.yar.ru/ftp/lftp-$portVersion.tar.gz" -CHECKSUM_SHA256="19f3a4236558fbdb88eec01bc9d693c51b122d23487b6bedad4cc67ae6825fc2" +CHECKSUM_SHA256="a37589c61914073f53c5da0e68bd233b41802509d758a022000e1ae2076da733" PATCHES="lftp-$portVersion.patchset" -ARCHITECTURES="all !x86_gcc2 ?x86 ?arm" +ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" +commandSuffix=$secondaryArchSuffix +commandBinDir=$binDir +if [ "$targetArchitecture" = x86_gcc2 ]; then + commandSuffix= + commandBinDir=$prefix/bin +fi + GLOBAL_WRITABLE_FILES=" settings/lftp.conf keep-old " PROVIDES=" lftp$secondaryArchSuffix = $portVersion - cmd:lftp$secondaryArchSuffix = $portVersion compat >= 4 - cmd:lftpget$secondaryArchSuffix = $portVersion compat >= 4 - lib:liblftp_jobs$secondaryArchSuffix = 0.0.0 compat >= 0 - lib:liblftp_tasks$secondaryArchSuffix = 0.0.0 compat >= 0 - " + cmd:lftp = $portVersion compat >= 4 + cmd:lftpget = $portVersion compat >= 4 + " REQUIRES=" haiku$secondaryArchSuffix ca_root_certificates - lib:libcrypto$secondaryArchSuffix lib:libexpat$secondaryArchSuffix lib:libgnutls$secondaryArchSuffix lib:libiconv$secondaryArchSuffix - lib:libintl$secondaryArchSuffix + lib:libidn2$secondaryArchSuffix lib:libncurses$secondaryArchSuffix lib:libreadline$secondaryArchSuffix - lib:libssl$secondaryArchSuffix lib:libz$secondaryArchSuffix " -PROVIDES_devel=" - lftp${secondaryArchSuffix}_devel = $portVersion - devel:liblftp_jobs$secondaryArchSuffix = 0.0.0 compat >= 0 - devel:liblftp_tasks$secondaryArchSuffix = 0.0.0 compat >= 0 - " -REQUIRES_devel=" - lftp$secondaryArchSuffix == $portVersion base - " - BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - devel:libcrypto$secondaryArchSuffix devel:libexpat$secondaryArchSuffix devel:libgnutls$secondaryArchSuffix devel:libiconv$secondaryArchSuffix - devel:libintl$secondaryArchSuffix + devel:libidn2$secondaryArchSuffix devel:libncurses$secondaryArchSuffix devel:libreadline$secondaryArchSuffix >= 8 - devel:libssl$secondaryArchSuffix devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - cmd:aclocal - cmd:autoconf - cmd:automake cmd:awk cmd:find cmd:gcc$secondaryArchSuffix - cmd:libtoolize$secondaryArchSuffix cmd:make cmd:pkg_config$secondaryArchSuffix cmd:sed @@ -78,11 +66,17 @@ BUILD_PREREQUIRES=" BUILD() { - autoreconf -vfi - runConfigure ./configure --with-openssl --enable-static --with-readline \ + runConfigure --omit-dirs binDir ./configure \ + --bindir="$commandBinDir" \ + --with-gnutls \ + --without-openssl \ + --without-included-regex \ + --with-readline \ --with-readline-lib=-lreadline \ --with-readline-inc="$(finddir B_SYSTEM_HEADERS_DIRECTORY)$secondaryArchSubDir/readline" \ - --with-modules --disable-nls + --disable-static \ + --disable-nls + make $jobArgs } @@ -90,14 +84,7 @@ INSTALL() { make install - rm $libDir/*.la - # prepare develop/lib - prepareInstalledDevelLibs liblftp-jobs liblftp-tasks - fixPkgconfig - - # devel package - packageEntries devel \ - $developDir + rm -rf $libDir $dataDir/applications } TEST() diff --git a/net-ftp/lftp/patches/lftp-4.8.4.patchset b/net-ftp/lftp/patches/lftp-4.8.4.patchset deleted file mode 100644 index a2c5d76fb..000000000 --- a/net-ftp/lftp/patches/lftp-4.8.4.patchset +++ /dev/null @@ -1,22 +0,0 @@ -From 5ade774564ec60f247d60adbd39c2f94c6164fff Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Sat, 17 May 2014 13:38:15 +0000 -Subject: gcc2 fix - - -diff --git a/lib/gl_openssl.h b/lib/gl_openssl.h -index 2414421..014769d 100644 ---- a/lib/gl_openssl.h -+++ b/lib/gl_openssl.h -@@ -95,7 +95,7 @@ GL_CRYPTO_FN (_finish_ctx) (struct _gl_ctx *ctx, void *res) - - GL_OPENSSL_INLINE void * - GL_CRYPTO_FN (_buffer) (const char *buf, size_t len, void *res) --{ return OPENSSL_FN () ((const unsigned char *) buf, len, (unsigned char *) res); } -+{ return OPENSSL_FN ( ) ((const unsigned char *) buf, len, (unsigned char *) res); } - - GL_OPENSSL_INLINE void * - GL_CRYPTO_FN (_read_ctx) (const struct _gl_ctx *ctx, void *res) --- -1.8.3.4 - diff --git a/net-ftp/lftp/patches/lftp-4.9.2.patchset b/net-ftp/lftp/patches/lftp-4.9.2.patchset new file mode 100644 index 000000000..d308298ba --- /dev/null +++ b/net-ftp/lftp/patches/lftp-4.9.2.patchset @@ -0,0 +1,30 @@ +From 8dd350f37049e1310a88fa6d99dcdafef5246134 Mon Sep 17 00:00:00 2001 +From: Chris Roberts +Date: Fri, 13 May 2022 20:31:59 -0600 +Subject: disable TOS on Haiku + + +diff --git a/src/network.cc b/src/network.cc +index cf26089..f1ab257 100644 +--- a/src/network.cc ++++ b/src/network.cc +@@ -227,14 +227,14 @@ void Networker::KeepAlive(int sock) + } + void Networker::MinimizeLatency(int sock) + { +-#ifdef IP_TOS ++#if defined(IP_TOS) && !defined(__HAIKU__) + int tos = IPTOS_LOWDELAY; + setsockopt(sock, IPPROTO_IP, IP_TOS, (char *)&tos, sizeof(int)); + #endif + } + void Networker::MaximizeThroughput(int sock) + { +-#ifdef IP_TOS ++#if defined(IP_TOS) && !defined(__HAIKU__) + int tos = IPTOS_THROUGHPUT; + setsockopt(sock, IPPROTO_IP, IP_TOS, (char *)&tos, sizeof(int)); + #endif +-- +2.35.1 +