summaryrefslogtreecommitdiff
path: root/net-ftp
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-05-07 17:37:01 +0100
committerV3n3RiX <venerix@koprulu.sector>2023-05-07 17:37:01 +0100
commit2fe5661a32d6ec0ba1d6b37cc8ae67e3f81459ec (patch)
treef41d653fa88967e28246f7b63dba9f2fd7be2ab7 /net-ftp
parent6e88bac8dd26372eea042112ad3769b1fac9ae18 (diff)
gentoo auto-resync : 07:05:2023 - 17:37:01
Diffstat (limited to 'net-ftp')
-rw-r--r--net-ftp/Manifest.gzbin3185 -> 3182 bytes
-rw-r--r--net-ftp/lftp/Manifest4
-rw-r--r--net-ftp/lftp/lftp-4.9.2-r1.ebuild7
-rw-r--r--net-ftp/lftp/lftp-9999.ebuild9
-rw-r--r--net-ftp/pure-ftpd/Manifest3
-rw-r--r--net-ftp/pure-ftpd/files/pure-ftpd-1.0.51-sys-sendfile.patch37
-rw-r--r--net-ftp/pure-ftpd/pure-ftpd-1.0.51-r2.ebuild (renamed from net-ftp/pure-ftpd/pure-ftpd-1.0.51-r1.ebuild)5
7 files changed, 56 insertions, 9 deletions
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index bb7ab7069dc0..3a4811ea55d9 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 d33f092c1411..5b4490bd05b7 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -12,6 +12,6 @@ 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
DIST lftp-4.9.2.tar.xz 1654960 BLAKE2B 04f168576ae6e001e0ffffb2e93e36d5bffa5ed1e2e671edb6210a54aa0ecedc280885450dcee890d05b64464eb641e7e63c8d4dd170100317dec3fe734ec483 SHA512 cda8698e7e34d748715a6fe5dc06c758240302621c7957402f0cc67577acf1a96b436fda4282408dee8171dc84a31e0be432df99a30f0a10057a8e7ea9ec64ad
-EBUILD lftp-4.9.2-r1.ebuild 2758 BLAKE2B 5cb484a6d8fd7fa9e85d297d589df8559856873e9a3c843a80ef6ac11720696befce046832ea950705b7275baec79b7442aeb22284dad434a519337ee9a76737 SHA512 e00c1f6507809d4c52b09b81d6edc20184633b35e39866b246275f692b072b0ea62f43794071f11e562bbf98bff3808193cafbf43d1285525e6a988c81ba4332
-EBUILD lftp-9999.ebuild 2445 BLAKE2B 3a39352024188a959e6d2d6cadab400acdb7f0e2977e58d4e97be6e52cc9d9dc7733baace2fe77b754f317b59ecddd58dda6da2d03c4ab0923861f1091c6d857 SHA512 0bb8e954d106b9e14899bd1375cc0e22fa2511f83e361903a0b21969e3b3f2158368ff61efed4306fb7dd43f23cc63675e4914ff5fa2734ebcd18693d6b5b96c
+EBUILD lftp-4.9.2-r1.ebuild 2816 BLAKE2B 6c08bea5f354779bd3a803d724deff8c73c1dd2bb5b12708a87d4cfe77d16665b0609994cddd376165a80bb690bee6a1f0faf8b634d8837f67da8c775d944732 SHA512 f02cd3b0cbfff588ca591b871ec465aaab9528355ce22c6498bbc968434751a65b5dd80e0f3e7cd3c30de0e6906c56f0f5d77b157294b90b5842dcd9d38451c0
+EBUILD lftp-9999.ebuild 2501 BLAKE2B b3e020e7e93dceca8a460ab744c5209078b856592489ff082b0e6de806188e5f88238194d320732628bad0f70a88a67db68c2b682620639c767e41308d2530b0 SHA512 a99c35e3aa95b337e571146fe46158ff9b6162640fdf1e95ce816fabcbe16f0022a8825cc01dd9b9633d562accb144f88fb38ba5879ea9325a39fefb7b7c9833
MISC metadata.xml 556 BLAKE2B d7469c2b0a5fd85a1a102b587d9cb992bee74a41df956bb91c6b944d6ab5f3bdbf003c8e2a4e89f8326e1c0290dde88efdc2689d212e284b7394383f2e4ded99 SHA512 84c61561f72df1c9daaa60b493877be495e35f306d65aeff607c356484492cecd40e1e4a1f6a5143e3cf5b2fed665489a50af8f5ed5afe38c614674692de0ca8
diff --git a/net-ftp/lftp/lftp-4.9.2-r1.ebuild b/net-ftp/lftp/lftp-4.9.2-r1.ebuild
index f7b4b9adf626..0e319edbe103 100644
--- a/net-ftp/lftp/lftp-4.9.2-r1.ebuild
+++ b/net-ftp/lftp/lftp-4.9.2-r1.ebuild
@@ -11,7 +11,7 @@ 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"
+IUSE="convert-mozilla-cookies +gnutls idn nls socks5 +ssl verify-file"
RESTRICT="test"
RDEPEND="
@@ -61,6 +61,9 @@ PATCHES=(
"${FILESDIR}"/${PN}-4.9.2-libressl.patch #903001
)
+# Gnulib false positive #900064
+QA_CONFIG_IMPL_DECL_SKIP="( MIN )"
+
src_prepare() {
default
@@ -77,12 +80,12 @@ src_prepare() {
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-ipv6 \
--enable-packager-mode \
--sysconfdir="${EPREFIX}"/etc/${PN} \
--with-modules \
diff --git a/net-ftp/lftp/lftp-9999.ebuild b/net-ftp/lftp/lftp-9999.ebuild
index c1915ac399f9..3020137e83ad 100644
--- a/net-ftp/lftp/lftp-9999.ebuild
+++ b/net-ftp/lftp/lftp-9999.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
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/lavv17/lftp"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS=""
-IUSE="convert-mozilla-cookies +gnutls idn ipv6 nls socks5 +ssl verify-file"
+IUSE="convert-mozilla-cookies +gnutls idn nls socks5 +ssl verify-file"
RDEPEND="
>=sys-libs/ncurses-5.1:=
@@ -57,6 +57,9 @@ PATCHES=(
"${FILESDIR}"/${PN}-4.9.1-libdir-readline.patch
)
+# Gnulib false positive #900064
+QA_CONFIG_IMPL_DECL_SKIP="( MIN )"
+
src_prepare() {
default
@@ -73,12 +76,12 @@ src_prepare() {
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-ipv6
--enable-packager-mode \
--sysconfdir="${EPREFIX}"/etc/${PN} \
--with-modules \
diff --git a/net-ftp/pure-ftpd/Manifest b/net-ftp/pure-ftpd/Manifest
index b167ec286e1c..0fe8e6e94c0d 100644
--- a/net-ftp/pure-ftpd/Manifest
+++ b/net-ftp/pure-ftpd/Manifest
@@ -1,12 +1,13 @@
AUX pure-certd.initd 562 BLAKE2B 21431b74d2a745b13daa7772748b4484e18a640ffc07252ed60867b297a8f31267f583ceb408ee31c11bbc43de3fcda0b51e4324279b50c8a4a19ea6f1342945 SHA512 1a7a7dcba98e92e86ae3f35c33c5fe970c6530f1059692f32cdc851de1d8492720020b252e70c646eff6fdbbb32dfb99b1ae449acaea5fd0fe5541dc89891301
AUX pure-certd.script 675 BLAKE2B 937fb3eb12ade192cd758d47f17cec97fe2b2f12bfc34d6ff531c3e012d0a117f0501800f1d61fa22ce4824dc064efaa0937fa02c814949a9d380341f269dc05 SHA512 612616e2c3f9d5a0552ae4da3924ca86deb3ef747de48b55fc52b0edd5719116f0e3d9df60c61ae061023bf5981385f01f1dac284f8bdcd63234c3708ec3f0d0
AUX pure-ftpd-1.0.28-pam.patch 568 BLAKE2B cb7a9540e5646d7e9b734f893d4449e11cad60f897b39ed111559877edb4cf22e607fcf15d6ed7eea6dbf7a03a430c9182d6405ced13cf9c6614d15a45e17a49 SHA512 c331837c4c8988e0623a6a4f4222263dd161a49a2748079d3c539db2025b7b048ca5976b4450dd32cab5755932c7e59f6976d9d3bda2e5e87f1869789f8e00ba
+AUX pure-ftpd-1.0.51-sys-sendfile.patch 1324 BLAKE2B 05fd1d0091faf606bc469e68180856d125b892114c9be72ed15cdab403f74f82001125ad257820c7ed005ba8d7a7437381eaf8585a3d2d7f3d057129558bbb6d SHA512 cd53f9d9fc317ac5a77ceb5048fda80ca3183ec5614f8843a45b9dde21b3f7c0f9d0c1f5d9a830f7587fa25d59360fb76cd86f413dcb7a3c6df125c6271a70f3
AUX pure-ftpd.confd-r4 170 BLAKE2B d552480bea7503066ef3f0e90a082660a30f35cf809e26860ba9b49fcbb2fcdafdfe35041510fdd73f1b42cb35b7d90caa37ed9722de769750558818ebfbfe43 SHA512 6afde5a6e0f8e3a14bd23a6f861e18754980ab1b845defe06378493ed58e693628f4af71b591b3160037a0fdf6cc750c2a0d156a47c48a2a1d58c0032e389a1f
AUX pure-ftpd.initd-r12 519 BLAKE2B 6271067b195de1b662ffe1577aaf3e6e2badd44494e17f27671f9f70e3f1bb955326af390b709a4ff9cefd2ba48e1ef77efaaac5595a5dccbbb75e9376db7153 SHA512 2189b8761aa51b68bd4b5b5c79e3f7220c9f96e5187bf17ed55a50a74ebe0989b3d5f2c9d8b3bdc89d184ce7f97d16e1c51e46b3d178feacc72864090717b8a1
AUX pure-ftpd.xinetd 247 BLAKE2B aa2b0f8b4b6ff45e9b8dd632af5ff680ddd5abe51647dda91ca78bf3cb9ba9a090b20433f460213e95b8e57958d711f4bd7fa594b3d33fae818b853ec5aaee5d SHA512 e8ac0527daf1e182e7514d17f04bd20e789231e627cc7228ac23a241a4c420204a61ef9438c57e63f402eb3608ae0acc15a72fe484c99bb4e172bbd5ece2b72d
AUX pure-uploadscript.confd 368 BLAKE2B 675e5349b2f808dd2a3cbaf2536a0541f40d42d300b7411163bc8232470c6f63a1d92cef393271693a02bcb5129624d38de77a99ca030a77bab00cc1fbe797c4 SHA512 2632be874a5afb25b8c8c1acbdfef929542d80dc9a8f280b4a9b0b6878be63f901ccd2c29c2ae0f9f74f45e41df1b7e69d1cef6f77e93c9b235709a7094480af
AUX pure-uploadscript.initd-r1 776 BLAKE2B 1e382300a92fabb5308aa2636de2f427418d8595859fa2d7e6ee0a62297a0a17386f2f4c55de03ad282ed0545cc97ea6c0df67fe5fe6af736789d01e18c69f97 SHA512 3bb735bf0dc12434bc283ea9948c5b7feeaf72a26382a65a3c8eaec87a13f82239699e4687e5b36be5478bcab801974633b17771d9a583b6be508503118899e4
DIST pure-ftpd-1.0.51.tar.bz2 520648 BLAKE2B 0b82fee114986140eb74d2669b7d91582a48f1b366936895acda913afb7d3bca1578295a930f7857f8674e593bd1bf8094c36f2ae8db6cf1a62cacfd4234cf13 SHA512 3615ac1ec42813855f3328dde200f60025e1f2ca7d1e17ea042967fd4164079260d058f3e2586acd778334660f387a280b35850a9e2091dd913fb84ef929bdca
-EBUILD pure-ftpd-1.0.51-r1.ebuild 4450 BLAKE2B a74926b5714227b97d6e7732985b5302e9f8d95f2ee5d722ad6c9b5aedd1a9d89b28405c9bd35e5dd460d328725cfd0f9187c09782fe77ad9314081dcf9429e9 SHA512 4130b154979dc8954da66d053bbd295e661684eac51b42aff1a5a36ab9c540e896f3a126eff63f95c8b3a595aa056edfbe893eb71f50caf2da9e3e5127e391da
+EBUILD pure-ftpd-1.0.51-r2.ebuild 4498 BLAKE2B e7713607a9809b8cb1525db1a9cb9a92c8a7c5e20dbea96db8721ba2051ffca9353ab2e6d7a1751a7cb44d1b411e60996ac0c346bd4e2dc69114f5db9305f462 SHA512 c9556e6034e759681e4140a60155b736d5793c93c65b09971dda715a19f1ed53cfe4083916be627fa22955336d64ef206c7c35d29f6982a8c815ba18d7350b85
EBUILD pure-ftpd-9999.ebuild 4459 BLAKE2B c9b9a0eb103ba66c0c31e71ca61377829d40dfaef4f81528936b395b2a04d7ca39d4689e5d78dfe0432c376bb63269169cc8f9ddb1a9bdbaf07a1b1f6d222f8b SHA512 acb68506a8a4df2c33b75830fe0ff965892bbaf7b63dc0dc6f51ac0e10ec8f4a2865dd1c671e084de3ad7c06e6fced96b93036cc18c8ff4bb1ce03cff8e70bf0
MISC metadata.xml 1289 BLAKE2B bf0e11d7e99724a817cdd10c7d38898d60725e455b4cf438a5d0e63cdaddaa6f4f3b231eb51231ff55226850f084dde65d885785aae0f5b7e3ccede8df366952 SHA512 ab0cfea202b128a04fb269f9332e9a1267d7e5194b3f34e2d34aefca07323304cacf8cbd97cf4db2e990632c1be781f97334a220aa5cb9815f7ca7eef4ad0ac1
diff --git a/net-ftp/pure-ftpd/files/pure-ftpd-1.0.51-sys-sendfile.patch b/net-ftp/pure-ftpd/files/pure-ftpd-1.0.51-sys-sendfile.patch
new file mode 100644
index 000000000000..bc2973c1389c
--- /dev/null
+++ b/net-ftp/pure-ftpd/files/pure-ftpd-1.0.51-sys-sendfile.patch
@@ -0,0 +1,37 @@
+From 511315971f227ac2ce1481ff9e7350a607f78d23 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 23 Apr 2023 06:27:20 +0100
+Subject: [PATCH] configure.ac: Silence harmless
+ -Wimplicit-function-declaration warning in hpux sendfile check
+
+We're currently looking for build systems where -Wimplicit-function-declaration
+is emitted by checks as it often implies a missing include, but in this case,
+it's fine - HPUX doesn't have a sendfile header, so it's just noise (and it
+won't be true on Linux anyway).
+
+But the check is run unconditionally and we already check if sendfile.h exists,
+so include the header conditionally if it exists, as it's harmless and it avoids
+it looking like there's a problem in pure-ftpd.
+
+Unfortunately, it's not so easy to silence the sendfilev check which has
+a similar (but different) problem because it uses AC_CHECK_FUNCS.
+
+Bug: https://bugs.gentoo.org/900068
+---
+ configure.ac | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 62768c8..0abb423 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -718,6 +718,9 @@ AC_MSG_CHECKING([if a hpuxish sendfile is available])
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+ #include <sys/socket.h>
+ #include <stdio.h>
++#ifdef HAVE_SYS_SENDFILE_H
++# include <sys/sendfile.h>
++#endif
+ ]], [[
+ do {
+ int fd = 0;
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.51-r1.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.51-r2.ebuild
index 223cdb2a5ea7..78000f7885e9 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.51-r1.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.51-r2.ebuild
@@ -48,7 +48,10 @@ RDEPEND="
BDEPEND="sys-devel/autoconf-archive"
-PATCHES=( "${FILESDIR}/${PN}-1.0.28-pam.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-1.0.28-pam.patch"
+ "${FILESDIR}/${PN}-1.0.51-sys-sendfile.patch"
+)
src_prepare() {
default