[Buildroot] [PATCH 1/1] package/lftp: fix build with OpenSSL

[Buildroot] [PATCH 1/1] package/lftp: fix build with OpenSSL

[Artem Panfilov via buildroot]

Add upstream patch from master(0276d5c) that fixes build with OpenSSL.

Signed-off-by: Artem Panfilov <artemp@synopsys.com>
---
 ...-with-LibreSSL-following-commit-537f37898.patch | 43 ++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 package/lftp/0001-Fix-build-with-LibreSSL-following-commit-537f37898.patch

diff --git a/package/lftp/0001-Fix-build-with-LibreSSL-following-commit-537f37898.patch b/package/lftp/0001-Fix-build-with-LibreSSL-following-commit-537f37898.patch
new file mode 100644
index 0000000000..b06e9a375b
--- /dev/null
+++ b/package/lftp/0001-Fix-build-with-LibreSSL-following-commit-537f37898.patch
@@ -0,0 +1,43 @@
+From 0276d5c239c41b3a63f738a5dc47fd56ac389cf0 Mon Sep 17 00:00:00 2001
+From: Ganael Laplanche <ganael.laplanche@martymac.org>
+Date: Thu, 20 Aug 2020 12:29:05 +0200
+Subject: [PATCH] Fix build with LibreSSL (following commit 537f37898)
+
+---
+ src/lftp_ssl.cc | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/lftp_ssl.cc b/src/lftp_ssl.cc
+index 14a3b9d4..968d3fb2 100644
+--- a/src/lftp_ssl.cc
++++ b/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" {
+@@ -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 *o)
+ 
+ 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();
+-- 
+2.25.1
+
-- 
2.16.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/lftp: fix build with OpenSSL

[Arnout Vandecappelle]

On 29/09/2021 18:14, Artem Panfilov via buildroot wrote:
> Add upstream patch from master(0276d5c) that fixes build with OpenSSL.
> 
> Signed-off-by: Artem Panfilov <artemp@synopsys.com>
> ---
>   ...-with-LibreSSL-following-commit-537f37898.patch | 43 ++++++++++++++++++++++
>   1 file changed, 43 insertions(+)
>   create mode 100644 package/lftp/0001-Fix-build-with-LibreSSL-following-commit-537f37898.patch
> 
> diff --git a/package/lftp/0001-Fix-build-with-LibreSSL-following-commit-537f37898.patch b/package/lftp/0001-Fix-build-with-LibreSSL-following-commit-537f37898.patch
> new file mode 100644
> index 0000000000..b06e9a375b
> --- /dev/null
> +++ b/package/lftp/0001-Fix-build-with-LibreSSL-following-commit-537f37898.patch
> @@ -0,0 +1,43 @@
> +From 0276d5c239c41b3a63f738a5dc47fd56ac389cf0 Mon Sep 17 00:00:00 2001
> +From: Ganael Laplanche <ganael.laplanche@martymac.org>
> +Date: Thu, 20 Aug 2020 12:29:05 +0200
> +Subject: [PATCH] Fix build with LibreSSL (following commit 537f37898)
> +

  You need to add your own Sob here.

  I've done that (with mine as well). I've also added an upstream link, and 
applied to master, thanks.

  Regards,
  Arnout

> +---
> + src/lftp_ssl.cc | 6 +++---
> + 1 file changed, 3 insertions(+), 3 deletions(-)
> +
> +diff --git a/src/lftp_ssl.cc b/src/lftp_ssl.cc
> +index 14a3b9d4..968d3fb2 100644
> +--- a/src/lftp_ssl.cc
> ++++ b/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" {
> +@@ -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 *o)
> +
> + 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();
> +--
> +2.25.1
> +
> 
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/lftp: fix build with OpenSSL

[Peter Korsgaard]

>>>>> "Artem" == Artem Panfilov via buildroot <buildroot@buildroot.org> writes:

 > Add upstream patch from master(0276d5c) that fixes build with OpenSSL.

It is a bit confusing to call it OpenSSL when this is specifically about
LibreSSL, so I've changed that and committed to 2021.02.x and 2021.08.x,
thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot