diff --git a/ftp/lftp/Makefile b/ftp/lftp/Makefile index 2901edb984bc..3ad1bd98a90b 100644 --- a/ftp/lftp/Makefile +++ b/ftp/lftp/Makefile @@ -1,74 +1,75 @@ PORTNAME= lftp -PORTVERSION= 4.9.2 -PORTREVISION= 1 +PORTVERSION= 4.9.3 CATEGORIES= ftp MASTER_SITES= ftp://ftp.cs.tu-berlin.de/pub/net/ftp/lftp/ \ http://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/ \ http://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/old/ \ http://ftp.tuwien.ac.at/infosys/browsers/ftp/lftp/ \ http://lftp.cybermirror.org/ \ http://lftp.cybermirror.org/old/ \ http://lftp.tech/ftp/ \ http://lftp.tech/ftp/old/ MAINTAINER= martymac@FreeBSD.org COMMENT= Shell-like command-line FTP client WWW= https://lftp.tech/ -LICENSE= GPLv3 +LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libexpat.so:textproc/expat2 \ libidn2.so:dns/libidn2 USES= charsetfix compiler:c++11-lang cpe iconv libtool localbase \ readline shebangfix CPE_VENDOR= lftp_project SHEBANG_FILES= src/convert-mozilla-cookies src/verify-file src/xdg-move GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share PORTDOCS= AUTHORS BUGS ChangeLog FAQ FEATURES INSTALL MIRRORS NEWS README \ README.debug-levels README.modules THANKS TODO OPTIONS_DEFINE= DOCS NLS OPTIONS_DEFAULT= OPENSSL OPTIONS_RADIO= SSL OPTIONS_RADIO_SSL= GNUTLS OPENSSL OPTIONS_SUB= yes GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls GNUTLS_USES= pkgconfig GNUTLS_CONFIGURE_WITH= gnutls NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls OPENSSL_USES= ssl OPENSSL_CONFIGURE_WITH= openssl +OPENSSL_CPPFLAGS= -I${OPENSSLINC} +OPENSSL_LDFLAGS= -L${OPENSSLLIB} post-install: ${MV} ${STAGEDIR}${PREFIX}/etc/lftp.conf \ ${STAGEDIR}${PREFIX}/etc/lftp.conf.sample post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include # Only link to libthr if necessary .if ${PORT_OPTIONS:MGNUTLS} NEED_PTHREAD= yes .else .if exists(${OPENSSLLIB}/libssl.so) NEED_PTHREAD!= ldd ${OPENSSLLIB}/libssl.so | ${GREP} -w 'libthr\.so' || ${ECHO_CMD} .else NEED_PTHREAD= # empty .endif .endif .if !empty(NEED_PTHREAD) LDFLAGS+= -pthread .endif .include diff --git a/ftp/lftp/distinfo b/ftp/lftp/distinfo index d31f54988964..b5a3e6271440 100644 --- a/ftp/lftp/distinfo +++ b/ftp/lftp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1597400932 -SHA256 (lftp-4.9.2.tar.gz) = a37589c61914073f53c5da0e68bd233b41802509d758a022000e1ae2076da733 -SIZE (lftp-4.9.2.tar.gz) = 2950063 +TIMESTAMP = 1732212586 +SHA256 (lftp-4.9.3.tar.gz) = 68116cc184ab660a78a4cef323491e89909e5643b59c7b5f0a14f7c2b20e0a29 +SIZE (lftp-4.9.3.tar.gz) = 3385456 diff --git a/ftp/lftp/files/patch-src_lftp__ssl.cc b/ftp/lftp/files/patch-src_lftp__ssl.cc deleted file mode 100644 index 79d85fd04207..000000000000 --- a/ftp/lftp/files/patch-src_lftp__ssl.cc +++ /dev/null @@ -1,38 +0,0 @@ ---- src/lftp_ssl.cc.orig 2020-01-29 20:36:37 UTC -+++ src/lftp_ssl.cc -@@ -34,7 +34,7 @@ - #include "misc.h" - #include "network.h" - #include "buffer.h" --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER - #define X509_STORE_CTX_get_by_subject X509_STORE_get_by_subject - #endif - extern "C" { -@@ -775,7 +775,7 @@ error: - #elif USE_OPENSSL - //static int lftp_ssl_passwd_callback(char *buf,int size,int rwflag,void *userdata); - --#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000L) - // for compatibility with older versions - X509_OBJECT *X509_OBJECT_new() - { -@@ -840,7 +840,7 @@ lftp_ssl_openssl_instance::lftp_ssl_openssl_instance() - ssl_ctx=SSL_CTX_new(); - X509_set_default_verify_paths(ssl_ctx->cert); - #else --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER - SSLeay_add_ssl_algorithms(); - #endif - ssl_ctx=SSL_CTX_new(SSLv23_client_method()); -@@ -1080,7 +1080,7 @@ void lftp_ssl_openssl::copy_sid(const lftp_ssl_openssl - - const char *lftp_ssl_openssl::strerror() - { --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER - SSL_load_error_strings(); - #endif - int error=ERR_get_error(); diff --git a/ftp/lftp/pkg-plist b/ftp/lftp/pkg-plist index 965674fc18d3..60b1216a8313 100644 --- a/ftp/lftp/pkg-plist +++ b/ftp/lftp/pkg-plist @@ -1,29 +1,31 @@ bin/lftp bin/lftpget @sample etc/lftp.conf.sample lib/liblftp-jobs.a lib/liblftp-tasks.a share/applications/lftp.desktop share/icons/hicolor/48x48/apps/lftp-icon.png +share/zsh/site-functions/_lftp %%DATADIR%%/convert-mozilla-cookies %%DATADIR%%/import-ncftp %%DATADIR%%/import-netscape %%DATADIR%%/verify-file %%DATADIR%%/xdg-move %%NLS%%share/locale/cs/LC_MESSAGES/lftp.mo %%NLS%%share/locale/de/LC_MESSAGES/lftp.mo %%NLS%%share/locale/es/LC_MESSAGES/lftp.mo %%NLS%%share/locale/fr/LC_MESSAGES/lftp.mo %%NLS%%share/locale/it/LC_MESSAGES/lftp.mo %%NLS%%share/locale/ja/LC_MESSAGES/lftp.mo %%NLS%%share/locale/ko/LC_MESSAGES/lftp.mo %%NLS%%share/locale/pl/LC_MESSAGES/lftp.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/lftp.mo %%NLS%%share/locale/ru/LC_MESSAGES/lftp.mo +%%NLS%%share/locale/sr/LC_MESSAGES/lftp.mo %%NLS%%share/locale/uk/LC_MESSAGES/lftp.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/lftp.mo %%NLS%%share/locale/zh_HK/LC_MESSAGES/lftp.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/lftp.mo share/man/man1/lftp.1.gz share/man/man1/lftpget.1.gz share/man/man5/lftp.conf.5.gz