gentoo Easter resync : 12.04.2020

4 files changed, 30 insertions, 8 deletions

diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 02d2417a1cc9..891d30384e86 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -9,6 +9,7 @@ AUX proftpd-1.3.6_rc4-msg-refresh-api.patch 903 BLAKE2B e335f81685552b0b9a05af37
 AUX proftpd-1.3.6_rc4-vroot-refresh-api.patch 736 BLAKE2B 9f3c4a1f80a27ce7e6f9348153584bc1134e63ad4c839927b7680439966003c76c7a25821be0f3431c472092ef5c8386166b372645f498fb655559fd683c3e6e SHA512 9cd98e2fb8c17d2ca38f5f7a20f5c6ffb03da7f51e53542237992bd2b98b2ef5b5fc0634cd7f5eef24fba8a601703b70ff7d0404e1c5103394e9fda260b815cd
 AUX proftpd-1.3.6a-fix-libcheck.patch 726 BLAKE2B e971ccfd5d5cd708054096eef3d8b4910d380933b79d7616225194f71213a07c14139cc7bc76b9fcb4f86f0a97672288837d5a1e7ce68673665db65e75328252 SHA512 8e4aface4c7ca010808e0531b896f8554107ad66c7e1019f25168e71e5f8d2df3673511dd4717eb8bdeedb2ca07bd6a587caca4955c4903991bcfb020ed72636
 AUX proftpd-1.3.6b-tls-crl-crash.patch 1466 BLAKE2B dc8f5cd38d07d2194966005eaf3d52b0230a763e35cb3ccbdd7c603eed5fee26a76a49feb31c6422a8adddd355059f82b6b07ac577a328b90e3e35ee5ece242b SHA512 b32281c717c8b1d1cd1ea86bebb6dc8577596e8dc97ad7fc797c83d34a5bbce1141a72f021d59e81be6437844411635c563baf84ef18eb9c5d576e84c80a786d
+AUX proftpd-1.3.6c-gcc-10.patch 653 BLAKE2B c756979c01e40b9bb83da39a05e5b8cf49db3e6954df7e31645357411b053b21a3dbc073429e9156ab40d9137286ef5c5469d35781eb3ca56ff4b3e7d09fc382 SHA512 0b735b97b2ccc849d12754323de97b72e049a5a5bca869e76c167ec2527e7e773cf53d4b41645d2a8532385edd23b905f38fe3ab0ad3c44923c1d5ff61557c3a
 AUX proftpd-tmpfiles.d.conf 34 BLAKE2B 03da2e04c7e0d4c6e889e4414a205942f0762a1ae856d16f95abb1d2e927d68f583ad5bbdbf142b32b141cd82e9288f2ef1faf459cbe8433e2e1127d3b30d686 SHA512 aa6ffbf15e4275941837306259fb426608e82e45a2da4b99c5d7778d11b8c9341e3a12ae9b751d0e173635239b6f1b20f0431be17296c005a83525a48327fa52
 AUX proftpd.conf.sample 1275 BLAKE2B db10306f79544b344856e065946e9ae0fa37d43507185f7d2407f23a962750a05bb2682e7c97e3979ca42dfe35921c3db7e98c095431796d82144869df0e324e SHA512 1c26f3e98ed07d89192c640f7823af168c045abee6ab076791aee9d50be5446be870a189979df4b828e7ae907dd40a346f1b92998fa39195195bfada4061c5df
 AUX proftpd.initd 1434 BLAKE2B a5d4b8c085925d08d7d0962ccd6a3eaad1a3a9227ea6cf553a217f9ef60c88841b5ab8fa8d249e68182a68ebae5940a421b220af4d2f30cf5c2af8ee4b6678dd SHA512 24875a5034813a12f1d24e1fa2c7a71330ffded96112d50dbe4fea6ea127f735eae48134e2f4c3faad168706eb9ff4e15f93dbbe7d6cb6ed0e0768e47aa1100b
@@ -17,12 +18,12 @@ AUX proftpd.service 196 BLAKE2B 89ef578220f97095a5ffd6b4f6d1880dfc26f54e1ac86670
 AUX proftpd.xinetd 295 BLAKE2B 4863cea66df5c32efba61647bbc854953dff28e154fab284c7e9f84efe3279a49c660ae37ef5b1410decdf32bb3061713e371fa3b529098848cae71f3e66d40d SHA512 a13d29ca2289f8bd58b4eb317683d57dfb7d608c53f163844349bbf0b896790f5e9f47a27eafda3b8fc78e60f4a0d6859da7c7ced7df852166cf0b8bcad876d4
 DIST mod_gss-1.3.9.tar.gz 117158 BLAKE2B f957fa465f9a9b06ceb9c190ab60c7f67fdeeef79dce7f51bcfed8dc726cb01a231232c65821ca3a240b77a5019fa22f31b45496c128a06627bd24dc960b566f SHA512 44615983b0f67939b110e54c4a83b3056263bad72ba78de1b16f9f8590f5504c60e679f55484708d49e694c528d4715d9abd0cb75cfe439982ea9e02e0c18891
 DIST mod_vroot-0.9.4.tar.gz 29461 BLAKE2B eb4d3f6425ab0a1a61ca607e4655b5f8ff6ea342ca49d49598e7a4c5596382aa2c1d4e8228a1cdcfff324feb92dac80fcc58e35bbb77155069749afdd7cc41fb SHA512 f5de392c9fe39f0a03b0783a7092bbfe17ea6db991f4b4e4a2d8f092f073d27ef2c64dd6484d5665b5abc808c0caba016d4fc3fab3da3810f5ebe5249bb4cbce
