gentoo resync : 25.04.2020

18 files changed, 55 insertions, 404 deletions

diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 991e8e4a7713..b795c21ff0ee 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/ftpbase/Manifest b/net-ftp/ftpbase/Manifest
index 4d040266c574..a3490b5c18a8 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 925 BLAKE2B 998379d0b90a72a8f1a8bcb676c118474f639ac01a8df184b81c4f944a161e3f705fc42a96ad3d01c407b49a282e78b5f637239314d0ec6af4312bad52722c77 SHA512 0ca1c63f5cc85c2b0981c1925ad85961e3f202a3adcf56591ea3124d8821d84f8b715869ef191b10fd179537782c9c36f1e4a22258e0c3b1c6e42808a52ae8fa
+EBUILD ftpbase-0.01-r3.ebuild 926 BLAKE2B d4cc4a0a8c3fe1ad44e4bee6be419edea881da518b9c75672187ff6cd3e040b4d2526265f417f74207d0ecb0926887a9274d2c6e2ae33e6780f562fcfe48c531 SHA512 c08ef2e103c314b24b483b0c17e521bbf5dcdec83fb16c63381f98b7bac5efe523a8b3edd149050c3de3798e2c0d76d789e9958a671e5de4a9491ef6e16f0acb
 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 5683be0aad22..6c435a9facd3 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 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="pam"
 
 DEPEND="pam? ( sys-libs/pam )
diff --git a/net-ftp/ncftp/Manifest b/net-ftp/ncftp/Manifest
index 2a52a7cc9f6e..6b924d08908d 100644
--- a/net-ftp/ncftp/Manifest
+++ b/net-ftp/ncftp/Manifest
@@ -1,5 +1,7 @@
 AUX ncftp-3.2.6-fno-common.patch 1818 BLAKE2B 620e3fbc7e297d3186fe9eef8855e2a663a5abcd680269101d5547ab9f6b9addcfe6040ba35e16e8e540784796e34304a9377b1149f7ac00fe0859627a141200 SHA512 c6bf0cc4324583d9aae3f3a57c900437a78d30138d0b9da06fea66cd5fbf57a79ea420afe33536a5bbcf2ace61aaca30ea04155df638daeae125ed9ca90b1c25
+DIST ncftp-3.2.6-src.tar.xz 420564 BLAKE2B ce6d8d2bf06761f884e9edfe6d0bb0230f5d515078a787c4e6faf7716b760166acdd0accf3de1e1f5f3d892c8c86348cdbbefeac6be05e6806011a3e8f4c9b02 SHA512 8e6091ce2ea1eb463edea322d1b5dde813475fd22096d67f0bfd2f5101ae09747ff25d38816d0b9b1077e6a5a256078361691f816aa2eefa38638aa523b4b382
 DIST ncftp-3.2.6.tar.xz 418836 BLAKE2B f0ffa0cc26617ee4007fe8589dbbc8d122edbfc8106a8618a66eab5d9def258d2ee9c2b709e1a637b9d833513ef87b652f4ab0ff518dc9d67d90a7dd43941d3c SHA512 040db7e2ca2ee78b79d682a951fd98c1e0ee2936b64462259992d70c51241fa50ae06c66b4f40933ad0ab7122f581bbb8ba7cda764dba5f70a1f8c7d3d751199
 EBUILD ncftp-3.2.6-r1.ebuild 975 BLAKE2B 30ff54992100b50c7b9a55300f324b369b8a5d6bc4e6084a00c5982648595211839262463d4f44b0474cfc86b63dbebb6ac650b2c7a9ab32c2cdb59fee3dc73b SHA512 9cf1333cd5ab061dabbc252df65598d0411a7a254596b35601a41dace0c713d0b0f503956f0fe26f2acfddfda1b8bde1d1d7da4fd0345ba8066d1b23263555a9
+EBUILD ncftp-3.2.6-r2.ebuild 991 BLAKE2B 57b8f55f6dd2b3112594c84ce159f52272869cdea70ad355ec2f20fb6fc665c06e53a6d2f7bbd62ded160d9e96554acc7ccdcce04b61a2f0cf4bf18eb0d51350 SHA512 0111172e0ff570700b14635079ee4c94b2efaff4f2e29f2044ddad1eca93feeb367b7c69fc6eeddccdbf4fdbf44803b8e10aa9ad8c8d6144afbd0ecc93302206
 EBUILD ncftp-3.2.6.ebuild 1043 BLAKE2B b5b30ecd0d33201c30a5ccfa13ddddbc9134b2176f4097be558659182538d5604d4ba9adf9ceb69a1c596695b4aad38e24e5184c9b389dfafb24f887cccbaa89 SHA512 e9912f780ccd6f0658a227d451934ba95ac0b29f27098300af44abaf8375a893992ef1aed4e13db43d59dadcbcb2dab3f60512383fcc4ece14d72eed612e0dfd
 MISC metadata.xml 738 BLAKE2B 98d564b3063dd25384758125efec702f385768f3f0c4066ef5b0e6748f9c27d0ef838c4a669e7113bbb70ff74882b1d4c3b0e09011f3ff5f01dad3eea56c6b16 SHA512 e792a9cbbc371515f5137c4c00faad6936b4c6cc27bcfd5bfab151b00002ae8159cb9b76777a4bdd59dd87ea951ea62898ac74f6afd8a4ec0a1e5dcec12210b3
