diff options
| author | Ganael LAPLANCHE <martymac@FreeBSD.org> | 2024-11-29 11:30:30 +0000 |
|---|---|---|
| committer | Ganael LAPLANCHE <martymac@FreeBSD.org> | 2024-11-29 11:30:30 +0000 |
| commit | 7e86812c08aff5e0f2305fef7b9f6713836a6d5c (patch) | |
| tree | 4f09e6268e5c3ed8e8ef3cc8fbe8f1f7f9fd538d | |
| parent | b9fcc139d0524d17205ac2a1af7c0f53b01db21d (diff) | |
| download | ports-7e86812c08aff5e0f2305fef7b9f6713836a6d5c.tar.gz ports-7e86812c08aff5e0f2305fef7b9f6713836a6d5c.zip | |
ftp/lftp: Update to 4.9.3
Also, fix LICENSE which is actually GPLv3+
| -rw-r--r-- | ftp/lftp/Makefile | 7 | ||||
| -rw-r--r-- | ftp/lftp/distinfo | 6 | ||||
| -rw-r--r-- | ftp/lftp/files/patch-src_lftp__ssl.cc | 38 | ||||
| -rw-r--r-- | ftp/lftp/pkg-plist | 2 |
4 files changed, 9 insertions, 44 deletions
diff --git a/ftp/lftp/Makefile b/ftp/lftp/Makefile index 2901edb984bc..3ad1bd98a90b 100644 --- a/ftp/lftp/Makefile +++ b/ftp/lftp/Makefile @@ -1,6 +1,5 @@ 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/ \ @@ -15,7 +14,7 @@ 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 \ @@ -46,6 +45,8 @@ 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 \ 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 @@ -5,6 +5,7 @@ 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 @@ -20,6 +21,7 @@ share/icons/hicolor/48x48/apps/lftp-icon.png %%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 |