-DIST proftpd-1.3.6b.tar.gz 20260731 BLAKE2B 03ef212bcb1bcc53dd6d1dc4472c5565682b1c6b99af737f4ad09c280f1038f0658a8cc9609634e9b4a2a1cb56f76d83278056af0a9d136b957f853615e46cac SHA512 51511f05f481a038fa3826bdf1bdb866423d9f8df48071a8a263347a1ed096a553e66daefcc95dfdfcde503e664ed4140cdbb2a4f95ade8b7aadf2007aa3a671
 DIST proftpd-1.3.6c.tar.gz 20271908 BLAKE2B 64f0aa70df844a376d333804100e18a28af6ab2b17a3d6f250817141db3952835740c15dcd68f71498b076238a668bdaf9672b4fd7d6fe61f8632d813e221573 SHA512 9b10e603b26d527b594682a4905e70dc0a8361372ed80a8e2617167305047bf94ea16b441f9d5782ae04dd50768d32e12f9cb68708c1f80dcd219b09e0d4fd15
+DIST proftpd-1.3.7rc3.tar.gz 20359920 BLAKE2B 96d2e26c815cd2c461580a2af642ac332bd848418d3d829f2795c610eead00a290a9633088809a5cd56899e3510dc3e608f1688052e1ca5121c78fcc80017523 SHA512 cab3ffee0ce6b921596cafc5fd2e0059c59a03f790791973b502e6384d45f0880b94e0d0961c3b230541a1785e9b0afa3d80276c82f4720696a46ea6594d744f
 DIST proftpd-mod-case-0.7.tar.gz 13184 BLAKE2B bf2118d9b8ed97a5b192b92b515d17ac7a0d75e154288e5afb3a1c3d686e635093df9501cc1c9b077f87c14326e31e8b9f751803dfca1eae9643f12333eb633f SHA512 c08d13ef82fec36ae75aa3213dd02e0ce4045904849f422e152f039a9da66a45e4423751074b8bcf8ce347a40ce0e7bde798a85cbadc962fd872aeaa898261fc
 DIST proftpd-mod-diskuse-0.9.tar.gz 18596 BLAKE2B 38c704c8607f0f93b080e77fe793cfe0125c88acc6f818ecb059c6c21a983e040ff5f2c1b91e34ef4ba2666a808d896018c364d1f12ea38f0c477e79bdaa2120 SHA512 d41976bf2810e4b783e775e8c767ca2030c3b5df116219fd31cbbac7feaf9922c315bf4ea092881b0d6cf43f2f4c5dbcae61be3c3a833058d12f962a3024b975
 DIST proftpd-mod-msg-0.4.1.tar.gz 8082 BLAKE2B 970b46b19d25bac22ecb01495270a523997a0b7d5b53b9470b4744b919adcf03d5bcee2df85ba88c4a4c20a9fc30dc01459ffb58c5dae8e78a52a7379bf36f11 SHA512 38ea63b1d355e1e10a6a4477596bf3fa28529a871c9fb8dbf093b5317f0743ef9cb59b986d0b8c1c7ed932dad5d5d571883d596fad2d3b793431824db4487012
 DIST proftpd-mod_clamav-0.14rc2.tar.gz 19710 BLAKE2B 3435e198cf029337904d4666910414124a3b7e1529d4b12f7acd8a9be563009fff4d9a30eb132a2d7361d2c830e5601c4a00a8814282585b6915e991cc29bc13 SHA512 b8e56880fadf36513215fa4c20be6db7cdf1274337072a9b29c3c3477b3de4743ebcdb1179572ec4cb1501fac0064330c855b1f818bf0cc52f0e91170f059772
-EBUILD proftpd-1.3.6b-r1.ebuild 8683 BLAKE2B 59bdfbebe224ffdd843c3abcfaaba5461899ef76eff40144807598b2740717373e068962ca5f1b276526c21b769b0624068b5655f4a998c09af5901b4592f8bc SHA512 abd5fa622034cda491f3bd8200b433b910ff0e78605817e29010975ab1284e4dc4b92e74b0e18d18d6286944820a0c765c95ea0103c697bd02a76c06f011c81f
-EBUILD proftpd-1.3.6c.ebuild 8643 BLAKE2B b6e8543ca2a377bf74fed26a8d2e0b7b527b49337ce81e4ab387e72838d9c5a231c85f4ca7259d0f06a2a858eebe7fa61be50552a798f33a932367d5a7ad5edf SHA512 b2c48642c8dfc857450201e1079aac8656da19d9c2caed23f5fa1515b38c639670f2cc9ba35aa8bd7d32b7578c1dd271cbd122a86b60a5a6e4ba50ebae447958
+EBUILD proftpd-1.3.6c.ebuild 8678 BLAKE2B 9f02b99da55a9528466538a0d889bb94dae0633f44f2eb7fcd8feb7d0bdeca9fa299d2b7e2ed8ae3d43ac457b47f908e51cc9f27e79caba5688668221be29b92 SHA512 f74170b4ddbced1a35db736e755420a10281c9e4bbdc8c5fc9ee387260fee97b5145ed5e8aae340a869a1648f7b9dab77337970c604f8fe6d567ab1e21be21a3
+EBUILD proftpd-1.3.7_rc3.ebuild 8630 BLAKE2B 334ca9731d3c4b952212d45c3ec7120d6f9135f45fc62da406bb1d580c7173d5c61aee8e0fe409bd47503d8158d3bc519bff547e4b266bc7e7b09375d6753eb2 SHA512 910b5600bdaa9ff8e8d4d0bdf3c749d7f43d480a162430ad3e4bd7e4be35e17e3d327aaff38bc0b6eb32c6a0856188d85b065cbf990c9adb8bd0ea136940d3d3
 MISC metadata.xml 2930 BLAKE2B f3f8218a737f50599ff687030bd8c84f1818b290d6d89bd6627ab8eb02598d196f1bae03d7b15e4eb02967fb7e0d826cdda10588c8bfe4f8a387a49d70d9cab0 SHA512 c90941671532512e4d085f3c6b4f56f3c2a252a613bf5c978d763fb0f8f9190431a41816f4fddde47e28eaeddcd17a7aef52064e5825499801bcdfbd72745be8
diff --git a/net-ftp/proftpd/files/proftpd-1.3.6c-gcc-10.patch b/net-ftp/proftpd/files/proftpd-1.3.6c-gcc-10.patch
new file mode 100644
index 000000000000..c3ee704c085c
--- /dev/null
+++ b/net-ftp/proftpd/files/proftpd-1.3.6c-gcc-10.patch
@@ -0,0 +1,21 @@
+--- a/contrib/mod_quotatab.c
++++ b/contrib/mod_quotatab.c
+@@ -50,6 +50,7 @@ typedef struct regtab_obj {
+ module quotatab_module;
+ 
+ /* Quota objects for the current session */
++quota_deltas_t quotatab_deltas;
+ static quota_table_t *limit_tab = NULL;
+ static quota_limit_t sess_limit;
+ 
+--- a/contrib/mod_quotatab.h
++++ b/contrib/mod_quotatab.h
+@@ -188,7 +188,7 @@ typedef struct table_obj {
+ #define QUOTATAB_TALLY_SRC      0x0002
+ 
+ /* Quota objects for the current session. */
+-quota_deltas_t quotatab_deltas;
++extern quota_deltas_t quotatab_deltas;
+ 
+ /* Function prototypes necessary for quotatab sub-modules */
+ int quotatab_log(const char *, ...)
diff --git a/net-ftp/proftpd/proftpd-1.3.6c.ebuild b/net-ftp/proftpd/proftpd-1.3.6c.ebuild
index 5c8f9eb610d3..c89615285d09 100644
--- a/net-ftp/proftpd/proftpd-1.3.6c.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6c.ebuild
@@ -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"
@@ -71,6 +71,7 @@ S="${WORKDIR}/${P/_/}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.3.6-use-trace.patch
 	"${FILESDIR}"/${PN}-1.3.6a-fix-libcheck.patch
+	"${FILESDIR}"/${PN}-1.3.6c-gcc-10.patch
 )
 
 RESTRICT=test # tests corrupt memory. need to be fixed upstream first
diff --git a/net-ftp/proftpd/proftpd-1.3.6b-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.7_rc3.ebuild
index 154eef3fbc46..40523c9d6937 100644
--- a/net-ftp/proftpd/proftpd-1.3.6b-r1.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.7_rc3.ebuild
@@ -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"
@@ -70,11 +70,10 @@ S="${WORKDIR}/${P/_/}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.3.6-use-trace.patch
-	"${FILESDIR}"/${PN}-1.3.6a-fix-libcheck.patch
-	"${FILESDIR}"/${PN}-1.3.6b-tls-crl-crash.patch
+	"${FILESDIR}"/${PN}-1.3.6c-gcc-10.patch
 )
 
-RESTRICT=test # tests corrupt memory. need to be fixed upstream first
+RESTRICT=test # Some tests are ran in chroot. Confuse sandbox.
 
 in_dir() {
 	pushd "${WORKDIR}/${1}" || die