public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/proj/libressl:master commit in: net-ftp/lftp/files/, net-ftp/lftp/
@ 2021-01-26 18:17 Quentin Retornaz
  0 siblings, 0 replies; 3+ messages in thread
From: Quentin Retornaz @ 2021-01-26 18:17 UTC (permalink / raw
  To: gentoo-commits

commit:     a7f82bcda7ef581a6555120d3c3c1b504b14219f
Author:     Quentin Retornaz <gentoo <AT> retornaz <DOT> com>
AuthorDate: Sun Jan 17 19:23:55 2021 +0000
Commit:     Quentin Retornaz <gentoo <AT> retornaz <DOT> com>
CommitDate: Tue Jan 26 00:21:42 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=a7f82bcd

net-ftp/lftp: new package

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Quentin Retornaz <gentoo <AT> retornaz.com>

 net-ftp/lftp/Manifest                              |   1 +
 net-ftp/lftp/files/lftp-4.0.2.91-lafile.patch      |  21 ++++
 .../lftp/files/lftp-4.5.5-am_config_header.patch   |  11 +++
 net-ftp/lftp/files/lftp-4.7.0-gettext.patch        |  11 +++
 .../lftp/files/lftp-4.7.5-libdir-additional.patch  |  12 +++
 net-ftp/lftp/files/lftp-4.7.5-libdir-expat.patch   |  11 +++
 .../lftp/files/lftp-4.8.2-libdir-configure.patch   |  18 ++++
 net-ftp/lftp/files/lftp-4.8.2-libdir-libidn2.patch |  10 ++
 net-ftp/lftp/files/lftp-4.8.2-libdir-openssl.patch |  18 ++++
 net-ftp/lftp/files/lftp-4.8.2-libdir-zlib.patch    |  20 ++++
 .../lftp/files/lftp-4.9.1-libdir-readline.patch    |  11 +++
 net-ftp/lftp/files/lftp-4.9.2-ac-270.patch         |  36 +++++++
 net-ftp/lftp/files/lftp-4.9.2-libressl.patch       |  40 ++++++++
 net-ftp/lftp/lftp-4.9.2.ebuild                     | 107 +++++++++++++++++++++
 net-ftp/lftp/metadata.xml                          |  16 +++
 15 files changed, 343 insertions(+)

diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
new file mode 100644
index 0000000..2ccaa2a
--- /dev/null
+++ b/net-ftp/lftp/Manifest
@@ -0,0 +1 @@
+DIST lftp-4.9.2.tar.xz 1654960 BLAKE2B 04f168576ae6e001e0ffffb2e93e36d5bffa5ed1e2e671edb6210a54aa0ecedc280885450dcee890d05b64464eb641e7e63c8d4dd170100317dec3fe734ec483 SHA512 cda8698e7e34d748715a6fe5dc06c758240302621c7957402f0cc67577acf1a96b436fda4282408dee8171dc84a31e0be432df99a30f0a10057a8e7ea9ec64ad

diff --git a/net-ftp/lftp/files/lftp-4.0.2.91-lafile.patch b/net-ftp/lftp/files/lftp-4.0.2.91-lafile.patch
new file mode 100644
index 0000000..6180d92
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-4.0.2.91-lafile.patch
@@ -0,0 +1,21 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -18,7 +18,8 @@
+ example_module1_la_SOURCES = example-module1.cc
+ example_module1_la_LDFLAGS  = -module -avoid-version -rpath $(pkgverlibdir)
+ 
+-TASK_MODULES = liblftp-pty.la liblftp-network.la proto-ftp.la proto-http.la proto-file.la proto-fish.la proto-sftp.la
++TASK_MODULES = liblftp-pty.la liblftp-network.la proto-ftp.la proto-http.la proto-file.la proto-fish.la proto-sftp.la liblftp-tasks.la liblftp-jobs.la
++
+ JOB_MODULES = cmd-mirror.la cmd-sleep.la cmd-torrent.la
+ if WITH_MODULES
+   pkgverlib_LTLIBRARIES = $(TASK_MODULES) $(JOB_MODULES)
+@@ -26,8 +27,6 @@
+   TASK_MODULES_STATIC = $(TASK_MODULES)
+   JOB_MODULES_STATIC = $(JOB_MODULES)
+ endif
+-lib_LTLIBRARIES = liblftp-tasks.la liblftp-jobs.la
+-
+ proto_ftp_la_SOURCES  = ftpclass.cc ftpclass.h FtpListInfo.cc FtpListInfo.h\
+  FtpDirList.cc FtpDirList.h ftp-opie.c FileCopyFtp.cc FileCopyFtp.h
+ proto_http_la_SOURCES = Http.cc Http.h HttpDir.cc HttpDir.h HttpDirXML.cc

diff --git a/net-ftp/lftp/files/lftp-4.5.5-am_config_header.patch b/net-ftp/lftp/files/lftp-4.5.5-am_config_header.patch
new file mode 100644
index 0000000..28a9e80
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-4.5.5-am_config_header.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -5,7 +5,7 @@
+ AC_CONFIG_MACRO_DIR([m4])
+ AC_CONFIG_LIBOBJ_DIR([lib])
+ AC_CONFIG_SRCDIR([src/ftpclass.cc])
+-AM_CONFIG_HEADER([lib/config.h])
++AC_CONFIG_HEADERS([lib/config.h])
+ AM_INIT_AUTOMAKE
+ 
+ dnl This doesn't *require* GNU extensions; it merely enables them if

diff --git a/net-ftp/lftp/files/lftp-4.7.0-gettext.patch b/net-ftp/lftp/files/lftp-4.7.0-gettext.patch
new file mode 100644
index 0000000..729410a
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-4.7.0-gettext.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -138,7 +138,7 @@
+ 
+ ALL_LINGUAS="de es fr it ja ko pl pt_BR ru uk zh_CN zh_TW zh_HK cs"
+ AM_GNU_GETTEXT([external])
+-AM_GNU_GETTEXT_VERSION([0.15])
++AM_GNU_GETTEXT_VERSION([0.19])
+ test "$MSGFMT"  = "no" && MSGFMT  ="$missing_dir/missing msgfmt"
+ test "$GMSGFMT" = "no" && GMSGFMT ="$missing_dir/missing msgfmt"
+ test "$XGETTEXT" = ":" && XGETTEXT="$missing_dir/missing xgettext"

diff --git a/net-ftp/lftp/files/lftp-4.7.5-libdir-additional.patch b/net-ftp/lftp/files/lftp-4.7.5-libdir-additional.patch
new file mode 100644
index 0000000..bf7f0a9
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-4.7.5-libdir-additional.patch
@@ -0,0 +1,12 @@
+--- a/m4/lib-prefix.m4
++++ b/m4/lib-prefix.m4
+@@ -108,7 +108,8 @@
+         if test -z "$haveit"; then
+           if test -d "$additional_libdir"; then
+             dnl Really add $additional_libdir to $LDFLAGS.
+-            LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
++            dnl No, let's not do that.
++            :
+           fi
+         fi
+       fi

diff --git a/net-ftp/lftp/files/lftp-4.7.5-libdir-expat.patch b/net-ftp/lftp/files/lftp-4.7.5-libdir-expat.patch
new file mode 100644
index 0000000..f82afc7
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-4.7.5-libdir-expat.patch
@@ -0,0 +1,11 @@
+--- a/m4/ax_lib_expat.m4
++++ b/m4/ax_lib_expat.m4
+@@ -109,7 +109,7 @@
+ 
+     if test -n "$expat_prefix"; then
+         expat_include_dir="$expat_prefix/include"
+-        expat_ld_flags="-L$expat_prefix/lib"
++        expat_ld_flags="-L$libdir"
+         expat_lib_flags="-lexpat"
+         run_expat_test="yes"
+     elif test "$expat_requested" = "yes"; then

diff --git a/net-ftp/lftp/files/lftp-4.8.2-libdir-configure.patch b/net-ftp/lftp/files/lftp-4.8.2-libdir-configure.patch
new file mode 100644
index 0000000..d8d620b
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-4.8.2-libdir-configure.patch
@@ -0,0 +1,18 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -186,7 +186,6 @@
+ esac
+ 
+ if test x$socks_loc != x; then
+-   LDFLAGS="$LDFLAGS -L$socks_loc/lib"
+    CPPFLAGS="$CPPFLAGS -I$socks_loc/include"
+ fi
+ 
+@@ -307,7 +306,6 @@
+ AX_CHECK_ZLIB([
+    AC_SUBST([ZLIB],[-lz])
+    r=""; test "$enable_rpath" = yes -a "$ZLIB_HOME" != /usr && r=" -R${ZLIB_HOME}/lib"
+-   AC_SUBST([ZLIB_LDFLAGS],["-L${ZLIB_HOME}/lib$r"])
+    AC_SUBST([ZLIB_CPPFLAGS],["-I${ZLIB_HOME}/include"])
+ ],[
+    AC_MSG_ERROR([cannot find -lz library, install zlib-devel package])

diff --git a/net-ftp/lftp/files/lftp-4.8.2-libdir-libidn2.patch b/net-ftp/lftp/files/lftp-4.8.2-libdir-libidn2.patch
new file mode 100644
index 0000000..cae07b9
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-4.8.2-libdir-libidn2.patch
@@ -0,0 +1,10 @@
+--- a/m4/lftp.m4
++++ b/m4/lftp.m4
+@@ -319,7 +319,6 @@
+        libidn2=$withval, libidn2=yes)
+      if test "$libidn2" != "no"; then
+        if test "$libidn2" != "yes"; then
+-         LDFLAGS="${LDFLAGS} -L$libidn2/lib"
+          CPPFLAGS="${CPPFLAGS} -I$libidn2/include"
+        fi
+        AC_CHECK_HEADER(idn2.h,

diff --git a/net-ftp/lftp/files/lftp-4.8.2-libdir-openssl.patch b/net-ftp/lftp/files/lftp-4.8.2-libdir-openssl.patch
new file mode 100644
index 0000000..f8bf45b
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-4.8.2-libdir-openssl.patch
@@ -0,0 +1,18 @@
+--- a/m4/ssl.m4
++++ b/m4/ssl.m4
+@@ -10,7 +10,6 @@
+ 		old_CPPFLAGS="$CPPFLAGS"
+ 		LIBS="$LIBS -lssl -lcrypto"
+ 		if test $loc != default; then
+-			LDFLAGS="$LDFLAGS -L$loc/lib"
+ 			CPPFLAGS="$CPPFLAGS -I$loc/include"
+ 		fi
+ 		AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <openssl/ssl.h>
+@@ -22,7 +21,6 @@
+ 			lftp_cv_openssl="OPENSSL_LIBS=\"-lssl -lcrypto\""
+ 			if test $found_loc != default; then
+ 				r=""; test "$enable_rpath" = yes -a "$found_loc" != /usr && r=" -R$found_loc/lib"
+-				lftp_cv_openssl="$lftp_cv_openssl OPENSSL_LDFLAGS=\"-L$found_loc/lib$r\""
+ 				lftp_cv_openssl="$lftp_cv_openssl OPENSSL_CPPFLAGS=-I$found_loc/include"
+ 			fi
+ 			break;

diff --git a/net-ftp/lftp/files/lftp-4.8.2-libdir-zlib.patch b/net-ftp/lftp/files/lftp-4.8.2-libdir-zlib.patch
new file mode 100644
index 0000000..7ff003f
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-4.8.2-libdir-zlib.patch
@@ -0,0 +1,20 @@
+--- a/m4/ax_check_zlib.m4
++++ b/m4/ax_check_zlib.m4
+@@ -105,7 +105,6 @@
+   ZLIB_OLD_LDFLAGS="$LDFLAGS"
+   ZLIB_OLD_CPPFLAGS="$CPPFLAGS"
+   if test -n "${ZLIB_HOME}"; then
+-        LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib"
+         CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include"
+   fi
+   AC_LANG_SAVE
+@@ -118,8 +118,7 @@
+     # If both library and header were found, action-if-found
+     #
+     m4_ifblank([$1],[
+-		test "$enable_rpath" = yes -a "$ZLIB_HOME" != /usr && \
+-		    LDFLAGS="$LDFLAGS -R${ZLIB_HOME}/lib"
++		test "$enable_rpath" = yes -a "$ZLIB_HOME" != /usr
+                 LIBS="-lz $LIBS"
+                 AC_DEFINE([HAVE_LIBZ], [1],
+                           [Define to 1 if you have `z' library (-lz)])

diff --git a/net-ftp/lftp/files/lftp-4.9.1-libdir-readline.patch b/net-ftp/lftp/files/lftp-4.9.1-libdir-readline.patch
new file mode 100644
index 0000000..fde1017
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-4.9.1-libdir-readline.patch
@@ -0,0 +1,11 @@
+--- a/m4/lftp_lib_readline.m4
++++ b/m4/lftp_lib_readline.m4
+@@ -107,7 +107,7 @@
+ 	if test -f "$readline_include_dir/readline/readline.h"; then
+ 	    readline_include_dir="$readline_include_dir/readline"
+ 	fi
+-        readline_ld_flags="-L$readline_prefix/lib"
++        readline_ld_flags="-L$libdir"
+         if test -z "$readline_lib_flags"; then
+             readline_lib_flags="-lreadline"
+         fi

diff --git a/net-ftp/lftp/files/lftp-4.9.2-ac-270.patch b/net-ftp/lftp/files/lftp-4.9.2-ac-270.patch
new file mode 100644
index 0000000..a2a558d
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-4.9.2-ac-270.patch
@@ -0,0 +1,36 @@
+--- a/m4/std-gnu11.m4
++++ b/m4/std-gnu11.m4
+@@ -6,6 +6,8 @@
+ # This implementation will be obsolete once we can assume Autoconf 2.70
+ # or later is installed everywhere a Gnulib program might be developed.
+ 
++m4_version_prereq([2.70], [], [
++
+ 
+ # Copyright (C) 2001-2020 Free Software Foundation, Inc.
+ 
+@@ -70,7 +72,7 @@ _AS_ECHO_LOG([checking for _AC_LANG compiler version])
+ set X $ac_compile
+ ac_compiler=$[2]
+ for ac_option in --version -v -V -qversion -version; do
+-  m4_ifdef([_AC_DO_LIMIT],[_AC_DO_LIMIT],[_AC_DO])([$ac_compiler $ac_option >&AS_MESSAGE_LOG_FD])
++  _AC_DO_LIMIT([$ac_compiler $ac_option >&AS_MESSAGE_LOG_FD])
+ done
+ 
+ m4_expand_once([_AC_COMPILER_EXEEXT])[]dnl
+@@ -135,7 +137,7 @@ _AS_ECHO_LOG([checking for _AC_LANG compiler version])
+ set X $ac_compile
+ ac_compiler=$[2]
+ for ac_option in --version -v -V -qversion; do
+-  m4_ifdef([_AC_DO_LIMIT],[_AC_DO_LIMIT],[_AC_DO])([$ac_compiler $ac_option >&AS_MESSAGE_LOG_FD])
++  _AC_DO_LIMIT([$ac_compiler $ac_option >&AS_MESSAGE_LOG_FD])
+ done
+ 
+ m4_expand_once([_AC_COMPILER_EXEEXT])[]dnl
+@@ -822,3 +824,6 @@ dnl Tru64	N/A (no support)
+ dnl with extended modes being tried first.
+ [[-std=gnu++11 -std=c++11 -std=gnu++0x -std=c++0x -qlanglvl=extended0x -AA]], [$1], [$2])[]dnl
+ ])# _AC_PROG_CXX_CXX11
++
++
++])# m4_version_prereq

diff --git a/net-ftp/lftp/files/lftp-4.9.2-libressl.patch b/net-ftp/lftp/files/lftp-4.9.2-libressl.patch
new file mode 100644
index 0000000..51de51f
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-4.9.2-libressl.patch
@@ -0,0 +1,40 @@
+https://github.com/lavv17/lftp/commit/0276d5c239c41b3a63f738a5dc47fd56ac389cf0.patch
+
+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(-)
+
+--- 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();

diff --git a/net-ftp/lftp/lftp-4.9.2.ebuild b/net-ftp/lftp/lftp-4.9.2.ebuild
new file mode 100644
index 0000000..8acf412
--- /dev/null
+++ b/net-ftp/lftp/lftp-4.9.2.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools libtool xdg-utils
+
+DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program"
+HOMEPAGE="https://lftp.tech/"
+SRC_URI="https://lftp.tech/ftp/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="convert-mozilla-cookies +gnutls idn ipv6 libressl nls socks5 +ssl verify-file"
+RESTRICT="test"
+
+RDEPEND="
+	>=sys-libs/ncurses-5.1:=
+	>=sys-libs/readline-5.1:=
+	dev-libs/expat
+	sys-libs/zlib
+	convert-mozilla-cookies? ( dev-perl/DBI )
+	idn? ( net-dns/libidn2:= )
+	socks5? (
+		>=net-proxy/dante-1.1.12
+		sys-libs/pam
+	)
+	ssl? (
+		gnutls? ( >=net-libs/gnutls-1.2.3:0= )
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
+	verify-file? (
+		dev-perl/String-CRC32
+		virtual/perl-Digest-MD5
+	)
+"
+DEPEND="
+	${RDEPEND}
+	=sys-devel/libtool-2*
+	app-arch/xz-utils
+	nls? ( >=sys-devel/gettext-0.19 )
+	virtual/pkgconfig
+"
+DOCS=(
+	BUGS ChangeLog FAQ FEATURES MIRRORS NEWS README README.debug-levels
+	README.dnssec README.modules THANKS TODO
+)
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0.2.91-lafile.patch
+	"${FILESDIR}"/${PN}-4.5.5-am_config_header.patch
+	"${FILESDIR}"/${PN}-4.7.0-gettext.patch
+	"${FILESDIR}"/${PN}-4.7.5-libdir-additional.patch
+	"${FILESDIR}"/${PN}-4.7.5-libdir-expat.patch
+	"${FILESDIR}"/${PN}-4.8.2-libdir-configure.patch
+	"${FILESDIR}"/${PN}-4.8.2-libdir-libidn2.patch
+	"${FILESDIR}"/${PN}-4.8.2-libdir-openssl.patch
+	"${FILESDIR}"/${PN}-4.8.2-libdir-zlib.patch
+	"${FILESDIR}"/${PN}-4.9.1-libdir-readline.patch
+	"${FILESDIR}"/${PN}-4.9.2-libressl.patch
+	"${FILESDIR}"/${PN}-4.9.2-ac-270.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	elibtoolize # for Darwin bundles
+
+	# bug #536036
+	printf 'set fish:auto-confirm no\nset sftp:auto-confirm no\n' >> ${PN}.conf || die
+}
+
+src_configure() {
+	econf \
+		$(use_enable ipv6) \
+		$(use_enable nls) \
+		$(use_with idn libidn2) \
+		$(use_with socks5 socksdante "${EPREFIX}"/usr) \
+		$(usex ssl "$(use_with !gnutls openssl ${EPREFIX}/usr)" '--without-openssl') \
+		$(usex ssl "$(use_with gnutls)" '--without-gnutls') \
+		--enable-packager-mode \
+		--sysconfdir="${EPREFIX}"/etc/${PN} \
+		--with-modules \
+		--with-readline="${EPREFIX}"/usr \
+		--without-included-regex
+}
+
+src_install() {
+	default
+
+	local script
+	for script in {convert-mozilla-cookies,verify-file}; do
+		use ${script} || { rm "${ED}"/usr/share/${PN}/${script} || die ;}
+	done
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}

diff --git a/net-ftp/lftp/metadata.xml b/net-ftp/lftp/metadata.xml
new file mode 100644
index 0000000..de1ae65
--- /dev/null
+++ b/net-ftp/lftp/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>slyfox@gentoo.org</email>
+		<name>Sergei Trofimovich</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
+	<use>
+		<flag name="convert-mozilla-cookies">Install the convert-mozilla-cookies script and its run-time dependencies</flag>
+		<flag name="verify-file">Install the verify-file script and its run-time dependencies</flag>
+	</use>
+</pkgmetadata>


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/libressl:master commit in: net-ftp/lftp/files/, net-ftp/lftp/
@ 2023-04-12  3:41 orbea
  0 siblings, 0 replies; 3+ messages in thread
From: orbea @ 2023-04-12  3:41 UTC (permalink / raw
  To: gentoo-commits

commit:     e714faa757f6e9cc67348e8bd8bda26fe58ba310
Author:     orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Wed Apr 12 03:39:52 2023 +0000
Commit:     orbea <orbea <AT> riseup <DOT> net>
CommitDate: Wed Apr 12 03:41:30 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=e714faa7

net-ftp/lftp: Add 4.9.2-r1

Signed-off-by: orbea <orbea <AT> riseup.net>

 .../lftp/files/lftp-4.9.2-configure-clang16.patch  | 22 ++++++++++++++++++++++
 .../{lftp-4.9.2.ebuild => lftp-4.9.2-r1.ebuild}    |  8 ++++++--
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/net-ftp/lftp/files/lftp-4.9.2-configure-clang16.patch b/net-ftp/lftp/files/lftp-4.9.2-configure-clang16.patch
new file mode 100644
index 0000000..d039390
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-4.9.2-configure-clang16.patch
@@ -0,0 +1,22 @@
+https://github.com/lavv17/lftp/commit/8af97cc255c3d2488adb107515bd1047dbedadfe
+
+From 8af97cc255c3d2488adb107515bd1047dbedadfe Mon Sep 17 00:00:00 2001
+From: DJ Delorie <dj@redhat.com>
+Date: Wed, 8 Feb 2023 23:37:37 -0500
+Subject: [PATCH] Fix C99 compatibility issue
+
+Related to:
+
+  <https://fedoraproject.org/wiki/Changes/PortingToModernC>
+  <https://fedoraproject.org/wiki/Toolchain/PortingToModernC>
+--- a/m4/needtrio.m4
++++ b/m4/needtrio.m4
+@@ -9,6 +9,7 @@ AC_DEFUN([LFTP_NEED_TRIO],[
+       else
+ 
+       AC_RUN_IFELSE([AC_LANG_SOURCE([[
++	 #include <stdio.h>
+ 	 int main()
+ 	 {
+ 	    unsigned long long x=0,x1;
+

diff --git a/net-ftp/lftp/lftp-4.9.2.ebuild b/net-ftp/lftp/lftp-4.9.2-r1.ebuild
similarity index 94%
rename from net-ftp/lftp/lftp-4.9.2.ebuild
rename to net-ftp/lftp/lftp-4.9.2-r1.ebuild
index ea543b8..7916d38 100644
--- a/net-ftp/lftp/lftp-4.9.2.ebuild
+++ b/net-ftp/lftp/lftp-4.9.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -56,13 +56,17 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.8.2-libdir-openssl.patch
 	"${FILESDIR}"/${PN}-4.8.2-libdir-zlib.patch
 	"${FILESDIR}"/${PN}-4.9.1-libdir-readline.patch
-	"${FILESDIR}"/${PN}-4.9.2-libressl.patch
 	"${FILESDIR}"/${PN}-4.9.2-ac-270.patch
+	"${FILESDIR}"/${PN}-4.9.2-configure-clang16.patch
+	"${FILESDIR}"/${PN}-4.9.2-libressl.patch
 )
 
 src_prepare() {
 	default
 
+	# bug #875692
+	sed -e '/#include/s/cmath/math.h/' -i trio/*.c || die
+
 	eautoreconf
 
 	elibtoolize # for Darwin bundles


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/libressl:master commit in: net-ftp/lftp/files/, net-ftp/lftp/
@ 2023-05-05  4:25 orbea
  0 siblings, 0 replies; 3+ messages in thread
From: orbea @ 2023-05-05  4:25 UTC (permalink / raw
  To: gentoo-commits

commit:     4ecf4b099951d5fa61fe9747fd5c0bd8960794c8
Author:     orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Fri May  5 04:23:08 2023 +0000
Commit:     orbea <orbea <AT> riseup <DOT> net>
CommitDate: Fri May  5 04:23:08 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=4ecf4b09

net-ftp/lftp: treeclean

Bug: https://bugs.gentoo.org/903001
Upstream-PR: https://github.com/gentoo/gentoo/pull/30873
Upstream-Commit: https://github.com/gentoo/gentoo/commit/5e1f8f0cd8b644690bfe597374a549f87548ad00
Signed-off-by: orbea <orbea <AT> riseup.net>

 net-ftp/lftp/Manifest                              |   1 -
 net-ftp/lftp/files/lftp-4.0.2.91-lafile.patch      |  21 ----
 .../lftp/files/lftp-4.5.5-am_config_header.patch   |  11 ---
 net-ftp/lftp/files/lftp-4.7.0-gettext.patch        |  11 ---
 .../lftp/files/lftp-4.7.5-libdir-additional.patch  |  12 ---
 net-ftp/lftp/files/lftp-4.7.5-libdir-expat.patch   |  11 ---
 .../lftp/files/lftp-4.8.2-libdir-configure.patch   |  18 ----
 net-ftp/lftp/files/lftp-4.8.2-libdir-libidn2.patch |  10 --
 net-ftp/lftp/files/lftp-4.8.2-libdir-openssl.patch |  18 ----
 net-ftp/lftp/files/lftp-4.8.2-libdir-zlib.patch    |  20 ----
 .../lftp/files/lftp-4.9.1-libdir-readline.patch    |  11 ---
 net-ftp/lftp/files/lftp-4.9.2-ac-270.patch         |  36 -------
 .../lftp/files/lftp-4.9.2-configure-clang16.patch  |  22 -----
 net-ftp/lftp/files/lftp-4.9.2-libressl.patch       |  76 ---------------
 net-ftp/lftp/lftp-4.9.2-r1.ebuild                  | 108 ---------------------
 net-ftp/lftp/metadata.xml                          |  12 ---
 16 files changed, 398 deletions(-)

diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
deleted file mode 100644
index 2ccaa2a..0000000
--- a/net-ftp/lftp/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST lftp-4.9.2.tar.xz 1654960 BLAKE2B 04f168576ae6e001e0ffffb2e93e36d5bffa5ed1e2e671edb6210a54aa0ecedc280885450dcee890d05b64464eb641e7e63c8d4dd170100317dec3fe734ec483 SHA512 cda8698e7e34d748715a6fe5dc06c758240302621c7957402f0cc67577acf1a96b436fda4282408dee8171dc84a31e0be432df99a30f0a10057a8e7ea9ec64ad

diff --git a/net-ftp/lftp/files/lftp-4.0.2.91-lafile.patch b/net-ftp/lftp/files/lftp-4.0.2.91-lafile.patch
deleted file mode 100644
index 6180d92..0000000
--- a/net-ftp/lftp/files/lftp-4.0.2.91-lafile.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -18,7 +18,8 @@
- example_module1_la_SOURCES = example-module1.cc
- example_module1_la_LDFLAGS  = -module -avoid-version -rpath $(pkgverlibdir)
- 
--TASK_MODULES = liblftp-pty.la liblftp-network.la proto-ftp.la proto-http.la proto-file.la proto-fish.la proto-sftp.la
-+TASK_MODULES = liblftp-pty.la liblftp-network.la proto-ftp.la proto-http.la proto-file.la proto-fish.la proto-sftp.la liblftp-tasks.la liblftp-jobs.la
-+
- JOB_MODULES = cmd-mirror.la cmd-sleep.la cmd-torrent.la
- if WITH_MODULES
-   pkgverlib_LTLIBRARIES = $(TASK_MODULES) $(JOB_MODULES)
-@@ -26,8 +27,6 @@
-   TASK_MODULES_STATIC = $(TASK_MODULES)
-   JOB_MODULES_STATIC = $(JOB_MODULES)
- endif
--lib_LTLIBRARIES = liblftp-tasks.la liblftp-jobs.la
--
- proto_ftp_la_SOURCES  = ftpclass.cc ftpclass.h FtpListInfo.cc FtpListInfo.h\
-  FtpDirList.cc FtpDirList.h ftp-opie.c FileCopyFtp.cc FileCopyFtp.h
- proto_http_la_SOURCES = Http.cc Http.h HttpDir.cc HttpDir.h HttpDirXML.cc

diff --git a/net-ftp/lftp/files/lftp-4.5.5-am_config_header.patch b/net-ftp/lftp/files/lftp-4.5.5-am_config_header.patch
deleted file mode 100644
index 28a9e80..0000000
--- a/net-ftp/lftp/files/lftp-4.5.5-am_config_header.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -5,7 +5,7 @@
- AC_CONFIG_MACRO_DIR([m4])
- AC_CONFIG_LIBOBJ_DIR([lib])
- AC_CONFIG_SRCDIR([src/ftpclass.cc])
--AM_CONFIG_HEADER([lib/config.h])
-+AC_CONFIG_HEADERS([lib/config.h])
- AM_INIT_AUTOMAKE
- 
- dnl This doesn't *require* GNU extensions; it merely enables them if

diff --git a/net-ftp/lftp/files/lftp-4.7.0-gettext.patch b/net-ftp/lftp/files/lftp-4.7.0-gettext.patch
deleted file mode 100644
index 729410a..0000000
--- a/net-ftp/lftp/files/lftp-4.7.0-gettext.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -138,7 +138,7 @@
- 
- ALL_LINGUAS="de es fr it ja ko pl pt_BR ru uk zh_CN zh_TW zh_HK cs"
- AM_GNU_GETTEXT([external])
--AM_GNU_GETTEXT_VERSION([0.15])
-+AM_GNU_GETTEXT_VERSION([0.19])
- test "$MSGFMT"  = "no" && MSGFMT  ="$missing_dir/missing msgfmt"
- test "$GMSGFMT" = "no" && GMSGFMT ="$missing_dir/missing msgfmt"
- test "$XGETTEXT" = ":" && XGETTEXT="$missing_dir/missing xgettext"

diff --git a/net-ftp/lftp/files/lftp-4.7.5-libdir-additional.patch b/net-ftp/lftp/files/lftp-4.7.5-libdir-additional.patch
deleted file mode 100644
index bf7f0a9..0000000
--- a/net-ftp/lftp/files/lftp-4.7.5-libdir-additional.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/m4/lib-prefix.m4
-+++ b/m4/lib-prefix.m4
-@@ -108,7 +108,8 @@
-         if test -z "$haveit"; then
-           if test -d "$additional_libdir"; then
-             dnl Really add $additional_libdir to $LDFLAGS.
--            LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
-+            dnl No, let's not do that.
-+            :
-           fi
-         fi
-       fi

diff --git a/net-ftp/lftp/files/lftp-4.7.5-libdir-expat.patch b/net-ftp/lftp/files/lftp-4.7.5-libdir-expat.patch
deleted file mode 100644
index f82afc7..0000000
--- a/net-ftp/lftp/files/lftp-4.7.5-libdir-expat.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/m4/ax_lib_expat.m4
-+++ b/m4/ax_lib_expat.m4
-@@ -109,7 +109,7 @@
- 
-     if test -n "$expat_prefix"; then
-         expat_include_dir="$expat_prefix/include"
--        expat_ld_flags="-L$expat_prefix/lib"
-+        expat_ld_flags="-L$libdir"
-         expat_lib_flags="-lexpat"
-         run_expat_test="yes"
-     elif test "$expat_requested" = "yes"; then

diff --git a/net-ftp/lftp/files/lftp-4.8.2-libdir-configure.patch b/net-ftp/lftp/files/lftp-4.8.2-libdir-configure.patch
deleted file mode 100644
index d8d620b..0000000
--- a/net-ftp/lftp/files/lftp-4.8.2-libdir-configure.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -186,7 +186,6 @@
- esac
- 
- if test x$socks_loc != x; then
--   LDFLAGS="$LDFLAGS -L$socks_loc/lib"
-    CPPFLAGS="$CPPFLAGS -I$socks_loc/include"
- fi
- 
-@@ -307,7 +306,6 @@
- AX_CHECK_ZLIB([
-    AC_SUBST([ZLIB],[-lz])
-    r=""; test "$enable_rpath" = yes -a "$ZLIB_HOME" != /usr && r=" -R${ZLIB_HOME}/lib"
--   AC_SUBST([ZLIB_LDFLAGS],["-L${ZLIB_HOME}/lib$r"])
-    AC_SUBST([ZLIB_CPPFLAGS],["-I${ZLIB_HOME}/include"])
- ],[
-    AC_MSG_ERROR([cannot find -lz library, install zlib-devel package])

diff --git a/net-ftp/lftp/files/lftp-4.8.2-libdir-libidn2.patch b/net-ftp/lftp/files/lftp-4.8.2-libdir-libidn2.patch
deleted file mode 100644
index cae07b9..0000000
--- a/net-ftp/lftp/files/lftp-4.8.2-libdir-libidn2.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/m4/lftp.m4
-+++ b/m4/lftp.m4
-@@ -319,7 +319,6 @@
-        libidn2=$withval, libidn2=yes)
-      if test "$libidn2" != "no"; then
-        if test "$libidn2" != "yes"; then
--         LDFLAGS="${LDFLAGS} -L$libidn2/lib"
-          CPPFLAGS="${CPPFLAGS} -I$libidn2/include"
-        fi
-        AC_CHECK_HEADER(idn2.h,

diff --git a/net-ftp/lftp/files/lftp-4.8.2-libdir-openssl.patch b/net-ftp/lftp/files/lftp-4.8.2-libdir-openssl.patch
deleted file mode 100644
index f8bf45b..0000000
--- a/net-ftp/lftp/files/lftp-4.8.2-libdir-openssl.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/m4/ssl.m4
-+++ b/m4/ssl.m4
-@@ -10,7 +10,6 @@
- 		old_CPPFLAGS="$CPPFLAGS"
- 		LIBS="$LIBS -lssl -lcrypto"
- 		if test $loc != default; then
--			LDFLAGS="$LDFLAGS -L$loc/lib"
- 			CPPFLAGS="$CPPFLAGS -I$loc/include"
- 		fi
- 		AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <openssl/ssl.h>
-@@ -22,7 +21,6 @@
- 			lftp_cv_openssl="OPENSSL_LIBS=\"-lssl -lcrypto\""
- 			if test $found_loc != default; then
- 				r=""; test "$enable_rpath" = yes -a "$found_loc" != /usr && r=" -R$found_loc/lib"
--				lftp_cv_openssl="$lftp_cv_openssl OPENSSL_LDFLAGS=\"-L$found_loc/lib$r\""
- 				lftp_cv_openssl="$lftp_cv_openssl OPENSSL_CPPFLAGS=-I$found_loc/include"
- 			fi
- 			break;

diff --git a/net-ftp/lftp/files/lftp-4.8.2-libdir-zlib.patch b/net-ftp/lftp/files/lftp-4.8.2-libdir-zlib.patch
deleted file mode 100644
index 7ff003f..0000000
--- a/net-ftp/lftp/files/lftp-4.8.2-libdir-zlib.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/m4/ax_check_zlib.m4
-+++ b/m4/ax_check_zlib.m4
-@@ -105,7 +105,6 @@
-   ZLIB_OLD_LDFLAGS="$LDFLAGS"
-   ZLIB_OLD_CPPFLAGS="$CPPFLAGS"
-   if test -n "${ZLIB_HOME}"; then
--        LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib"
-         CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include"
-   fi
-   AC_LANG_SAVE
-@@ -118,8 +118,7 @@
-     # If both library and header were found, action-if-found
-     #
-     m4_ifblank([$1],[
--		test "$enable_rpath" = yes -a "$ZLIB_HOME" != /usr && \
--		    LDFLAGS="$LDFLAGS -R${ZLIB_HOME}/lib"
-+		test "$enable_rpath" = yes -a "$ZLIB_HOME" != /usr
-                 LIBS="-lz $LIBS"
-                 AC_DEFINE([HAVE_LIBZ], [1],
-                           [Define to 1 if you have `z' library (-lz)])

diff --git a/net-ftp/lftp/files/lftp-4.9.1-libdir-readline.patch b/net-ftp/lftp/files/lftp-4.9.1-libdir-readline.patch
deleted file mode 100644
index fde1017..0000000
--- a/net-ftp/lftp/files/lftp-4.9.1-libdir-readline.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/m4/lftp_lib_readline.m4
-+++ b/m4/lftp_lib_readline.m4
-@@ -107,7 +107,7 @@
- 	if test -f "$readline_include_dir/readline/readline.h"; then
- 	    readline_include_dir="$readline_include_dir/readline"
- 	fi
--        readline_ld_flags="-L$readline_prefix/lib"
-+        readline_ld_flags="-L$libdir"
-         if test -z "$readline_lib_flags"; then
-             readline_lib_flags="-lreadline"
-         fi

diff --git a/net-ftp/lftp/files/lftp-4.9.2-ac-270.patch b/net-ftp/lftp/files/lftp-4.9.2-ac-270.patch
deleted file mode 100644
index a2a558d..0000000
--- a/net-ftp/lftp/files/lftp-4.9.2-ac-270.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/m4/std-gnu11.m4
-+++ b/m4/std-gnu11.m4
-@@ -6,6 +6,8 @@
- # This implementation will be obsolete once we can assume Autoconf 2.70
- # or later is installed everywhere a Gnulib program might be developed.
- 
-+m4_version_prereq([2.70], [], [
-+
- 
- # Copyright (C) 2001-2020 Free Software Foundation, Inc.
- 
-@@ -70,7 +72,7 @@ _AS_ECHO_LOG([checking for _AC_LANG compiler version])
- set X $ac_compile
- ac_compiler=$[2]
- for ac_option in --version -v -V -qversion -version; do
--  m4_ifdef([_AC_DO_LIMIT],[_AC_DO_LIMIT],[_AC_DO])([$ac_compiler $ac_option >&AS_MESSAGE_LOG_FD])
-+  _AC_DO_LIMIT([$ac_compiler $ac_option >&AS_MESSAGE_LOG_FD])
- done
- 
- m4_expand_once([_AC_COMPILER_EXEEXT])[]dnl
-@@ -135,7 +137,7 @@ _AS_ECHO_LOG([checking for _AC_LANG compiler version])
- set X $ac_compile
- ac_compiler=$[2]
- for ac_option in --version -v -V -qversion; do
--  m4_ifdef([_AC_DO_LIMIT],[_AC_DO_LIMIT],[_AC_DO])([$ac_compiler $ac_option >&AS_MESSAGE_LOG_FD])
-+  _AC_DO_LIMIT([$ac_compiler $ac_option >&AS_MESSAGE_LOG_FD])
- done
- 
- m4_expand_once([_AC_COMPILER_EXEEXT])[]dnl
-@@ -822,3 +824,6 @@ dnl Tru64	N/A (no support)
- dnl with extended modes being tried first.
- [[-std=gnu++11 -std=c++11 -std=gnu++0x -std=c++0x -qlanglvl=extended0x -AA]], [$1], [$2])[]dnl
- ])# _AC_PROG_CXX_CXX11
-+
-+
-+])# m4_version_prereq

diff --git a/net-ftp/lftp/files/lftp-4.9.2-configure-clang16.patch b/net-ftp/lftp/files/lftp-4.9.2-configure-clang16.patch
deleted file mode 100644
index d039390..0000000
--- a/net-ftp/lftp/files/lftp-4.9.2-configure-clang16.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://github.com/lavv17/lftp/commit/8af97cc255c3d2488adb107515bd1047dbedadfe
-
-From 8af97cc255c3d2488adb107515bd1047dbedadfe Mon Sep 17 00:00:00 2001
-From: DJ Delorie <dj@redhat.com>
-Date: Wed, 8 Feb 2023 23:37:37 -0500
-Subject: [PATCH] Fix C99 compatibility issue
-
-Related to:
-
-  <https://fedoraproject.org/wiki/Changes/PortingToModernC>
-  <https://fedoraproject.org/wiki/Toolchain/PortingToModernC>
---- a/m4/needtrio.m4
-+++ b/m4/needtrio.m4
-@@ -9,6 +9,7 @@ AC_DEFUN([LFTP_NEED_TRIO],[
-       else
- 
-       AC_RUN_IFELSE([AC_LANG_SOURCE([[
-+	 #include <stdio.h>
- 	 int main()
- 	 {
- 	    unsigned long long x=0,x1;
-

diff --git a/net-ftp/lftp/files/lftp-4.9.2-libressl.patch b/net-ftp/lftp/files/lftp-4.9.2-libressl.patch
deleted file mode 100644
index c19bc3e..0000000
--- a/net-ftp/lftp/files/lftp-4.9.2-libressl.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-https://github.com/lavv17/lftp/commit/0276d5c239c41b3a63f738a5dc47fd56ac389cf0.patch
-
-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(-)
-
---- 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();
-https://github.com/orbea/lftp/commit/3ffa0132987bdde986c82c924bc51b13b37f8b54
-
-From 3ffa0132987bdde986c82c924bc51b13b37f8b54 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Wed, 6 Apr 2022 22:56:21 +0200
-Subject: [PATCH] src/lftp_ssl.c: fix build with libressl >= 2.7.0
-
-X509_OBJECT_get0_X509_CRL is provided by libressl since version 2.7.0
-and
-https://github.com/libressl-portable/openbsd/commit/9866ae34c0af718973475296bd9ef036d3aaa94e
-resulting in the following build failure:
-
-/nvmedata/autobuild/instance-21/output-1/host/opt/ext-toolchain/bin/../lib/gcc/microblaze-buildroot-linux-musl/11.2.0/../../../../microblaze-buildroot-linux-musl/bin/ld: /nvmedata/autobuild/instance-21/output-1/host/microblaze-buildroot-linux-musl/sysroot/usr/lib/libcrypto.a(x509_lu.c.o): in function `X509_OBJECT_get0_X509_CRL':
-(.text+0xc3c): multiple definition of `X509_OBJECT_get0_X509_CRL'; /nvmedata/autobuild/instance-21/output-1/build/lftp-4.9.2/src/.libs/liblftp-network.a(liblftp_network_la-lftp_ssl.o):(.text+0x894): first defined here
-
-Fixes:
- - http://autobuild.buildroot.org/results/7fd1dfd5bc750ae5a3278ca950c838ae90704b23
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- src/lftp_ssl.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/lftp_ssl.cc b/src/lftp_ssl.cc
-index 26e91e4b..a814543d 100644
---- a/src/lftp_ssl.cc
-+++ b/src/lftp_ssl.cc
-@@ -664,7 +664,7 @@ int gnutls_x509_crt_list_import(gnutls_x509_crt_t *certs, unsigned int* cert_max
- #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()
- {

diff --git a/net-ftp/lftp/lftp-4.9.2-r1.ebuild b/net-ftp/lftp/lftp-4.9.2-r1.ebuild
deleted file mode 100644
index 7916d38..0000000
--- a/net-ftp/lftp/lftp-4.9.2-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools libtool xdg-utils
-
-DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program"
-HOMEPAGE="http://lftp.yar.ru/"
-SRC_URI="http://lftp.yar.ru/ftp/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="convert-mozilla-cookies +gnutls idn ipv6 nls socks5 +ssl verify-file"
-RESTRICT="test"
-
-RDEPEND="
-	>=sys-libs/ncurses-5.1:=
-	>=sys-libs/readline-5.1:=
-	dev-libs/expat
-	sys-libs/zlib
-	convert-mozilla-cookies? ( dev-perl/DBI )
-	idn? ( net-dns/libidn2:= )
-	socks5? (
-		>=net-proxy/dante-1.1.12
-		sys-libs/pam
-	)
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-1.2.3:0= )
-		!gnutls? ( dev-libs/openssl:0= )
-	)
-	verify-file? (
-		dev-perl/String-CRC32
-		virtual/perl-Digest-MD5
-	)
-"
-DEPEND="
-	${RDEPEND}
-	=sys-devel/libtool-2*
-	app-arch/xz-utils
-	nls? ( >=sys-devel/gettext-0.19 )
-	virtual/pkgconfig
-"
-DOCS=(
-	BUGS ChangeLog FAQ FEATURES MIRRORS NEWS README README.debug-levels
-	README.dnssec README.modules THANKS TODO
-)
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0.2.91-lafile.patch
-	"${FILESDIR}"/${PN}-4.5.5-am_config_header.patch
-	"${FILESDIR}"/${PN}-4.7.0-gettext.patch
-	"${FILESDIR}"/${PN}-4.7.5-libdir-additional.patch
-	"${FILESDIR}"/${PN}-4.7.5-libdir-expat.patch
-	"${FILESDIR}"/${PN}-4.8.2-libdir-configure.patch
-	"${FILESDIR}"/${PN}-4.8.2-libdir-libidn2.patch
-	"${FILESDIR}"/${PN}-4.8.2-libdir-openssl.patch
-	"${FILESDIR}"/${PN}-4.8.2-libdir-zlib.patch
-	"${FILESDIR}"/${PN}-4.9.1-libdir-readline.patch
-	"${FILESDIR}"/${PN}-4.9.2-ac-270.patch
-	"${FILESDIR}"/${PN}-4.9.2-configure-clang16.patch
-	"${FILESDIR}"/${PN}-4.9.2-libressl.patch
-)
-
-src_prepare() {
-	default
-
-	# bug #875692
-	sed -e '/#include/s/cmath/math.h/' -i trio/*.c || die
-
-	eautoreconf
-
-	elibtoolize # for Darwin bundles
-
-	# bug #536036
-	printf 'set fish:auto-confirm no\nset sftp:auto-confirm no\n' >> ${PN}.conf || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable ipv6) \
-		$(use_enable nls) \
-		$(use_with idn libidn2) \
-		$(use_with socks5 socksdante "${EPREFIX}"/usr) \
-		$(usex ssl "$(use_with !gnutls openssl "${EPREFIX}"/usr)" '--without-openssl') \
-		$(usex ssl "$(use_with gnutls)" '--without-gnutls') \
-		--enable-packager-mode \
-		--sysconfdir="${EPREFIX}"/etc/${PN} \
-		--with-modules \
-		--with-readline="${EPREFIX}"/usr \
-		--without-included-regex
-}
-
-src_install() {
-	default
-
-	local script
-	for script in {convert-mozilla-cookies,verify-file}; do
-		use ${script} || { rm "${ED}"/usr/share/${PN}/${script} || die ;}
-	done
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}

diff --git a/net-ftp/lftp/metadata.xml b/net-ftp/lftp/metadata.xml
deleted file mode 100644
index 31c778d..0000000
--- a/net-ftp/lftp/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>conikost@gentoo.org</email>
-		<name>Conrad Kostecki</name>
-	</maintainer>
-	<use>
-		<flag name="convert-mozilla-cookies">Install the convert-mozilla-cookies script and its run-time dependencies</flag>
-		<flag name="verify-file">Install the verify-file script and its run-time dependencies</flag>
-	</use>
-</pkgmetadata>


^ permalink raw reply related	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-05-05  4:25 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-05  4:25 [gentoo-commits] repo/proj/libressl:master commit in: net-ftp/lftp/files/, net-ftp/lftp/ orbea
  -- strict thread matches above, loose matches on Subject: below --
2023-04-12  3:41 orbea
2021-01-26 18:17 Quentin Retornaz

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox