gentoo resync : 22.01.2021

22 files changed, 496 insertions, 305 deletions

diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 52fed2cfe39e..78a6796e3b8a 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/atftp/Manifest b/net-ftp/atftp/Manifest
index ea1a3b29812f..49855c910e4c 100644
--- a/net-ftp/atftp/Manifest
+++ b/net-ftp/atftp/Manifest
@@ -1,8 +1,12 @@
 AUX atftp-0.7.2-CFLAGS.patch 611 BLAKE2B a897ae1d9f03387283826c5b9795028b9190ca5a55e9db795d6a3753c7ce45ccd75a8d37eb2de228bd1b8fc57472fb3f662860c0f1efdc5a0ceab2d1a178c1dc SHA512 b020e761af2b73193e0bc3ef0e11e293babdfaedeac5429f3ad89079d686ce9c69737a4f74e147a023a92a2424241d61f17574feaadc39a5b6bd361245886c8a
+AUX atftp-0.7.2-cve-2020-6097.patch 3433 BLAKE2B 3ea6ac0bf80a8750535b1184d7b9d8e6023d5678ebf1150fce02b268a4e44ba08f4350d1c7ee4e3bb9dc5676d3b0c75db4e95fb637c9cbcb5f074fb0d9ec28e4 SHA512 0677ffc38f1e94036596ab58f356c351d53b4440cbb37b96f265fe335d1595003ff3e773cb1b5ab5af3be31a4a93af30188fe1ea88cd9cb5a7cb65e385932bd5
+AUX atftp-0.7.2-fewer_seeks.patch 1398 BLAKE2B 6ac60c1953a1849700fd7e00cce78c2481667846aad6966f6df570d1cc29b69524edd8a9763dbafdfaee219a27666a6b8d8857350521813338729c0dfe553a11 SHA512 f83f98419487d4caa861ec16fe3250e4421a0cb9366a3aca3bb6dbda1141ec19cb0318aa5d00740672d99a73b28353a220138e86d30a370d902dcd606a5da40c
 AUX atftp.confd 105 BLAKE2B 6672479bce2240d4c34c70853227a769fa45c06e4b5c04f7d5aebdbceb0987316a9ec906182cacf5337fce5190aeac3bfc4cda0be72b8d48e99a5b2cbc2eca0e SHA512 cdbd63df16c2cee7491209de8ec44e05e10beccc6286cf7cb1c5dc7731c616d41bc94ce4d6c020b4ac8bb77b27956e9ee36d9b5703dcd3477e8b14927d154b91
 AUX atftp.init 438 BLAKE2B 1783431801dbf04353bde6c3766c7d0acdd06b8ec853c8fba5cf1bbfe6c7020b55305f44992e3921a63654f290a28c28373dd94f925188c72105c8a3dd047dca SHA512 b64f78658d2da17a4fe4237835c0a6a0cc59d0b7278e8f6f49673ffd8a97a9473e4773b43bcc70d312043ee4324d8105c50f0cfcf6055c0755ce598c9d7e5a23
 AUX atftp.service 233 BLAKE2B 4c9a1a8041ffc4cdf71a24800494f340121beb9bde9760fa090b9e515ef0b2aa7dd73173543c75fde465dbf9cc229b04acc9e72c296fa27cace2063128de06c6 SHA512 533372c4863e39d6139ddc491c2b2b2051f1094a90d9854879f28bae7975c8dc997696318794cd1136f9cc542a8f418ad8361b87dd6b3455445d8528d2cc993a
 AUX atftp.service.conf 45 BLAKE2B dd52bd3ef0d72f28d2e317282026d354b6023f8b51634d0374623c782afacae1284f5385967dfa91026553845f9283be59b4c7d96031da85261067b7be6544f7 SHA512 661befb6873eee6c0ed25fd5cb156e3d7c4ef801d2f58cda8df0f0c5fd851c7eb28089a9399529164c61505963e9d10143df2195d57ff66f85ad0e2750fbbd57
 DIST atftp-0.7.2.tar.gz 248038 BLAKE2B 3ca44624bf989009c2ebd0ae97927b0784e3c617a79a1bd00212a72a185302cf84f51c8bcda2012981d67cfed4d241b70f8719e78155207608f07a2227e6c437 SHA512 d602bb69451175a36e619abcff412ab1f6d0e7baf8c3f9a2b32081530fbc5816157404b80d42a8b6caa89cc83675b5cbeefcd57a5d98b8f5b43c6254b20ef28b
 EBUILD atftp-0.7.2-r1.ebuild 1454 BLAKE2B 1dd9278366a7bbc136e6f7fcf584a7f52076de01a53cdf2b65e486bd1582c75211cca6e7380ddc8978f3760a369be5b580dfcac99c4d5672e9a86a8478ff8450 SHA512 a7f27b1c0087aceb9f8c4e9e645cc932b9d69faecc0a7d51529f8395017a2a8ea8a25f9a882f2d128fbd0cb4a51b53cc351b2310b12ae207e543047bc32801c0
+EBUILD atftp-0.7.2-r2.ebuild 1499 BLAKE2B e1fedac27e5d2b097d706c3ee99d03df03ad27ad61c4297c83d222f3a5b4c69b1d3b6ee4966622db073d2e18ccde24ebe4e16508bac156e88027d34086faa45b SHA512 de134e6a16c57f253af44b1a53e5c1f849943e52683f06d4945d042cd4c4f1bcd776379fcae0176149395617efe6f2b5ef9d587ccb2f7ab35cf683bde2164a03
+EBUILD atftp-0.7.2-r3.ebuild 1537 BLAKE2B 1e56e24731a2f43d58b6a819c8f561c2669240fc87553d1d187047f0d27303a785828b7d0c976d5eb32d76c2c76c7277158d77369e71d66c0f3ea5315bc81d3c SHA512 0208bfc439df1b605bbdb8aeb5d91fea46c45196cb5417340f636f1c149e606ab06f2eb75c8dd57ee5bdb7b44336ff44eeec7cac282ce0c9622cfd2ad7dc3897
 MISC metadata.xml 418 BLAKE2B 882119fa041eaa33650c5e3efaa440e3ed25056f05dda4667a150a8646f32f620b3479821b0e6c3220541afd811f35b6060127aa58b98e7604fc498536e8c724 SHA512 cff57d66fe14a48905bd9280e15f794a66df58f83fff73290db3dc7a8d2196c5ffba05693d9e8909e3bf710bb05b72e00001747bd9d92379a7cdfc0dbaba57cb
