gentoo resync : 10.02.2020

8 files changed, 47 insertions, 26 deletions

diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 29f84cd48fcc..722d48b8fdee 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/ftpbase/Manifest b/net-ftp/ftpbase/Manifest
index bb4a6b16843a..9702d9a3ad82 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 910 BLAKE2B 8ab569029fa5acc0641f0e5bcb6036d8fba0bd64c30212c1a1d86c23910ebb5db8ab8fa1e2e7868dc54a7db5978c6c3123f5d8057eacf24e29f1377c4645b93a SHA512 6d81026bd86dba82a82e66ebf45922781b4b14b7e84e8d47a29a439d769716813d61cf85ec3fe69b81e580c25ebf4acc35cd779cccca8b074febb8e3379edf58
+EBUILD ftpbase-0.01-r3.ebuild 927 BLAKE2B 062c457b1b5a48a47fdd783b337e9ef9859af56561f80a26e7c9f49f51a46ca1202897b52c55f50d743d2f7cebfbc7fde82c2cfea1bae9bd5b63ebf2ca1a744f SHA512 9af9e72433e7346d57a8cd1457bb5454f9b5e0b6fc4c5c695ea8303a831a0b8d7f295da42b8ae22ea25304c174941f51d2a7db9ebd0ffb47f2e1550d6286364d
 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 b7c12a48f0a1..b285f0229656 100644
--- a/net-ftp/ftpbase/ftpbase-0.01-r3.ebuild
+++ b/net-ftp/ftpbase/ftpbase-0.01-r3.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit eutils pam user
 
 DESCRIPTION="FTP layout package"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI=""
 
 LICENSE="GPL-2"
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 313b3e55d4fe..a6eb561c3a85 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -27,6 +27,6 @@ DIST proftpd-mod-msg-0.4.1.tar.gz 8082 BLAKE2B 970b46b19d25bac22ecb01495270a5239
 DIST proftpd-mod_clamav-0.14rc2.tar.gz 19710 BLAKE2B 3435e198cf029337904d4666910414124a3b7e1529d4b12f7acd8a9be563009fff4d9a30eb132a2d7361d2c830e5601c4a00a8814282585b6915e991cc29bc13 SHA512 b8e56880fadf36513215fa4c20be6db7cdf1274337072a9b29c3c3477b3de4743ebcdb1179572ec4cb1501fac0064330c855b1f818bf0cc52f0e91170f059772
 EBUILD proftpd-1.3.6-r5.ebuild 8697 BLAKE2B 9ac05bd946c84bf0d6f7d30a3003b26e93ef1d625d7e8c1c7e990cb2213a2575f6ab5e47da5925c245d29bdf691103fc55d6cb904d0ca7468bd568d59b0adffa SHA512 a3d0703dea49561f0c7f1aa9456495d310f9093906da59e22ad33111e88644ed01ddfbdffd0062fff8f942e0f6f1b73be39cea69dc55025893b4e1de77d73734
 EBUILD proftpd-1.3.6-r6.ebuild 8756 BLAKE2B f38b4a1066f45b044497f72f4f7467e09c7fcec70cb68ac09095f65aa872f8d4c91124007c6f62bf04e88fec45e56b3a687936fef476ac5f8ca182a241cf7328 SHA512 6a7963148c4526cf8234ffc964165f290968d1164b140e4e85764248140c990efc58217f87b58f18c18cfb7998294347747d5dd884af92b3d4c216b694141898
-EBUILD proftpd-1.3.6b-r1.ebuild 8691 BLAKE2B 96bdc1b96d5c06657908d5dbd0731f979870adcee85ff9b251699202c113b063ce4eed5515e16ae5d55f721fa0c3d914cda392e1ff1795b012eda603a75fc00f SHA512 218c27a740f0cac46f41cd09b3b389bb28f29778af457c7dead39dcaba14452cae38016993143804ee33da6ec104dfed53d6221615a92d909c9ac5f2d6773722
+EBUILD proftpd-1.3.6b-r1.ebuild 8690 BLAKE2B c2e5fc8c82691cf4e01a32a6bae845b95cfe24c94595d0d66bc96e739fefe65605eabc5af8bfad22772558618ae60249b368ae4a7c883cf3ed9ff378478698b1 SHA512 578b5db73e1affd47ba0a1fd9b209f07cedc255d3ca3f773b7490bf5ce0569e7da05fcb539baedbe644cee6b969c4e0f82acb513a8a804d3725a03206cacf519
 EBUILD proftpd-1.3.6b.ebuild 8635 BLAKE2B c6493c2c8258c7fc836fd77e2da827a70bce2f57a596c9f13b9c8679ca5c0dcc3f31387fbc0c9d256502ba9279c432ba765df23035bc36009b7794ba77b9579d SHA512 c297d069ffbbb46ae354b11c8abb4d3d88350ad37dccfcf3ad77dc91bc8a831037969a027f88641e46cecb7fa78f084e5968a53185de6f6acc9f6148bd5a16b3
 MISC metadata.xml 2930 BLAKE2B f3f8218a737f50599ff687030bd8c84f1818b290d6d89bd6627ab8eb02598d196f1bae03d7b15e4eb02967fb7e0d826cdda10588c8bfe4f8a387a49d70d9cab0 SHA512 c90941671532512e4d085f3c6b4f56f3c2a252a613bf5c978d763fb0f8f9190431a41816f4fddde47e28eaeddcd17a7aef52064e5825499801bcdfbd72745be8
diff --git a/net-ftp/proftpd/proftpd-1.3.6b-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.6b-r1.ebuild
index a7cb7a64d240..27c9846e806a 100644
--- a/net-ftp/proftpd/proftpd-1.3.6b-r1.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6b-r1.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
@@ -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/vsftpd/Manifest b/net-ftp/vsftpd/Manifest
index e961e1ed7206..7e37eb1b0550 100644
--- a/net-ftp/vsftpd/Manifest
+++ b/net-ftp/vsftpd/Manifest
@@ -7,6 +7,7 @@ AUX vsftpd-3.0.2-alpha.patch 525 BLAKE2B 8d3e0ce8a6cd79862ae0071ab61f1bd9db5a694
 AUX vsftpd-3.0.2-remove-legacy-cap.patch 1739 BLAKE2B ee1d4461ec1ca783a2f704797f504f40f6fbde93707e27044031d03a67e105ecf02be524b1c60bc3ee5ec1624403adab4362637c120de6336aab76a3bf4397a8 SHA512 b0c2b91f0ba3b73706c352ac391e35b048b544fbab1ab3cd223be7f5ca33516143a775456871ded354a05bf74f0403436f4659d06ae9345e8d6a6d1b21addd42
 AUX vsftpd-3.0.3-sparc.patch 462 BLAKE2B bb63dab9f38ba46aa622a1cbacd4d42c1e24a6e413b57e2c47d98235f4fc99684b42ee2a729d12b4e11c14ca063aa51afae25fcbfa9c01b8ab8733801470d397 SHA512 6bbee5674969d6ea356722196cb54c4b8f5da5802b05af560595b0cc48b63af6666ecb58cff085f5a77a95eb8c03590e7406fadf5e38cbce8354e6df66c989cf
 AUX vsftpd-checkconfig.sh 785 BLAKE2B c856a268dbfbcda6bbae38fcf444b1c64986c32d426c890bd67da15c65ecb9082b76f4f8382534f519d6d1c34d50cd5d9bd917f41e5e393af68483b666eb4ebf SHA512 541702557231c79413ae77cf26c28398fea3cb332375f8d22e0c0a45706b04db954d268addd76fecbb8b0ab3109f1009c18b0599394ed33c4a6fc8dc647d889e
+AUX vsftpd-disable-seccomp-sandbox.patch 362 BLAKE2B 47aeb759113e6c6c401c6e135d742f06435490a51bad1a3b72778c60ed5a6ccbb4ea6ab3eeb87948b7658bcf539c277bc75674284474f05d0c4b76e9690c5cb7 SHA512 efa4529a30dc306c190840f47b0e7c4f99321e6d83254015a98018d287c7e624a2472effdd7e7fa1e11a25ca00e876539fd4bc63dc6b0d859c065a7c48e2b0ac
 AUX vsftpd.conf 3733 BLAKE2B 17b92df3ffebd556a9a8e6b7d5ee819528e29615c270afbac82694c31dc8ebb86e844780e49f84fdedfe84a70c6ace998969c026b9ff8aa1ddac27ecd60cd665 SHA512 417b2ebdffe41073d7ee8a1f414ba5bfe4b15411e37b99444443c240fa540c97b0c247f9151ef306f84775dd78370f5985121417267bf25a76f87d259d843719
 AUX vsftpd.init 1319 BLAKE2B 8fd753979e553aa88aefb80e20e65602c8d96fbfdd727a4b375e873315aa24da204900786966846105dc17166aff70f7a8a1b2f4dae8a9cb82897db00a1122c4 SHA512 b367c412f2aebdfa90fae912467ebf227b39be04b45f686c5ea5f66df6addc81a2f130dd616dae932a55108337169e19ef53012f27127eb1970852ed5ea697c0
 AUX vsftpd.logrotate 54 BLAKE2B fcf5395a656ce427c48f806c01d967af06e9f1f795f2af85c51951db59b4fa30209c2211bc1dd44f2cc8a45911531c87d45ea277b722a0c036ed3a99494fd285 SHA512 cee63caaf5e3db620e57132dc1a531cfd39ce790ac64e22b649cf3fac8b825cf188425bdf19cd376aa3f31ea114c8889ee307b6e7f9a2cbd155324f64084d5fc
@@ -15,5 +16,5 @@ AUX vsftpd.socket 104 BLAKE2B 093a6265694c177e724fa2880e8de2e0477347bda315937dba
 AUX vsftpd.xinetd 321 BLAKE2B 3a91c0e65a511ed5ca0feed429550b0ce6e1bd2cc133460e2642fe37aa122b59c0a3fe509d00a5435eaf4c300962c9cb5712b083e7d7d927ffbc148d0bd6a5b8 SHA512 30fb4ae07f55011b9b29625db072062a0f1df4f1c7578041231f35febfb90ad2d2dfe1deb964e34fde5c660f0e3ffc3df3d77af1b2f3a1f724176f691a53a182
 AUX vsftpd_at.service 328 BLAKE2B 826daeaa5b388273c6cefcfcee7415353773db5b9937b3ee714bcf76dd8b061c0693bc9d4b60742fcf5cc946543e69dbb7caacc4ba07b5503d8b66c7db4174df SHA512 5a39e853405bd5028f2c52183eb91ad559fb8edbaacfff5d5146e686417c208bb894bd86d5830a61720a1aaa9ba901160c75ed2bf47eec459b2a49ed217b9cb1
 DIST vsftpd-3.0.3.tar.gz 196649 BLAKE2B dbf96e788494c29d78ca49fad6a03641c9725f9a5b01a4059ad009870fdc28520cd467cd8288a8a9a520c411c495a42c3fff57ee1069efc65840adb245792dca SHA512 5a4410a88e72ecf6f60a60a89771bcec300c9f63c2ea83b219bdf65fd9749b9853f9579f7257205b55659aefcd5dab243eba878dbbd4f0ff8532dd6e60884df7
-EBUILD vsftpd-3.0.3-r2.ebuild 3624 BLAKE2B 237c08d04ebcf4e1c234288db81751fe438c1bfd30b4cabdf3f7105bdbbb02fcffb5e58403811ce158e0a2926c2fe0818390496c62b1ec69403484e8d2c7aa12 SHA512 1869c60ae51d221568140d35fc9a57770cb0fed26481f7e01d30bb21f31d3b227e7b77b94c3a4530616cf6408901f346337c9544fe5ce29b50307cc120b2c458
+EBUILD vsftpd-3.0.3-r3.ebuild 3694 BLAKE2B 10256812e1bdf9d455e69aef203c6e63afb3e0f67d15c6a1d1dd9e6e266552c55769098ee21d3dff23ba15f750a0bec6b5d29d1fc12e6345bd91cc7bb3afea26 SHA512 ed73641f99e079a41c282a109aa5f32687e3137e059e056c0ba64ffa1ec4f9db87de32f202ff011ca5ca6c906f2b5d16af3310016117b7eadf42ff21e36fd38a
 MISC metadata.xml 289 BLAKE2B 3792154c21dd99e4a6e68a711493e3086ddf124a40275c43d8d6aca47f01dd76e7992eea16b235302d83529483a13843c8fb254ae2e436e9c2bd398908d65bcf SHA512 89cacd404713612a2347edb25dccf6c25c565d2b18ecdceb8614b5b5c5a913cd5ac0fe0b2ca32918854a69817e7b43300612eb6248655b59cf147b6d03922360