diff --git a/net-ftp/ncftp/ncftp-3.2.6-r2.ebuild b/net-ftp/ncftp/ncftp-3.2.6-r2.ebuild
new file mode 100644
index 000000000000..30b5c3cc3f0b
--- /dev/null
+++ b/net-ftp/ncftp/ncftp-3.2.6-r2.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="https://www.ncftp.com/"
+SRC_URI="
+	https://ftp.mirrorservice.org/sites/ftp.${PN}.com/${PN}/${P}-src.tar.xz
+"
+
+LICENSE="Clarified-Artistic"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 891d30384e86..e335eea015ba 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -1,14 +1,9 @@
-AUX proftpd-1.3.6-EINTR-like-EAGAIN.patch 2271 BLAKE2B e040216b0c7fa3590b26f62363680e56b01c6d88bc22d878ab1a29370b3916af569f7a50800d990135826cd7cc371f38d9619a775d97bd717ad8a52ee7e25e04 SHA512 699a42fc05b64309f55e3d4f2e9b5acc3cd05f4e81ec724227ff7a0800d62f00cd08b05fe6a806735e854b4eac01e0bb2192f7469fefd94c7f0981ed3472cb14
-AUX proftpd-1.3.6-mod_copy.patch 3069 BLAKE2B 08b9afdfa32e17d50d1762f4bf8a932b4c5106b91814b707b92e5745835f79c569d07ee18021c53aa961970a7167760a90e967388f0ac64956cde3899d72942c SHA512 2df01ce88d340b097523c10e0287c0a02484daaa11c3acd8975471c2cd346429fe9ef84f372943251af264d8d2713dfd1d259fb7fb30bc6aa75fab7559e8b4ef
-AUX proftpd-1.3.6-mysql-8.patch 750 BLAKE2B e8d9a48b2af603f1b50298ba5102242d575eb9b2321508a574ec3e6e0a0e54d058d248706aa2bfc9b85172ee6404ce5e16354e600e5332d8bc388649d10751e9 SHA512 15213f045427611f8ab5af9e064f4aadd448514a1789558f65c83b0703710df547178c15b254a368c1913c82d9fb533c47fd95d42326527809d4150191869bdd
-AUX proftpd-1.3.6-sighup-crash.patch 2145 BLAKE2B 60e24fe7f8ee4fdac4a95b73c5e6d76862d6163e6dfbc1a15970f18ab6a38e715bace0adad487606a29dc9de39bbb2987b3d4c5e0283d6468864f877c2030b6f SHA512 d16515e7bf14d1d3a147b93fea330b0342db3ad501f366dd4f1d872262829902cb3c197fe68b20b86048bc3bbe0e5c22470d6d81bf08c72c192a33770c3d499a
 AUX proftpd-1.3.6-use-trace.patch 477 BLAKE2B f69adc68327f467b44dd19d0da66388945c0d1c35ce734ab8fa5e618ca7dbf1164e785e37a6dcb0e9f8ab671ece0b4e711b6614947f39b55310ffd4522df5e07 SHA512 90164f799d1f6c3768a30161a40d5c369e576c3b1a875047ef65c1224d3e18cf1f4dd5145c5ff6f7aeda80135134df58a1d57046129b922514cb56d1de97f13e
 AUX proftpd-1.3.6_rc4-diskuse-refresh-api.patch 576 BLAKE2B ce4522896a81fed326ae234810491005c5165fa1bbcd0b64d785c6d070f2ac80c763e75f813655696a9405284cf27c82293026e2d8c68936d7794c20e886dacb SHA512 08a0674600944ff5d13033651a1dea1647c9d22f18efe6505e051b36566bf357bc41439d2dd7c2900e873ef8d600ba7f16332680dda1abb2529808fbe5a4e573
 AUX proftpd-1.3.6_rc4-gss-refresh-api.patch 1868 BLAKE2B ff50d3834d6cc0970256dcada8a14db6681440494abc24ccbf53ea5baef2362a9174de3bf7e3e07d562f30a55492735137efa91a9dd09676dbb95e624f3ae77f SHA512 4cc235bdb60ea4c84794d4347826b040057067d8283dcfcb795d5d25a156de480df7d897078ab8ab4faf12d4fc9e714a55f723ce27c9397bc2223550597df674
 AUX proftpd-1.3.6_rc4-msg-refresh-api.patch 903 BLAKE2B e335f81685552b0b9a05af3700ce4a09d7f31ca9b24c66e1a1306bbe26c243b553c1cb81c13cc9593ae36e93b03f28faeb64fe2ae2f834575e9dee402f73ee55 SHA512 d0dcc467289b4107aecee66edf122667b2fbb9b1f1a6a6ecea517f286090d22682200b9d11f503465cb9b5387e8fb749cc09c3033825282450fe1d6c0a4bb11d
 AUX proftpd-1.3.6_rc4-vroot-refresh-api.patch 736 BLAKE2B 9f3c4a1f80a27ce7e6f9348153584bc1134e63ad4c839927b7680439966003c76c7a25821be0f3431c472092ef5c8386166b372645f498fb655559fd683c3e6e SHA512 9cd98e2fb8c17d2ca38f5f7a20f5c6ffb03da7f51e53542237992bd2b98b2ef5b5fc0634cd7f5eef24fba8a601703b70ff7d0404e1c5103394e9fda260b815cd
 AUX proftpd-1.3.6a-fix-libcheck.patch 726 BLAKE2B e971ccfd5d5cd708054096eef3d8b4910d380933b79d7616225194f71213a07c14139cc7bc76b9fcb4f86f0a97672288837d5a1e7ce68673665db65e75328252 SHA512 8e4aface4c7ca010808e0531b896f8554107ad66c7e1019f25168e71e5f8d2df3673511dd4717eb8bdeedb2ca07bd6a587caca4955c4903991bcfb020ed72636