diff --git a/net-ftp/atftp/atftp-0.7.2-r2.ebuild b/net-ftp/atftp/atftp-0.7.2-r2.ebuild
new file mode 100644
index 000000000000..28a0da5d668f
--- /dev/null
+++ b/net-ftp/atftp/atftp-0.7.2-r2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic systemd
+
+DESCRIPTION="Advanced TFTP implementation client/server"
+HOMEPAGE="https://sourceforge.net/projects/atftp/"
+SRC_URI="mirror://sourceforge/atftp/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="selinux tcpd readline pcre"
+
+DEPEND="tcpd? ( sys-apps/tcp-wrappers )
+	readline? ( sys-libs/readline:0= )
+	pcre? ( dev-libs/libpcre )"
+RDEPEND="${DEPEND}
+	!net-ftp/tftp-hpa
+	!net-ftp/uftpd
+	selinux? ( sec-policy/selinux-tftp )"
+BDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}/${P}-CFLAGS.patch"
+	"${FILESDIR}/${P}-cve-2020-6097.patch"
+)
+
+src_prepare() {
+	append-cppflags -D_REENTRANT -DRATE_CONTROL
+	# fix #561720 by restoring pre-GCC5 inline semantics
+	append-cflags -std=gnu89
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable tcpd libwrap) \
+		$(use_enable readline libreadline) \
+		$(use_enable pcre libpcre) \
+		--enable-mtftp
+}
+
+src_test() {
+	cd "${S}"/test || die
+	# Try to run the tests
+	./test.sh || die
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/atftp.init atftp
+	newconfd "${FILESDIR}"/atftp.confd atftp
+
+	systemd_dounit "${FILESDIR}"/atftp.service
+	systemd_install_serviced "${FILESDIR}"/atftp.service.conf
+
+	dodoc README* BUGS FAQ Changelog INSTALL TODO
+	dodoc "${S}"/docs/*
+
+	docinto test
+	cd "${S}"/test || die
+	dodoc load.sh mtftp.conf pcre_pattern.txt test.sh test_suite.txt
+}
diff --git a/net-ftp/atftp/atftp-0.7.2-r3.ebuild b/net-ftp/atftp/atftp-0.7.2-r3.ebuild
new file mode 100644
index 000000000000..0b2c1e633f95
--- /dev/null
+++ b/net-ftp/atftp/atftp-0.7.2-r3.ebuild
@@ -0,0 +1,69 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic systemd
+
+DESCRIPTION="Advanced TFTP implementation client/server"
+HOMEPAGE="https://sourceforge.net/projects/atftp/"
+SRC_URI="mirror://sourceforge/atftp/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="selinux tcpd readline pcre"
+
+DEPEND="tcpd? ( sys-apps/tcp-wrappers )
+	readline? ( sys-libs/readline:0= )
+	pcre? ( dev-libs/libpcre )"
+RDEPEND="${DEPEND}
+	!net-ftp/tftp-hpa
+	!net-ftp/uftpd
+	selinux? ( sec-policy/selinux-tftp )"
+BDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}/${P}-CFLAGS.patch"
+	"${FILESDIR}/${P}-cve-2020-6097.patch"
+	"${FILESDIR}/${P}-fewer_seeks.patch"
+)
+
+src_prepare() {
+	append-cppflags -D_REENTRANT -DRATE_CONTROL
+	# fix #561720 by restoring pre-GCC5 inline semantics
+	append-cflags -std=gnu89
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable tcpd libwrap) \
+		$(use_enable readline libreadline) \
+		$(use_enable pcre libpcre) \
+		--enable-mtftp
+}
+
+src_test() {
+	cd "${S}"/test || die
+	# Try to run the tests
+	./test.sh || die
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/atftp.init atftp
+	newconfd "${FILESDIR}"/atftp.confd atftp
+
+	systemd_dounit "${FILESDIR}"/atftp.service
+	systemd_install_serviced "${FILESDIR}"/atftp.service.conf
+
+	dodoc README* BUGS FAQ Changelog INSTALL TODO
+	dodoc "${S}"/docs/*
+
+	docinto test
+	cd "${S}"/test || die
+	dodoc load.sh mtftp.conf pcre_pattern.txt test.sh test_suite.txt
+}
diff --git a/net-ftp/atftp/files/atftp-0.7.2-cve-2020-6097.patch b/net-ftp/atftp/files/atftp-0.7.2-cve-2020-6097.patch
new file mode 100644
index 000000000000..5130d0086432
--- /dev/null
+++ b/net-ftp/atftp/files/atftp-0.7.2-cve-2020-6097.patch
@@ -0,0 +1,92 @@
+commit 96409ef3b9ca061f9527cfaafa778105cf15d994
+Author: Peter Kaestle <peter.kaestle@nokia.com>
+Date:   Wed Oct 14 14:02:41 2020 +0200
+
+    Fix for DoS issue CVE-2020-6097
+    
+    "sockaddr_print_addr" of tftpd can be triggered remotely to call
+    assert(), which will crash the tftpd daemon.  See:
+    https://talosintelligence.com/vulnerability_reports/TALOS-2020-1029
+    
+    "sockaddr_print_addr" originaly had two features:
+    1) returning pointer to string of the incoming ip address
+    2) checking whether ss_family of the connection is supported
+    
+    To fix the issue, a separate function "sockaddr_family_supported" is
+    used to take care of 2) and "sockaddr_print_addr" returns an error
+    message string for unsupported cases when using 1) insert of calling
+    assert().
+
+diff --git a/tftp_def.c b/tftp_def.c
+index d457c2a..428a930 100644
+--- a/tftp_def.c
++++ b/tftp_def.c
+@@ -180,6 +180,15 @@ int Gethostbyname(char *addr, struct hostent *host)
+      return OK;
+ }
+ 
++int
++sockaddr_family_supported(const struct sockaddr_storage *ss)
++{
++     if (ss->ss_family == AF_INET || ss->ss_family == AF_INET6)
++          return 1;
++     else
++          return 0;
++}
++
+ char *
+ sockaddr_print_addr(const struct sockaddr_storage *ss, char *buf, size_t len)
+ {
+@@ -189,7 +198,7 @@ sockaddr_print_addr(const struct sockaddr_storage *ss, char *buf, size_t len)
+      else if (ss->ss_family == AF_INET6)
+           addr = &((const struct sockaddr_in6 *)ss)->sin6_addr;
+      else
+-          assert(!"sockaddr_print: unsupported address family");
++          return "sockaddr_print: unsupported address family";
+      return (char *)inet_ntop(ss->ss_family, addr, buf, len);
+ }
+ 
+diff --git a/tftp_def.h b/tftp_def.h
+index 0841746..458e310 100644
+--- a/tftp_def.h
++++ b/tftp_def.h
+@@ -54,6 +54,7 @@ int print_eng(double value, char *string, int size, char *format);
+ inline char *Strncpy(char *to, const char *from, size_t size);
+ int Gethostbyname(char *addr, struct hostent *host);
+ 
++int sockaddr_family_supported(const struct sockaddr_storage *ss);
+ char *sockaddr_print_addr(const struct sockaddr_storage *, char *, size_t);
+ #define SOCKADDR_PRINT_ADDR_LEN INET6_ADDRSTRLEN
+ uint16_t sockaddr_get_port(const struct sockaddr_storage *);
+diff --git a/tftpd.c b/tftpd.c
+index 0b6f6a5..a7561a5 100644
+--- a/tftpd.c
++++ b/tftpd.c
+@@ -644,6 +644,11 @@ void *tftpd_receive_request(void *arg)
+      }
+ 
+ #ifdef HAVE_WRAP
++     if (!abort && !sockaddr_family_supported(&data->client_info->client))
++     {
++          logger(LOG_ERR, "Connection from unsupported network address family refused");
++          abort = 1;
++     }
+      if (!abort)
+      {
+           /* Verify the client has access. We don't look for the name but
+diff --git a/tftpd_mtftp.c b/tftpd_mtftp.c
+index d420d10..0032905 100644
+--- a/tftpd_mtftp.c
++++ b/tftpd_mtftp.c
+@@ -393,6 +393,11 @@ void *tftpd_mtftp_server(void *arg)
+                                         &data_size, data->data_buffer);
+ 
+ #ifdef HAVE_WRAP
++               if (!sockaddr_family_supported(&sa))
++               {
++                    logger(LOG_ERR, "mtftp: Connection from unsupported network address family refused");
++                    continue;
++               }
+                /* Verify the client has access. We don't look for the name but
+                   rely only on the IP address for that. */
+                sockaddr_print_addr(&sa, addr_str, sizeof(addr_str));
diff --git a/net-ftp/atftp/files/atftp-0.7.2-fewer_seeks.patch b/net-ftp/atftp/files/atftp-0.7.2-fewer_seeks.patch
new file mode 100644
index 000000000000..78926b94b9f7
--- /dev/null
+++ b/net-ftp/atftp/files/atftp-0.7.2-fewer_seeks.patch
@@ -0,0 +1,38 @@
+<F28>diff -U8 atftp-0.7.2/tftp_io.c /var/tmp/portage/net-ftp/atftp-0.7.2-r1/work/atftp-0.7.2/tftp_io.c
+--- atftp-0.7.2/tftp_io.c	2019-04-14 17:38:55.000000000 -0500
++++ /var/tmp/portage/net-ftp/atftp-0.7.2-r1/work/atftp-0.7.2/tftp_io.c	2020-03-16 12:55:22.371820662 -0500
+@@ -439,26 +439,32 @@
+ }
+ 
+ /*
+  * Write to file and do netascii conversion if needed
+  */
+ int tftp_file_write(FILE *fp, char *data_buffer, int data_buffer_size, long block_number, int data_size,
+                     int convert, long *prev_block_number, int *temp)
+ {
++     static long filepos;
+      int bytes_written;
+      int c;
+      char prevchar = *temp;
+ 
+      if (!convert)
+      {
+ 	  /* Simple case, just seek and write */
+-          if (fseek(fp, (block_number - 1) * data_buffer_size, SEEK_SET) != 0)
+-	      return 0;
++          long position = (block_number - 1)*data_buffer_size;
++          if (position != filepos)
++               if (fseek(fp, position, SEEK_SET) != 0)
++                    return 0;
++               else
++                    filepos = position;
+ 	  bytes_written = fwrite(data_buffer, 1, data_size, fp);
++          filepos += bytes_written;
+      }
+      else if (block_number != *prev_block_number)
+      {
+ 	  /* 
+ 	   * Same principle than for reading, but simpler since when client
+            * send same block twice there is no need to rewrite it to the
+            * file
+ 	   */
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index a6b94cdca73e..69677b556adf 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -1,8 +1,11 @@
 AUX filezilla-3.22.1-debug.patch 349 BLAKE2B 2a38aba4ddc49cbe97d3d6ce1348d94588a3bb2821ad1643e5e5d43cd18adfe5911309a24822368fd38176aaf2af99d7b098864bc5ae2d6f94ffb481a4d25340 SHA512 009946fbb676698e404b1c91bb6b14767234751cbecb7faa097692b382a65af7ab31b54f1aac81fdb72c1492db4698d24f5fa9b1966f69bffa1f4b6073283e00
 AUX filezilla-3.47.0-disable-shellext_conf.patch 699 BLAKE2B 9d0209166f8e76b0575be47e8a13b1d07f159ed05aaf9e8624030fa1ea2ce1ab63a7283336511bc14b6a922c8536d9ac992a231cf53f9c825299b4b588512c62 SHA512 3c0e6178f8fcc3793cbc722fcb91b2b2834eccda17ab6260243d1262198debe3c71ced1c2443ada8245a7bcf02b5fbb5fffdb16bdab948dc3badc149576ab027
 AUX filezilla-3.47.0-metainfo.patch 309 BLAKE2B b36d7f3e5446c76cc9e20be01b3a5005f140bef005b264c2956485cc9c33ed76d05319b53f51eea2b57606a6573e802e52bee94d373baefb5a317fcddd163090 SHA512 32e1a9e41dcd01322fd75cdb5d5bf16a1ce1241266d52a39e017c5eff64ae06592ae6799acfc6aaa935eb61023efc5fb3fcfadd43a9765a309a12c3fa3ee725c
+AUX filezilla-3.52.2-slibtool.patch 723 BLAKE2B f051ae8d8b1d9c75bf4752d009a3b710b742accb50ec46ad6d1be0d7c5f88ab77996e47b55e3f87432a9d5aee2fef61e915ed36c09e988e01bbf68943a64144b SHA512 7a7f1adc4144c5535d60e6dd6f18aecc04c93ff2c98f52660fa576dcbce9ff7bb53175eef2fee7671c472181ea7f5c388ccc8697e70b8841759fdec06e62d1a1
 DIST FileZilla_3.51.0_src.tar.bz2 4808717 BLAKE2B 67f614032145abe7f715254fd47756d3a537d2eca63be976c29351f79e15d3620e77c1bb7beccc2b61a1df8b86484334a3e77639402c93e8ce28d4b12eb8884f SHA512 b5e0f80b61eb168b41f7582bf10bf0067da76aec3165ffe13819e20eb842ffc0fb12b01c54843b3ec4e7355111c36be249db3526e2ea2eaa77ba4274ffa03e93
-DIST FileZilla_3.52.0.4_src.tar.bz2 4812985 BLAKE2B 245433ba085ded75b6f283be3bf8a36779644ee7beacd70adfbab89c82faa14b4b4b811c1eab1fa069686e168a3c0e2066841a2ba87ad93e90d3f035d4a81da2 SHA512 adf3f1264c6e98c19313eb9857278247b1590b6d41848683056aca25ff62e367d0349b740c000c3549153d84e9fb0615bfe94e8015e55a52dfb9eccb809c8411
+DIST FileZilla_3.52.0.5_src.tar.bz2 4811653 BLAKE2B a80d0784e5c85b74cadb944af232bb42fd0170ca31034e51804b56dc06ca2bbc4580a5ed1564bf82436be50be62d86f2017ebf3496ecc00af24837c0da99bbcc SHA512 c0a3f20ad9351ae0bb15e7e488801cdaefc83d5eb1355fcb664150ea588b9fb8c4b446e4b1df5d8b35fb88111a37527037e4dc70ba783d5161b1d91c8dc3bee0
+DIST FileZilla_3.52.2_src.tar.bz2 4813167 BLAKE2B af651f4db74e805c866d040aa932c39e1a488bf37b0c215a2cdeae3fd4ab608f84b1b12dfbe8bf197e778760ca26183a3532a370e7a0095c1a250eefdc14717c SHA512 74abb78eaece5ffed044a88bdbbff7be0470e47868b806925ea5666d741370dff910d55849f6ad91fb57f8c1a33c461dc10c9f093d75e7a96ff0d909f3a8f131
 EBUILD filezilla-3.51.0.ebuild 1957 BLAKE2B 2e3089f2a70a43ef4dafc954204a2c770fbf0969f1510d1f10d11c1d133314699431a439d83bf8a124fd0df001dcbfe9da1cb794219545269e855599420a0e97 SHA512 c0892524296e0449e20148bd3723a603fe78b7dd2c96cf4dc0bc040c661cfe36483ca94a251af9ac761d31534d994be0a88a9c45785f87665e62a0c887a348ca
-EBUILD filezilla-3.52.0.4.ebuild 1961 BLAKE2B fac20a3303d173d9590befc1d8ad7984a9f64600655efaa84ccdb722309d6db055b332e378721709082da21e8ce95cd7fb7b70737b781c0dc758e366833ab9a3 SHA512 fbe14ca5bae08360767874bd4ef5355add7252d1f5141ed88fdcd174cff880bc7466377d459350efeb28259073aaec54d328a7dfae2f02067b8e1ab7d9e308d3
+EBUILD filezilla-3.52.0.5.ebuild 1961 BLAKE2B fac20a3303d173d9590befc1d8ad7984a9f64600655efaa84ccdb722309d6db055b332e378721709082da21e8ce95cd7fb7b70737b781c0dc758e366833ab9a3 SHA512 fbe14ca5bae08360767874bd4ef5355add7252d1f5141ed88fdcd174cff880bc7466377d459350efeb28259073aaec54d328a7dfae2f02067b8e1ab7d9e308d3
+EBUILD filezilla-3.52.2.ebuild 2004 BLAKE2B e140dd155a123e9020a3a33097a72f2c8f20c1df1156faa30053e5bead65e409cc090837c5c3fd893bc2623affa1c5907c65e9bf8002943b6d475bf01c6fc82f SHA512 9d1a03103bb3e62f346854fd9b14d0b5408ed8a2ab817b97269b31a32c1d1e1a88a82d4c853ffdfd7ab4afe96887ceaf19baf412a4efb745fc35220aabf50f8d
 MISC metadata.xml 459 BLAKE2B 71b683a0a48407daa9577a84b6d08bb6bcbcea46b9805fd31256e4f55666c0716b4fe43cbd30617ec1b88cc8697eb9a4254f7bd3e399ecdfcd81e92db24b4cd2 SHA512 e1f653c9a5dd7631ebea96be29472e2824cc6377c9e8783cd56913c1d7951eb9d80cbdaff05affc766c6f38277b6aea5b8a23e8b808840f29249eb7e0cfdfe3f
diff --git a/net-ftp/filezilla/files/filezilla-3.52.2-slibtool.patch b/net-ftp/filezilla/files/filezilla-3.52.2-slibtool.patch
new file mode 100644
index 000000000000..4eaae857e1db
--- /dev/null
+++ b/net-ftp/filezilla/files/filezilla-3.52.2-slibtool.patch
@@ -0,0 +1,24 @@
+This fixes compilation with slibtool instead of GNU libtool
+
+--- filezilla-3.52.2/src/engine/Makefile.am
++++ filezilla-3.52.2/src/engine/Makefile.am
+@@ -146,6 +146,8 @@
+ libfzclient_private_la_LDFLAGS += $(LIBFILEZILLA_LIBS)
+ libfzclient_private_la_LDFLAGS += $(IDN_LIB)
+ 
++libfzclient_private_la_LIBADD = $(PUGIXML_LIBS)
++
+ dist_noinst_DATA = engine.vcxproj
+ 
+ CLEANFILES = filezilla.h.gch
+--- filezilla-3.52.2/src/interface/Makefile.am
++++ filezilla-3.52.2/src/interface/Makefile.am
+@@ -309,7 +309,7 @@
+ 
+ if HAVE_DBUS
+ filezilla_DEPENDENCIES += ../dbus/libfzdbus.a
+-filezilla_LDFLAGS += ../dbus/libfzdbus.a $(LIBDBUS_LIBS)
++filezilla_LDADD = ../dbus/libfzdbus.a $(LIBDBUS_LIBS)
+ endif
+ 
+ filezilla_LDFLAGS += $(WX_LIBS)
diff --git a/net-ftp/filezilla/filezilla-3.52.0.4.ebuild b/net-ftp/filezilla/filezilla-3.52.0.5.ebuild
index ba2ce7335de1..ba2ce7335de1 100644
--- a/net-ftp/filezilla/filezilla-3.52.0.4.ebuild
+++ b/net-ftp/filezilla/filezilla-3.52.0.5.ebuild
diff --git a/net-ftp/filezilla/filezilla-3.52.2.ebuild b/net-ftp/filezilla/filezilla-3.52.2.ebuild
new file mode 100644
index 000000000000..c8f67f39ebeb
--- /dev/null
+++ b/net-ftp/filezilla/filezilla-3.52.2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit autotools flag-o-matic wxwidgets xdg
+
+MY_PV=${PV/_/-}
+MY_P="FileZilla_${MY_PV}"
+
+DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
+HOMEPAGE="https://filezilla-project.org/"
+SRC_URI="https://download.filezilla-project.org/client/${MY_P}_src.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="dbus nls test"
+
+# pugixml 1.7 minimal dependency is for c++11 proper configuration
+RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
+	>=dev-libs/nettle-3.1:=
+	>=dev-db/sqlite-3.7
+	>=dev-libs/libfilezilla-0.26.0:=
+	>=dev-libs/pugixml-1.7
+	>=net-libs/gnutls-3.5.7
+	>=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X]
+	x11-misc/xdg-utils
+	dbus? ( sys-apps/dbus )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=sys-devel/libtool-1.4
+	nls? ( >=sys-devel/gettext-0.11 )
+	test? ( >=dev-util/cppunit-1.13.0 )"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+DOCS=(AUTHORS ChangeLog NEWS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.22.1-debug.patch
+	"${FILESDIR}"/${PN}-3.47.0-metainfo.patch
+	"${FILESDIR}"/${PN}-3.47.0-disable-shellext_conf.patch
+	"${FILESDIR}"/${PN}-3.52.2-slibtool.patch
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if ! test-flag-CXX -std=c++14; then
+			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
+			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
+			eerror "to gcc-4.9 or an equivalent version supporting C++14."
+			die "Currently active compiler does not support -std=c++14"
+		fi
+	fi
+}
+
+src_prepare() {
+	setup-wxwidgets
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-autoupdatecheck
+		--with-pugixml=system
+		$(use_enable nls locales)
+		$(use_with dbus)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}
diff --git a/net-ftp/pureadmin/Manifest b/net-ftp/pureadmin/Manifest
index 6f3c5d388d70..ef8692e86b58 100644
--- a/net-ftp/pureadmin/Manifest
+++ b/net-ftp/pureadmin/Manifest
@@ -1,5 +1,7 @@
 AUX pureadmin-0.4-QA-desktop-file.patch 186 BLAKE2B 964d5fa4353b6514dd70f997f251418f9ed4de7dd865693b3603e1f49dbef368ff2b298bab542a590ab417fefee8be1a0165e039d6b9f5189c9dbcdc19962ea6 SHA512 98e00f785a3fd5dca53321f0f6faa7f3ceaf5d8217e28492b4bcbb21eb59b3d0b894485850fb09f5e307bca3a6f03b2e442f8e863b655de1248beefa1e023134
-AUX pureadmin-0.4-gold.patch 842 BLAKE2B 43a20608f3d86ae4fa0ad3b9bb21f17e0643521a15e727ff206dcada573aad24ad525c36bdb4dde4910d5e591f145dfe651d42a46f0ea2ac5b7da58724086f1a SHA512 1c6848987cf21c023cabecd8107d9f4292e704164c4330bd8c43217b7ebd1a6d74a5476c8ab1586e2a1f683f7e35926dfe8c3cbae91b01617e6689dc966e8851
+AUX pureadmin-0.4-fno-common.patch 1071 BLAKE2B 4c1b6be9a4f87a35f5359dd3e5f47ed1eebfb08096d02fef96d5a3cc0b54788ab5d399701be66d38a56c3f6baf28fcbf43a074870d866079cd20b073a6ba1dc0 SHA512 ac93ec4c8ec7deae4f2a2a4fc48c8448e15c108d74ba4d732bb523a07173f762ad2bac812d4d07bf0dfc260760e7898678305525f90ce7920d9236c1613094a0
+AUX pureadmin-0.4-gold.patch 583 BLAKE2B 8567eaf1f18d2751aed81e71a1fe947b3cb735421885e7010488204029a13e096c7d02cb7a425986d6c3ffafb2090105ae7f6901c1c1e452c8a557095375953d SHA512 71bf32b5a0bcb718ab41d1d8bd13d443a486ae553be8ee27142dd5a8a56e089700275e74d31aa1179cfb1a6ec8e8cfab3b8e5d01f909c01ca46d75685556f13c
 DIST pureadmin-0.4.tar.gz 386739 BLAKE2B e0699210d6f22f4043bd667e82993b019e8a58b16d42157be42f4497ee383e1da7935beca77491e105a1b3537ef1920cbe57b0cc8ce1e48fb30c01c491f9605e SHA512 46fd4caff0d6c123412478690411409038d5590cc7388993eed35fc33a34302b8310ae1ede971ed31cbf29ba4ef3b4c21ce5b8c9b225659b3110c6abcd1e78c6
 EBUILD pureadmin-0.4-r1.ebuild 1293 BLAKE2B d29a24337ed7162606ecdff73eca78c63695d7bbacbfa2628ad124c4aa43b12d03a6c028d5d439cd85cee0e9533a326bb4ee60b7f1f47892e945761852ae0128 SHA512 fb1889e5bb130b02c6d67471b4e125a1830389d88b00dfe293358e59876a9ca8cc8d4903d6735d57de0f1038dcfdf010ae85d4b476f2c73dc3bce5733fea1284
