summaryrefslogtreecommitdiff
path: root/net-ftp
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-02-05 18:44:56 +0000
committerV3n3RiX <venerix@redcorelinux.org>2020-02-05 18:44:56 +0000
commit29aabba0ea759c6a2864ff5631735b67ee38e5e0 (patch)
treeab466b4dfa7abecb401b2f8039d08af4689306bb /net-ftp
parentd42200bec37eef2a7478d88988ff00addd0a9202 (diff)
gentoo resync : 05.02.2020
Diffstat (limited to 'net-ftp')
-rw-r--r--net-ftp/Manifest.gzbin4000 -> 4005 bytes
-rw-r--r--net-ftp/filezilla/Manifest2
-rw-r--r--net-ftp/filezilla/filezilla-3.46.3.ebuild4
-rw-r--r--net-ftp/ftp/Manifest2
-rw-r--r--net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild2
-rw-r--r--net-ftp/ftpbase/Manifest2
-rw-r--r--net-ftp/ftpbase/ftpbase-0.01-r3.ebuild2
-rw-r--r--net-ftp/lftp/Manifest2
-rw-r--r--net-ftp/lftp/lftp-4.8.4-r1.ebuild2
-rw-r--r--net-ftp/ncftp/Manifest4
-rw-r--r--net-ftp/ncftp/files/ncftp-3.2.6-fno-common.patch68
-rw-r--r--net-ftp/ncftp/ncftp-3.2.6-r1.ebuild49
-rw-r--r--net-ftp/ncftp/ncftp-3.2.6.ebuild2
-rw-r--r--net-ftp/proftpd/Manifest2
-rw-r--r--net-ftp/proftpd/proftpd-1.3.6-r5.ebuild2
-rw-r--r--net-ftp/pure-ftpd/Manifest2
-rw-r--r--net-ftp/pure-ftpd/pure-ftpd-1.0.47-r4.ebuild2
-rw-r--r--net-ftp/tftp-hpa/Manifest3
-rw-r--r--net-ftp/tftp-hpa/files/tftp-hpa-5.2-gcc-10.patch42
-rw-r--r--net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild6
-rw-r--r--net-ftp/vsftpd/Manifest2
-rw-r--r--net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild2
22 files changed, 184 insertions, 20 deletions
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 81e0c532c681..29f84cd48fcc 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
Binary files differ
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index e605d93e88a7..9bd11fdb7cdb 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -8,5 +8,5 @@ EBUILD filezilla-3.39.0.ebuild 1830 BLAKE2B f3456ceeac58ed5fb0ebdb16091bdfd64282
EBUILD filezilla-3.44.2.ebuild 1884 BLAKE2B 5175bcabdcbb34dc8c6c2ee967b4aa2a487f04a5148469656b8f8014e325d5055cef22103d808a92d2323549b02d1b2cc8fd3a02fed89109ba604b36f378596d SHA512 25ca53bffa1e9729e4f9f3613f7b81582842fdd1bd076905a841bf1f993b8564d67833691316281f4603a6c93ac573ec626431e334d7f2de6d97a09ccb3d2485
EBUILD filezilla-3.45.1.ebuild 1888 BLAKE2B 3a89bb7289cdb392e74572a707621c30afbdfacb3cb93510d18683a07039b286ede6ee8b62c63ee64f1c31bf1bc80f959a0fbbbcbbf2452cc46b87abf3c50c6b SHA512 ff7bdce8a143dd46860cd112283f69e02251b79879c12e850945b0f03af97bcbfac4400b789cc045c735d01bd2fde9203e58a0019fe2fe502a318fdb29dd1e51
EBUILD filezilla-3.46.0.ebuild 1888 BLAKE2B 9682974c356117d373fa3b0db1f702689e779703152651190d5d667131cd6f2c573943e485d79221e2c86d5bb751035df2f91bccad436e93ab2fc37e002c13ce SHA512 cc272b8acdb871132fba72529fd3afcedae057502da09eb00b4740e21dda814a68d534c3697ceabaa288382cf266877abacbdd78a5082a39a7afc89b482a1be6
-EBUILD filezilla-3.46.3.ebuild 1888 BLAKE2B 5e2f24d76263547e37ad666135d1d0bf0008c1c05d358392a3a3b5dc0fd361179b2c0b3db57ec1d2bdf1f29673934182119143ffcbefb163954e41c1f2219e9a SHA512 d1dba5262e94143141cb224e3034e883941f4012a80349a17dead8d492a675153fb756f1b315488c6dc63bcbe96c8ef3af3965c0bcf1e416711e9fbe81109ab5
+EBUILD filezilla-3.46.3.ebuild 1895 BLAKE2B 62393dba06d50ec02917d54851592ae850b4a919c9e85137684904fe913be20e2cff1b00a547e237fcb556204e6f8ebc33043c61dea30b5b5fbf19ba17ea8b02 SHA512 53f08f568ae779249224d664c48093663cf00c0f6fdfd0020283da2713c44fd104ddf7349815b5bae3e21709f459f62c1bc858ef11c2bce1527de99d400cd0c3
MISC metadata.xml 562 BLAKE2B ef75eb5e07f57db7de0a8e90dc2ad86c84b65776c674a1e282443029101d05c3292bf0d5786ab97d846de984aedc6ed59640a256dcce29c65aef537adf18c348 SHA512 a69afbf6f03dec20a4ec61e39bcfbc964e09e0d74496b383a348764a61d83e54fea2cd715a4bcc239ca0f3ed0c2e1c5d46dcfeb99f7cc4feea488663a0931544
diff --git a/net-ftp/filezilla/filezilla-3.46.3.ebuild b/net-ftp/filezilla/filezilla-3.46.3.ebuild
index cd36d5e5cd86..8a3e44f5cd6f 100644
--- a/net-ftp/filezilla/filezilla-3.46.3.ebuild
+++ b/net-ftp/filezilla/filezilla-3.46.3.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=6
@@ -16,7 +16,7 @@ SRC_URI="https://download.filezilla-project.org/client/${MY_P}_src.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
IUSE="dbus nls test"
# pugixml 1.7 minimal dependency is for c++11 proper configuration
diff --git a/net-ftp/ftp/Manifest b/net-ftp/ftp/Manifest
index e17a52aafd2c..82348c1c1101 100644
--- a/net-ftp/ftp/Manifest
+++ b/net-ftp/ftp/Manifest
@@ -1,5 +1,5 @@
DIST netkit-ftp-0.17-patches-2.tar.bz2 4307 BLAKE2B d7febb30807dab2dd66b6fe1991675b37cdea63703769f228895d7722f46b56dd2f5a7774d92740ff3f9ff7797a64660a580cb231582d2b9b912da35c209746a SHA512 6a9adfd33eae4ac2e1a9e070ed89467804dc484eda084694398bb7e3ebbaf04bf70d00ffaa637bace078c4c0024115ba3620fd75d4a3558a44dc991798885461
DIST netkit-ftp-0.17.tar.gz 53934 BLAKE2B 451f90f26cd5cc1a6693fea7c31d47127d8b89b4b00a2f863af61d46d87f6e416141db1c6f6bb320021665a99f0d9e00dc4a5c3b0bb209df0ae74aad97a45f20 SHA512 ba8e411d0230c78e9e4555c03dc1036c6e506ef8edb72ecee4d6a7559d85143721bffbe8b8a6e42918b3098072ac8f207584be9e3a241f6bd31e361c92de6554
DIST netkit-ftp-ssl_0.17.23+0.2-1.debian.tar.gz 48189 BLAKE2B 7894f64308ae14c72e2fcf7e18225fa36680d2d88a3e59c4b7edac3669e051e3196a2acda3f8da083bd3d8405e9f28f67be10d70684854e8bbc7008f8189cb8d SHA512 c2fa882c185987298a73e7cef8c073ab0aee7627b60b412be90eef8619bf02d97721c15197fe4f443eab53bcca87876633924872f3102ef9e92dc7511c065228
-EBUILD ftp-0.17.23.0.2.1.ebuild 1557 BLAKE2B 18ddb66949a826dfd52572c152a20a3d2f8fb98ba6deb42114f03363f53cfc4b1bac962cd8850a6e404719bac9cbeff272712541f798c8fdd48099d45e959b31 SHA512 60583b1c084cc68c06d19d646833ef002d3e85fa2e299e8dbe9f8c1cab5c4173d950592416a812df126b8e38f1caf12ea6a80f2c260c6792762c8159756d5aad
+EBUILD ftp-0.17.23.0.2.1.ebuild 1558 BLAKE2B 1ac2bf787abec7c37399e4f44f38f176008626d55b9c53cbd2d2dcf4f13178a8f84686bff2f19ce978dcaaa6f7f16821e3eb84f3560f58cc26d99a2d0244333d SHA512 aeda332d45b4d96b73c7a584077867a47d81cf6092bb5bbb30d01c8182a369016bd99a75a0abb244511651e86229e103197a62441da724cf799fa4da0df9a610
MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild b/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
index c107e4e7ccc0..cfc4a326bb22 100644
--- a/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
+++ b/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="ftp://sunsite.unc.edu/pub/Linux/system/network/netkit/${MY_P}.tar.gz
LICENSE="BSD"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
IUSE="ipv6 libressl readline ssl"
RDEPEND="
diff --git a/net-ftp/ftpbase/Manifest b/net-ftp/ftpbase/Manifest
index 1a0495ee53ce..bb4a6b16843a 100644
--- a/net-ftp/ftpbase/Manifest
+++ b/net-ftp/ftpbase/Manifest
@@ -1,5 +1,5 @@
AUX ftp-pamd 700 BLAKE2B c867c659cac367c51021504dd4da0a9dc90609564613f580a0a01a94d2a87d0df903f22486561f23722901df4df06a33d7d7b643ffa4562cf426f2058391d887 SHA512 61aceee28610cb7a6989fca0ee82702df1118dd2e964bb26fe5cfcb508250599e9e1cdb9aa5dfb61df9c5fef25af4334a87d5f1f4065f693193912dfe172bb68
AUX ftp-pamd-include 632 BLAKE2B 28aa913499698f136e784e8ed420748fe1415d0ddeb64761b8ed71b869e4b9afb6b86df4b8a8a748ec3a740d99c000fcc4789ee45c3a302f81ffbaab07c7e106 SHA512 adc59c544b815bd88b7e91a43cb5620008d1f83d15a08620f56242d74991ba413e56b31bcca8e5fcfe71f05362bbad89b02d5289260f08649d38965c8951ec76
AUX ftpusers 300 BLAKE2B 02489b8eed29bfd4cea148b1b4214ac5ba798faa44da1be68cea06c18680e44f0054c952107810e4a199398b6ba382c649a481cf9d7388cd5caa10ace50e06d3 SHA512 29a8bdca1a6bb516c5189e6c69969cba3c220ea878e352e78bb6ea5cb2ac7476306736240155dc6d3f7512aac48164354db68721ea952d1010639e8ae14635e0
-EBUILD ftpbase-0.01-r3.ebuild 909 BLAKE2B 0d3cda7e792dd3025ff983cfb7d20ee574da2bdb33af303ee40ab00b84f683f437f17fad1a91c2639d3a600fad681327197f9566cc48406f3620d4fdfb031295 SHA512 f3797addbb1b77e6295a82c1fd6d7e18f25fb989937f36dbc9115a9111d6b1ae849934401bb3727b42f2ce581e616dddd4794ec4e1521171799a9e777896dae0
+EBUILD ftpbase-0.01-r3.ebuild 910 BLAKE2B 8ab569029fa5acc0641f0e5bcb6036d8fba0bd64c30212c1a1d86c23910ebb5db8ab8fa1e2e7868dc54a7db5978c6c3123f5d8057eacf24e29f1377c4645b93a SHA512 6d81026bd86dba82a82e66ebf45922781b4b14b7e84e8d47a29a439d769716813d61cf85ec3fe69b81e580c25ebf4acc35cd779cccca8b074febb8e3379edf58
MISC metadata.xml 235 BLAKE2B da947ee7650abf01b4eee1667349a14d2d8d496ec234acd60db66c1059d42d6e9a1d30403068b7977a397f4e0a2934fe4e7c2c04d356b2c23a5e8a87ac7266a1 SHA512 fa78af8197737bd5d9b44305bac24dacac9034fd96284af1e3c89428fc418e17a4bea91fa53f07dce02e6ab8afe6455343db364d031ab342225a26d0364c23da
diff --git a/net-ftp/ftpbase/ftpbase-0.01-r3.ebuild b/net-ftp/ftpbase/ftpbase-0.01-r3.ebuild
index 54fd9199f7a6..b7c12a48f0a1 100644
--- a/net-ftp/ftpbase/ftpbase-0.01-r3.ebuild
+++ b/net-ftp/ftpbase/ftpbase-0.01-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI=""
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
IUSE="pam"
DEPEND="pam? ( sys-libs/pam )
diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index e8fc5bc038c0..bb0c5a35f7b7 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -13,7 +13,7 @@ AUX lftp-4.9.1-libdir-readline.patch 404 BLAKE2B 88746dbfd082202950e54270519fa25
DIST lftp-4.8.4.tar.xz 1633444 BLAKE2B cbd85b553268823e7633e414752876db083355d92e55728337bc7863fb3bd89729ac725be41a9bcca275cf1752ea5f8ad01fdc67c7593868084c9c32bb75332d SHA512 2528e2cbfe132068dc75036d6334372f79f8063d44e46c724a28ea1f5b40d8de0d1e36cde3124fbcc27e5ba8be04b893eb1a7546346253768346a80bc54c02d1
DIST lftp-4.9.0.tar.xz 1642596 BLAKE2B 111e559c98e0572e1ca79f935a1db8c45c99275c8aa7b584be06d1738296b32808e97d696a02751575c5d1ea24a30a52f5d9f177a193f70addf1168e3208aa13 SHA512 8d83ea76390d38cb1f84f02eb7bf45780758afb9fe61f5b7278a48c9a5d216d03bc8b699c0f449a0036bdb441b4225af074da1b5e92a77ddb61aca704758211e
DIST lftp-4.9.1.tar.xz 1648564 BLAKE2B 2f36dec3de01dd3f9e7316567912a04196732a1e71a4d1c3a5124471d2941673d7b58bc3182d73d3cf154def905f57d37667d33fedec6ea9434f74850aa64f4d SHA512 303e2354bd61a850403a02ac5b71e54719c12b026c7e36194a6382e9044f1fee93ea581ba0a55fea19981e07b896216e92c7d961c719350762eb0cfb51a2c506
-EBUILD lftp-4.8.4-r1.ebuild 2638 BLAKE2B 080f74b4e0f85ce80ec41d0d3ab9d973e29687d403b39c6b13c1a651ed38acc589c318d8da0d8f7a58dc7568c13a1934c0f63622f01407a1280c088cc6184c1f SHA512 fdfe756c3bb98b24a60db5bdab8eda92313e30d27ce3bbc374ad47ba083f7af383dc8c8ce8fe5c885f3302eeec869b019e0d776171351cb9e8483cd024aadf01
+EBUILD lftp-4.8.4-r1.ebuild 2639 BLAKE2B bf0e652b8e6de56f09d021f0b8e04c059b78ec5768293aeee772093fce1756a5af3acd4e7b1e7aa92ab3ac75925cf8ce36c2354d4910c07ebf63564e6a7001bf SHA512 a500f9f5f97aa193de8778c23ee28b94b03245703df26cf2f90edcffd73f57a79ec1587b6c9c381b6e41370ed9bee555080c0b9b387db7b271a982a03cc83f19
EBUILD lftp-4.9.0.ebuild 2685 BLAKE2B 7a87acb519d1d28651e637746feab44b9035147eb3a45b2b600bf3aff939e0ba051a8d06b7211114fd671ea7b78b461459ceb6ead7116bb9ec0d9ff50839b23d SHA512 e2f203ba0f6017882724e7c4902126c7af33a3ad9d5706fdd4a753808eb3a28b21559d01afbc0ba77e3949a7394b2900285885668f61e385461fd027df1ff6b0
EBUILD lftp-4.9.1.ebuild 2647 BLAKE2B fa80daecd6dde52a240315ab5e962858437aaca2facef16b39fe04e81115c14d4826a974a7f3c77611e3ce27b9a0c4e4a1640ed219da4bbf1e8893caa53af061 SHA512 f11cc44daa678b17d4345adae1ebcde1a3d7eac2a7b987227d40a2ed3c54254688a106af3e1c431e51c89f5b5fafed74581b6f65d47369b67218c56f504ec40e
EBUILD lftp-9999.ebuild 2438 BLAKE2B 4061f2513e9a5695288c66590604fafd4641280e9a72a4be1a60d5c9a6337088d082734291f9d54d35083cbff0c634b18495bcd7b963b09abc82a22d6f841a72 SHA512 71a5ab649e24cb8f49d686830bb3a0a56a0cd4cd15d5a563a2fed2592c46ae71f0d3630d3479bf5ac7a8c22e70214523354e054872d0be5145e13ac6efb40e38
diff --git a/net-ftp/lftp/lftp-4.8.4-r1.ebuild b/net-ftp/lftp/lftp-4.8.4-r1.ebuild
index 8fb8b288d1d8..144ab62b5006 100644
--- a/net-ftp/lftp/lftp-4.8.4-r1.ebuild
+++ b/net-ftp/lftp/lftp-4.8.4-r1.ebuild
@@ -10,7 +10,7 @@ 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 ~x86-macos ~sparc-solaris ~x86-solaris"
+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"
diff --git a/net-ftp/ncftp/Manifest b/net-ftp/ncftp/Manifest
index b769746c1929..0dd348f5642c 100644
--- a/net-ftp/ncftp/Manifest
+++ b/net-ftp/ncftp/Manifest
@@ -1,3 +1,5 @@
+AUX ncftp-3.2.6-fno-common.patch 1818 BLAKE2B 620e3fbc7e297d3186fe9eef8855e2a663a5abcd680269101d5547ab9f6b9addcfe6040ba35e16e8e540784796e34304a9377b1149f7ac00fe0859627a141200 SHA512 c6bf0cc4324583d9aae3f3a57c900437a78d30138d0b9da06fea66cd5fbf57a79ea420afe33536a5bbcf2ace61aaca30ea04155df638daeae125ed9ca90b1c25
DIST ncftp-3.2.6.tar.xz 418836 BLAKE2B f0ffa0cc26617ee4007fe8589dbbc8d122edbfc8106a8618a66eab5d9def258d2ee9c2b709e1a637b9d833513ef87b652f4ab0ff518dc9d67d90a7dd43941d3c SHA512 040db7e2ca2ee78b79d682a951fd98c1e0ee2936b64462259992d70c51241fa50ae06c66b4f40933ad0ab7122f581bbb8ba7cda764dba5f70a1f8c7d3d751199
-EBUILD ncftp-3.2.6.ebuild 1048 BLAKE2B 866ebac7950de5ff4a62c71f3d3a6d2a4ff9555938631e7504d386b9c9e551cc49252cad2be8af9c6d47cf7ef3adb4a935cea4eb38989e0c75e80b6ca16586b3 SHA512 7a468af48b1a9598fae257c7b691323c2b24185480ff5d838cb15a0edc1adb66edeec038b6cab5c9544d1a68a866c05cca9d772266e4695543ffa08d30c8d883
+EBUILD ncftp-3.2.6-r1.ebuild 979 BLAKE2B 9e68d2e14177156f97097fe1b4951de353a913626a3e8a7478a34fa8914a9810a4076011bbbe994640ab57b4c1bf3bc1ee2c69a17cf4c3749c6fa29488ba235f SHA512 9200b5c0e4fdfd52742b12c57df84a04a40482e7e3efba9a322701f5e0f4de692f38c1bd6d2f81d73235e3167a0bf7d00523b2044e79f2662796a9f2cba9e178
+EBUILD ncftp-3.2.6.ebuild 1049 BLAKE2B c206df46bb7a669b765a4c37f2cc52935950cd7dfe4e4edefd44be6e7b605ea5e7c43882e2e5f0c947dd891093ed8977455940f13d09815d89be5de9b84303be SHA512 32b641ce00ff56ae28c82c90958a31fa8203b838ff825a1c48c133d898e17e2b9e7333cbacae762d9159fd9e5a010e233485b01c283019065b688be3a9d82e8f
MISC metadata.xml 738 BLAKE2B 98d564b3063dd25384758125efec702f385768f3f0c4066ef5b0e6748f9c27d0ef838c4a669e7113bbb70ff74882b1d4c3b0e09011f3ff5f01dad3eea56c6b16 SHA512 e792a9cbbc371515f5137c4c00faad6936b4c6cc27bcfd5bfab151b00002ae8159cb9b76777a4bdd59dd87ea951ea62898ac74f6afd8a4ec0a1e5dcec12210b3
diff --git a/net-ftp/ncftp/files/ncftp-3.2.6-fno-common.patch b/net-ftp/ncftp/files/ncftp-3.2.6-fno-common.patch
new file mode 100644
index 000000000000..8b17b9b39862
--- /dev/null
+++ b/net-ftp/ncftp/files/ncftp-3.2.6-fno-common.patch
@@ -0,0 +1,68 @@
+--- a/ncftp/bookmark.h
++++ b/ncftp/bookmark.h
+@@ -59,3 +59,5 @@
+ void DefaultBookmarkName(char *, size_t, char *);
+ void DisposeBookmarkTable(void);
+ int AddNewItemToBookmarkTable(void);
++
++extern Bookmark gBm;
+--- a/ncftp/cmds.c
++++ b/ncftp/cmds.c
+@@ -91,7 +91,6 @@
+ extern char gOS[];
+ extern int gAutoResume;
+ extern int gAutoSaveChangesToExistingBookmarks;
+-extern Bookmark gBm;
+ extern int gLoadedBm, gConfirmClose, gSavePasswords, gScreenColumns;
+ extern char gLocalCWD[512], gPrevLocalCWD[512];
+ extern int gMayCancelJmp;
+--- a/ncftp/main.c
++++ b/ncftp/main.c
+@@ -38,7 +38,6 @@
+ char gLocalCWD[512], gPrevLocalCWD[512];
+
+ extern char gRemoteCWD[512], gPrevRemoteCWD[512];
+-extern Bookmark gBm;
+ extern int gLoadedBm;
+ extern int gFirewallType;
+ extern char gAutoAscii[];
+--- a/sh_util/gpshare.c
++++ b/sh_util/gpshare.c
+@@ -28,7 +28,6 @@
+
+ static int gIsAtty1 = 1, gIsAtty2 = 1;
+ extern int gLoadedBm, gBookmarkMatchMode;
+-Bookmark gBm;
+
+ double
+ FileSize(double size, const char **uStr0, double *uMult0)
+--- a/sh_util/ncftpget.c
++++ b/sh_util/ncftpget.c
+@@ -40,7 +40,6 @@
+ extern char gFirewallExceptionList[256];
+ extern int gFwDataPortMode;
+ extern const char gOS[], gVersion[];
+-extern Bookmark gBm;
+
+ static void
+ Usage(void)
+--- a/sh_util/ncftpls.c
++++ b/sh_util/ncftpls.c
+@@ -39,7 +39,6 @@
+ extern char gFirewallExceptionList[256];
+ extern int gFwDataPortMode;
+ extern const char gOS[], gVersion[];
+-extern Bookmark gBm;
+
+ static int FTPRemoteRecursiveMList(FTPCIPtr cip, const char *const rdir, /* FTPFileInfoListPtr files, */ FTPLineListPtr lines);
+
+--- a/sh_util/ncftpput.c
++++ b/sh_util/ncftpput.c
+@@ -41,7 +41,6 @@
+ extern char gFirewallExceptionList[256];
+ extern int gFwDataPortMode;
+ extern const char gOS[], gVersion[];
+-extern Bookmark gBm;
+ extern int gSendfileInProgress;
+
+ static void
diff --git a/net-ftp/ncftp/ncftp-3.2.6-r1.ebuild b/net-ftp/ncftp/ncftp-3.2.6-r1.ebuild
new file mode 100644
index 000000000000..7c177b45e9f7
--- /dev/null
+++ b/net-ftp/ncftp/ncftp-3.2.6-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools toolchain-funcs
+
+DESCRIPTION="An extremely configurable ftp client"
+HOMEPAGE="http://www.ncftp.com/"
+SRC_URI="
+ ftp://ftp.${PN}.com/${PN}/${P}-src.tar.xz -> ${P}.tar.xz
+"
+
+LICENSE="Clarified-Artistic"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
+IUSE="pch"
+
+DEPEND="
+ sys-libs/ncurses:*
+"
+RDEPEND="
+ ${DEPEND}
+"
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.2.6-fno-common.patch
+)
+
+src_prepare() {
+ default
+
+ AT_M4DIR=autoconf_local/ eautoreconf
+}
+
+src_configure() {
+ tc-export CC
+ LC_ALL="C" \
+ LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses)" \
+ econf \
+ $(use_enable pch precomp) \
+ --disable-ccdv \
+ --disable-universal
+}
+
+src_install() {
+ default
+ dodoc README.txt doc/*.txt
+ docinto html
+ dodoc doc/html/*.html
+}
diff --git a/net-ftp/ncftp/ncftp-3.2.6.ebuild b/net-ftp/ncftp/ncftp-3.2.6.ebuild
index b590ebd27be8..3f9258b19818 100644
--- a/net-ftp/ncftp/ncftp-3.2.6.ebuild
+++ b/net-ftp/ncftp/ncftp-3.2.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
LICENSE="Clarified-Artistic"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
IUSE="pch"
DEPEND="
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index c5b35def13d4..313b3e55d4fe 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -25,7 +25,7 @@ DIST proftpd-mod-case-0.7.tar.gz 13184 BLAKE2B bf2118d9b8ed97a5b192b92b515d17ac7
DIST proftpd-mod-diskuse-0.9.tar.gz 18596 BLAKE2B 38c704c8607f0f93b080e77fe793cfe0125c88acc6f818ecb059c6c21a983e040ff5f2c1b91e34ef4ba2666a808d896018c364d1f12ea38f0c477e79bdaa2120 SHA512 d41976bf2810e4b783e775e8c767ca2030c3b5df116219fd31cbbac7feaf9922c315bf4ea092881b0d6cf43f2f4c5dbcae61be3c3a833058d12f962a3024b975
DIST proftpd-mod-msg-0.4.1.tar.gz 8082 BLAKE2B 970b46b19d25bac22ecb01495270a523997a0b7d5b53b9470b4744b919adcf03d5bcee2df85ba88c4a4c20a9fc30dc01459ffb58c5dae8e78a52a7379bf36f11 SHA512 38ea63b1d355e1e10a6a4477596bf3fa28529a871c9fb8dbf093b5317f0743ef9cb59b986d0b8c1c7ed932dad5d5d571883d596fad2d3b793431824db4487012
DIST proftpd-mod_clamav-0.14rc2.tar.gz 19710 BLAKE2B 3435e198cf029337904d4666910414124a3b7e1529d4b12f7acd8a9be563009fff4d9a30eb132a2d7361d2c830e5601c4a00a8814282585b6915e991cc29bc13 SHA512 b8e56880fadf36513215fa4c20be6db7cdf1274337072a9b29c3c3477b3de4743ebcdb1179572ec4cb1501fac0064330c855b1f818bf0cc52f0e91170f059772
-EBUILD proftpd-1.3.6-r5.ebuild 8696 BLAKE2B c03fabf7f49be982302ea74eee75580304dae1393d7a452e9aacadfb5790b6b49a82320999ef4a9863f90e26d48788301ae423262172d3f1c04a5e18008cf0e9 SHA512 e64ad6c8e38b8b81dfc1dcef02c05e0ae591972baede8642df393b521499652075e2c970e6cd33cc1bda2e0f853dc79ea7277ba85d4a5df4ce081cb540d323cc
+EBUILD proftpd-1.3.6-r5.ebuild 8697 BLAKE2B 9ac05bd946c84bf0d6f7d30a3003b26e93ef1d625d7e8c1c7e990cb2213a2575f6ab5e47da5925c245d29bdf691103fc55d6cb904d0ca7468bd568d59b0adffa SHA512 a3d0703dea49561f0c7f1aa9456495d310f9093906da59e22ad33111e88644ed01ddfbdffd0062fff8f942e0f6f1b73be39cea69dc55025893b4e1de77d73734
EBUILD proftpd-1.3.6-r6.ebuild 8756 BLAKE2B f38b4a1066f45b044497f72f4f7467e09c7fcec70cb68ac09095f65aa872f8d4c91124007c6f62bf04e88fec45e56b3a687936fef476ac5f8ca182a241cf7328 SHA512 6a7963148c4526cf8234ffc964165f290968d1164b140e4e85764248140c990efc58217f87b58f18c18cfb7998294347747d5dd884af92b3d4c216b694141898
EBUILD proftpd-1.3.6b-r1.ebuild 8691 BLAKE2B 96bdc1b96d5c06657908d5dbd0731f979870adcee85ff9b251699202c113b063ce4eed5515e16ae5d55f721fa0c3d914cda392e1ff1795b012eda603a75fc00f SHA512 218c27a740f0cac46f41cd09b3b389bb28f29778af457c7dead39dcaba14452cae38016993143804ee33da6ec104dfed53d6221615a92d909c9ac5f2d6773722
EBUILD proftpd-1.3.6b.ebuild 8635 BLAKE2B c6493c2c8258c7fc836fd77e2da827a70bce2f57a596c9f13b9c8679ca5c0dcc3f31387fbc0c9d256502ba9279c432ba765df23035bc36009b7794ba77b9579d SHA512 c297d069ffbbb46ae354b11c8abb4d3d88350ad37dccfcf3ad77dc91bc8a831037969a027f88641e46cecb7fa78f084e5968a53185de6f6acc9f6148bd5a16b3
diff --git a/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild b/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild
index 738991828ea1..565bcc27e4da 100644
--- a/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse dso dynmasq exec ifsession ifversion ident ipv6
kerberos ldap libressl log-forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius
ratio readme rewrite selinux sftp shaper sitemisc snmp sodium softquota sqlite ssl tcpd test unique-id vroot"
diff --git a/net-ftp/pure-ftpd/Manifest b/net-ftp/pure-ftpd/Manifest
index fc92d13cee42..0d89ca95d045 100644
--- a/net-ftp/pure-ftpd/Manifest
+++ b/net-ftp/pure-ftpd/Manifest
@@ -8,7 +8,7 @@ AUX pure-ftpd.rc11 2018 BLAKE2B 1783228b5179b6d11fd6b06bc722e15f6f81e6c8443dd516
AUX pure-ftpd.xinetd 247 BLAKE2B aa2b0f8b4b6ff45e9b8dd632af5ff680ddd5abe51647dda91ca78bf3cb9ba9a090b20433f460213e95b8e57958d711f4bd7fa594b3d33fae818b853ec5aaee5d SHA512 e8ac0527daf1e182e7514d17f04bd20e789231e627cc7228ac23a241a4c420204a61ef9438c57e63f402eb3608ae0acc15a72fe484c99bb4e172bbd5ece2b72d
DIST pure-ftpd-1.0.47.tar.bz2 489177 BLAKE2B 06e71ead47b87dedf47a84e488b2de127fcd297c2e9ca7a617c2ee2760cf55b816884763721826c512558d016cbd38a87a11ca0e8c2334d93145edc6f88d9287 SHA512 c1920a3f67f04635fde600fe226a7730b801e7e64658b25f1d9f9c0b35a704664be4adfb0b291594f7e0f10beade25eae9a5e6cc3b6777a3b413f3c2d9574e63
DIST pure-ftpd-1.0.49.tar.bz2 487958 BLAKE2B bd5f10a49b533eb6c257032659e97aa7ae16ec9402704d8ee06c92938e217b748b390ccf0e31b3640f41cb7a93f85b29c8ddcdc296f214391b1d92da9d701a7c SHA512 b44896d6fe2cda9169b1db93c5260bb892af14a173f2d25e60dd6530afe85d8e9156985609e35da7e5550dc123afb42bc5012beb9fca9011054cf0ed8b2eddef
-EBUILD pure-ftpd-1.0.47-r4.ebuild 4098 BLAKE2B 93c666f13b86af87258fc2c827d67979a905efcd7246b4a3bdb4642eb05221582b476eb4a5b234f28c0c26beaf81641ae49d2dfa0f5b3be6ea2a0c656801e43b SHA512 9e87cd8db2d70d42dbbc900d82c3dc9399e8319dc66dba338f58d82fb9d53a843005834ad0ffa286f4d4aa3c42848a766bd9f1389c8f171473fefb2704ccb4a6
+EBUILD pure-ftpd-1.0.47-r4.ebuild 4099 BLAKE2B 76db51e9c293eab861e6f56dc83aa8a15a888ad5b50bb21e8b2ff4e9215e44fac45cab9a9b078c6c5f1c50151c8bef38770f3591f9026c401555b4cc10904390 SHA512 43fcbd617fd95aa116bc593f42a69bf2e4d3a01866d3bf875a191896e350309868f9fbb0a35d8ac7e851954a68cf9b48eb99a36a791433955d54036b606de203
EBUILD pure-ftpd-1.0.49-r1.ebuild 4099 BLAKE2B 3723ab3562ea792ea7d939eb35f11f7fc31b82f002cb53a4c436a1a2ffb3a1883211ad083bb17527f43c9972a58cc079297ea01b1647453f0e62f10597bab3a9 SHA512 489ed9093dd16d6afea68fa288617221dbdd19ed25d642fce3d5ae0725c373497b84991f96924b91f878ed5752bc8e34d71d2ba04c3871058d145fa25d4c6457
EBUILD pure-ftpd-9999.ebuild 4099 BLAKE2B 3723ab3562ea792ea7d939eb35f11f7fc31b82f002cb53a4c436a1a2ffb3a1883211ad083bb17527f43c9972a58cc079297ea01b1647453f0e62f10597bab3a9 SHA512 489ed9093dd16d6afea68fa288617221dbdd19ed25d642fce3d5ae0725c373497b84991f96924b91f878ed5752bc8e34d71d2ba04c3871058d145fa25d4c6457
MISC metadata.xml 1233 BLAKE2B 02ea0260dacca81d5b2eef251f98756f151b03ee7abcf3ccc46832167848b8aa80dba90d855c118908b87ce7085921cae81f3a747402c5e0fb70401dd668150b SHA512 ce47470d3c8bfeba9c02f6d6638e7b0bb6e0ddeddd1aaf0362342aadf07e823f1093523a1432c703bd410c3b760049a1e1c32e3f36718844b3a1ba44144afea4
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.47-r4.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.47-r4.ebuild
index e1e9feb5178d..2f0fdf3fabb4 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.47-r4.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.47-r4.ebuild
@@ -5,7 +5,7 @@ EAPI=7
inherit flag-o-matic
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86"
DESCRIPTION="Fast, production-quality, standard-conformant FTP server"
HOMEPAGE="http://www.pureftpd.org/"
diff --git a/net-ftp/tftp-hpa/Manifest b/net-ftp/tftp-hpa/Manifest
index 2e0c6183bd05..672bde382a7b 100644
--- a/net-ftp/tftp-hpa/Manifest
+++ b/net-ftp/tftp-hpa/Manifest
@@ -1,8 +1,9 @@
AUX in.tftpd.confd-0.44 576 BLAKE2B f5dbab65e92173c3a81ed6790d20b8091616278399471b09b3ec726c5caec1a4ad1864e5ac8b2da7aee7fbfb0a602c879d0317bd3ce6a702af1a01927b0a5da9 SHA512 2aa2f69a6cc86cd0b0ac9dd3c06bb271e3085eb5d44b74edf1b33a9723ba172b0cd0aa92dc0224de52e0572deb9f855e725ed076d8f57c86b509b2fbc03f5075
AUX in.tftpd.rc6 334 BLAKE2B 2f7c20b4704b5f3466c838fc79a59785cbb9c46a43037d044dea88caeda0be85f62084f0ff27a8aab20bb129d08dc37602d5a4934c2a6dc1b43c8e3d62c992d4 SHA512 77fd2fd385a6ee9415dfe4a15a993bde86396014cf7cfc0f97fb56c4040ef4becfe103be973b90688d0ee00bb46a36b51297ea46ecf7e32c400373c976de05df
+AUX tftp-hpa-5.2-gcc-10.patch 1251 BLAKE2B 0701e5495a1d36237fa84ac97403ab2776bcf48ec9529ef486c32d40019de88d6554046e573fd3512cdb0d567f7ba8122c22906fad3e721b6564270db8d5e2cd SHA512 a6729ec1b39dd771efc82ecb9b54da9d21139906f81fca827d1cb870e4367aae3befa34ebc902d664778383019eee451af0076ee6f802f3082eb9056a7655525
AUX tftp.service 119 BLAKE2B a2d50dba1103fb7c868e070331c8a2000e65364801abc85d9692040af528bb7b0f84924d6903ea261a504b6e361c45f078cc5c2354a1438a4f18f45ebdcc4649 SHA512 e6be243fb28d014d7492b64cc9e72a29f0d2fcf7cf403f0b41998483c298bc39e83be2d0a6d0b7604d4da71fcb48ad0aabbfd0fa1620597883e66d5a6df222d8
AUX tftp.socket 112 BLAKE2B 11e8c6e77819ba772b709843af11449e768db16fe866dc67e4209e83e7d6d273583b2cd9104ba611e3acca0018d915f4313860039a3b0003e556f49f82917ef1 SHA512 d49cdbb7e265aa98d989f8ae96e2c80bfd5887ae0efc6bfcd726d5fa4d83ffc480f5f374e30b8564b05d9690eb2a0c0ed0077982a74946edfbce5d19066d0564
AUX tftp.xinetd 219 BLAKE2B d348f13fdfa749b10ec765d5cd90a65a46d266a132dde47dad00fbd1ef4046c250cd9246e7b1fe9590e974a2bc7fcc817535fd2e9447a10c5286f7c4148eec93 SHA512 26883a4feffe8f66fe2c21c05892beeb93fa4511ca5ce18e92273badd4b93afefb0d9cef48e07503037ca37b2ff0cdb24d35e5c24d2e32d8027a5e74c49426f5
DIST tftp-hpa-5.2.tar.xz 89564 BLAKE2B 45917ca3d710f8a4b584dbe1e9a912e06fd181e4ffcfd8fba13008f08dbbce0fe339b61fb6f97236b8012e755025d05700214e365adac81dfce42b0edd636e80 SHA512 a5198e923a6e58281f749dc77b3f3ed8579e56b6f0fd6a17482cc88bdc8d34b6702c7c709717885b9b937ecae459d9a832328a49a2e3536dc7432cdb39d2a394
-EBUILD tftp-hpa-5.2-r1.ebuild 1314 BLAKE2B 69222c38c7f2a5162a3895a2142b06c724ffac4f830e7ead107083843ee03391f6f4097557fb56e04e53f25e80a793369e85fe08455455b09ad0949765634eb4 SHA512 ea75db5ccddec62558244a0bd0c261d993370eed42232c8c38a2f75589bf2264f7f8e19a13afd2f96984005f5880d8c050ab7924b293fadf593c1c4d287d82af
+EBUILD tftp-hpa-5.2-r1.ebuild 1361 BLAKE2B 72dd1453bdb0910feeb54fcce3384aab55f2a91ccabeba7f6f4dd874373f6addde548297c8ac8ad39ae3ff6baa4ba9c3fb9dc06f28e9f6d49d01e8e10a02727a SHA512 f971610c761758febdb7111d875b278cd12183b88965deb580afc67817688e4629f95d959d4ef75f56de352d4ee2493c775087c416959af87abaeef65cc618fc
MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-ftp/tftp-hpa/files/tftp-hpa-5.2-gcc-10.patch b/net-ftp/tftp-hpa/files/tftp-hpa-5.2-gcc-10.patch
new file mode 100644
index 000000000000..ff2488d5dfb4
--- /dev/null
+++ b/net-ftp/tftp-hpa/files/tftp-hpa-5.2-gcc-10.patch
@@ -0,0 +1,42 @@
+From 7afd5aa65fdabaa4583f6e1a84936eb9bdd33c65 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Tue, 21 Jan 2020 23:10:46 +0000
+Subject: [PATCH] tftp-hpa: fix build failure against gcc-10
+
+On gcc-10 (and gcc-9 -fno-common) build fails as:
+
+```
+x86_64-pc-linux-gnu-gcc -Wl,-O1 -Wl,--as-needed -Wl,--hash-style=gnu tftp.o main.o ../common/libcommon.a -lreadline -liberty -o tftp
+ld: main.o:(.bss+0x40):
+ multiple definition of `toplevel'; tftp.o:(.bss+0x100): first defined here
+collect2: error: ld returned 1 exit status
+make[1]: *** [Makefile:12: tftp] Error 1
+```
+
+gcc-10 will change the default from -fcommon to fno-common:
+https://gcc.gnu.org/PR85678.
+
+The error also happens if CFLAGS=-fno-common passed explicitly.
+
+Bug: https://bugs.gentoo.org/705834
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ tftp/tftp.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tftp/tftp.c b/tftp/tftp.c
+index d15da22..d067f96 100644
+--- a/tftp/tftp.c
++++ b/tftp/tftp.c
+@@ -48,7 +48,7 @@ extern int maxtimeout;
+ #define PKTSIZE SEGSIZE+4
+ char ackbuf[PKTSIZE];
+ int timeout;
+-sigjmp_buf toplevel;
++extern sigjmp_buf toplevel;
+ sigjmp_buf timeoutbuf;
+
+ static void nak(int, const char *);
+--
+2.25.0
+
diff --git a/net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild b/net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild
index d34763b41f02..78723b2d830f 100644
--- a/net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild
+++ b/net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/software/network/tftp/${PN}/${P}.tar.xz"
LICENSE="BSD-4"
SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-macos"
IUSE="ipv6 readline selinux tcpd"
CDEPEND="
@@ -24,7 +24,9 @@ DEPEND="${CDEPEND}
RDEPEND="${CDEPEND}
selinux? ( sec-policy/selinux-tftp )
"
+
src_prepare() {
+ epatch "${FILESDIR}"/tftp-hpa-5.2-gcc-10.patch
epatch_user
sed -i "/^AR/s:ar:$(tc-getAR):" MCONFIG.in || die
diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest
index 9c8d2d3e92f6..e961e1ed7206 100644
--- a/net-ftp/vsftpd/Manifest
+++ b/net-ftp/vsftpd/Manifest
@@ -15,5 +15,5 @@ AUX vsftpd.socket 104 BLAKE2B 093a6265694c177e724fa2880e8de2e0477347bda315937dba
AUX vsftpd.xinetd 321 BLAKE2B 3a91c0e65a511ed5ca0feed429550b0ce6e1bd2cc133460e2642fe37aa122b59c0a3fe509d00a5435eaf4c300962c9cb5712b083e7d7d927ffbc148d0bd6a5b8 SHA512 30fb4ae07f55011b9b29625db072062a0f1df4f1c7578041231f35febfb90ad2d2dfe1deb964e34fde5c660f0e3ffc3df3d77af1b2f3a1f724176f691a53a182
AUX vsftpd_at.service 328 BLAKE2B 826daeaa5b388273c6cefcfcee7415353773db5b9937b3ee714bcf76dd8b061c0693bc9d4b60742fcf5cc946543e69dbb7caacc4ba07b5503d8b66c7db4174df SHA512 5a39e853405bd5028f2c52183eb91ad559fb8edbaacfff5d5146e686417c208bb894bd86d5830a61720a1aaa9ba901160c75ed2bf47eec459b2a49ed217b9cb1
DIST vsftpd-3.0.3.tar.gz 196649 BLAKE2B dbf96e788494c29d78ca49fad6a03641c9725f9a5b01a4059ad009870fdc28520cd467cd8288a8a9a520c411c495a42c3fff57ee1069efc65840adb245792dca SHA512 5a4410a88e72ecf6f60a60a89771bcec300c9f63c2ea83b219bdf65fd9749b9853f9579f7257205b55659aefcd5dab243eba878dbbd4f0ff8532dd6e60884df7
-EBUILD vsftpd-3.0.3-r2.ebuild 3623 BLAKE2B db6f1566dd210fccdb0333b0898b63e9dc950442946c98df9113af53336990eaabae8023c1e69be5af8f8599a136c7a403e62805c5371221d2977f66634d63f1 SHA512 33c2ac0bac9f67c2810b25b39950fa4dbe0fd372eb84c7ed22c45963e0db9314f0033a855cfcc3c20ad1a36c48bc394185642253b2443806aab74b9ca1c075b0
+EBUILD vsftpd-3.0.3-r2.ebuild 3624 BLAKE2B 237c08d04ebcf4e1c234288db81751fe438c1bfd30b4cabdf3f7105bdbbb02fcffb5e58403811ce158e0a2926c2fe0818390496c62b1ec69403484e8d2c7aa12 SHA512 1869c60ae51d221568140d35fc9a57770cb0fed26481f7e01d30bb21f31d3b227e7b77b94c3a4530616cf6408901f346337c9544fe5ce29b50307cc120b2c458
MISC metadata.xml 289 BLAKE2B 3792154c21dd99e4a6e68a711493e3086ddf124a40275c43d8d6aca47f01dd76e7992eea16b235302d83529483a13843c8fb254ae2e436e9c2bd398908d65bcf SHA512 89cacd404713612a2347edb25dccf6c25c565d2b18ecdceb8614b5b5c5a913cd5ac0fe0b2ca32918854a69817e7b43300612eb6248655b59cf147b6d03922360
diff --git a/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild b/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild
index 361b7f7bfc3f..737cd124f08e 100644
--- a/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild
+++ b/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://security.appspot.com/downloads/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
IUSE="caps libressl pam tcpd ssl selinux xinetd"
DEPEND="caps? ( >=sys-libs/libcap-2 )