From 7b744169f910185aacfd39dbd71d58b58a2e1d2f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 15 Feb 2023 01:59:31 +0000 Subject: gentoo auto-resync : 15:02:2023 - 01:59:31 --- net-ftp/Manifest.gz | Bin 3174 -> 3178 bytes net-ftp/lftp/Manifest | 3 +- .../lftp/files/lftp-4.9.2-configure-clang16.patch | 22 +++++ net-ftp/lftp/lftp-4.9.2-r1.ebuild | 107 +++++++++++++++++++++ net-ftp/lftp/lftp-4.9.2.ebuild | 106 -------------------- 5 files changed, 131 insertions(+), 107 deletions(-) create mode 100644 net-ftp/lftp/files/lftp-4.9.2-configure-clang16.patch create mode 100644 net-ftp/lftp/lftp-4.9.2-r1.ebuild delete mode 100644 net-ftp/lftp/lftp-4.9.2.ebuild (limited to 'net-ftp') diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz index 01d96e01035a..7d3cfdddf22e 100644 Binary files a/net-ftp/Manifest.gz and b/net-ftp/Manifest.gz differ diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest index c13390c1a18e..b28951633f65 100644 --- a/net-ftp/lftp/Manifest +++ b/net-ftp/lftp/Manifest @@ -9,7 +9,8 @@ AUX lftp-4.8.2-libdir-openssl.patch 658 BLAKE2B 430dab0713f82c3c10ac7395b8ca9ca1 AUX lftp-4.8.2-libdir-zlib.patch 714 BLAKE2B a770bc7a3f974ece766883e644403691de8370cdf511303df4b17346275d936ebfcb658262102c01e61e11861d69e4c54f45baeddb246c062f3c66eadf8b0bcd SHA512 4a47a2e63bfe80faa640edc92c645e89d5c0063c0adc992f0b0613e01cfa0599f61f9bd07568432673addb1a981f101c474b1a0d99fd50fced455c9700b886e6 AUX lftp-4.9.1-libdir-readline.patch 404 BLAKE2B 88746dbfd082202950e54270519fa25c8a2042d3479342443394918722a8f0b7b2cde1580c7ac07c0c3408f86c12a83fa1973391ef25a9b3f348b7ad1afa68ac SHA512 e6ab456b237613f31c3e7e450a5127b5fac74a9d24d4bd5ca95f9b28d6c810ad0253d71d710e1daf15c43d0b2d5d2ecdb2b1fb7bbdaa4c3bc0b610d6cc6caf3b AUX lftp-4.9.2-ac-270.patch 1298 BLAKE2B 3431c649aa1f772a94640c1d1508b584eff0892098400eea5390c754ece5f23a877aa2eccb814bf1ece93e329980a29190aa784f4cc2b41efccc58c2921409d8 SHA512 efabe7cd6b3467b9212d47669842bf3b1b981ad6c8615bdfda4122d1a217e10fc0fda167903172502a13c63341ddab8e5bba91e5f39721c6fd304e29e6647a08 +AUX lftp-4.9.2-configure-clang16.patch 617 BLAKE2B c8e2f3476011b6fa154de4021644bfed1c9fb420940c26cdc57a4ac9939c84bf5c123745cb8d5749a776a29a0afee65dd11c4faa97c3d2ef53f5545b86bf4d54 SHA512 078c309e20a49e28a65ec5d6c732ea0a57c0cdbc8b9e54f4fc5ddc917bc3fe439c1e4592243b57117f0d32ba7ae17067124e8a17e57513326a4fda7abdf5b6ac DIST lftp-4.9.2.tar.xz 1654960 BLAKE2B 04f168576ae6e001e0ffffb2e93e36d5bffa5ed1e2e671edb6210a54aa0ecedc280885450dcee890d05b64464eb641e7e63c8d4dd170100317dec3fe734ec483 SHA512 cda8698e7e34d748715a6fe5dc06c758240302621c7957402f0cc67577acf1a96b436fda4282408dee8171dc84a31e0be432df99a30f0a10057a8e7ea9ec64ad -EBUILD lftp-4.9.2.ebuild 2657 BLAKE2B d4504b82c1af9dc26fae70c86941cfc71ab7a2c1359f28481d220a8fc091ad0c8ab9812bc29446148190b7fee2d1440faaf9801532d9c486b6dda560df82da51 SHA512 fe4e64e5f2a751bdd55f3696a37c8a375a190bddb2032f9a703c4434ad125f5bf5a1f10dabf8a76fc05832f0d239ef6a588b188d78e0d56658e7aa999b1f0edd +EBUILD lftp-4.9.2-r1.ebuild 2708 BLAKE2B b0613d9932f8010911d0877f8a6b74423324191b8747f5e381dccacb2b917bef31fc2606ecc5c28339c2b4768f25f6df3129b73019ac304c4994191543979f99 SHA512 279248619815058833a5d7f538267cb8a637edc91a6696c708c15141636ae6be3dfd0f5673faddfecb41c942401125f88595459a2cbd92bfe5b549d657e12205 EBUILD lftp-9999.ebuild 2445 BLAKE2B 3a39352024188a959e6d2d6cadab400acdb7f0e2977e58d4e97be6e52cc9d9dc7733baace2fe77b754f317b59ecddd58dda6da2d03c4ab0923861f1091c6d857 SHA512 0bb8e954d106b9e14899bd1375cc0e22fa2511f83e361903a0b21969e3b3f2158368ff61efed4306fb7dd43f23cc63675e4914ff5fa2734ebcd18693d6b5b96c MISC metadata.xml 480 BLAKE2B 931c7e6b08cd167d3c1b9c68a342b06b4f1c1c740561644463066311ae6ec145ed262867f02452432494de522d0542d67b2a24f084a716e29c2a55986b7f0db7 SHA512 f0e2170af26c5218e609a615a6312b9d28e8a1113dcb9c3a34b833c879be6af37537a520c8d242771b70a96e054afef70244f6caf937debd3c70f896824b8944 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 +Date: Wed, 8 Feb 2023 23:37:37 -0500 +Subject: [PATCH] Fix C99 compatibility issue + +Related to: + + + +--- 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 + int main() + { + unsigned long long x=0,x1; + diff --git a/net-ftp/lftp/lftp-4.9.2-r1.ebuild b/net-ftp/lftp/lftp-4.9.2-r1.ebuild new file mode 100644 index 000000000000..9047ab306f17 --- /dev/null +++ b/net-ftp/lftp/lftp-4.9.2-r1.ebuild @@ -0,0 +1,107 @@ +# 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 +) + +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/lftp-4.9.2.ebuild b/net-ftp/lftp/lftp-4.9.2.ebuild deleted file mode 100644 index 59f56239e17f..000000000000 --- a/net-ftp/lftp/lftp-4.9.2.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2022 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 -) - -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 -} -- cgit v1.2.3