From nobody Wed Oct 05 19:20:24 2022 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 4MjPY83CQgz4dsf8; Wed, 5 Oct 2022 19:20:28 +0000 (UTC) (envelope-from matthias.andree@tu-dortmund.de) Received: from unimail.uni-dortmund.de (mx1.hrz.uni-dortmund.de [129.217.128.51]) (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 (2048 bits) client-digest SHA256) (Client CN "unimail.tu-dortmund.de", Issuer "GEANT OV RSA CA 4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MjPY72QSkz44j1; Wed, 5 Oct 2022 19:20:27 +0000 (UTC) (envelope-from matthias.andree@tu-dortmund.de) Received: from mandree.no-ip.org (p54a03871.dip0.t-ipconnect.de [84.160.56.113]) (authenticated bits=0) by unimail.uni-dortmund.de (8.17.1.9/8.17.1) with ESMTPSA id 295JKOLT028708 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Wed, 5 Oct 2022 21:20:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tu-dortmund.de; s=unimail; t=1664997624; bh=KX+SJQkol3orNMG6zqWkaNOvsDO0oOd+OPx2M2fwHp8=; h=Date:Subject:To:References:Cc:From:In-Reply-To; b=SEbwGBxGvsXB8/PKzkTJq3z+q64HOQ+HH1TTLVYYLY8Fp0f351vLEk/Z+zv0o7zdB lCDmIeOQf7Ih/pZq00AceSHTZQa/3Z360Rs0/dRocqS1Q4aZkDiUJNNZ7j4J4TjXN9 WpMI3KFfwD6tmHN+E0R+Q0duRmv6f0wQtoJJYspg= Received: from [127.0.0.1] (localhost [127.0.0.1]) by ryzen.an3e.de (Postfix) with ESMTP id 50A6690243E; Wed, 5 Oct 2022 21:20:24 +0200 (CEST) Content-Type: multipart/alternative; boundary="------------UK3SH4Dy76vjZvOXqYf8v0AS" Message-ID: <34183267-0f60-bb0d-61c8-424d3b704fcd@tu-dortmund.de> Date: Wed, 5 Oct 2022 21:20:24 +0200 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.3.1 Subject: Re: git: 9a36ff5299c8 - main - ftp/lftp: Fix build with libressl >= 2.7.0 Content-Language: en-US, de-DE, en-GB, fr-FR, nl-NL To: Ganael LAPLANCHE , ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org References: <202210051845.295Ijrbg014568@gitrepo.freebsd.org> Cc: portmgr From: Matthias Andree In-Reply-To: <202210051845.295Ijrbg014568@gitrepo.freebsd.org> X-Rspamd-Queue-Id: 4MjPY72QSkz44j1 X-Spamd-Bar: ----- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=tu-dortmund.de header.s=unimail header.b=SEbwGBxG; dmarc=none; spf=pass (mx1.freebsd.org: domain of matthias.andree@tu-dortmund.de designates 129.217.128.51 as permitted sender) smtp.mailfrom=matthias.andree@tu-dortmund.de X-Spamd-Result: default: False [-5.27 / 15.00]; DWL_DNSWL_LOW(-1.00)[tu-dortmund.de:dkim]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.97)[-0.967]; RCVD_DKIM_ARC_DNSWL_MED(-0.50)[]; RCVD_IN_DNSWL_MED(-0.20)[129.217.128.51:from]; R_SPF_ALLOW(-0.20)[+ip4:129.217.128.0/24]; R_DKIM_ALLOW(-0.20)[tu-dortmund.de:s=unimail]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; RWL_MAILSPIKE_GOOD(-0.10)[129.217.128.51:from]; RCVD_TLS_LAST(0.00)[]; DKIM_TRACE(0.00)[tu-dortmund.de:+]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; MLMMJ_DEST(0.00)[dev-commits-ports-main@FreeBSD.org,dev-commits-ports-all@FreeBSD.org]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCPT_COUNT_FIVE(0.00)[5]; ASN(0.00)[asn:680, ipnet:129.217.0.0/16, country:DE]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; TO_DN_SOME(0.00)[]; DMARC_NA(0.00)[tu-dortmund.de]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MID_RHS_MATCH_FROM(0.00)[] X-ThisMailContainsUnwantedMimeParts: N This is a multi-part message in MIME format. --------------UK3SH4Dy76vjZvOXqYf8v0AS Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Hi Ganaël, please decide to  either mark this NO_PACKAGE,  or if we want to continue providing binary packages: *  remove the LibreSSL option, you cannot link GPLv3 software with LibreSSL, *  and ensure that OpenSSL is either "from base" (GPL copyleft does not apply to OS components (*)), or v3.0.x or newer (OpenSSL v3 is Apache licensed and compatible with GPL v3). OpenSSL 1.x or older from ports also cannot be used for binary shipments. Merci. Cheers, Matthias Am 05.10.22 um 20:45 schrieb Ganael LAPLANCHE: > The branch main has been updated by martymac: > > URL:https://cgit.FreeBSD.org/ports/commit/?id=9a36ff5299c8de0f7a97093fcfe88a2befc0fe35 > > commit 9a36ff5299c8de0f7a97093fcfe88a2befc0fe35 > Author: Ganael LAPLANCHE > AuthorDate: 2022-10-05 18:38:05 +0000 > Commit: Ganael LAPLANCHE > CommitDate: 2022-10-05 18:45:45 +0000 > > ftp/lftp: Fix build with libressl >= 2.7.0 > > While here, re-generate patches using makepatch target. > > PR: 266803 > Reported by:tjlegg@gmail.com > Obtained from:https://github.com/lavv17/lftp/commit/3ffa0132987bdde986c82c924bc51b13b37f8b54 > --- > ftp/lftp/files/patch-src-Makefile.in | 4 ++-- > ftp/lftp/files/patch-src_lftp__ssl.cc | 9 +++++++++ > 2 files changed, 11 insertions(+), 2 deletions(-) > > diff --git a/ftp/lftp/files/patch-src-Makefile.in b/ftp/lftp/files/patch-src-Makefile.in > index a0a82f1b3647..be33f1b58e7c 100644 > --- a/ftp/lftp/files/patch-src-Makefile.in > +++ b/ftp/lftp/files/patch-src-Makefile.in > @@ -1,6 +1,6 @@ > ---- src/Makefile.in.orig 2019-12-21 09:41:47 UTC > +--- src/Makefile.in.orig 2020-08-13 19:57:03 UTC > +++ src/Makefile.in > -@@ -2607,7 +2607,7 @@ info: info-am > +@@ -2625,7 +2625,7 @@ info: info-am > > info-am: > > diff --git a/ftp/lftp/files/patch-src_lftp__ssl.cc b/ftp/lftp/files/patch-src_lftp__ssl.cc > index 03a2b75a31c8..79d85fd04207 100644 > --- a/ftp/lftp/files/patch-src_lftp__ssl.cc > +++ b/ftp/lftp/files/patch-src_lftp__ssl.cc > @@ -9,6 +9,15 @@ > #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); --------------UK3SH4Dy76vjZvOXqYf8v0AS Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: 8bit

Hi Ganaël,

please decide to

 either mark this NO_PACKAGE,

 or if we want to continue providing binary packages:

  •  remove the LibreSSL option, you cannot link GPLv3 software with LibreSSL,
  •  and ensure that OpenSSL is either "from base" (GPL copyleft does not apply to OS components (*)), or v3.0.x or newer (OpenSSL v3 is Apache licensed and compatible with GPL v3). OpenSSL 1.x or older from ports also cannot be used for binary shipments.

Merci.

Cheers,
Matthias

Am 05.10.22 um 20:45 schrieb Ganael LAPLANCHE:
The branch main has been updated by martymac:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9a36ff5299c8de0f7a97093fcfe88a2befc0fe35

commit 9a36ff5299c8de0f7a97093fcfe88a2befc0fe35
Author:     Ganael LAPLANCHE <martymac@FreeBSD.org>
AuthorDate: 2022-10-05 18:38:05 +0000
Commit:     Ganael LAPLANCHE <martymac@FreeBSD.org>
CommitDate: 2022-10-05 18:45:45 +0000

    ftp/lftp: Fix build with libressl >= 2.7.0
    
    While here, re-generate patches using makepatch target.
    
    PR:             266803
    Reported by:    tjlegg@gmail.com
    Obtained from:  https://github.com/lavv17/lftp/commit/3ffa0132987bdde986c82c924bc51b13b37f8b54
---
 ftp/lftp/files/patch-src-Makefile.in  | 4 ++--
 ftp/lftp/files/patch-src_lftp__ssl.cc | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ftp/lftp/files/patch-src-Makefile.in b/ftp/lftp/files/patch-src-Makefile.in
index a0a82f1b3647..be33f1b58e7c 100644
--- a/ftp/lftp/files/patch-src-Makefile.in
+++ b/ftp/lftp/files/patch-src-Makefile.in
@@ -1,6 +1,6 @@
---- src/Makefile.in.orig	2019-12-21 09:41:47 UTC
+--- src/Makefile.in.orig	2020-08-13 19:57:03 UTC
 +++ src/Makefile.in
-@@ -2607,7 +2607,7 @@ info: info-am
+@@ -2625,7 +2625,7 @@ info: info-am
  
  info-am:
  
diff --git a/ftp/lftp/files/patch-src_lftp__ssl.cc b/ftp/lftp/files/patch-src_lftp__ssl.cc
index 03a2b75a31c8..79d85fd04207 100644
--- a/ftp/lftp/files/patch-src_lftp__ssl.cc
+++ b/ftp/lftp/files/patch-src_lftp__ssl.cc
@@ -9,6 +9,15 @@
  #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);
--------------UK3SH4Dy76vjZvOXqYf8v0AS--