+EBUILD pureadmin-0.4-r2.ebuild 1392 BLAKE2B 17b6dfd5bc708a66f80d7167f5bf9b4992170a28b164b954d68487556c786fd81c83590bad2d11a1208e18659971989f21a9b3aba9728128177d9a136692cc3f SHA512 782991cfea38dd0a5408e19b6de0fd4c82960b4d6ec854b61c4a35d3011ea60f9f0a646ba429009d17d663bf2a6b7d522726dd164c2ab356f31c7f7f009e8137
 MISC metadata.xml 243 BLAKE2B 92e4be4dc62f417ee02761d2b2c43ab9b95775a33959160c8ca1af42923063413b128c2169b5d10dfa5b9a14753686f2df8ce32648935924e2e985800b2d6914 SHA512 b51712ea8ad59d4f1138caaa9889a7f35c9b3dea5ba47ee1e93b44d66f4d4d1faee4f52ff95c9c09041593086cf8cb3ba5eeca655a58a754df5e9f956b6867f2
diff --git a/net-ftp/pureadmin/files/pureadmin-0.4-fno-common.patch b/net-ftp/pureadmin/files/pureadmin-0.4-fno-common.patch
new file mode 100644
index 000000000000..829867e8c0db
--- /dev/null
+++ b/net-ftp/pureadmin/files/pureadmin-0.4-fno-common.patch
@@ -0,0 +1,42 @@
+https://bugs.gentoo.org/707206
+--- a/src/globals.h
++++ b/src/globals.h
+@@ -90,7 +90,7 @@ typedef enum {
+ 	RUNMODE_INETD    /* Running through inetd or similar */
+ } ftp_runmode_t;
+ 
+-ftp_runmode_t ftp_runmode;
++extern ftp_runmode_t ftp_runmode;
+ 
+ void exit_program (void);
+ 
+--- a/src/gui_helper.c
++++ b/src/gui_helper.c
+@@ -39,6 +39,7 @@
+ #include "binreloc.h"
+ #include "system_accounts.h"
+ 
++extern ftp_runmode_t ftp_runmode;
+ EggStatusIcon *status_icon = NULL;
+ 
+ static gchar *sec_to_time (gulong sec)
+--- a/src/main.c
++++ b/src/main.c
+@@ -53,6 +53,7 @@
+ gboolean timeout_update_activity (gpointer data);
+ gboolean timeout_check_for_availability (gpointer data);
+ 
++ftp_runmode_t ftp_runmode;
+ static ftp_runmode_t get_ftp_runmode (void);
+ static void activity_show_error_message (const gchar *errmsg);
+ static void activity_show_welcome_message (void);
+--- a/src/mainwin_cb.c
++++ b/src/mainwin_cb.c
+@@ -46,6 +46,7 @@
+ 
+ popup_src_t popup_source;
+ 
++extern ftp_runmode_t ftp_runmode;
+ gboolean usermanager_initialized = FALSE;
+ 
+ static void update_adv_info (void)
diff --git a/net-ftp/pureadmin/files/pureadmin-0.4-gold.patch b/net-ftp/pureadmin/files/pureadmin-0.4-gold.patch
index 7b19565ac10a..c410da51f507 100644
--- a/net-ftp/pureadmin/files/pureadmin-0.4-gold.patch
+++ b/net-ftp/pureadmin/files/pureadmin-0.4-gold.patch
@@ -1,9 +1,3 @@
- src/Makefile.am |    2 +-
- src/Makefile.in |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 94f61e0..0ebb561 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
 @@ -38,5 +38,5 @@ pureadmin_CFLAGS = -std=gnu99 -Wall
