Date: Wed, 5 Oct 2022 21:20:24 +0200 From: Matthias Andree <matthias.andree@tu-dortmund.de> To: Ganael LAPLANCHE <martymac@FreeBSD.org>, ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Cc: portmgr <portmgr@FreeBSD.org> Subject: Re: git: 9a36ff5299c8 - main - ftp/lftp: Fix build with libressl >= 2.7.0 Message-ID: <34183267-0f60-bb0d-61c8-424d3b704fcd@tu-dortmund.de> In-Reply-To: <202210051845.295Ijrbg014568@gitrepo.freebsd.org> References: <202210051845.295Ijrbg014568@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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<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
Content-Type: text/html; charset=UTF-8
Content-Transfer-Encoding: 8bit
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
<body>
<p>Hi Ganaël,</p>
<p>please decide to</p>
<p> either mark this NO_PACKAGE, <br>
</p>
<p> or if we want to continue providing binary packages:</p>
<ul>
<li> remove the LibreSSL option, you cannot link GPLv3 software
with LibreSSL, <br>
</li>
<li> 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.<br>
</li>
</ul>
<p>Merci.</p>
<p>Cheers,<br>
Matthias<br>
</p>
<div class="moz-cite-prefix">Am 05.10.22 um 20:45 schrieb Ganael
LAPLANCHE:<br>
</div>
<blockquote type="cite"
cite="mid:202210051845.295Ijrbg014568@gitrepo.freebsd.org">
<pre class="moz-quote-pre" wrap="">The branch main has been updated by martymac:
URL: <a class="moz-txt-link-freetext" href="https://cgit.FreeBSD.org/ports/commit/?id=9a36ff5299c8de0f7a97093fcfe88a2befc0fe35">https://cgit.FreeBSD.org/ports/commit/?id=9a36ff5299c8de0f7a97093fcfe88a2befc0fe35</a>;
commit 9a36ff5299c8de0f7a97093fcfe88a2befc0fe35
Author: Ganael LAPLANCHE <a class="moz-txt-link-rfc2396E" href="mailto:martymac@FreeBSD.org"><martymac@FreeBSD.org></a>
AuthorDate: 2022-10-05 18:38:05 +0000
Commit: Ganael LAPLANCHE <a class="moz-txt-link-rfc2396E" href="mailto:martymac@FreeBSD.org"><martymac@FreeBSD.org></a>
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: <a class="moz-txt-link-abbreviated" href="mailto:tjlegg@gmail.com">tjlegg@gmail.com</a>
Obtained from: <a class="moz-txt-link-freetext" href="https://github.com/lavv17/lftp/commit/3ffa0132987bdde986c82c924bc51b13b37f8b54">https://github.com/lavv17/lftp/commit/3ffa0132987bdde986c82c924bc51b13b37f8b54</a>;
---
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);
</pre>
</blockquote>
</body>
</html>
--------------UK3SH4Dy76vjZvOXqYf8v0AS--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?34183267-0f60-bb0d-61c8-424d3b704fcd>