-AUX proftpd-1.3.6b-tls-crl-crash.patch 1466 BLAKE2B dc8f5cd38d07d2194966005eaf3d52b0230a763e35cb3ccbdd7c603eed5fee26a76a49feb31c6422a8adddd355059f82b6b07ac577a328b90e3e35ee5ece242b SHA512 b32281c717c8b1d1cd1ea86bebb6dc8577596e8dc97ad7fc797c83d34a5bbce1141a72f021d59e81be6437844411635c563baf84ef18eb9c5d576e84c80a786d
 AUX proftpd-1.3.6c-gcc-10.patch 653 BLAKE2B c756979c01e40b9bb83da39a05e5b8cf49db3e6954df7e31645357411b053b21a3dbc073429e9156ab40d9137286ef5c5469d35781eb3ca56ff4b3e7d09fc382 SHA512 0b735b97b2ccc849d12754323de97b72e049a5a5bca869e76c167ec2527e7e773cf53d4b41645d2a8532385edd23b905f38fe3ab0ad3c44923c1d5ff61557c3a
 AUX proftpd-tmpfiles.d.conf 34 BLAKE2B 03da2e04c7e0d4c6e889e4414a205942f0762a1ae856d16f95abb1d2e927d68f583ad5bbdbf142b32b141cd82e9288f2ef1faf459cbe8433e2e1127d3b30d686 SHA512 aa6ffbf15e4275941837306259fb426608e82e45a2da4b99c5d7778d11b8c9341e3a12ae9b751d0e173635239b6f1b20f0431be17296c005a83525a48327fa52
 AUX proftpd.conf.sample 1275 BLAKE2B db10306f79544b344856e065946e9ae0fa37d43507185f7d2407f23a962750a05bb2682e7c97e3979ca42dfe35921c3db7e98c095431796d82144869df0e324e SHA512 1c26f3e98ed07d89192c640f7823af168c045abee6ab076791aee9d50be5446be870a189979df4b828e7ae907dd40a346f1b92998fa39195195bfada4061c5df
@@ -25,5 +20,5 @@ DIST proftpd-mod-diskuse-0.9.tar.gz 18596 BLAKE2B 38c704c8607f0f93b080e77fe793cf
 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.6c.ebuild 8678 BLAKE2B 9f02b99da55a9528466538a0d889bb94dae0633f44f2eb7fcd8feb7d0bdeca9fa299d2b7e2ed8ae3d43ac457b47f908e51cc9f27e79caba5688668221be29b92 SHA512 f74170b4ddbced1a35db736e755420a10281c9e4bbdc8c5fc9ee387260fee97b5145ed5e8aae340a869a1648f7b9dab77337970c604f8fe6d567ab1e21be21a3
-EBUILD proftpd-1.3.7_rc3.ebuild 8630 BLAKE2B 334ca9731d3c4b952212d45c3ec7120d6f9135f45fc62da406bb1d580c7173d5c61aee8e0fe409bd47503d8158d3bc519bff547e4b266bc7e7b09375d6753eb2 SHA512 910b5600bdaa9ff8e8d4d0bdf3c749d7f43d480a162430ad3e4bd7e4be35e17e3d327aaff38bc0b6eb32c6a0856188d85b065cbf990c9adb8bd0ea136940d3d3
+EBUILD proftpd-1.3.7_rc3.ebuild 8624 BLAKE2B 68fd4a55032025659ddbba3c1b556e2c33c6b08fdd4422c240636cc1f96423215dcd3cfd9664632f2b5b6a6c72dce7683750cd7a2569b044a45be04a0651ce13 SHA512 5fa038ade54fe40f8da2bd1e3177eb627a8e74a88118b13a01f2ce0d7fe2b78d3d7709b5dbdcada1bcc70c78b51d5910c7285d85a78d99f2d5220d8266b35483
 MISC metadata.xml 2930 BLAKE2B f3f8218a737f50599ff687030bd8c84f1818b290d6d89bd6627ab8eb02598d196f1bae03d7b15e4eb02967fb7e0d826cdda10588c8bfe4f8a387a49d70d9cab0 SHA512 c90941671532512e4d085f3c6b4f56f3c2a252a613bf5c978d763fb0f8f9190431a41816f4fddde47e28eaeddcd17a7aef52064e5825499801bcdfbd72745be8
