OK to update lftp to 4.9.2? https://lftp.tech/news.html I add a simple
patch to fix build with LibreSSL.

Index: Makefile
===================================================================
RCS file: /cvs/ports/net/lftp/Makefile,v
retrieving revision 1.128
diff -u -p -u -p -r1.128 Makefile
--- Makefile    18 Jan 2020 06:48:03 -0000      1.128
+++ Makefile    24 Aug 2020 04:37:14 -0000
@@ -2,7 +2,7 @@
 
 COMMENT=       shell-like command line ftp and sftp client
 
-DISTNAME=      lftp-4.9.1
+DISTNAME=      lftp-4.9.2
 CATEGORIES=    net
 
 HOMEPAGE=      https://lftp.tech/
@@ -15,7 +15,7 @@ PERMIT_PACKAGE=       Yes
 WANTLIB += ${COMPILER_LIBCXX} c crypto curses ereadline expat
 WANTLIB += iconv idn2 intl m ssl unistring util z
 
-COMPILER =             base-clang ports-gcc base-gcc
+COMPILER =     base-clang ports-gcc base-gcc
 
 DEBUG_PACKAGES =${BUILD_PACKAGES}
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/lftp/distinfo,v
retrieving revision 1.78
diff -u -p -u -p -r1.78 distinfo
--- distinfo    18 Jan 2020 06:48:03 -0000      1.78
+++ distinfo    24 Aug 2020 04:37:14 -0000
@@ -1,2 +1,2 @@
-SHA256 (lftp-4.9.1.tar.gz) = AjNtT/xhe0U+fP0zXzpCR1hAj/MaEHINWa3Ybjc3lmo=
-SIZE (lftp-4.9.1.tar.gz) = 2936796
+SHA256 (lftp-4.9.2.tar.gz) = o3WJxhkUBz9TxdoOaL0jO0GAJQnXWKAiAA4a4gdtpzM=
+SIZE (lftp-4.9.2.tar.gz) = 2950063
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/net/lftp/patches/patch-configure,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 patch-configure
--- patches/patch-configure     18 Jan 2020 06:48:03 -0000      1.23
+++ patches/patch-configure     24 Aug 2020 04:37:14 -0000
@@ -5,7 +5,7 @@ Use GNU readline as our base readline la
 Index: configure
 --- configure.orig
 +++ configure
-@@ -55194,7 +55194,7 @@ fi
+@@ -55428,7 +55428,7 @@ fi
        fi
          readline_ld_flags="-L$readline_prefix/lib"
          if test -z "$readline_lib_flags"; then
Index: patches/patch-lib_vasnprintf_c
===================================================================
RCS file: /cvs/ports/net/lftp/patches/patch-lib_vasnprintf_c,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-lib_vasnprintf_c
--- patches/patch-lib_vasnprintf_c      8 Jan 2020 07:50:30 -0000       1.5
+++ patches/patch-lib_vasnprintf_c      24 Aug 2020 04:37:14 -0000
@@ -3,7 +3,7 @@ Initialize variable e
 Index: lib/vasnprintf.c
 --- lib/vasnprintf.c.orig
 +++ lib/vasnprintf.c
-@@ -1306,7 +1306,7 @@ scale10_round_decimal_decoded (int e, mpn_t m, void *m
+@@ -1375,7 +1375,7 @@ scale10_round_decimal_decoded (int e, mpn_t m, void *m
  static char *
  scale10_round_decimal_long_double (long double x, int n)
  {
@@ -12,7 +12,7 @@ Index: lib/vasnprintf.c
    mpn_t m;
    void *memory = decode_long_double (x, &e, &m);
    return scale10_round_decimal_decoded (e, m, memory, n);
-@@ -1324,7 +1324,7 @@ scale10_round_decimal_long_double (long double x, int 
+@@ -1393,7 +1393,7 @@ scale10_round_decimal_long_double (long double x, int 
  static char *
  scale10_round_decimal_double (double x, int n)
  {
Index: patches/patch-src_lftp_ssl_cc
===================================================================
RCS file: patches/patch-src_lftp_ssl_cc
diff -N patches/patch-src_lftp_ssl_cc
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_lftp_ssl_cc       24 Aug 2020 04:37:14 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/lftp_ssl.cc
+--- src/lftp_ssl.cc.orig
++++ src/lftp_ssl.cc
+@@ -34,7 +34,7 @@
+ #include "misc.h"
+ #include "network.h"
+ #include "buffer.h"
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L
+ #define X509_STORE_CTX_get_by_subject X509_STORE_get_by_subject
+ #endif
+ extern "C" {

Reply via email to