summaryrefslogtreecommitdiff
path: root/net-ftp
diff options
context:
space:
mode:
Diffstat (limited to 'net-ftp')
-rw-r--r--net-ftp/Manifest.gzbin3185 -> 3183 bytes
-rw-r--r--net-ftp/lftp/Manifest5
-rw-r--r--net-ftp/lftp/files/lftp-4.9.3-gnulib.patch45
-rw-r--r--net-ftp/lftp/lftp-4.9.3.ebuild112
-rw-r--r--net-ftp/lftp/lftp-9999.ebuild28
5 files changed, 176 insertions, 14 deletions
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 5b3651e34392..09d6b6160440 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
Binary files differ
diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index ebceb19e5f42..ee1c49f8924f 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -12,7 +12,10 @@ AUX lftp-4.9.2-ac-270.patch 1298 BLAKE2B 3431c649aa1f772a94640c1d1508b584eff0892
AUX lftp-4.9.2-configure-clang16.patch 617 BLAKE2B c8e2f3476011b6fa154de4021644bfed1c9fb420940c26cdc57a4ac9939c84bf5c123745cb8d5749a776a29a0afee65dd11c4faa97c3d2ef53f5545b86bf4d54 SHA512 078c309e20a49e28a65ec5d6c732ea0a57c0cdbc8b9e54f4fc5ddc917bc3fe439c1e4592243b57117f0d32ba7ae17067124e8a17e57513326a4fda7abdf5b6ac
AUX lftp-4.9.2-libressl.patch 1964 BLAKE2B 045b1436b970530741b4109b8408151b5d0714310667b8a4eec9817e14e96395e47141112b22acf0a5e28dac0eb157029e2bef8a5cd677eba8b1d8471e02d814 SHA512 081dc57c78645bb528d745406789e9edf7d6b54f16c4df825b69829df2e0d8f383d11f8fe15530c406f15debb0cad17e5fa0b1415529068228c380503c974d55
AUX lftp-4.9.2-socks.patch 1041 BLAKE2B 2590e96690ae08c5fa4bc1d0041fd7fa1ab642878b3dcbda5a4f121fc42ef0e39bdd9d1d4fe668bdd1987e6a510c313109d292701267cc2d22a25da72ba79b28 SHA512 ce4229c3c58f0df4ffda9d342a0e709fc5256c94bac4b52607486cfb72cd208bf3465deca2bab4f3b67d1ba1cdd09aeb7d82d1cf887641543081863ad38afe47
+AUX lftp-4.9.3-gnulib.patch 1356 BLAKE2B a3f6c8ed0052c77b6513b2064c98464d2e0264136e1a4c265d512473afe2cd40a5818abaaf264551ecbecf9a18746befef1d05748dfa2da98040d7599af0d9aa SHA512 46d048c0e74e180fbb3ce2b4b90cdde90449703acf1a2088a7accd57adc06c9f63bf5d25dae734fbecda711048805871ae26caab8e70634f1d575def6ae01aa2
DIST lftp-4.9.2.tar.xz 1654960 BLAKE2B 04f168576ae6e001e0ffffb2e93e36d5bffa5ed1e2e671edb6210a54aa0ecedc280885450dcee890d05b64464eb641e7e63c8d4dd170100317dec3fe734ec483 SHA512 cda8698e7e34d748715a6fe5dc06c758240302621c7957402f0cc67577acf1a96b436fda4282408dee8171dc84a31e0be432df99a30f0a10057a8e7ea9ec64ad
+DIST lftp-4.9.3.tar.gz 3385456 BLAKE2B 10d96a8d10d95ab205b63adb1fa31ffa71ee88aeea6ba1740e4f9e24fbc7499387507cb9a9d6b7025cd8ff05c4d4ac0acc9ddbc5e6d04561ad1a4fc644faf86a SHA512 3168077f065ab71d1c49fda9c6e22ecc67bc0a16c27206c413f2103ba343e0c1364f63a1ee10a4c0f06203cbb9a2a81f94f736f7ef8a3dd667445e17ea75206f
EBUILD lftp-4.9.2-r1.ebuild 2857 BLAKE2B 299d796259dfe7e0a7fc87fde9af7627eee729ac0fd66bf7acbda64c352750c1198a163b3bb534d937c5d0dfdd2e7334109a835ce51ae70acc12c59b28ce8af8 SHA512 972c17f25afc2a816a1df12f2c58b3f602e5efd592bd64ff57e5f34b6507e46f5b674073b4a91e9c5210e213557bba05a4a713190838e613dcb80450fa4b7c6e
-EBUILD lftp-9999.ebuild 2501 BLAKE2B af14e90c24711edfb7a4ef6b54f69e8510954489547b86879b4290018f10136d8683a68641a4816a5d51bdd792ec618072fffac937f37148f6519551909b7d15 SHA512 e5b24983b0c2a952513fd0ad2dbcb6901dfbeb5b9062fb1c85915a900e3ec71ba5b0f2e287cf7c26c8e9c06e2c9e8c65305f03c8b841676d044b7e4da7abc3a7
+EBUILD lftp-4.9.3.ebuild 2701 BLAKE2B 34a1a4605d481073a50b63a22f97311caee93ddbfa2708fce5dc7a3b1c8dccc11908355f3a6201cc5bc6c8bfa0219db2b93c9b27208d04f0a8d96ce0801b31d9 SHA512 558890581bc5d1b45454035bea1a92455d6db46bda41dc2350e1e66776d161c29f9bd1dc8c159de00d300d5142d96a19a88e42f9997c30813b1c5727cb20207d
+EBUILD lftp-9999.ebuild 2528 BLAKE2B 0da869938940b9ee0151ff4840e6a36aba05a681d73a1b88604e2d9e69fdeabe7d65a0aca8d1bdafddd548709a81a5061aabafbc6c68012fe14312cad3b0166d SHA512 8fb509fde5f15d951c5d67915088c35a60219fb730eac535d1585c8a3d4fd4cd18032a5f70322f1e573e26bfab94819f8438892e3a5803f982d42ec51050d5ab
MISC metadata.xml 556 BLAKE2B d7469c2b0a5fd85a1a102b587d9cb992bee74a41df956bb91c6b944d6ab5f3bdbf003c8e2a4e89f8326e1c0290dde88efdc2689d212e284b7394383f2e4ded99 SHA512 84c61561f72df1c9daaa60b493877be495e35f306d65aeff607c356484492cecd40e1e4a1f6a5143e3cf5b2fed665489a50af8f5ed5afe38c614674692de0ca8
diff --git a/net-ftp/lftp/files/lftp-4.9.3-gnulib.patch b/net-ftp/lftp/files/lftp-4.9.3-gnulib.patch
new file mode 100644
index 000000000000..2d821907f2d7
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-4.9.3-gnulib.patch
@@ -0,0 +1,45 @@
+From: Jan Palus <jpalus@fastmail.com>
+Date: Sun, 17 Nov 2024 17:58:42 +0000 (+0100)
+Subject: md5-stream, sha*-stream, sm3-stream: Avoid duplicate symbols.
+X-Git-Url: https://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commitdiff_plain;h=353a3236d9328349c18ce2e4e984755cb4a76ea7
+
+md5-stream, sha*-stream, sm3-stream: Avoid duplicate symbols.
+
+* lib/md5-stream.c (GL_OPENSSL_INLINE): Remove definition, that caused
+the symbols defined in md5.o to be defined in md5-stream.o as well.
+* lib/sha1-stream.c (GL_OPENSSL_INLINE): Likewise.
+* lib/sha256-stream.c (GL_OPENSSL_INLINE): Likewise.
+* lib/sha512-stream.c (GL_OPENSSL_INLINE): Likewise.
+* lib/sm3-stream.c (GL_OPENSSL_INLINE): Likewise.
+
+Copyright-paperwork-exempt: Yes
+---
+
+diff --git a/lib/md5-stream.c b/lib/md5-stream.c
+index fdd2bd8b4b..2cbdda6b0f 100644
+--- a/lib/md5-stream.c
++++ b/lib/md5-stream.c
+@@ -22,9 +22,6 @@
+ #include <config.h>
+
+ /* Specification. */
+-#if HAVE_OPENSSL_MD5
+-# define GL_OPENSSL_INLINE _GL_EXTERN_INLINE
+-#endif
+ #include "md5.h"
+
+ #include <stdlib.h>
+diff --git a/lib/sha1-stream.c b/lib/sha1-stream.c
+index cbdf95ab76..b713e678a6 100644
+--- a/lib/sha1-stream.c
++++ b/lib/sha1-stream.c
+@@ -24,9 +24,6 @@
+ #include <config.h>
+
+ /* Specification. */
+-#if HAVE_OPENSSL_SHA1
+-# define GL_OPENSSL_INLINE _GL_EXTERN_INLINE
+-#endif
+ #include "sha1.h"
+
+ #include <stdlib.h>
diff --git a/net-ftp/lftp/lftp-4.9.3.ebuild b/net-ftp/lftp/lftp-4.9.3.ebuild
new file mode 100644
index 000000000000..b7c5e998433f
--- /dev/null
+++ b/net-ftp/lftp/lftp-4.9.3.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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="https://github.com/lavv17/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="convert-mozilla-cookies +gnutls idn 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}
+ =dev-build/libtool-2*
+ app-arch/xz-utils
+ nls? ( >=sys-devel/gettext-0.21 )
+ 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.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-socks.patch
+ "${FILESDIR}"/${PN}-4.9.3-gnulib.patch
+)
+
+# Gnulib false positive #900064
+QA_CONFIG_IMPL_DECL_SKIP="( MIN )"
+
+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 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-ipv6 \
+ --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/lftp-9999.ebuild b/net-ftp/lftp/lftp-9999.ebuild
index 4eeb8cb7874b..a5e731f6531e 100644
--- a/net-ftp/lftp/lftp-9999.ebuild
+++ b/net-ftp/lftp/lftp-9999.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
+
inherit autotools git-r3 libtool xdg-utils
DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program"
@@ -10,7 +11,6 @@ EGIT_REPO_URI="https://github.com/lavv17/lftp"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS=""
IUSE="convert-mozilla-cookies +gnutls idn nls socks5 +ssl verify-file"
RDEPEND="
@@ -36,10 +36,9 @@ RDEPEND="
DEPEND="
${RDEPEND}
- dev-libs/gnulib
=dev-build/libtool-2*
app-arch/xz-utils
- nls? ( >=sys-devel/gettext-0.19 )
+ nls? ( >=sys-devel/gettext-0.21 )
virtual/pkgconfig
"
@@ -47,14 +46,18 @@ DOCS=(
BUGS ChangeLog FAQ FEATURES MIRRORS NEWS README README.debug-levels
README.dnssec README.modules THANKS TODO
)
+
PATCHES=(
- "${FILESDIR}"/${PN}-4.5.5-am_config_header.patch
+ "${FILESDIR}"/${PN}-4.0.2.91-lafile.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-socks.patch
+ "${FILESDIR}"/${PN}-4.9.3-gnulib.patch
)
# Gnulib false positive #900064
@@ -66,12 +69,12 @@ src_prepare() {
# bug #875692
sed -e '/#include/s/cmath/math.h/' -i trio/*.c || die
- gnulib-tool --update || die
-
- chmod +x build-aux/git-version-gen || 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() {
@@ -81,7 +84,7 @@ src_configure() {
$(use_with socks5 socksdante "${EPREFIX}"/usr) \
$(usex ssl "$(use_with !gnutls openssl "${EPREFIX}"/usr)" '--without-openssl') \
$(usex ssl "$(use_with gnutls)" '--without-gnutls') \
- --enable-ipv6
+ --enable-ipv6 \
--enable-packager-mode \
--sysconfdir="${EPREFIX}"/etc/${PN} \
--with-modules \
@@ -90,8 +93,7 @@ src_configure() {
}
src_install() {
- # FIXME: MKDIR_P is not getting picked up in po/Makefile
- emake DESTDIR="${D}" mkdir_p="mkdir -p" install
+ default
local script
for script in {convert-mozilla-cookies,verify-file}; do
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-05 07:27:18 +0000