@@ -13,8 +7,6 @@ index 94f61e0..0ebb561 100644
 -pureadmin_LDADD = @GTK_LIBS@ $(INTLLIBS) @BINRELOC_LIBS@
 +pureadmin_LDADD = @GTK_LIBS@ $(INTLLIBS) @BINRELOC_LIBS@ -lm -lX11
  
-diff --git a/src/Makefile.in b/src/Makefile.in
-index b2ade45..dd9401c 100644
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
 @@ -249,7 +249,7 @@ pureadmin_SOURCES = \
diff --git a/net-ftp/pureadmin/pureadmin-0.4-r2.ebuild b/net-ftp/pureadmin/pureadmin-0.4-r2.ebuild
new file mode 100644
index 000000000000..9932e66fe383
--- /dev/null
+++ b/net-ftp/pureadmin/pureadmin-0.4-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop xdg
+
+DESCRIPTION="GUI tool used to make the management of Pure-FTPd a little easier"
+HOMEPAGE="http://purify.sourceforge.net/"
+SRC_URI="mirror://sourceforge/purify/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~x86"
+IUSE="doc"
+
+RDEPEND="
+	gnome-base/libglade:2.0
+	sys-libs/zlib
+	virtual/fam
+	x11-libs/gtk+:2
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gold.patch
+	"${FILESDIR}"/${P}-QA-desktop-file.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
+
+src_prepare() {
+	default
+
+	# prevent "make check" from complaining
+	cat >> po/POTFILES.skip <<- EOF || die
+		src/eggstatusicon.c
+		src/eggtrayicon.c
+		src/prereq_usrmanager.c
+	EOF
+}
+
+src_install() {
+	default
+
+	# Move the docs to the correct location, if we want the docs
+	use doc &&
+		dodoc -r "${ED}"/usr/share/pureadmin/docs/.
+	rm -Rv "${ED}"/usr/share/pureadmin/docs || die
+
+	make_desktop_entry pureadmin "Pure-FTPd menu config" pureadmin
+}
+
+pkg_postinst() {
+	ewarn "PureAdmin is at a beta-stage right now and it may break your"
+	ewarn "configuration. DO NOT use it for safety critical system"
+	ewarn "or production use!"
+
+	elog
+	elog "You need root-privileges to be able to use PureAdmin."
+	elog "This will probably change in the future."
+	elog
+}
diff --git a/net-ftp/tlswrap/Manifest b/net-ftp/tlswrap/Manifest
deleted file mode 100644
index 7604b5c60250..000000000000
--- a/net-ftp/tlswrap/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX fix-Wformat-security-warnings.patch 2478 BLAKE2B a5eaabcee8e6bdcb573d020c1b7bba80a6f5dd266cd5e1f02b987b2cbafb3d86b77b82458afc00a152ee1c2ac2424b1d1c994eba7607f19dc7105ccbcec6e366 SHA512 77af5535f8a250baa1e1967bdf31a8f74f2e5222b7c138f140ec245b06a7bcd398e7877f523170fe2cfa2bc026245f66533285bf03008eb317ecc5a0955ee239
-AUX modernize-am_init_automake.patch 920 BLAKE2B ff8fade6f0cb57b1edb28f36fdbb0b6be864f43a7c344fe5540b101f1fc7bdadd23a8b4cb9f9458413dba96ca682a9234cb640038a8ea2288ebe00fea09e7e91 SHA512 42056abceb24f7680d0480f2dbe9f87c37c124a5012811681a4826fb1dd3d3cdc883d31e5fb4d202a67bd1f6dc7edc5f8fa2aa828c20ee46c1ab6a05b0e49a17
-AUX respect-cflags.patch 2327 BLAKE2B 4ba3c51a989b6a23a7e5edd787a0e36b15f1876f28f15e75ba74624d5481dbf1321424c1bafd06869209cc818845e7d3480bc30149d6bddf3f899daa07db6e06 SHA512 97ff02e1417bbee2cf518f8dfcd6d32535fd610394f499ef4c552aa0741a56fe54a8ab7cedf8a553f337f4a38a221e990c222ff9c019f3037e01bdd3241e92fc
-AUX tlswrap-1.04-openssl11.patch 1949 BLAKE2B 45b36c5f43285221cb2bf5d77f4ca181225977d7acc7b255695a5977edca3d0bb214cd7365ce9c7939989244e1d8280cec0e2c2489e591e14404b09947aa2fc4 SHA512 65ba9b78c7a73ed0ac819fcb56f3dc9685974161e772bea1ce809620e780c45a77644cabd8e29a0770068febae89e5412d47eef209db92a63928ff5d5ea4927a
-AUX tlswrap.init 395 BLAKE2B c43439a23c748d820fb5375b6183b6f3a992ee9d0324e23eb85f9a2c938d6579bb296e332dd7e042b9355e75fd94b2bf6f91a625ff98b3169e95c4df13334b8e SHA512 6699101e5a628cf91013575e31f85c13a254854814240e7d7bf7006d1bb6f73eab8ecb80fe1d168e952c7c6ffc001495a6a6bc0e591de2e84d40591fccf02fae
-DIST tlswrap-1.04.tar.gz 129507 BLAKE2B fafbe0185f3b2e1a440cd1ad3892c005435eecc371ecd5094d81f3dac08f1c6186cd5d873e02ae35d9dfb987168ae0c6c7a4233420c874d171d3a8fe8004e885 SHA512 f6d2a54cd77fef42174726cbe7ddd5109bb8a9c2289ddf22eddb2d240edba4a5de2e857d940ab44298e4c48da142e638d9b91fd971e5f328a36c6a557f4a257a
-EBUILD tlswrap-1.04-r3.ebuild 820 BLAKE2B 9a7c1a4be52bfe44353575b3a6ebe59d6448da1d1d2e084795bca7e37a98e0264cfa8c7541bbad106f907b18fcb6020f8899c6aa01e2dc23eb8f4732c0114925 SHA512 1d90fa0ad9bd65b7a7a77a08801302a65f786b247f0c6048af52774737546997153367015a735506d938a6ef63fc06ae7eaffa42ee81ce992efb676222ef88f5
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-ftp/tlswrap/files/fix-Wformat-security-warnings.patch b/net-ftp/tlswrap/files/fix-Wformat-security-warnings.patch
deleted file mode 100644
index e90ffffc4335..000000000000
--- a/net-ftp/tlswrap/files/fix-Wformat-security-warnings.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From dbbc4b17b5fdd08b11b0f285cfc99a28be8a89e5 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Thu, 11 Aug 2016 13:05:43 -0400
-Subject: [PATCH 3/3] Fix -Wformat-security warnings by adding trivial format
- strings.
-
-Newer versions of GCC have the option to output warnings for insecure
-(e.g. missing) format string usage. A few places were making calls to
-the printf family of functions, and passing in a string variable
-without a format string. In all cases, the desired format string was
-simply "%s", intended to print the sole argument, and that "%s" has
-been added.
-
-This eliminates the warnings, and allows the build to complete when
--Werror=format-security is used.
----
- misc.c  | 4 ++--
- parse.c | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/misc.c b/misc.c
-index ebaabb2..d9bb150 100644
---- a/misc.c
-+++ b/misc.c
-@@ -164,7 +164,7 @@ int print_to_ud(struct user_data *ud, const char *s) {
-   	size_t slen;
-   	char str[1024];
-   
--  	snprintf(str, sizeof(str), s);
-+  	snprintf(str, sizeof(str), "%s", s);
- 
-   	slen = strlen(str); /* NOT including null char */
-   
-@@ -184,7 +184,7 @@ int print_to_serv(struct user_data *ud, const char *s) {
- 	size_t slen;
- 	char str[130];
- 
--	snprintf(str, sizeof(str), s);
-+	snprintf(str, sizeof(str), "%s", s);
- 	slen = strlen(str); /* NOT including null char */
- 	if ( (&ud->u2s_buf[U2S_SIZE]-ud->u2s_i)<slen) {
- 		printf("print_to_ud: can't fit string to buffer\n");
-diff --git a/parse.c b/parse.c
-index 1174202..ac4529f 100644
---- a/parse.c
-+++ b/parse.c
-@@ -345,7 +345,7 @@ parse_serv_buf(struct user_data *ud, int index, char *ucertspath, char *cafile)
- 		ud->serv_status = SERV_PBSZ;
- 		snprintf(s, sizeof(s), "PROT %c\r\n", ud->prot);
- 		if (debug)
--			printf(s);
-+			printf("%s", s);
- 		print_to_serv(ud,s);
- 	} else if ((ud->serv_status == SERV_PBSZ) && (strncasecmp(dst,"200 ",4) == 0) ) {
- 		ud->serv_status = SERV_PROT;
-@@ -365,7 +365,7 @@ parse_serv_buf(struct user_data *ud, int index, char *ucertspath, char *cafile)
- 	} else if (ud->delay_prot && (ud->serv_status == SERV_PROT) && (strncasecmp(dst,"230 ",4) == 0) ) {
- 		snprintf(s, sizeof(s), "PROT %c\r\n", ud->prot);
- 		if (debug)
--			printf(s);
-+			printf("%s", s);
- 		print_to_serv(ud,s);
- 	} else if (ud->delay_prot && (ud->serv_status == SERV_PROT) && (strncasecmp(dst,"200 ",4) == 0) ) {
- 		write(ud->user_fd, "230 Bypassed login text because the ftpd can't handle PROT before USER.\r\n", 73);
--- 
-2.7.3
-
diff --git a/net-ftp/tlswrap/files/modernize-am_init_automake.patch b/net-ftp/tlswrap/files/modernize-am_init_automake.patch
deleted file mode 100644
index 6171e45801ab..000000000000
--- a/net-ftp/tlswrap/files/modernize-am_init_automake.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 4d6541b108ab59e30e7413a5bc62f29bbc1fd2ab Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Thu, 11 Aug 2016 13:00:53 -0400
-Subject: [PATCH 2/3] Modernize the AM_INIT_AUTOMAKE invocation.
-
-The existing call to AM_INIT_AUTOMAKE, which passed both the project
-name and its version, had been deprecated. These days, you're supposed
-to pass those things to AC_INIT, and then call AM_INIT_AUTOMAKE with
-no arguments. This commit does that, and fixes the version number in
-the process.
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 575a5ab..fe26bad 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,6 +1,6 @@
- dnl Process this file with autoconf to produce a configure script.
--AC_INIT(tlswrap.c)
--AM_INIT_AUTOMAKE(tlswrap, 0.8)
-+AC_INIT(tlswrap.c, 1.04)
-+AM_INIT_AUTOMAKE
- 
- dnl
- dnl Get cannonical host
--- 
-2.7.3
-
diff --git a/net-ftp/tlswrap/files/respect-cflags.patch b/net-ftp/tlswrap/files/respect-cflags.patch
deleted file mode 100644
index 38da48b167e4..000000000000
--- a/net-ftp/tlswrap/files/respect-cflags.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 1a38cd3f931d728fc7a2bcfdf1fa19510a19acde Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Thu, 11 Aug 2016 12:53:53 -0400
-Subject: [PATCH 1/3] Rename configure.in to configure.ac and respect the
- user's CFLAGS.
-
-The name configure.in has been deprecated for a long time, so the
-first order of business was to rename it to configure.ac.
-
-To respect the user's CFLAGS, the most important change was to remove
-the line CFLAGS="-g" which wiped out any pre-existing CFLAGS and
-replaced them all with just "-g". There was also a test for GCC that
-would append a few flags like "-O2" and "-Wall" to the user's CFLAGS
-if the configure script detected GCC. That test was modified to only
-trigger when the user's CFLAGS were unset, and in that case, the (now
-removed) "-g" flag was added back.
-
-The end result of the CFLAGS changes is that a default set of CFLAGS
-will be used for GCC, but only if the user does not have any CFLAGS
-previously set. The default behavior should be completely unchanged
-when CFLAGS="".
-
-Gentoo-Bug: 240898
----
- configure.in => configure.ac | 17 ++++-------------
- 1 file changed, 4 insertions(+), 13 deletions(-)
- rename configure.in => configure.ac (84%)
-
-diff --git a/configure.in b/configure.ac
-similarity index 84%
-rename from configure.in
-rename to configure.ac
-index dd0ee15..575a5ab 100644
---- a/configure.in
-+++ b/configure.ac
-@@ -6,23 +6,14 @@ dnl
- dnl Get cannonical host
- dnl
- 
--CFLAGS="-g"
--
- dnl Checks for programs.
- AC_PROG_CC
--if test "$GCC" = "yes" && test "$CC" != "icc"; then CFLAGS="$CFLAGS -O2 -Wall -Wmissing-prototypes"; fi
--#  if test -n "$GCC"; then
--#    CFLAGS="$CFLAGS -O2 -Wall -Wmissing-prototypes"
--#  else
--    #case "$host_os" in
--#      *hpux*)  CFLAGS="$CFLAGS +O3"                      ;;
--#      *ultrix* | *osf*) CFLAGS="$CFLAGS -O -Olimit 2000" ;;
--#      *)       CFLAGS="$CFLAGS -O" ;;
--#    esac
--#  fi
-+if test "$GCC" = "yes" && test "$CC" != "icc" && test -z "$CFLAGS" ; then
-+   CFLAGS="-g -O2 -Wall -Wmissing-prototypes";
-+fi
- 
- AC_CYGWIN
--if test "$CYGWIN" = "yes"; then CFLAGS="$CFLAGS -Dsys_errlist=_imp___sys_errlist"; fi
-+if test "$CYGWIN" = "yes"; then CFLAGS="$CFLAGS -g -Dsys_errlist=_imp___sys_errlist"; fi
- checkssldir() { :
-     if test -f "$1/include/openssl/ssl.h"; then
- #       AC_DEFINE(HAVE_OPENSSL)
--- 
-2.7.3
-
diff --git a/net-ftp/tlswrap/files/tlswrap-1.04-openssl11.patch b/net-ftp/tlswrap/files/tlswrap-1.04-openssl11.patch
deleted file mode 100644
index e8d0941d7434..000000000000
--- a/net-ftp/tlswrap/files/tlswrap-1.04-openssl11.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -wru tlswrap-1.04.orig/tls.c tlswrap-1.04/tls.c
---- tlswrap-1.04.orig/tls.c	2006-11-25 19:52:08.000000000 +0100
-+++ tlswrap-1.04/tls.c	2017-12-05 04:43:56.757223948 +0100
-@@ -73,10 +73,12 @@
- 		printf("egd_sock is %s\n", egd_sock);
- #ifdef HAVE_RAND_STATUS
- 	if (RAND_status() != 1) {
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || OPENSSL_NO_EGD
- 		if ( RAND_egd(egd_sock) == -1 ) {
- 			fprintf(stderr, "egd_sock is %s\n", egd_sock);
- 			sys_err("RAND_egd failed\n");
- 		}
-+#endif
- 		if (RAND_status() != 1)
- 			sys_err("ssl_init: System without /dev/urandom, PRNG seeding must be done manually.\r\n");
- 	}
-@@ -262,7 +264,8 @@
- 	int					ok, extcount, i, j;
- 	char 				*extstr;
- 	SSL					*ssl;
--#if (OPENSSL_VERSION_NUMBER > 0x00908000L)
-+#if (OPENSSL_VERSION_NUMBER > 0x10100000L)
-+#elif (OPENSSL_VERSION_NUMBER > 0x00908000L)
- 	unsigned char const		*data1;
- #else
- 	unsigned char	*data1;
-@@ -279,6 +282,16 @@
- 	if (debug)
- 		printf("tls_cert2\n");
- 	
-+#if (OPENSSL_VERSION_NUMBER > 0x10100000L)
-+	if (ud->sec_level > 3) {
-+		X509_VERIFY_PARAM *param = SSL_get0_param(ssl);
-+		X509_VERIFY_PARAM_set_hostflags(param, X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
-+		X509_VERIFY_PARAM_set1_host(param, ud->serv_dns.hostname, 0);
-+		X509_VERIFY_PARAM_set1_ip_asc(param, ud->serv_data_host);
-+		SSL_set_verify(ssl, SSL_VERIFY_PEER, 0);
-+	}
-+#endif
-+
- 	if ((x509_peer = SSL_get_peer_certificate(ssl)) == NULL)
- 		return X509_V_ERR_APPLICATION_VERIFICATION; /* SSL_get_peer* can only be NULL on  'anonymous DH connections' so shouldn't happen. */
- 
-@@ -287,6 +300,8 @@
- 		return SSL_get_verify_result(ssl);
- 	}
- 	
-+
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
- 	if ((extcount = X509_get_ext_count(x509_peer)) > 0) {
- 		if (debug) printf("extcount = %d\n", extcount);
- 		for (i = 0; i < extcount; i++) {
-@@ -333,6 +348,7 @@
-   		return X509_V_ERR_APPLICATION_VERIFICATION;
-   	}
-   }
-+#endif
-   X509_free(x509_peer);
- 	return SSL_get_verify_result(ssl);
- }
diff --git a/net-ftp/tlswrap/files/tlswrap.init b/net-ftp/tlswrap/files/tlswrap.init
deleted file mode 100644
index a454c1692260..000000000000
--- a/net-ftp/tlswrap/files/tlswrap.init
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-        need net
-}
-
-start() {
-        ebegin "Starting tlswrap"
-	start-stop-daemon --start --exec /usr/bin/tlswrap >/dev/null
-        eend $?
-}
-
-stop() {
-        ebegin "Stopping tlswrap"
-	start-stop-daemon --stop --exec /usr/sbin/tlswrap
-        eend $?
-}
diff --git a/net-ftp/tlswrap/metadata.xml b/net-ftp/tlswrap/metadata.xml
deleted file mode 100644
index 7a38bb900964..000000000000
--- a/net-ftp/tlswrap/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/net-ftp/tlswrap/tlswrap-1.04-r3.ebuild b/net-ftp/tlswrap/tlswrap-1.04-r3.ebuild
deleted file mode 100644
index 07e388e8f258..000000000000
--- a/net-ftp/tlswrap/tlswrap-1.04-r3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-DESCRIPTION="FTP wrapper which supports TLS with every FTP client"
-HOMEPAGE="https://www.tlswrap.com/"
-SRC_URI="https://www.tlswrap.com/${P}.tar.gz"
-
-# GPL-2 for Gentoo init script
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:= )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/respect-cflags.patch"
-	"${FILESDIR}/modernize-am_init_automake.patch"
-	"${FILESDIR}/fix-Wformat-security-warnings.patch"
-	"${FILESDIR}/${P}-openssl11.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_install() {
-	emake prefix="${D}/usr" install
-	einstalldocs
-	newinitd "${FILESDIR}/tlswrap.init" tlswrap
-}