diff --git a/net-ftp/proftpd/files/proftpd-1.3.6-EINTR-like-EAGAIN.patch b/net-ftp/proftpd/files/proftpd-1.3.6-EINTR-like-EAGAIN.patch
deleted file mode 100644
index 43608d96492c..000000000000
--- a/net-ftp/proftpd/files/proftpd-1.3.6-EINTR-like-EAGAIN.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-https://bugs.gentoo.org/695972
-https://github.com/proftpd/proftpd/commit/f09f0c661621eb22cb1ce579194478007ba62866
-
-From f09f0c661621eb22cb1ce579194478007ba62866 Mon Sep 17 00:00:00 2001
-From: Justin Maggard <jmaggard@netgear.com>
-Date: Tue, 10 Oct 2017 18:20:06 -0700
-Subject: [PATCH] Bug #4319: Treat EINTR like EAGAIN
-
-This bug described a situation where an ongoing transfer would be
-prematurely aborted when one of our timers fired.  The timer could have
-fired for an unrelated reason, but if we were in the process of reading
-or writing with pr_netio_read() or pr_netio_write(), those calls would
-be interrupted with errno set to EINTR, and an error would be returned.
-Then pr_data_xfer() would abort the transfer.
-
-EAGAIN was already being handled properly, and we can just use the same
-treatment for EINTR so that we only respond to the timers we should
-actually care about.
----
- src/data.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- a/src/data.c
-+++ b/src/data.c
-@@ -1143,7 +1143,7 @@ int pr_data_xfer(char *cl_buf, size_t cl_size) {
-         while (len < 0) {
-           int xerrno = errno;
-  
--          if (xerrno == EAGAIN) {
-+          if (xerrno == EAGAIN || xerrno == EINTR) {
-             /* Since our socket is in non-blocking mode, read(2) can return
-              * EAGAIN if there is no data yet for us.  Handle this by
-              * delaying temporarily, then trying again.
-@@ -1265,7 +1265,7 @@ int pr_data_xfer(char *cl_buf, size_t cl_size) {
-       while (len < 0) {
-         int xerrno = errno;
- 
--        if (xerrno == EAGAIN) {
-+        if (xerrno == EAGAIN || xerrno == EINTR) {
-           /* Since our socket is in non-blocking mode, read(2) can return
-            * EAGAIN if there is no data yet for us.  Handle this by
-            * delaying temporarily, then trying again.
-@@ -1362,7 +1362,7 @@ int pr_data_xfer(char *cl_buf, size_t cl_size) {
-       while (bwrote < 0) {
-         int xerrno = errno;
- 
--        if (xerrno == EAGAIN) {
-+        if (xerrno == EAGAIN || xerrno == EINTR) {
-           /* Since our socket is in non-blocking mode, write(2) can return
-            * EAGAIN if there is not enough from for our data yet.  Handle
-            * this by delaying temporarily, then trying again.
--- 
-2.23.0
-
diff --git a/net-ftp/proftpd/files/proftpd-1.3.6-mod_copy.patch b/net-ftp/proftpd/files/proftpd-1.3.6-mod_copy.patch
deleted file mode 100644
index 40d912eb2b50..000000000000
--- a/net-ftp/proftpd/files/proftpd-1.3.6-mod_copy.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-https://bugs.gentoo.org/690528
-CVE-2019-12815
-
-From a73dbfe3b61459e7c2806d5162b12f0957990cb3 Mon Sep 17 00:00:00 2001
-From: TJ Saunders <tj@castaglia.org>
-Date: Wed, 17 Jul 2019 09:48:39 -0700
-Subject: [PATCH] Backport of fix for Bug#4372 to the 1.3.6 branch.
-
----
- NEWS               |  1 +
- contrib/mod_copy.c | 36 +++++++++++++++++++++++++++++++++---
- 2 files changed, 34 insertions(+), 3 deletions(-)
-
---- a/contrib/mod_copy.c
-+++ b/contrib/mod_copy.c
-@@ -1,7 +1,7 @@
- /*
-  * ProFTPD: mod_copy -- a module supporting copying of files on the server
-  *                      without transferring the data to the client and back
-- * Copyright (c) 2009-2016 TJ Saunders
-+ * Copyright (c) 2009-2019 TJ Saunders
-  *
-  * This program is free software; you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-@@ -657,7 +657,7 @@ MODRET copy_copy(cmd_rec *cmd) {
- MODRET copy_cpfr(cmd_rec *cmd) {
-   register unsigned int i;
-   int res;
--  char *path = "";
-+  char *cmd_name, *path = "";
-   unsigned char *authenticated = NULL;
- 
-   if (copy_engine == FALSE) {
-@@ -705,6 +705,21 @@ MODRET copy_cpfr(cmd_rec *cmd) {
-     path = pstrcat(cmd->tmp_pool, path, *path ? " " : "", decoded_path, NULL);
-   }
- 
-+  cmd_name = cmd->argv[0];
-+  pr_cmd_set_name(cmd, "SITE_CPFR");
-+  if (!dir_check(cmd->tmp_pool, cmd, G_READ, path, NULL)) {
-+    int xerrno = EPERM;
-+
-+    pr_cmd_set_name(cmd, cmd_name);
-+    pr_response_add_err(R_550, "%s: %s", (char *) cmd->argv[3],
-+      strerror(xerrno));
-+
-+    pr_cmd_set_errno(cmd, xerrno);
-+    errno = xerrno;
-+    return PR_ERROR(cmd);
-+  }
-+  pr_cmd_set_name(cmd, cmd_name);
-+
-   res = pr_filter_allow_path(CURRENT_CONF, path);
-   switch (res) {
-     case 0:
-@@ -758,6 +773,7 @@ MODRET copy_cpfr(cmd_rec *cmd) {
- MODRET copy_cpto(cmd_rec *cmd) {
-   register unsigned int i;
-   const char *from, *to = "";
-+  char *cmd_name;
-   unsigned char *authenticated = NULL;
- 
-   if (copy_engine == FALSE) {
-@@ -816,6 +832,20 @@ MODRET copy_cpto(cmd_rec *cmd) {
- 
-   to = dir_canonical_vpath(cmd->tmp_pool, to);
- 
-+  cmd_name = cmd->argv[0];
-+  pr_cmd_set_name(cmd, "SITE_CPTO");
-+  if (!dir_check(cmd->tmp_pool, cmd, G_WRITE, to, NULL)) {
-+    int xerrno = EPERM;
-+
-+    pr_cmd_set_name(cmd, cmd_name);
-+    pr_response_add_err(R_550, "%s: %s", to, strerror(xerrno));
-+
-+    pr_cmd_set_errno(cmd, xerrno);
-+    errno = xerrno;
-+    return PR_ERROR(cmd);
-+  }
-+  pr_cmd_set_name(cmd, cmd_name);
-+
-   if (copy_paths(cmd->tmp_pool, from, to) < 0) {
-     int xerrno = errno;
-     const char *err_code = R_550;
-@@ -940,7 +970,7 @@ static conftable copy_conftab[] = {
- 
- static cmdtable copy_cmdtab[] = {
-   { CMD, 	C_SITE, G_WRITE,	copy_copy,	FALSE,	FALSE, CL_MISC },
--  { CMD, 	C_SITE, G_DIRS,		copy_cpfr,	FALSE,	FALSE, CL_MISC },
-+  { CMD, 	C_SITE, G_READ,		copy_cpfr,	FALSE,	FALSE, CL_MISC },
-   { CMD, 	C_SITE, G_WRITE,	copy_cpto,	FALSE,	FALSE, CL_MISC },
-   { POST_CMD,	C_PASS,	G_NONE,		copy_post_pass, FALSE,	FALSE },
-   { LOG_CMD, 	C_SITE, G_NONE,		copy_log_site,	FALSE,	FALSE },
--- 
-2.22.0
-
diff --git a/net-ftp/proftpd/files/proftpd-1.3.6-mysql-8.patch b/net-ftp/proftpd/files/proftpd-1.3.6-mysql-8.patch
deleted file mode 100644
index 4149a6540595..000000000000
--- a/net-ftp/proftpd/files/proftpd-1.3.6-mysql-8.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://bugs.gentoo.org/692434
-https://github.com/proftpd/proftpd/issues/824
---- a/contrib/mod_sql_mysql.c
-+++ b/contrib/mod_sql_mysql.c
-@@ -132,6 +132,7 @@
- #include "../contrib/mod_sql.h"
- 
- #include <mysql.h>
-+#include <stdbool.h>
- 
- /* The my_make_scrambled_password{,_323} functions are not part of the public
-  * MySQL API and are not declared in any of the MySQL header files. But the
-@@ -495,7 +495,11 @@ MODRET cmd_open(cmd_rec *cmd) {
-    *  http://dev.mysql.com/doc/refman/5.0/en/auto-reconnect.html
-    */
-   if (!(pr_sql_opts & SQL_OPT_NO_RECONNECT)) {
-+#if MYSQL_VERSION_ID >= 80000
-+    bool reconnect = true;
-+#else
-     my_bool reconnect = TRUE;
-+#endif
-     mysql_options(conn->mysql, MYSQL_OPT_RECONNECT, &reconnect);
-   }
- #endif
diff --git a/net-ftp/proftpd/files/proftpd-1.3.6-sighup-crash.patch b/net-ftp/proftpd/files/proftpd-1.3.6-sighup-crash.patch
deleted file mode 100644
index cca550405e11..000000000000
--- a/net-ftp/proftpd/files/proftpd-1.3.6-sighup-crash.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-https://bugs.gentoo.org/678490
-
-From 345aa19ee2a98a3612d9b64a49107461455031a0 Mon Sep 17 00:00:00 2001
-From: TJ Saunders <tj@castaglia.org>
-Date: Tue, 18 Jul 2017 23:00:22 -0700
-Subject: [PATCH] Bug#4310: Use of mod_facl as static module causes ProFTPD to
- die on SIGHUP/restart.
-
----
- modules/mod_facl.c | 35 +++++++++++++++++++++++++++++++----
- 1 file changed, 31 insertions(+), 4 deletions(-)
-
-diff --git a/modules/mod_facl.c b/modules/mod_facl.c
-index b3ac42b7b..258708cf5 100644
---- a/modules/mod_facl.c
-+++ b/modules/mod_facl.c
-@@ -1260,16 +1260,34 @@ MODRET set_faclengine(cmd_rec *cmd) {
-   return PR_HANDLED(cmd);
- }
- 
-+/* Event listeners
-+ */
-+
-+static void unmount_facl(void) {
-+  pr_fs_t *fs;
-+
-+  fs = pr_unmount_fs("/", "facl");
-+  if (fs != NULL) {
-+    destroy_pool(fs->fs_pool);
-+    fs->fs_pool = NULL;
-+    return;
-+  }
-+
-+  if (errno != ENOENT) {
-+    pr_log_debug(DEBUG0, MOD_FACL_VERSION
-+      ": error unmounting 'facl' FS: %s", strerror(errno));
-+  }
-+}
-+
- #if defined(PR_SHARED_MODULE) && \
-     defined(PR_USE_FACL) && \
-     defined(HAVE_POSIX_ACL)
- static void facl_mod_unload_ev(const void *event_data, void *user_data) {
-   if (strcmp("mod_facl.c", (const char *) event_data) == 0) {
-+    pr_fs_t *fs;
-+
-     pr_event_unregister(&facl_module, NULL, NULL);
--    if (pr_unregister_fs("/") < 0) {
--      pr_log_debug(DEBUG0, MOD_FACL_VERSION
--        ": error unregistering 'facl' FS: %s", strerror(errno));
--    }
-+    unmount_facl();
-   }
- }
- #endif /* !PR_SHARED_MODULE */
-@@ -1303,6 +1321,14 @@ static void facl_postparse_ev(const void *event_data, void *user_data) {
- #endif /* PR_USE_FACL and HAVE_POSIX_ACL */
- }
- 
-+static void facl_restart_ev(const void *event_data, void *user_data) {
-+  if (facl_engine == FALSE) {
-+    return;
-+  }
-+
-+  unmount_facl();
-+}
-+
- /* Initialization routines
-  */
- 
-@@ -1315,6 +1341,7 @@ static int facl_init(void) {
- # endif /* !PR_SHARED_MODULE */
- #endif /* PR_USE_FACL and HAVE_POSIX_ACL */
-   pr_event_register(&facl_module, "core.postparse", facl_postparse_ev, NULL);
-+  pr_event_register(&facl_module, "core.restart", facl_restart_ev, NULL);
- 
-   return 0;
- }
--- 
-2.20.1
-
diff --git a/net-ftp/proftpd/files/proftpd-1.3.6b-tls-crl-crash.patch b/net-ftp/proftpd/files/proftpd-1.3.6b-tls-crl-crash.patch
deleted file mode 100644
index 3cfd81867215..000000000000
--- a/net-ftp/proftpd/files/proftpd-1.3.6b-tls-crl-crash.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-https://bugs.gentoo.org/701814
-https://github.com/proftpd/proftpd/commit/be8e1687819cb665359bd62b4c896ff4b1a09c3f
-
-From be8e1687819cb665359bd62b4c896ff4b1a09c3f Mon Sep 17 00:00:00 2001
-From: TJ Saunders <tj@castaglia.org>
-Date: Sun, 24 Nov 2019 14:03:54 -0800
-Subject: [PATCH] Issue #859, #861: Fix handling of CRL lookups by properly
- using issuer for lookups, and guarding against null pointers.
-
----
- contrib/mod_tls.c | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
---- a/contrib/mod_tls.c
-+++ b/contrib/mod_tls.c
-@@ -9066,10 +9066,10 @@ static int tls_verify_crl(int ok, X509_STORE_CTX *ctx) {
- 
- #if OPENSSL_VERSION_NUMBER >= 0x10100000L && \
-     !defined(HAVE_LIBRESSL)
--  crls = X509_STORE_CTX_get1_crls(store_ctx, subject);
-+  crls = X509_STORE_CTX_get1_crls(store_ctx, issuer);
- #elif OPENSSL_VERSION_NUMBER >= 0x10000000L && \
-       !defined(HAVE_LIBRESSL)
--  crls = X509_STORE_get1_crls(store_ctx, subject);
-+  crls = X509_STORE_get1_crls(store_ctx, issuer);
- #else
-   /* Your OpenSSL is before 1.0.0.  You really need to upgrade. */
-   crls = NULL;
-@@ -9088,6 +9088,9 @@ static int tls_verify_crl(int ok, X509_STORE_CTX *ctx) {
-         ASN1_INTEGER *sn;
- 
-         revoked = sk_X509_REVOKED_value(X509_CRL_get_REVOKED(crl), j);
-+        if (revoked == NULL) {
-+          continue;
-+        }
- #if OPENSSL_VERSION_NUMBER >= 0x10100000L && \
-     !defined(HAVE_LIBRESSL)
-         sn = X509_REVOKED_get0_serialNumber(revoked);
--- 
-2.24.0
diff --git a/net-ftp/proftpd/proftpd-1.3.7_rc3.ebuild b/net-ftp/proftpd/proftpd-1.3.7_rc3.ebuild
index 40523c9d6937..2bbf557ee9bc 100644
--- a/net-ftp/proftpd/proftpd-1.3.7_rc3.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.7_rc3.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/pybootd/Manifest b/net-ftp/pybootd/Manifest
deleted file mode 100644
index c50024fe9eb9..000000000000
--- a/net-ftp/pybootd/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX pybootd-scripts.patch 1055 BLAKE2B f8a5c1e37aef5a939919df5efd2c5728d6b90d55e122dc18991df4278e92b1250420d10695501d081e6076906a29f2122e28f61161722f57e9cafd77d3746786 SHA512 b3727ac420ab322742bfcbba6f59aea4e30d592549c1652ae092d93c4918d2d83ee9252058f4bf35dd0a3a3e20e97f2c032a6a2b014cc132ab7cc9e9a61c8933
-DIST pybootd-1.5.0_pre20110524131526.tar.gz 21855 BLAKE2B 39479c742d73d29998de1dd9cf4c7398dd27f1d5564c18de0ebb5cfce0a439e3dec829f88938a72f932bc0bf486e27dd9b2e239b27cfe99ed25cb87e1354b6ab SHA512 113a2195d33ba5a0196810370fedd582204de5f8323ecec37e6209fc7074cde06ba80cb8113fd83be70685c8ea18c6167d751085ea9bee5c1ab34dab152eea71
-EBUILD pybootd-1.5.0_pre20110524131526.ebuild 597 BLAKE2B 8369a1b9a16307d04453af99db48c5fefcf1a4ac9b049edefed7fe9e0cf52e0253c372d956fcb7e3c0dac35ca75c9b25dc42f48a6f621fea30def850c49b5a60 SHA512 6429cce2e69904a29d373096989d9d035c01cf344c46e22782c056eeaa4f9776335a040f3fc2d2174ef65279b7c7a4222a4f88831b68584d6bcc6a41da4f1816
-MISC metadata.xml 290 BLAKE2B 686b5811ef01fb36f025543898a706adb2310edc4e9f7b482d0b23b8aa0ad807f6e68fc0306e68ae09e9946ac4d00aa711630565bb1c7e70a8e75642d47cb76c SHA512 b0756ada0e59328587d68c99d9ce401c0e2f3f5a402719a5e9b67b7969b56fd55c4930c63e1209e01d58562f09c45cbcedb758204efec65d09f82c4595e39ce5
diff --git a/net-ftp/pybootd/files/pybootd-scripts.patch b/net-ftp/pybootd/files/pybootd-scripts.patch
deleted file mode 100644
index 71a001f44798..000000000000
--- a/net-ftp/pybootd/files/pybootd-scripts.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-install the pybootd.py helper as pybootd otherwise the import gets confused
-
---- a/setup.py
-+++ b/setup.py
-@@ -18,13 +18,23 @@
- # License along with this library; if not, write to the Free Software
- # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- 
-+import shutil
- from distutils.core import setup
-+import distutils.command.install_scripts
- 
- 
- def _read(fname):
-     import os
-     return open(os.path.join(os.path.dirname(__file__), fname)).read()
- 
-+class script_rename(distutils.command.install_scripts.install_scripts):
-+
-+    def run(self):
-+        distutils.command.install_scripts.install_scripts.run(self)
-+        for script in self.get_outputs():
-+            if script.endswith('.py'):
-+                shutil.move(script, script[:-3])
-+
- setup(
-     name='pybootd',
-     version='1.5.0',
-@@ -56,5 +66,7 @@ setup(
-     package_data = {
-         '': ['etc/*.ini', 'etc/*.cfg'],
-     },
-+    cmdclass = {'install_scripts': script_rename},
-+    scripts = ['pybootd.py'],
-     long_description=_read('README.rst'),
- )
diff --git a/net-ftp/pybootd/metadata.xml b/net-ftp/pybootd/metadata.xml
deleted file mode 100644
index 236bb92992dd..000000000000
--- a/net-ftp/pybootd/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="pypi">pybootd</remote-id>
-		<remote-id type="github">eblot/pybootd</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-ftp/pybootd/pybootd-1.5.0_pre20110524131526.ebuild b/net-ftp/pybootd/pybootd-1.5.0_pre20110524131526.ebuild
deleted file mode 100644
index ba6a2718f413..000000000000
--- a/net-ftp/pybootd/pybootd-1.5.0_pre20110524131526.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-GIT_HASH="7fd7d045fd4b4cdeebf4d07c1c5cd9649c2172b8"
-
-DESCRIPTION="Simplified BOOTP/DHCP/PXE/TFTP server"
-HOMEPAGE="https://github.com/eblot/pybootd"
-SRC_URI="https://github.com/eblot/pybootd/archive/${GIT_HASH:0:6}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/netifaces-0.5"
-DEPEND=""
-
-S="${WORKDIR}/pybootd-${GIT_HASH}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-scripts.patch
-)
diff --git a/net-ftp/uftpd/Manifest b/net-ftp/uftpd/Manifest
index 455b106aafcf..b82fc38c3b36 100644
--- a/net-ftp/uftpd/Manifest
+++ b/net-ftp/uftpd/Manifest
@@ -1,5 +1,3 @@
-DIST uftpd-2.10.tar.xz 161948 BLAKE2B 9a6c72758e12cf8190b9aaea72c337997bd544c4fbee1f6de44de178e698ccf2eb1ddfcb0b48de23ebe669aa2d0d0d74ae0510b48e8e3f2b4d50d3f39f4e9901 SHA512 d9fbeca46b7bf8cbc258e501591e1e1af26ed380578276eacc2fdf0331cb66bbee6e715ee3d2021366b7884022f2e733b6d676f72649e97acff7d8dc3045be9e
 DIST uftpd-2.11.tar.xz 182000 BLAKE2B 75c9a564a90b10f2efdbfaaab67572adefda160d7b5df8fd303cfd970153ee24bdfbfb25dca1764d7b747a27779a2863a1b32a0ec489fbc2e4f3f991bc3436ee SHA512 bce9fe3d763d61030e883bba7988d206630f2124991ce0c11613744813f66ed8bf215a555e0061d0083d32b90ac5c9b583adf08520fb691617adeac759d50546
-EBUILD uftpd-2.10.ebuild 454 BLAKE2B c69bf9e3e15ce56b12991305dc30a77185ce80fcbe9a6101f4105c6975143bfbedbed20723abb2c21057d543dbb1cc7c8725b1ffad04a231c17e4d85fe68586e SHA512 1115d7ab9a907c509efdc5c5ea19fb31f4f5684226e4d9805e7e8f5053cc0f6fd2082db5371882f684502f88f1c68da87f25a54970b5d85ad1329a5854f9d81f
 EBUILD uftpd-2.11.ebuild 454 BLAKE2B c72336d1ad331c59c67f40167cb966dc9d9ffe4bf51b58bc567c0ae775c650df75b55cc6926744515f73918422c0489bd7b7c32180a2e951472d587c80bcecd7 SHA512 bc3c6f1b80b80e975f659ea52514c3485f1103d1ebdea2e868ba88e7f6388643072985bf96eb06e92abd9003fe48fe90668df8b61c8f87d7ce5692fb6edebc3c
 MISC metadata.xml 919 BLAKE2B b8bb2ddc64dc727547cf908e62df335d5cdf71132a2292e14a7e995d48364de64adde5d0035af3ddbdbdd8b64640b929cd3de0cdd62f49e2480154b1e5d543e4 SHA512 fec60605c1a67eee40734f15395129e76cfd0d0fbde24e977a61973e960704cd5be83e68094d45b0b2ce9b688c5d27cf41c4fb540094b7be532e1563ab622d31
diff --git a/net-ftp/uftpd/uftpd-2.10.ebuild b/net-ftp/uftpd/uftpd-2.10.ebuild
deleted file mode 100644
index 5f894de40797..000000000000
--- a/net-ftp/uftpd/uftpd-2.10.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="The no nonsense TFTP/FTP server"
-HOMEPAGE="https://github.com/troglobit/uftpd"
-SRC_URI="https://github.com/troglobit/${PN}/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-libs/libite-1.5
-	>=dev-libs/libuev-2.2"
-
-RDEPEND="
-	${DEPEND}
-	!net-misc/uftp
-	!net-ftp/atftp"