From nobody Fri Nov 29 11:31:18 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y09x30Y9wz5f2RP; Fri, 29 Nov 2024 11:31:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y09x26ndvz42Gy; Fri, 29 Nov 2024 11:31:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732879879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YBmQY7QifrXSuZtsHjETLL1uYF86LoO72zaLHZyEYns=; b=POIio5Pyw46bqctmue5O2yuW86kyFEtabJdAQDVgBVCfmb1TeO9jITRhfFCMIYvbjlw7M8 jMNUqGteWPne0H2R3INgjUgI63OF4tKM/IFwnP03LN0IJ5l1B6HvfmnEKV7ONIOf22GV4O EmhRILmXJn67NAcuTQIQj0NqVAxlpfgZgL8fUyhvcjvx5Q+d14hjZA+FU+WzHiUys81TN0 U/apnB0dglJoFvp9u2Z7BdyLGz40+prcH6CnUiL9tqkXgAB7Q5DrbepEwDudWO6fnF2aAQ s10X39dg+5C7p5D1AHWGTQvJsDrN1iJXrW/nyhiv17cpbD0zt+jdfQQxou5e7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732879878; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YBmQY7QifrXSuZtsHjETLL1uYF86LoO72zaLHZyEYns=; b=rJHNw1Bcl5HJ7TxsbvjUyII6IaPgepYLGGngMVGQPLI5im10y+8f/I/CkQu4nyfom6LmR7 SQKejlwQf6qpx4C2asmktvfC39Oo+AERRlO3dWm+RvzXF02WN1PYq6v131JVqAqjkvfC6b WkxQGKKJAoxV4bVVCeExweeFaZC7OWkJdwqW6rTAkWfgWC3sTGub12iNQa/xDvzRD7cD6n DPY3/hXdTTyKK8qvthAyrEyUQrvXf/MFAJEPajMAWSWIwgWO+2FdUEouA6Pf+tI+mC5KuP 8JUEX9AkbVx4akeLiKC3FScQdxqiLlKdsQffEOm3pWBwGLLvcI9VrOdeBKUFPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732879879; a=rsa-sha256; cv=none; b=Ez0jSWNGFiycKE9UgEnJhIyHcCRfFN3hAJiYFFsyPftrV6OIR4PreiEoE6xfc91xC4v7yY n1bbRpHHstfoOhd6xVSD0C/xvZQ8KiZB6QZoNR811B5qqBauX8DUW8LfY3tHKbkPVX4NdH vRrkSBt2QHAWOQeCqTLdWmiBfI8b1VJtGValNY3M8wRkHpsCjIzEm0TockfcIPi2icTlia XjiyLgylc5RauVTcS84bsBZQvSMzPzUlqqLqMYC0gkWs4KUWj/isq2eCDrLCBYd4tjHNDX MnZdRzagSICKZtSAbcURxjGRn6eLi/Pga8RaQ1Bd2vg18sfJHFKYwY9GK26YoQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y09x26PFSzLd7; Fri, 29 Nov 2024 11:31:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4ATBVIJQ068796; Fri, 29 Nov 2024 11:31:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4ATBVI8D068793; Fri, 29 Nov 2024 11:31:18 GMT (envelope-from git) Date: Fri, 29 Nov 2024 11:31:18 GMT Message-Id: <202411291131.4ATBVI8D068793@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ganael LAPLANCHE Subject: git: 7e86812c08af - main - ftp/lftp: Update to 4.9.3 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: martymac X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7e86812c08aff5e0f2305fef7b9f6713836a6d5c Auto-Submitted: auto-generated The branch main has been updated by martymac: URL: https://cgit.FreeBSD.org/ports/commit/?id=7e86812c08aff5e0f2305fef7b9f6713836a6d5c commit 7e86812c08aff5e0f2305fef7b9f6713836a6d5c Author: Ganael LAPLANCHE AuthorDate: 2024-11-29 11:30:30 +0000 Commit: Ganael LAPLANCHE CommitDate: 2024-11-29 11:30:30 +0000 ftp/lftp: Update to 4.9.3 Also, fix LICENSE which is actually GPLv3+ --- ftp/lftp/Makefile | 7 ++++--- ftp/lftp/distinfo | 6 +++--- ftp/lftp/files/patch-src_lftp__ssl.cc | 38 ----------------------------------- 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