gentoo resync : 13.01.2018

4 files changed, 34 insertions, 10 deletions

diff --git a/net-ftp/pure-ftpd/Manifest b/net-ftp/pure-ftpd/Manifest
index ffecac4c9e37..c3b915d099f6 100644
--- a/net-ftp/pure-ftpd/Manifest
+++ b/net-ftp/pure-ftpd/Manifest
@@ -1,12 +1,12 @@
 AUX pure-ftpd-1.0.28-pam.patch 568 BLAKE2B cb7a9540e5646d7e9b734f893d4449e11cad60f897b39ed111559877edb4cf22e607fcf15d6ed7eea6dbf7a03a430c9182d6405ced13cf9c6614d15a45e17a49 SHA512 c331837c4c8988e0623a6a4f4222263dd161a49a2748079d3c539db2025b7b048ca5976b4450dd32cab5755932c7e59f6976d9d3bda2e5e87f1869789f8e00ba
 AUX pure-ftpd-1.0.45-openssl-1.1.patch 1184 BLAKE2B 94750ec0312d42347d094b28ab283cf59ca7bb2bc6cbd879e2a76a9a6c7faa97f8fa99ebf8358c4b6d396af0e7c769730e5c0b8394e0bfbbe3eb322c726032bc SHA512 e6876cd2dd8551f7ad37ad52dfad142d19d7294c2ef226b394d1ea064ab89408b90ad84a7b560be0eb4ac955606f9aeb44b28009a712b681acceafa7410fb053
+AUX pure-ftpd-1.0.47-MAX_DATA_SIZE.patch 787 BLAKE2B bac7b7d788e2928c7c5a4f9af593b6841475d0850b1b3c09f6c6e3f7a575db13975fccfabbcb5813482c326f355dadcd33aa30184da9c098764480b95a9730ac SHA512 1124ba66f8c98935acf3f9bc11b7c90370e2e0dee05fa0c25ae517d198ef1bf47b7d93b3abbe79a3e98356588bd12a6f44584ff85a5fe241e2561c5805876624
 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.45.tar.bz2 497695 BLAKE2B c905675253d992757e44baf1fae42d8363789ce3eb4d71d6f0e5c994a63efd307af69fb81aadb1875f0f2da952c0b3c8fbbc79c9c5c0b22c2d2f82029b417f11 SHA512 bb22b6b88778e2586411318905aa165e590185f7a87ac30761d6250f4de22a1deec6be5441926eae28011d3a5a923bad2ac366e237cc96a4d7932e3dbc9a1f2a
-DIST pure-ftpd-1.0.46.tar.bz2 490337 BLAKE2B c0b1fcbf46343dd49fcc9ecec44807c9474ecaf29869f67bfebfd722e0fd9947e8c2e84d5123afcdf6d219d527700f317affd44f3610a6dec46a1cea7ab0a433 SHA512 e44c1842e6f101f4d7dd42617392f3d54ff58d68608f6a3bc5e612fc89bfd1da6935215a7e87c0d2bbd9fc9f0fa31a40ceb764fd67428dfdd8c5454e0d64e0ab
 DIST pure-ftpd-1.0.47.tar.bz2 489177 BLAKE2B 06e71ead47b87dedf47a84e488b2de127fcd297c2e9ca7a617c2ee2760cf55b816884763721826c512558d016cbd38a87a11ca0e8c2334d93145edc6f88d9287 SHA512 c1920a3f67f04635fde600fe226a7730b801e7e64658b25f1d9f9c0b35a704664be4adfb0b291594f7e0f10beade25eae9a5e6cc3b6777a3b413f3c2d9574e63
-EBUILD pure-ftpd-1.0.45-r1.ebuild 3896 BLAKE2B 5898ca67bad41a51f0c40cc49c5f56aefde1948be2ea24b2d0f948734e86742de28a68c37a04a8b4ae93d238da8c5bd91608528abba436f3dcc5c9b3a81134f9 SHA512 285cfa299ff0f5554b1b54163e4d0c9824f404c2eee76cb77831c6989b8bbc089f45b6c0acc969ac35bfc77065082d6a0288ec35c38427204edc0bcef7354176
-EBUILD pure-ftpd-1.0.46.ebuild 3867 BLAKE2B fbfedba995ca14f2c9e6b8e5ce1bba53631d5451c3be6d1ca18d237073c072da67899b79b53137fb6a4b8dd2047e8fbf42244a92699cd89f9f0da1af64b2d240 SHA512 baae36d4332ba3e44b913691fe90e382f55eeff34da12cbbf1d81361db5db8e0d1014329d915972010656131519071f1c983bf7177a59f2bed9ad04ed625859c
+EBUILD pure-ftpd-1.0.45-r2.ebuild 3944 BLAKE2B 6aae69a820f6bc379f0bcf42daf5a7047a4bc424a44b7018cd59d2b644329f3669d620a75e3eed9f7748a056ce667435f5babf7587268b7a969454a5cf14c306 SHA512 232589647aaba6adfec80a8cc024c5674f27968f4db3491711cb6cf00fd30515eb224b0a93de3bd618066c2e4025372d0cc906be9dc4159fb4c867ff92ba4af0
+EBUILD pure-ftpd-1.0.47-r1.ebuild 3915 BLAKE2B 0d216396715a08d42477a4b6fe8d846b08fcd941e704a870e8e9b4a4c8dc0f41f9ecfc52e148d2a954349fa77393b65c17bb8180c7a4ffa2e0cbb77055b1499e SHA512 85e3ff0ee728198655a72d85f363e13c806f2c5316c24e6434f7d52b643908b61289c5d38cc45f654797bc62d6e4420813764d0021ed57c5a8c800de1fc5272f
 EBUILD pure-ftpd-1.0.47.ebuild 3867 BLAKE2B 0c1930e2ddc0aa3efbbe1388d6017fcd5fe0e75b399819676c23c14b9b26eb4a9e2d124c086454fe522d56b2c75940e0fae6d6501ef26a82d8ae9d04c7289afa SHA512 02420399d83ba5e5d54fdca2b57dc87a28f23bd7a39f2ad28960feb30603a5b8ebc6614bae77fedc87a4a73f1ac3c75a5a878a815908a6440e0ed7a59df6d855
 MISC metadata.xml 1233 BLAKE2B 02ea0260dacca81d5b2eef251f98756f151b03ee7abcf3ccc46832167848b8aa80dba90d855c118908b87ce7085921cae81f3a747402c5e0fb70401dd668150b SHA512 ce47470d3c8bfeba9c02f6d6638e7b0bb6e0ddeddd1aaf0362342aadf07e823f1093523a1432c703bd410c3b760049a1e1c32e3f36718844b3a1ba44144afea4
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
new file mode 100644
index 000000000000..a9ad0a30b9b6
--- /dev/null
+++ b/net-ftp/pure-ftpd/files/pure-ftpd-1.0.47-MAX_DATA_SIZE.patch
@@ -0,0 +1,22 @@
+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/pure-ftpd-1.0.45-r1.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.45-r2.ebuild
index 7dcc0d9aee3d..d448d8f15cd2 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.45-r1.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.45-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -37,8 +37,9 @@ RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-ftp )"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.28-pam.patch
-	"${FILESDIR}"/${P}-openssl-1.1.patch
+	"${FILESDIR}/${PN}-1.0.28-pam.patch"
+	"${FILESDIR}/${P}-openssl-1.1.patch"
+	"${FILESDIR}/${PN}-1.0.47-MAX_DATA_SIZE.patch"
 )
 
 src_configure() {
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.46.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.47-r1.ebuild
index 0666f54ec764..412951b81a3a 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.46.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.47-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils flag-o-matic
+inherit flag-o-matic
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 DESCRIPTION="Fast, production-quality, standard-conformant FTP server"
 HOMEPAGE="http://www.pureftpd.org/"
@@ -37,7 +37,8 @@ RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-ftp )"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.28-pam.patch
+	"${FILESDIR}/${PN}-1.0.28-pam.patch"
+	"${FILESDIR}/${PN}-1.0.47-MAX_DATA_SIZE.patch"
 )
 
 src_configure() {