gentoo Easter resync : 12.04.2020

10 files changed, 68 insertions, 266 deletions

diff --git a/net-ftp/pure-ftpd/Manifest b/net-ftp/pure-ftpd/Manifest
index 0afdb2a4bde1..03a090f5b09d 100644
--- a/net-ftp/pure-ftpd/Manifest
+++ b/net-ftp/pure-ftpd/Manifest
@@ -1,14 +1,10 @@
 AUX pure-ftpd-1.0.28-pam.patch 568 BLAKE2B cb7a9540e5646d7e9b734f893d4449e11cad60f897b39ed111559877edb4cf22e607fcf15d6ed7eea6dbf7a03a430c9182d6405ced13cf9c6614d15a45e17a49 SHA512 c331837c4c8988e0623a6a4f4222263dd161a49a2748079d3c539db2025b7b048ca5976b4450dd32cab5755932c7e59f6976d9d3bda2e5e87f1869789f8e00ba
-AUX pure-ftpd-1.0.47-MAX_DATA_SIZE.patch 787 BLAKE2B bac7b7d788e2928c7c5a4f9af593b6841475d0850b1b3c09f6c6e3f7a575db13975fccfabbcb5813482c326f355dadcd33aa30184da9c098764480b95a9730ac SHA512 1124ba66f8c98935acf3f9bc11b7c90370e2e0dee05fa0c25ae517d198ef1bf47b7d93b3abbe79a3e98356588bd12a6f44584ff85a5fe241e2561c5805876624
-AUX pure-ftpd-1.0.47-TLSv1.3.patch 1743 BLAKE2B 54d88c30f842da11c93121d2cda6d91cd7a1971b4703b29373716c90eab7ae781067eee7e20028fe71a22cc74a5329dd338a3d8299adba23711486e847f34040 SHA512 25804c6f7a46b1a032efa97dae5b086b66946346a6192c21e4e48537a392fbbc3b0748674c9015aa9b6e273015fe13877fdc27009e5ff5b5be56d2983645e5e2
-AUX pure-ftpd-1.0.47-disable-TLSv1.1.patch 687 BLAKE2B 3d33790c7a410bf994cb24efddc07ce79e9fb5ca2e21f32dc007a8b8ef6801f5cc7e9c1fcce58e947d3e6a52aae7b58a60314c93ae9bc5daaa1b10ceaaad8c0e SHA512 81bee81a8ed942b004ba72b97c8c7f7df05ae0344e16b9cc909a70a717a0a32de882c393ccb9565e8892dccf8ede3b71de4e9eb442918bf1991a66c4b5561980
-AUX pure-ftpd-1.0.47-disable-TLSv1.3.patch 652 BLAKE2B cf6c1879eb1a2ad07117f6f8dcf7640d97b8e2ed331be327a160f1686bd2041e5b19d45194d0e2567aab77e0001671bb60200fa7c513bb85354906a65fcf044b SHA512 925087b9a454b5d3da289d04db52c947e29983041456ebf4e05d055b1526240587016db05a3e8a1b54dc7bb55a413319ef9cea084fd71cac1de888f0d22328c9
+AUX pure-ftpd-1.0.49-diraliases_uninitialized_pointer.patch 898 BLAKE2B ccccd0302184a768ac522197628b2021374579afcda595a70041dc14f3cab05317ac373a2fadf9d0565a95c0d730c87590c3dc13efa944e8d496264b3f0e4ab1 SHA512 7930dddc7e58bd00fdeb4cd0da49491d59907334f47f23d12433f71a9a2103a8b5cc503c5d4d461b110cdea61f2f6ef974bf123d96394334f668aacdb747f830
+AUX pure-ftpd-1.0.49-pure_strcmp_OOB_read.patch 847 BLAKE2B f7e12194d219bb5a410a7b55743cdb2b8eb268a60aef8b8d9826e242264989a4502bb2378503c3a7ed8913fce4d95b681fcd185d184ef54e04dcda6b4853d99e SHA512 ff4aefeffd92f9e01e7c57779cc9ed59c0972a40a02431fa4e63696071ebbf28e4a0f83b6b6c878d4b62fed7efa05ff90e9d604e8c7e6a9358bc8853105731f1
 AUX pure-ftpd.conf_d-3 3728 BLAKE2B a9bfa8208bdf7fcb053cd48e17638f787388804c57788ac594fae096cc824e347979b251b2c8e9d753308bfb63a37111f9690aabe684dc3eb614f68949d3983b SHA512 a5cc8e59178a5d0f7b5909d09009ef6ace1f8e6874bd733e21bc30f4899447e70b020a0369077132751ceb28afa971588efedcce3dea83e9b043b1545caf3393
 AUX pure-ftpd.rc11 2018 BLAKE2B 1783228b5179b6d11fd6b06bc722e15f6f81e6c8443dd516f8fe1b7c7132ef4f8b92a67083354a4f78d41cee4b4a33b39d1940748bcd1056d336b5744069aac8 SHA512 920bb0c20a3a0a053977e999cf26a23a835155eca9c0224577b13623e002a07f52c30439e54f66c42dd89566b66cc5b8341a3d2e78a9bdc038f2a096153daaba
 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 4099 BLAKE2B 8a9931bab67c29030b59a066a3f7669c4d9377dd3c6eac64c87766ac1a35eab23d411e3e10259a34cf3c4cede7ef290adebbc10bcd8b9d781f019d845269091e SHA512 0dbd75aae92fe8deef2307da001d1d8e2ff2532749645e6502c8d7357b450b320de96b2c6d008f537c554309993413f17eecb08aa11feeb078eb6ff141a5f3b0
-EBUILD pure-ftpd-1.0.49-r1.ebuild 4099 BLAKE2B 3723ab3562ea792ea7d939eb35f11f7fc31b82f002cb53a4c436a1a2ffb3a1883211ad083bb17527f43c9972a58cc079297ea01b1647453f0e62f10597bab3a9 SHA512 489ed9093dd16d6afea68fa288617221dbdd19ed25d642fce3d5ae0725c373497b84991f96924b91f878ed5752bc8e34d71d2ba04c3871058d145fa25d4c6457
+EBUILD pure-ftpd-1.0.49-r2.ebuild 4234 BLAKE2B d40992d9cc1515aab154e8dcf99b1f6f9cb93174bad78a92377c13dd701ea351ee4959425fdb258de40dcdb876202a6c84f644eeef7871b7cb4768fdba16de74 SHA512 845a00014a2afa9c6810848b9db83791eb33120be2a14a4d4e138e236aea1e1bc9541f1033773879cd596bc9f0271b79d1f27eae644c0e61a40939d3dcbbe577
 EBUILD pure-ftpd-9999.ebuild 4099 BLAKE2B 3723ab3562ea792ea7d939eb35f11f7fc31b82f002cb53a4c436a1a2ffb3a1883211ad083bb17527f43c9972a58cc079297ea01b1647453f0e62f10597bab3a9 SHA512 489ed9093dd16d6afea68fa288617221dbdd19ed25d642fce3d5ae0725c373497b84991f96924b91f878ed5752bc8e34d71d2ba04c3871058d145fa25d4c6457
-MISC metadata.xml 1233 BLAKE2B 02ea0260dacca81d5b2eef251f98756f151b03ee7abcf3ccc46832167848b8aa80dba90d855c118908b87ce7085921cae81f3a747402c5e0fb70401dd668150b SHA512 ce47470d3c8bfeba9c02f6d6638e7b0bb6e0ddeddd1aaf0362342aadf07e823f1093523a1432c703bd410c3b760049a1e1c32e3f36718844b3a1ba44144afea4
+MISC metadata.xml 1176 BLAKE2B b11de08a23ff79546eaa18ea83dda697c855f2f4f636ef933737d31a11f225502121dd2138c9f015114484526378f2905892dcb709269c6df7fa78e3c0670957 SHA512 1e4c4bfc1adb2d9996e3bf9cdd2a4946b8314ffe2d1292d3313458d5cdf35824fe6e3af1ae9e66da824815dd16e3d0875daf55f613b3ac362bee0e48558d2161
diff --git a/net-ftp/pure-ftpd/files/pure-ftpd-1.0.47-MAX_DATA_SIZE.patch b/net-ftp/pure-ftpd/files/pure-ftpd-1.0.47-MAX_DATA_SIZE.patch
deleted file mode 100644
index a9ad0a30b9b6..000000000000
--- a/net-ftp/pure-ftpd/files/pure-ftpd-1.0.47-MAX_DATA_SIZE.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 27a5c200f9643ce907118aad169279b3a66a9e8a Mon Sep 17 00:00:00 2001
-From: Frank Denis <github@pureftpd.org>
-Date: Sat, 4 Nov 2017 20:46:16 +0100
-Subject: [PATCH] Increase MAX_DATA_SIZE due to Argon2id requirements
-
----
- src/ftpd.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/ftpd.h b/src/ftpd.h
-index 1beeab8..5bb1f6b 100644
---- a/src/ftpd.h
-+++ b/src/ftpd.h
-@@ -557,7 +557,7 @@ Your platform has a very large PATH_MAX, we should not trust it.
- 
- #ifndef MAX_DATA_SIZE
- # ifdef HAVE_LIBSODIUM
--#  define MAX_DATA_SIZE (40 * 1024 * 1024)
-+#  define MAX_DATA_SIZE (70 * 1024 * 1024)
- # elif defined(WITH_LDAP) || defined(WITH_MYSQL) || defined(WITH_PGSQL)
- #  define MAX_DATA_SIZE (16 * 1024 * 1024)       /* Max memory usage - SQL/LDAP need more */
- # else
diff --git a/net-ftp/pure-ftpd/files/pure-ftpd-1.0.47-TLSv1.3.patch b/net-ftp/pure-ftpd/files/pure-ftpd-1.0.47-TLSv1.3.patch
deleted file mode 100644
index 65f19bf49da7..000000000000
--- a/net-ftp/pure-ftpd/files/pure-ftpd-1.0.47-TLSv1.3.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 4a495c61ce22c893aed5ee57f6ce0b43c3be59ad Mon Sep 17 00:00:00 2001
-From: Frank Denis <github@pureftpd.org>
-Date: Wed, 19 Sep 2018 23:53:45 +0200
-Subject: [PATCH] TLS1.3 compatibility
-
-Fixes #94
----
- src/tls.c | 17 +++++++++++++----
- 1 file changed, 13 insertions(+), 4 deletions(-)
-
-diff --git a/src/tls.c b/src/tls.c
-index c693d3b..f383ed9 100644
---- a/src/tls.c
-+++ b/src/tls.c
-@@ -228,7 +228,16 @@ static void ssl_info_cb(const SSL *cnx, int where, int ret)
-     if ((where & SSL_CB_HANDSHAKE_START) != 0) {
-         if ((cnx == tls_cnx && tls_cnx_handshook != 0) ||
-             (cnx == tls_data_cnx && tls_data_cnx_handshook != 0)) {
--            die(400, LOG_ERR, "TLS renegociation");
-+            const SSL_CIPHER *cipher;
-+            const char *cipher_version;
-+            if ((cipher = SSL_get_current_cipher(cnx)) == NULL ||
-+                (cipher_version = SSL_CIPHER_get_version(cipher)) == NULL) {
-+                die(400, LOG_ERR, "No cipher");
-+            }
-+            if (strcmp(cipher_version, "TLSv1.3") != 0) {
-+                die(400, LOG_ERR, "TLS renegociation");
-+                return;
-+            }
-         }
-         return;
-     }
-@@ -264,10 +273,10 @@ int tls_init_library(void)
-     OpenSSL_add_all_algorithms();
- # else
-     OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS |
--		     OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
-+                     OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
-     OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS |
--			OPENSSL_INIT_ADD_ALL_DIGESTS |
--			OPENSSL_INIT_LOAD_CONFIG, NULL);
-+                        OPENSSL_INIT_ADD_ALL_DIGESTS |
-+                        OPENSSL_INIT_LOAD_CONFIG, NULL);
- # endif
-     while (RAND_status() == 0) {
-         rnd = zrand();
diff --git a/net-ftp/pure-ftpd/files/pure-ftpd-1.0.47-disable-TLSv1.1.patch b/net-ftp/pure-ftpd/files/pure-ftpd-1.0.47-disable-TLSv1.1.patch
deleted file mode 100644
index cd4532bb97ab..000000000000
--- a/net-ftp/pure-ftpd/files/pure-ftpd-1.0.47-disable-TLSv1.1.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From aa68b2d620ef0c83c7f52213c7e6093722b0b8bd Mon Sep 17 00:00:00 2001
-From: Frank Denis <github@pureftpd.org>
-Date: Wed, 24 Oct 2018 19:19:26 +0200
-Subject: [PATCH] Disable TLSv1_1
-
----
- src/tls.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/tls.c b/src/tls.c
-index f383ed9..c4e2a1b 100644
---- a/src/tls.c
-+++ b/src/tls.c
-@@ -297,7 +297,7 @@ int tls_init_library(void)
-     SSL_CTX_set_options(tls_ctx, SSL_OP_NO_TLSv1);
- # endif
- # ifdef SSL_OP_NO_TLSv1_1
--    SSL_CTX_clear_options(tls_ctx, SSL_OP_NO_TLSv1_1);
-+    SSL_CTX_set_options(tls_ctx, SSL_OP_NO_TLSv1_1);
- # endif
- # ifdef SSL_OP_NO_TLSv1_2
-     SSL_CTX_clear_options(tls_ctx, SSL_OP_NO_TLSv1_2);
diff --git a/net-ftp/pure-ftpd/files/pure-ftpd-1.0.47-disable-TLSv1.3.patch b/net-ftp/pure-ftpd/files/pure-ftpd-1.0.47-disable-TLSv1.3.patch
deleted file mode 100644
index cbe9c8bdcb8f..000000000000
--- a/net-ftp/pure-ftpd/files/pure-ftpd-1.0.47-disable-TLSv1.3.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Temporarily disable TLSv1.3 support
-
-Disable TLSv1.3 until support for it is fixed in pure-ftpd. This is a
-workaround for the following issue:
-https://github.com/jedisct1/pure-ftpd/issues/102
-
---- a/src/tls.c
-+++ b/src/tls.c
-@@ -301,6 +301,10 @@ int tls_init_library(void)
- # endif
- # ifdef SSL_OP_NO_TLSv1_2
-     SSL_CTX_clear_options(tls_ctx, SSL_OP_NO_TLSv1_2);
-+# endif
-+    /* Disable TLSv1.3 support until it works properly in pure-ftpd */
-+# ifdef SSL_OP_NO_TLSv1_3
-+    SSL_CTX_set_options(tls_ctx, SSL_OP_NO_TLSv1_3);
- # endif
-     if (tlsciphersuite != NULL) {
-         if (SSL_CTX_set_cipher_list(tls_ctx, tlsciphersuite) != 1) {
--- 
-2.20.1
diff --git a/net-ftp/pure-ftpd/files/pure-ftpd-1.0.49-diraliases_uninitialized_pointer.patch b/net-ftp/pure-ftpd/files/pure-ftpd-1.0.49-diraliases_uninitialized_pointer.patch
new file mode 100644
index 000000000000..7e29934caf5d
--- /dev/null
+++ b/net-ftp/pure-ftpd/files/pure-ftpd-1.0.49-diraliases_uninitialized_pointer.patch
@@ -0,0 +1,31 @@
+From 8d0d42542e2cb7a56d645fbe4d0ef436e38bcefa Mon Sep 17 00:00:00 2001
+From: Frank Denis <github@pureftpd.org>
+Date: Tue, 18 Feb 2020 18:36:58 +0100
+Subject: [PATCH] diraliases: always set the tail of the list to NULL
+
+Spotted and reported by Antonio Norales from GitHub Security Labs.
+Thanks!
+---
+ src/diraliases.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/diraliases.c b/src/diraliases.c
+index 4002a36..fb70273 100644
+--- a/src/diraliases.c
++++ b/src/diraliases.c
+@@ -93,7 +93,6 @@ int init_aliases(void)
+                 (tail->dir = strdup(dir)) == NULL) {
+                 die_mem();
+             }
+-            tail->next = NULL;
+         } else {
+             DirAlias *curr;
+ 
+@@ -105,6 +104,7 @@ int init_aliases(void)
+             tail->next = curr;
+             tail = curr;
+         }
++        tail->next = NULL;
+     }
+     fclose(fp);
+     aliases_up++;
diff --git a/net-ftp/pure-ftpd/files/pure-ftpd-1.0.49-pure_strcmp_OOB_read.patch b/net-ftp/pure-ftpd/files/pure-ftpd-1.0.49-pure_strcmp_OOB_read.patch
new file mode 100644
index 000000000000..4ed197e46d35
--- /dev/null
+++ b/net-ftp/pure-ftpd/files/pure-ftpd-1.0.49-pure_strcmp_OOB_read.patch
@@ -0,0 +1,27 @@
+From 36c6d268cb190282a2c17106acfd31863121b58e Mon Sep 17 00:00:00 2001
+From: Frank Denis <github@pureftpd.org>
+Date: Mon, 24 Feb 2020 15:19:43 +0100
+Subject: [PATCH] pure_strcmp(): len(s2) can be > len(s1)
+
+Reported by Antonio Morales from GitHub Security Labs, thanks!
+---
+ src/utils.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/src/utils.c b/src/utils.c
+index f41492d..a7f0381 100644
+--- a/src/utils.c
++++ b/src/utils.c
+@@ -45,5 +45,11 @@ int pure_memcmp(const void * const b1_, const void * const b2_, size_t len)
+ 
+ int pure_strcmp(const char * const s1, const char * const s2)
+ {
+-    return pure_memcmp(s1, s2, strlen(s1) + 1U);
++    const size_t s1_len = strlen(s1);
++    const size_t s2_len = strlen(s2);
++
++    if (s1_len != s2_len) {
++        return -1;
++    }
++    return pure_memcmp(s1, s2, s1_len);
+ }
diff --git a/net-ftp/pure-ftpd/metadata.xml b/net-ftp/pure-ftpd/metadata.xml
index 5ee42de87aec..35a922921783 100644
--- a/net-ftp/pure-ftpd/metadata.xml
+++ b/net-ftp/pure-ftpd/metadata.xml
@@ -11,7 +11,6 @@
 	<flag name="anonperm">Permit anonymous to change file permissions</flag>
 	<flag name="anonren">Permit anonymous to rename files</flag>
 	<flag name="anonres">Permit anonymous to resume file transfers</flag>
-	<flag name="charconv">Enables charset conversion</flag>
 	<flag name="implicittls">Enable TLS on Port 990</flag>
 	<flag name="noiplog">Disables logging of IP addresses</flag>
 	<flag name="paranoidmsg">Display paranoid messages instead of normal
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
deleted file mode 100644
index de299a33183d..000000000000
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.47-r4.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86"
-
-DESCRIPTION="Fast, production-quality, standard-conformant FTP server"
-HOMEPAGE="http://www.pureftpd.org/"
-SRC_URI="ftp://ftp.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2
-	http://download.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-
-IUSE="anondel anonperm anonren anonres caps charconv implicittls ldap libressl mysql noiplog pam paranoidmsg postgres resolveids selinux ssl sysquota vchroot xinetd"
-
-REQUIRED_USE="implicittls? ( ssl )"
-
-DEPEND="caps? ( sys-libs/libcap )
-	charconv? ( virtual/libiconv )
-	ldap? ( >=net-nds/openldap-2.0.25 )
-	mysql? ( || (
-		dev-db/mariadb-connector-c
-		dev-db/mysql-connector-c
-	) )
-	pam? ( sys-libs/pam )
-	postgres? ( dev-db/postgresql:= )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.6g:0=[-bindist] )
-		libressl? ( dev-libs/libressl:= )
-	)
-	sysquota? ( sys-fs/quota[-rpc] )
-	xinetd? ( virtual/inetd )"
-
-RDEPEND="${DEPEND}
-	dev-libs/libsodium:=
-	net-ftp/ftpbase
-	selinux? ( sec-policy/selinux-ftp )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.28-pam.patch"
-	"${FILESDIR}/${PN}-1.0.47-MAX_DATA_SIZE.patch"
-	"${FILESDIR}/${PN}-1.0.47-TLSv1.3.patch"
-	"${FILESDIR}/${PN}-1.0.47-disable-TLSv1.3.patch"
-	"${FILESDIR}/${PN}-1.0.47-disable-TLSv1.1.patch"
-)
-
-src_configure() {
-	# adjust max user length to something more appropriate
-	# for virtual hosts. See bug #62472 for details.
-	sed -e "s:# define MAX_USER_LENGTH 32U:# define MAX_USER_LENGTH 127U:" \
-		-i "${S}/src/ftpd.h" || die "sed failed"
-
-	# Those features are only configurable like this, see bug #179375.
-	use anondel && append-cppflags -DANON_CAN_DELETE
-	use anonperm && append-cppflags -DANON_CAN_CHANGE_PERMS
-	use anonren && append-cppflags -DANON_CAN_RENAME
-	use anonres && append-cppflags -DANON_CAN_RESUME
-	use resolveids && append-cppflags -DALWAYS_RESOLVE_IDS
-
-	# Do not auto-use SSP -- let the user select this.
-	export ax_cv_check_cflags___fstack_protector_all=no
-
-	local myeconfargs=(
-		--enable-largefile
-		--with-altlog
-		--with-cookie
-		--with-diraliases
-		--with-extauth
-		--with-ftpwho
-		--with-language=${PUREFTPD_LANG:=english}
-		--with-peruserlimits
-		--with-privsep
-		--with-puredb
-		--with-quotas
-		--with-ratios
-		--with-throttling
-		--with-uploadscript
-		--with-virtualhosts
-		$(use_with charconv rfc2640)
-		$(use_with ldap)
-		$(use_with mysql)
-		$(use_with pam)
-		$(use_with paranoidmsg)
-		$(use_with postgres pgsql)
-		$(use_with ssl tls)
-		$(use_with implicittls)
-		$(use_with vchroot virtualchroot)
-		$(use_with sysquota sysquotas)
-		$(usex caps '' '--without-capabilities')
-		$(usex noiplog '--without-iplogging' '')
-		$(usex xinetd '' '--without-inetd')
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	local DOCS=( AUTHORS CONTACT ChangeLog FAQ HISTORY INSTALL README* NEWS )
-
-	default
-
-	newinitd "${FILESDIR}/pure-ftpd.rc11" ${PN}
-	newconfd "${FILESDIR}/pure-ftpd.conf_d-3" ${PN}
-
-	if use implicittls ; then
-		sed -i '/^SERVER/s@21@990@' "${ED}"/etc/conf.d/${PN} \
-			|| die "Adjusting default server port for implicittls usage failed!"
-	fi
-
-	keepdir /var/lib/run/${PN}
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/pure-ftpd.xinetd" ${PN}
-	fi
-
-	if use ldap ; then
-		insinto /etc/openldap/schema
-		doins pureftpd.schema
-		insinto /etc/openldap
-		insopts -m 0600
-		doins pureftpd-ldap.conf
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		elog
-		elog "Before starting Pure-FTPd, you have to edit the /etc/conf.d/pure-ftpd file!"
-		elog
-		ewarn "It's *really* important to read the README provided with Pure-FTPd!"
-		ewarn "Check out http://download.pureftpd.org/pub/pure-ftpd/doc/README for general info"
-		ewarn "and http://download.pureftpd.org/pub/pure-ftpd/doc/README.TLS for SSL/TLS info."
-		ewarn
-		if use charconv ; then
-			ewarn "Charset conversion is an *experimental* feature!"
-			ewarn "Remember to set a valid charset for your filesystem in the configuration!"
-		fi
-	fi
-}
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.49-r1.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.49-r2.ebuild
index d1be10cc99f1..3386fbb63f8f 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.49-r1.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.49-r2.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=7
@@ -13,7 +13,7 @@ if [[ "${PV}" == 9999 ]] ; then
 else
 	SRC_URI="ftp://ftp.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2
 		http://download.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 fi
 
 LICENSE="BSD"
@@ -45,6 +45,10 @@ RDEPEND="${DEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.0.28-pam.patch"
+
+	# https://bugs.gentoo.org/711124
+	"${FILESDIR}/${P}-diraliases_uninitialized_pointer.patch"
+	"${FILESDIR}/${P}-pure_strcmp_OOB_read.patch"
 )
 
 src_prepare() {