* [gentoo-commits] repo/gentoo:master commit in: net-ftp/lftp/, net-ftp/lftp/files/
@ 2015-12-19 9:55 Jeroen Roovers
0 siblings, 0 replies; 8+ messages in thread
From: Jeroen Roovers @ 2015-12-19 9:55 UTC (permalink / raw
To: gentoo-commits
commit: 3bb3a4a57e46a4310dc1f27f7a398bbb6f6e150b
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 19 09:55:00 2015 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Dec 19 09:55:52 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bb3a4a5
net-ftp/lftp: Set SLOT dependencies.
Package-Manager: portage-2.2.26
net-ftp/lftp/files/lftp-4.5.3-autopoint.patch | 10 ----------
net-ftp/lftp/lftp-9999.ebuild | 13 ++++++++-----
2 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/net-ftp/lftp/files/lftp-4.5.3-autopoint.patch b/net-ftp/lftp/files/lftp-4.5.3-autopoint.patch
deleted file mode 100644
index 7a68843..0000000
--- a/net-ftp/lftp/files/lftp-4.5.3-autopoint.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -137,6 +137,7 @@
- AM_ICONV
-
- ALL_LINGUAS="de es fr it ja ko pl pt_BR ru uk zh_CN zh_TW zh_HK cs"
-+AM_GNU_GETTEXT_VERSION([0.18.1])
- AM_GNU_GETTEXT([external])
- test "$MSGFMT" = "no" && MSGFMT ="$missing_dir/missing msgfmt"
- test "$GMSGFMT" = "no" && GMSGFMT ="$missing_dir/missing msgfmt"
diff --git a/net-ftp/lftp/lftp-9999.ebuild b/net-ftp/lftp/lftp-9999.ebuild
index f21a9be..58231f6 100644
--- a/net-ftp/lftp/lftp-9999.ebuild
+++ b/net-ftp/lftp/lftp-9999.ebuild
@@ -22,8 +22,8 @@ REQUIRED_USE="
"
RDEPEND="
- >=sys-libs/ncurses-5.1
- >=sys-libs/readline-5.1
+ >=sys-libs/ncurses-5.1:=
+ >=sys-libs/readline-5.1:=
dev-libs/expat
sys-libs/zlib
convert-mozilla-cookies? ( dev-perl/DBI )
@@ -34,7 +34,7 @@ RDEPEND="
)
ssl? (
gnutls? ( >=net-libs/gnutls-1.2.3 )
- openssl? ( >=dev-libs/openssl-0.9.6 )
+ openssl? ( dev-libs/openssl:0 )
)
verify-file? (
dev-perl/string-crc32
@@ -58,11 +58,12 @@ DOCS=(
src_prepare() {
epatch \
- "${FILESDIR}"/${PN}-4.5.3-autopoint.patch \
"${FILESDIR}"/${PN}-4.5.5-am_config_header.patch
gnulib-tool --update || die
+ chmod +x build-aux/git-version-gen || die
+
eautoreconf
elibtoolize # for Darwin bundles
}
@@ -81,7 +82,9 @@ src_configure() {
}
src_install() {
- default
+ # FIXME: MKDIR_P is not getting picked up in po/Makefile
+ emake DESTDIR="${D}" mkdir_p="mkdir -p"
+
local script
for script in {convert-mozilla-cookies,verify-file}; do
use ${script} || { rm "${ED}"/usr/share/${PN}/${script} || die ;}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/lftp/, net-ftp/lftp/files/
@ 2016-03-28 17:24 Jeroen Roovers
0 siblings, 0 replies; 8+ messages in thread
From: Jeroen Roovers @ 2016-03-28 17:24 UTC (permalink / raw
To: gentoo-commits
commit: de2497f634a09037b9fd8f3b3a96a25ebad5030a
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 28 17:11:53 2016 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Mon Mar 28 17:24:46 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de2497f6
net-ftp/lftp: Version bump.
Package-Manager: portage-2.2.28
net-ftp/lftp/Manifest | 1 +
net-ftp/lftp/files/lftp-4.7.0-gettext.patch | 11 ++++
net-ftp/lftp/lftp-4.7.0.ebuild | 91 +++++++++++++++++++++++++++++
3 files changed, 103 insertions(+)
diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index 1f096fc..1aefdae 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -1,2 +1,3 @@
DIST lftp-4.6.4.tar.xz 1508952 SHA256 1e7cb674c83ace48172263f86847ed04bb6ab2f24116b11a8505f70a15e8805c SHA512 998050c0e69fc590233df8b400664c1165dfa80d7b3844aa307be33e004c3dd3e049df8f288ad7079257a31dc4adcdb07a57b8f28cd0adf7e3cf94c41d38b9dc WHIRLPOOL d79849970ff72eda2f5dccd3ce16b619e37661b60152363d96c13d94e4045d24e568b265bb27c8ef809fbfb18c6e31884ae28dba0d0bf6fc252c87ea82ca1396
DIST lftp-4.6.5.tar.xz 1514644 SHA256 1fd0920a1791ce0e9e39ffce77ae6619e5dc665f16e9380bafbfc69411eeb71e SHA512 a22faa3a6901160460f1103c19c5276f603c154908ec2e34804a6eb48452b59ba495993e6824f57d114285ddc80a64dccd0069465cc0593f34f435ac181250c0 WHIRLPOOL 088598ed9395cd8f9ed79be26e0833593e733cf87bbd51e5d008ce4de2b9924e62add20789c098a866d82dc3f168a373c4874de264d669950524a9a255e1e028
+DIST lftp-4.7.0.tar.xz 1621592 SHA256 9a0b3580b222a7f9cc17c6c85d6ac8ec227357ca5050301171fd9564aae73f44 SHA512 9d20b78a8ae33ef7337ce2699d5ff682b45fd3015d5a9b40e87ca6c426a1ce22ab13778110e8120da8c5087c5de9fe203b7192e2e80296e9d84d267c4b2b5de6 WHIRLPOOL 3df4ef7e89c3499811ed90d0775c5eed48a7698cc26475cd9c545af66ffa1e355e93c8bf579d24885fee301d044f39fe92de7a5afc48a4700910fa9959050725
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..c2d6b80
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-4.7.0-gettext.patch
@@ -0,0 +1,11 @@
+--- configure.ac.orig 2016-03-28 18:28:34.834007550 +0200
++++ configure.ac 2016-03-28 19:03:32.455125971 +0200
+@@ -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/lftp-4.7.0.ebuild b/net-ftp/lftp/lftp-4.7.0.ebuild
new file mode 100644
index 0000000..fc29144
--- /dev/null
+++ b/net-ftp/lftp/lftp-4.7.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils libtool
+
+DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program"
+HOMEPAGE="http://lftp.yar.ru/"
+SRC_URI="${HOMEPAGE}ftp/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+IUSE="convert-mozilla-cookies +gnutls idn ipv6 nls openssl socks5 +ssl verify-file"
+LFTP_LINGUAS=( cs de es fr it ja ko pl pt_BR ru uk zh_CN zh_HK zh_TW )
+IUSE+=" ${LFTP_LINGUAS[@]/#/linguas_}"
+
+REQUIRED_USE="
+ ssl? ( ^^ ( openssl gnutls ) )
+"
+
+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/libidn )
+ socks5? (
+ >=net-proxy/dante-1.1.12
+ virtual/pam
+ )
+ ssl? (
+ gnutls? ( >=net-libs/gnutls-1.2.3 )
+ openssl? ( 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
+)
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${PN}-4.0.2.91-lafile.patch \
+ "${FILESDIR}"/${PN}-4.5.5-am_config_header.patch \
+ "${FILESDIR}"/${PN}-4.7.0-gettext.patch
+
+ 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 nls) \
+ $(use_with gnutls) \
+ $(use_with idn libidn) \
+ $(use_enable ipv6) \
+ $(use_with openssl openssl "${EPREFIX}"/usr) \
+ $(use_with socks5 socksdante "${EPREFIX}"/usr) \
+ --enable-packager-mode \
+ --sysconfdir="${EPREFIX}"/etc/${PN} \
+ --with-modules \
+ --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
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/lftp/, net-ftp/lftp/files/
@ 2019-05-03 8:26 Jeroen Roovers
0 siblings, 0 replies; 8+ messages in thread
From: Jeroen Roovers @ 2019-05-03 8:26 UTC (permalink / raw
To: gentoo-commits
commit: 93ce6a29b012ae8e10039e4f9a02c71bc8745e39
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri May 3 08:26:24 2019 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri May 3 08:26:50 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93ce6a29
net-ftp/lftp: Old
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Bug: https://bugs.gentoo.org/show_bug.cgi?id=662882
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
net-ftp/lftp/Manifest | 1 -
.../lftp/files/lftp-4.7.5-libdir-configure.patch | 10 --
net-ftp/lftp/files/lftp-4.7.5-libdir-libidn.patch | 10 --
net-ftp/lftp/files/lftp-4.7.5-libdir-openssl.patch | 18 ----
net-ftp/lftp/files/lftp-4.7.5-libdir-zlib.patch | 28 ------
net-ftp/lftp/lftp-4.7.5.ebuild | 98 --------------------
net-ftp/lftp/lftp-4.8.4.ebuild | 101 ---------------------
7 files changed, 266 deletions(-)
diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index eeccc3697da..7fc73c4df9c 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -1,2 +1 @@
-DIST lftp-4.7.5.tar.xz 1567232 BLAKE2B 6ff7d264102ee25e989136b67b0587c025fd29a2573b25e4b9baac63c0ff0e9e40a4444b61ad50f8b892eb2f16dd31266056840aec0fb260686eb3b1714e4326 SHA512 e7d478367a3b79f61686a538827efe8afb807a587d2967189ae351927e3acb0d5b097d8707e0cb3997aa650f8f0787aa44038bb1d081e393bc7202b348249960
DIST lftp-4.8.4.tar.xz 1633444 BLAKE2B cbd85b553268823e7633e414752876db083355d92e55728337bc7863fb3bd89729ac725be41a9bcca275cf1752ea5f8ad01fdc67c7593868084c9c32bb75332d SHA512 2528e2cbfe132068dc75036d6334372f79f8063d44e46c724a28ea1f5b40d8de0d1e36cde3124fbcc27e5ba8be04b893eb1a7546346253768346a80bc54c02d1
diff --git a/net-ftp/lftp/files/lftp-4.7.5-libdir-configure.patch b/net-ftp/lftp/files/lftp-4.7.5-libdir-configure.patch
deleted file mode 100644
index e855ac19432..00000000000
--- a/net-ftp/lftp/files/lftp-4.7.5-libdir-configure.patch
+++ /dev/null
@@ -1,10 +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
-
diff --git a/net-ftp/lftp/files/lftp-4.7.5-libdir-libidn.patch b/net-ftp/lftp/files/lftp-4.7.5-libdir-libidn.patch
deleted file mode 100644
index 890138013da..00000000000
--- a/net-ftp/lftp/files/lftp-4.7.5-libdir-libidn.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/m4/lftp.m4
-+++ b/m4/lftp.m4
-@@ -319,7 +319,6 @@
- libidn=$withval, libidn=yes)
- if test "$libidn" != "no"; then
- if test "$libidn" != "yes"; then
-- LDFLAGS="${LDFLAGS} -L$libidn/lib"
- CPPFLAGS="${CPPFLAGS} -I$libidn/include"
- fi
- AC_CHECK_HEADER(idna.h,
diff --git a/net-ftp/lftp/files/lftp-4.7.5-libdir-openssl.patch b/net-ftp/lftp/files/lftp-4.7.5-libdir-openssl.patch
deleted file mode 100644
index 44c5239ae03..00000000000
--- a/net-ftp/lftp/files/lftp-4.7.5-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>
-@@ -21,7 +20,6 @@
- if test $found_loc != "none"; then
- lftp_cv_openssl="OPENSSL_LIBS=\"-lssl -lcrypto\""
- if test $found_loc != default; then
-- lftp_cv_openssl="$lftp_cv_openssl OPENSSL_LDFLAGS=\"-L$found_loc/lib -R$found_loc/lib\""
- lftp_cv_openssl="$lftp_cv_openssl OPENSSL_CPPFLAGS=-I$found_loc/include"
- fi
- break;
diff --git a/net-ftp/lftp/files/lftp-4.7.5-libdir-zlib.patch b/net-ftp/lftp/files/lftp-4.7.5-libdir-zlib.patch
deleted file mode 100644
index 791bd2c5a3b..00000000000
--- a/net-ftp/lftp/files/lftp-4.7.5-libdir-zlib.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -305,7 +305,6 @@
-
- AX_CHECK_ZLIB([
- AC_SUBST([ZLIB],[-lz])
-- AC_SUBST([ZLIB_LDFLAGS],["-L${ZLIB_HOME}/lib"])
- AC_SUBST([ZLIB_CPPFLAGS],["-I${ZLIB_HOME}/include"])
- ],[
- AC_MSG_ERROR([cannot find -lz library, install zlib-devel package])
---- 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
-@@ -120,7 +119,6 @@
- #
- m4_ifblank([$1],[
- CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include"
-- LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib"
- LIBS="-lz $LIBS"
- AC_DEFINE([HAVE_LIBZ], [1],
- [Define to 1 if you have `z' library (-lz)])
diff --git a/net-ftp/lftp/lftp-4.7.5.ebuild b/net-ftp/lftp/lftp-4.7.5.ebuild
deleted file mode 100644
index 6dac748590d..00000000000
--- a/net-ftp/lftp/lftp-4.7.5.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils libtool
-
-DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program"
-HOMEPAGE="https://lftp.tech/"
-SRC_URI="${HOMEPAGE}ftp/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-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/libidn:= )
- socks5? (
- >=net-proxy/dante-1.1.12
- virtual/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-configure.patch
- "${FILESDIR}"/${PN}-4.7.5-libdir-expat.patch
- "${FILESDIR}"/${PN}-4.7.5-libdir-libidn.patch
- "${FILESDIR}"/${PN}-4.7.5-libdir-openssl.patch
- "${FILESDIR}"/${PN}-4.7.5-libdir-readline.patch
- "${FILESDIR}"/${PN}-4.7.5-libdir-zlib.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 libidn) \
- $(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
-}
diff --git a/net-ftp/lftp/lftp-4.8.4.ebuild b/net-ftp/lftp/lftp-4.8.4.ebuild
deleted file mode 100644
index 2fe153fc40d..00000000000
--- a/net-ftp/lftp/lftp-4.8.4.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils libtool
-
-DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program"
-HOMEPAGE="https://lftp.tech/"
-SRC_URI="
- ${HOMEPAGE}ftp/${P}.tar.xz
-"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-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
- virtual/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.7.5-libdir-readline.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
-)
-
-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
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/lftp/, net-ftp/lftp/files/
@ 2019-12-23 16:13 Jeroen Roovers
0 siblings, 0 replies; 8+ messages in thread
From: Jeroen Roovers @ 2019-12-23 16:13 UTC (permalink / raw
To: gentoo-commits
commit: 1859ce88d3e01568e8a971c730731071b1515821
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 23 15:49:28 2019 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Mon Dec 23 16:13:30 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1859ce88
net-ftp/lftp: Version 4.9.0
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
net-ftp/lftp/Manifest | 1 +
net-ftp/lftp/files/lftp-4.9.0-ipv6.patch | 18 ++++++
net-ftp/lftp/lftp-4.9.0.ebuild | 108 +++++++++++++++++++++++++++++++
3 files changed, 127 insertions(+)
diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index 7fc73c4df9c..37283c7c30b 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -1 +1,2 @@
DIST lftp-4.8.4.tar.xz 1633444 BLAKE2B cbd85b553268823e7633e414752876db083355d92e55728337bc7863fb3bd89729ac725be41a9bcca275cf1752ea5f8ad01fdc67c7593868084c9c32bb75332d SHA512 2528e2cbfe132068dc75036d6334372f79f8063d44e46c724a28ea1f5b40d8de0d1e36cde3124fbcc27e5ba8be04b893eb1a7546346253768346a80bc54c02d1
+DIST lftp-4.9.0.tar.xz 1642596 BLAKE2B 111e559c98e0572e1ca79f935a1db8c45c99275c8aa7b584be06d1738296b32808e97d696a02751575c5d1ea24a30a52f5d9f177a193f70addf1168e3208aa13 SHA512 8d83ea76390d38cb1f84f02eb7bf45780758afb9fe61f5b7278a48c9a5d216d03bc8b699c0f449a0036bdb441b4225af074da1b5e92a77ddb61aca704758211e
diff --git a/net-ftp/lftp/files/lftp-4.9.0-ipv6.patch b/net-ftp/lftp/files/lftp-4.9.0-ipv6.patch
new file mode 100644
index 00000000000..2c02ce5e787
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-4.9.0-ipv6.patch
@@ -0,0 +1,18 @@
+--- a/src/ftpclass.cc
++++ b/src/ftpclass.cc
+@@ -848,6 +848,7 @@ Ftp::pasv_state_t Ftp::Handle_EPSV_CEPR()
+ conn->data_sa.in.sin_port=htons(port);
+ conn->data_sa.sa.sa_family=AF_INET;
+ }
++#if INET6
+ // V6 / AF_INET6
+ else if (proto == 2)
+ {
+@@ -855,6 +856,7 @@ Ftp::pasv_state_t Ftp::Handle_EPSV_CEPR()
+ conn->data_sa.in6.sin6_port=htons(port);
+ conn->data_sa.sa.sa_family=AF_INET6;
+ }
++#endif
+ else
+ {
+ Disconnect("unsupported address family");
diff --git a/net-ftp/lftp/lftp-4.9.0.ebuild b/net-ftp/lftp/lftp-4.9.0.ebuild
new file mode 100644
index 00000000000..617212d87a4
--- /dev/null
+++ b/net-ftp/lftp/lftp-4.9.0.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2019 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="
+ ${HOMEPAGE}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 ~x86-macos ~sparc-solaris ~x86-solaris"
+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.7.5-libdir-readline.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.0-ipv6.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
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/lftp/, net-ftp/lftp/files/
@ 2020-03-27 6:46 Jeroen Roovers
0 siblings, 0 replies; 8+ messages in thread
From: Jeroen Roovers @ 2020-03-27 6:46 UTC (permalink / raw
To: gentoo-commits
commit: 74b9ddb6a09a6b6cfdbfb98d98e18a6db0220e51
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 27 06:34:34 2020 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Mar 27 06:46:02 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74b9ddb6
net-ftp/lftp: Update live ebuild
Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
net-ftp/lftp/files/lftp-9999-libdir-readline.patch | 11 +++++++++++
net-ftp/lftp/lftp-9999.ebuild | 4 ++--
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/net-ftp/lftp/files/lftp-9999-libdir-readline.patch b/net-ftp/lftp/files/lftp-9999-libdir-readline.patch
new file mode 100644
index 00000000000..fde1017f4bd
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-9999-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/lftp-9999.ebuild b/net-ftp/lftp/lftp-9999.ebuild
index 44b55978713..b38775a32ae 100644
--- a/net-ftp/lftp/lftp-9999.ebuild
+++ b/net-ftp/lftp/lftp-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -53,11 +53,11 @@ DOCS=(
PATCHES=(
"${FILESDIR}"/${PN}-4.5.5-am_config_header.patch
"${FILESDIR}"/${PN}-4.7.5-libdir-expat.patch
- "${FILESDIR}"/${PN}-4.7.5-libdir-readline.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}-9999-libdir-readline.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/lftp/, net-ftp/lftp/files/
@ 2020-12-16 22:35 Sergei Trofimovich
0 siblings, 0 replies; 8+ messages in thread
From: Sergei Trofimovich @ 2020-12-16 22:35 UTC (permalink / raw
To: gentoo-commits
commit: 288871cfa29812169a92ef9209ccf882f08e6bd9
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 16 22:35:14 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Dec 16 22:35:33 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=288871cf
net-ftp/lftp: tweak for autoconf-2.70
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
net-ftp/lftp/files/lftp-4.9.2-ac-270.patch | 36 ++++++++++++++++++++++++++++++
net-ftp/lftp/lftp-4.9.2.ebuild | 1 +
2 files changed, 37 insertions(+)
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 00000000000..a2a558db5a6
--- /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/lftp-4.9.2.ebuild b/net-ftp/lftp/lftp-4.9.2.ebuild
index 121ccc94638..ab4b0a1a9ff 100644
--- a/net-ftp/lftp/lftp-4.9.2.ebuild
+++ b/net-ftp/lftp/lftp-4.9.2.ebuild
@@ -60,6 +60,7 @@ PATCHES=(
"${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() {
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/lftp/, net-ftp/lftp/files/
@ 2023-02-14 21:41 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2023-02-14 21:41 UTC (permalink / raw
To: gentoo-commits
commit: 800629fbe1e806757c79537eaa1bf5b37b937174
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 14 08:26:34 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 14 21:41:35 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=800629fb
net-ftp/lftp: fix configure w/ clang 16
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../lftp/files/lftp-4.9.2-configure-clang16.patch | 22 ++++++++++++++++++++++
.../{lftp-4.9.2.ebuild => lftp-4.9.2-r1.ebuild} | 3 ++-
2 files changed, 24 insertions(+), 1 deletion(-)
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 000000000000..d039390ffb80
--- /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 96%
rename from net-ftp/lftp/lftp-4.9.2.ebuild
rename to net-ftp/lftp/lftp-4.9.2-r1.ebuild
index 59f56239e17f..9047ab306f17 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-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -57,6 +57,7 @@ PATCHES=(
"${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
)
src_prepare() {
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/lftp/, net-ftp/lftp/files/
@ 2023-05-04 21:39 Conrad Kostecki
0 siblings, 0 replies; 8+ messages in thread
From: Conrad Kostecki @ 2023-05-04 21:39 UTC (permalink / raw
To: gentoo-commits
commit: 5e1f8f0cd8b644690bfe597374a549f87548ad00
Author: orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Thu May 4 20:08:49 2023 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu May 4 21:38:48 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e1f8f0c
net-ftp/lftp: add upstream libressl patch
This patch has been accepted upstream and fixes the build with LibreSSL
>= 2.7.0.
Bug: https://bugs.gentoo.org/903001
Upstream-PR: https://github.com/lavv17/lftp/pull/663
Uptream-Commit: https://github.com/lavv17/lftp/commit/3ffa0132987bdde986c82c924bc51b13b37f8b54
Signed-off-by: orbea <orbea <AT> riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/30873
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
net-ftp/lftp/files/lftp-4.9.2-libressl.patch | 38 ++++++++++++++++++++++++++++
net-ftp/lftp/lftp-4.9.2-r1.ebuild | 1 +
2 files changed, 39 insertions(+)
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 000000000000..a0b52df4a9e5
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-4.9.2-libressl.patch
@@ -0,0 +1,38 @@
+https://bugs.gentoo.org/903001
+https://github.com/lavv17/lftp/pull/663
+https://github.com/lavv17/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
index 9047ab306f17..f7b4b9adf626 100644
--- a/net-ftp/lftp/lftp-4.9.2-r1.ebuild
+++ b/net-ftp/lftp/lftp-4.9.2-r1.ebuild
@@ -58,6 +58,7 @@ PATCHES=(
"${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 #903001
)
src_prepare() {
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2023-05-04 21:39 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-04 21:39 [gentoo-commits] repo/gentoo:master commit in: net-ftp/lftp/, net-ftp/lftp/files/ Conrad Kostecki
-- strict thread matches above, loose matches on Subject: below --
2023-02-14 21:41 Sam James
2020-12-16 22:35 Sergei Trofimovich
2020-03-27 6:46 Jeroen Roovers
2019-12-23 16:13 Jeroen Roovers
2019-05-03 8:26 Jeroen Roovers
2016-03-28 17:24 Jeroen Roovers
2015-12-19 9:55 Jeroen Roovers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox