gentoo resync : 10.02.2019

9 files changed, 60 insertions, 9 deletions

diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index af2bfbf55aab..885561d1399b 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index e4c2f49fa9d0..1ea1ad736a9a 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -7,6 +7,6 @@ DIST FileZilla_3.40.0_src.tar.bz2 4997647 BLAKE2B 88ff2461d33369c435645f1dd5afa9
 EBUILD filezilla-3.34.0.ebuild 1803 BLAKE2B c04510be956992888544049b5b6c837c377f72b695fb5800471c6f727b1a9c2926aef3db754846bcff850e7cfb3ea5a4c505272b76aaa35be19ec940cbf13561 SHA512 fd8e85a7b5d9755bab0379ed38a79750d0b9baf4b0a244779e0c49f72df566cefb14bea83eb00c20ff1bb9ad3f318c680b94c73fc5222025e25c6f1a40e5ec7e
 EBUILD filezilla-3.37.4.ebuild 1773 BLAKE2B f4047b62f61357055ef3dd02bb1c86c73e8813ba9fd1af34dc605b9925aeaff810d61c920672ce614174cae80ba3366b0d6cc8db3872227f3d2b0ae4c34211b3 SHA512 99bbd32e2a1c4f2944dbbe15b21b0ca6e572614e536270763de8b1bb863bafd333c7865df4282171b15adfe5e4e8421e8ce59dfd63e36d3bdba65d8799674265
 EBUILD filezilla-3.38.1.ebuild 1773 BLAKE2B 237c7d4f03842a478d3fbcacc77dd851f682b4ff8e5743f5a85f4275dbb73507d45d77a2ea39138076f3137435c8fd63063720d9469e1e0b6a006937220c1f4d SHA512 6de6bf7356480bcbfc8e9123fc9def256710c0335357aa401b958425e9532617e286574e041b39b2ff8260fa1fc13d23de4beb3bc8007e28e8112f6bf454787a
-EBUILD filezilla-3.39.0.ebuild 1773 BLAKE2B ee08653a3cb9bd33a4f1534389bf330877dfa3fa92c22217a0e43046ed8d42523904b74525cd84f18612ebace2d266003e1e6ec8290d1b723366c4efad7ffaae SHA512 0fba922d5f4be687e8870c8faf69a19a7601b2e8af75fba1f4a5a37fc2be125dd29fa3382bbea052cd4f425047e73e866f2734210054c10f957a0f61b4125431
+EBUILD filezilla-3.39.0.ebuild 1771 BLAKE2B 05145bb2d43f0a6d24142732d4d1247a9073d53085b043e7ccc64c53933d3d77c3835e0ca226e363ed8f2b8739d674a1ee8d53b134251deb8c28745e0770ac53 SHA512 06fd729193fb6d0d130bc18b3f6a1a6d323a823d5eb34ce4e65e0f9151162186430fdbc960f6d0ebbe7c06115d33d0222e5a722fea100dd27c6a4faa2400b2fc
 EBUILD filezilla-3.40.0.ebuild 1773 BLAKE2B f3d7b9724a434a96c8a084cbee5039b6275b4855c38547a43bcae0575e6b1a1b51350ee52564c956514763b2805848d668e93c23b779d268a14f730b4e03024c SHA512 51a72bd06eb89c7e1e72d11ff526e31d5869efa55d9fda2e81a64d8b8cdd964dcc9ce1bbe1f49875188fed14ae6b534842a73a510be00c8a8c30f6ec52d637c2
 MISC metadata.xml 562 BLAKE2B ef75eb5e07f57db7de0a8e90dc2ad86c84b65776c674a1e282443029101d05c3292bf0d5786ab97d846de984aedc6ed59640a256dcce29c65aef537adf18c348 SHA512 a69afbf6f03dec20a4ec61e39bcfbc964e09e0d74496b383a348764a61d83e54fea2cd715a4bcc239ca0f3ed0c2e1c5d46dcfeb99f7cc4feea488663a0931544
diff --git a/net-ftp/filezilla/filezilla-3.39.0.ebuild b/net-ftp/filezilla/filezilla-3.39.0.ebuild
index eb9f18cd0673..ade4fafc2863 100644
--- a/net-ftp/filezilla/filezilla-3.39.0.ebuild
+++ b/net-ftp/filezilla/filezilla-3.39.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="https://download.filezilla-project.org/client/${MY_P}_src.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc x86"
 IUSE="dbus nls test"
 
 # pugixml 1.7 minimal dependency is for c++11 proper configuration
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 1192af58936e..ca08351fc507 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -18,6 +18,6 @@ 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
 EBUILD proftpd-1.3.5e.ebuild 7264 BLAKE2B 3e5e8dca76b1a6fcd8de4673fcb2af33454bcf2443626bbda699149251232579d24655d6bf89906feddabd502df682a2f01c19e9b0ba8d6e8f428aa3af154d4f SHA512 a0b0204493f6d10741830d9eef7c5b2349a27765ebc7c6ff3b6baa4879549c8c1d68e409b35af72b4271c2c70ef65639db9302f4d93965e4f02df9f0e908d512
 EBUILD proftpd-1.3.6-r1.ebuild 8455 BLAKE2B 3152ba84ad6e73b57413a9ef9bef3f9557a9e63a3be9fdf1838ba65c8ec9be653dcba036af7c199832faa85bb6d4fcf92c48d88adf7e99214f51f51c0416afcd SHA512 6f658928141d2b08ccd93129a96a9c5bafe766a6706e7e47c6ecd2ddf64a3c373930c6db5dd9974bd2f19ea4a194da39ac939d016dab4aae0d9f8cb3a4b6a085
-EBUILD proftpd-1.3.6-r2.ebuild 8469 BLAKE2B fe5189eecdea9c4383e97684a10bfca02f3d16fc037fac2781db361afd5336d637e14003635ed3a65145dccbbcc0c8b36e2a1d17166c99ff6f9ad321ab329785 SHA512 fda7f50fa28ac7fb7738411515290cdc0964b36c746532ad960313e726f671139bd56415f302daaf68346dd5d8e02c2da839072fd125ce0a4a86c9bb9617bd28
+EBUILD proftpd-1.3.6-r2.ebuild 8533 BLAKE2B febfcd73184829ca04f0e8013ed4ad16ebbc3640a186a1432193bb991cae7f5723bfe1118ea558565ddb25e5c05e1b04d0e69392a912b2b790f6309226643c99 SHA512 ae98a188143fb35a8cfcfd85fccb6d57f28af3a5d4f978c74b08269d1e68d7e4ea738adc0793f7bb04a20791062d9e12e4ddd5db8269e9aa8299663b7eec7a00
 EBUILD proftpd-1.3.6.ebuild 8337 BLAKE2B e968ce2c91b562da83a80ddf50a6acebcf16b3d8cbcfbd7dd5d6b3a511de689cd9bf67086844fe5ba502bc491731b5565c792734ebc0cfd57415f53dfeefde81 SHA512 294b99f911ff074c6ba3cb0ce3c58a59aac53255c494bed4dd8f49f450a0eb14b0e7f50cd3521c5ebb79229af35f36a919f9a267aa9b7d4f2ef7e21f3999bf93
-MISC metadata.xml 2925 BLAKE2B fbaf52a74111f18f61a9faeae4133e192a429820cc1c9bcb663fd34f21a4de02d20060ab00dc6640279fe1895ab4039c91dafe30168cc83e8ffa51f8079bed31 SHA512 5ea78237d076c30108c62180b1ad0d458c88c555b2ff91cd84edd807655d9df0ca660047f39e26cd6841c03c8a26cc87dc2d1258e6f55800d5911951ea6404fd
+MISC metadata.xml 3028 BLAKE2B c9b780180099942fa3a023629ed5f5faaf9a84eeca9f95cc88665d310c67b7647c7917e5d1a0ab4e1ecfa85b993af260f32f604c30267083364ef6b7683933e5 SHA512 9558151e889dc4a1f90968565247446ad47fda8f3e048d67350ad8580067fd995f8a79cef3673c462f75ebdf6fa830672c3a078d7e26b493dced84bfda8520bf
diff --git a/net-ftp/proftpd/metadata.xml b/net-ftp/proftpd/metadata.xml
index 7434ca7e6384..d63407ebc65e 100644
--- a/net-ftp/proftpd/metadata.xml
+++ b/net-ftp/proftpd/metadata.xml
@@ -33,6 +33,7 @@ server.</longdescription>
 		<flag name="shaper">Enable support for the mod_shaper module</flag>
 		<flag name="sftp">Enable support for the mod_sftp module and optionally mod_sftp_sql and mod_sftp_pam if matching USE flags are enabled</flag>
 		<flag name="sitemisc">Enable support for the sitemisc module</flag>
+		<flag name="sodium">Use <pkg>dev-libs/libsodium</pkg> for password encryption an key exchange</flag>
 		<flag name="softquota">Enable support for the quotatab module</flag>
 		<flag name="trace">Build with trace support. Should not be enabled on production servers</flag>
 		<flag name="unique_id">Enable support for the mod_unique_id module, every connection gets unique ID.</flag>
diff --git a/net-ftp/proftpd/proftpd-1.3.6-r2.ebuild b/net-ftp/proftpd/proftpd-1.3.6-r2.ebuild
index 6585ad48c894..3286db7e1078 100644
--- a/net-ftp/proftpd/proftpd-1.3.6-r2.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -29,7 +29,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse doc 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 softquota sqlite ssl tcpd test unique_id vroot xinetd"
+	ratio readme rewrite selinux sftp shaper sitemisc snmp sodium softquota sqlite ssl tcpd test unique_id vroot xinetd"
 # TODO: geoip
 REQUIRED_USE="ban? ( ctrls )
 	msg? ( ctrls )
@@ -52,6 +52,7 @@ CDEPEND="acl? ( virtual/acl )
 	pam? ( virtual/pam )
 	pcre? ( dev-libs/libpcre )
 	postgres? ( dev-db/postgresql:= )
+	sodium? ( dev-libs/libsodium:0= )
 	sqlite? ( dev-db/sqlite:3 )
 	xinetd? ( virtual/inetd )"
 DEPEND="${CDEPEND}
@@ -220,6 +221,7 @@ src_configure() {
 		$(use_enable ssl openssl) \
 		$(use_enable pam auth-pam) \
 		$(use_enable pcre) \
+		$(use_enable sodium) \
 		$(use_enable test tests) \
 		--enable-trace \
 		$(use_enable userland_GNU shadow) \
diff --git a/net-ftp/pure-ftpd/Manifest b/net-ftp/pure-ftpd/Manifest
index de09d58f233c..641649b742bc 100644
--- a/net-ftp/pure-ftpd/Manifest
+++ b/net-ftp/pure-ftpd/Manifest
@@ -1,8 +1,9 @@
 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.conf_d-3 3728 BLAKE2B a9bfa8208bdf7fcb053cd48e17638f787388804c57788ac594fae096cc824e347979b251b2c8e9d753308bfb63a37111f9690aabe684dc3eb614f68949d3983b SHA512 a5cc8e59178a5d0f7b5909d09009ef6ace1f8e6874bd733e21bc30f4899447e70b020a0369077132751ceb28afa971588efedcce3dea83e9b043b1545caf3393
 AUX pure-ftpd.rc11 1990 BLAKE2B a0f4bccad43ae3f767188326ec1853c516165c0268e31756b573470bd9b49dea848c74e1b04a8241df873977938011aed2c5acc9084d1e1c2d0aa7ea0de44692 SHA512 39e076b3ecc511646e6e14884852313ba6126810841ed9667a53ac061232418e8e53e2cf9191b35d7655168680d961ee2edf67bff5e16b295f8a00752032e253
 AUX pure-ftpd.xinetd 247 BLAKE2B aa2b0f8b4b6ff45e9b8dd632af5ff680ddd5abe51647dda91ca78bf3cb9ba9a090b20433f460213e95b8e57958d711f4bd7fa594b3d33fae818b853ec5aaee5d SHA512 e8ac0527daf1e182e7514d17f04bd20e789231e627cc7228ac23a241a4c420204a61ef9438c57e63f402eb3608ae0acc15a72fe484c99bb4e172bbd5ece2b72d
 DIST pure-ftpd-1.0.47.tar.bz2 489177 BLAKE2B 06e71ead47b87dedf47a84e488b2de127fcd297c2e9ca7a617c2ee2760cf55b816884763721826c512558d016cbd38a87a11ca0e8c2334d93145edc6f88d9287 SHA512 c1920a3f67f04635fde600fe226a7730b801e7e64658b25f1d9f9c0b35a704664be4adfb0b291594f7e0f10beade25eae9a5e6cc3b6777a3b413f3c2d9574e63
-EBUILD pure-ftpd-1.0.47-r2.ebuild 3955 BLAKE2B f063cd0ba2697090bdcc17dd8f42443e0bd8bfb09cd4fe7e8946e659ce3d73b31b048b5d5c0a29f23eee8a02745ee552fea9dfc0138ae6748dfa4cdd67ac3577 SHA512 6a0233381908f2ef3ef75d78d3b1f9c0d3653e13b79f60c2ed327ff1366886f2bc07741cc0b6831c2eb50b0abe374feba72c70136e4f706d7d4f511a0de3f225
+EBUILD pure-ftpd-1.0.47-r3.ebuild 3997 BLAKE2B 0a1a7482645667f5a176877888f2da9fa1cec4de8bd864ca4fea983b9a0ffe931aebcbf7bc085dbab0bc8d378546a3451742534b4b08aef8a81facbc54b43029 SHA512 62f91979226fbf0237856dcf0bf8c1f34fbd3d620747240849c55256fc6b844dc0499e47478261b784d1ad318e90c14b16ae40da56dc1934b036d2197e9a62d0
 MISC metadata.xml 1233 BLAKE2B 02ea0260dacca81d5b2eef251f98756f151b03ee7abcf3ccc46832167848b8aa80dba90d855c118908b87ce7085921cae81f3a747402c5e0fb70401dd668150b SHA512 ce47470d3c8bfeba9c02f6d6638e7b0bb6e0ddeddd1aaf0362342aadf07e823f1093523a1432c703bd410c3b760049a1e1c32e3f36718844b3a1ba44144afea4
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
new file mode 100644
index 000000000000..65f19bf49da7
--- /dev/null
+++ b/net-ftp/pure-ftpd/files/pure-ftpd-1.0.47-TLSv1.3.patch
@@ -0,0 +1,46 @@
+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/pure-ftpd-1.0.47-r2.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.47-r3.ebuild
index 864c1ad82373..58e90f89ddc0 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.47-r2.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.47-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -43,6 +43,7 @@ RDEPEND="${DEPEND}
 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"
 )
 
 src_configure() {