diff --git a/net-ftp/vsftpd/files/vsftpd-disable-seccomp-sandbox.patch b/net-ftp/vsftpd/files/vsftpd-disable-seccomp-sandbox.patch
new file mode 100644
index 000000000000..10266e36a87e
--- /dev/null
+++ b/net-ftp/vsftpd/files/vsftpd-disable-seccomp-sandbox.patch
@@ -0,0 +1,15 @@
+Disable buggy seccomp sandbox code by default
+
+Bug: https://bugs.gentoo.org/443898
+
+--- a/tunables.c
++++ b/tunables.c
+@@ -226,7 +226,7 @@
+   tunable_isolate_network = 1;
+   tunable_ftp_enable = 1;
+   tunable_http_enable = 0;
+-  tunable_seccomp_sandbox = 1;
++  tunable_seccomp_sandbox = 0;
+   tunable_allow_writeable_chroot = 0;
+ 
+   tunable_accept_timeout = 60;
diff --git a/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild b/net-ftp/vsftpd/vsftpd-3.0.3-r3.ebuild
index 737cd124f08e..b5dea09d6877 100644
--- a/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild
+++ b/net-ftp/vsftpd/vsftpd-3.0.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -27,17 +27,31 @@ RDEPEND="${DEPEND}
 	xinetd? ( sys-apps/xinetd )"
 
 src_prepare() {
-	# kerberos patch. bug #335980
-	epatch "${FILESDIR}/${PN}-2.3.2-kerberos.patch"
+	local PATCHES=(
+		# kerberos patch. bug #335980
+		"${FILESDIR}/${PN}-2.3.2-kerberos.patch"
 
-	# Patch the source, config and the manpage to use /etc/vsftpd/
-	epatch "${FILESDIR}/${PN}-2.3.5-gentoo.patch"
+		# Patch the source, config and the manpage to use /etc/vsftpd/
+		"${FILESDIR}/${PN}-2.3.5-gentoo.patch"
 
-	# Fix building without the libcap
-	epatch "${FILESDIR}/${PN}-2.1.0-caps.patch"
+		# Fix building without the libcap
+		"${FILESDIR}/${PN}-2.1.0-caps.patch"
 
-	# Fix building on alpha. Bug #405829
-	epatch "${FILESDIR}/${PN}-3.0.2-alpha.patch"
+		# Fix building on alpha. Bug #405829
+		"${FILESDIR}/${PN}-3.0.2-alpha.patch"
+
+		#Bug #335977
+		"${FILESDIR}"/${PN}-3.0.0-Makefile.patch
+
+		#Bug #450536
+		"${FILESDIR}"/${PN}-3.0.2-remove-legacy-cap.patch
+
+		#Bug #630704
+		"${FILESDIR}"/${PN}-3.0.3-sparc.patch
+
+		# https://bugs.gentoo.org/443898
+		"${FILESDIR}"/vsftpd-disable-seccomp-sandbox.patch
+	)
 
 	# Configure vsftpd build defaults
 	use tcpd && echo "#define VSF_BUILD_TCPWRAPPERS" >> builddefs.h
@@ -47,22 +61,13 @@ src_prepare() {
 	# Ensure that we don't link against libcap unless asked
 	if ! use caps ; then
 		sed -i '/^#define VSF_SYSDEP_HAVE_LIBCAP$/ d' sysdeputil.c || die
-		epatch "${FILESDIR}"/${PN}-2.2.0-dont-link-caps.patch
+		eapply "${FILESDIR}"/${PN}-2.2.0-dont-link-caps.patch
 	fi
 
 	# Let portage control stripping
 	sed -i '/^LINK[[:space:]]*=[[:space:]]*/ s/-Wl,-s//' Makefile || die
 
-	#Bug #335977
-	epatch "${FILESDIR}"/${PN}-3.0.0-Makefile.patch
-
-	#Bug #450536
-	epatch "${FILESDIR}"/${PN}-3.0.2-remove-legacy-cap.patch
-
-	#Bug #630704
-	epatch "${FILESDIR}"/${PN}-3.0.3-sparc.patch
-
-	eapply_user
+	default
 }
 
 src_compile() {