gentoo resync : 06.08.2019

4 files changed, 27 insertions, 1 deletions

diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 1cd6afcb83e0..2ca8231833df 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 043ed2090e59..da9557dc692c 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -1,4 +1,5 @@
 AUX proftpd-1.3.6-mod_copy.patch 3069 BLAKE2B 08b9afdfa32e17d50d1762f4bf8a932b4c5106b91814b707b92e5745835f79c569d07ee18021c53aa961970a7167760a90e967388f0ac64956cde3899d72942c SHA512 2df01ce88d340b097523c10e0287c0a02484daaa11c3acd8975471c2cd346429fe9ef84f372943251af264d8d2713dfd1d259fb7fb30bc6aa75fab7559e8b4ef
+AUX proftpd-1.3.6-mysql-8.patch 750 BLAKE2B e8d9a48b2af603f1b50298ba5102242d575eb9b2321508a574ec3e6e0a0e54d058d248706aa2bfc9b85172ee6404ce5e16354e600e5332d8bc388649d10751e9 SHA512 15213f045427611f8ab5af9e064f4aadd448514a1789558f65c83b0703710df547178c15b254a368c1913c82d9fb533c47fd95d42326527809d4150191869bdd
 AUX proftpd-1.3.6-sighup-crash.patch 2145 BLAKE2B 60e24fe7f8ee4fdac4a95b73c5e6d76862d6163e6dfbc1a15970f18ab6a38e715bace0adad487606a29dc9de39bbb2987b3d4c5e0283d6468864f877c2030b6f SHA512 d16515e7bf14d1d3a147b93fea330b0342db3ad501f366dd4f1d872262829902cb3c197fe68b20b86048bc3bbe0e5c22470d6d81bf08c72c192a33770c3d499a
 AUX proftpd-1.3.6-use-trace.patch 477 BLAKE2B f69adc68327f467b44dd19d0da66388945c0d1c35ce734ab8fa5e618ca7dbf1164e785e37a6dcb0e9f8ab671ece0b4e711b6614947f39b55310ffd4522df5e07 SHA512 90164f799d1f6c3768a30161a40d5c369e576c3b1a875047ef65c1224d3e18cf1f4dd5145c5ff6f7aeda80135134df58a1d57046129b922514cb56d1de97f13e
 AUX proftpd-1.3.6_rc4-diskuse-refresh-api.patch 576 BLAKE2B ce4522896a81fed326ae234810491005c5165fa1bbcd0b64d785c6d070f2ac80c763e75f813655696a9405284cf27c82293026e2d8c68936d7794c20e886dacb SHA512 08a0674600944ff5d13033651a1dea1647c9d22f18efe6505e051b36566bf357bc41439d2dd7c2900e873ef8d600ba7f16332680dda1abb2529808fbe5a4e573
@@ -18,5 +19,5 @@ DIST proftpd-1.3.6.tar.gz 20251898 BLAKE2B b68bd8bfb6cc970974b7a67cf13d1a543ffbc
 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
-EBUILD proftpd-1.3.6-r5.ebuild 8664 BLAKE2B 756dcfb300ed8e6beb5e6d71023f78547e5e7920c8c8d9f686300dc121461341bcf375168e8490e06a1f9f8d2a63bb41400719b186d628c99a0f3bead7415ae3 SHA512 9d2cbd0aaee69700ebb1dc2b0d95dad250bf1feb072cf70d8cf414044fdc9c3fb1776351fa8b4856854552c1e29076b2965d7582ddc0dcbba3c62ce26527a5f2
+EBUILD proftpd-1.3.6-r5.ebuild 8705 BLAKE2B b17b9cb7c090725f90a0851f9e525ef583759f86dd5aa1aa5bda871064acb42bf52954050ad0c19dcd5bb7fb537b52b324313438e7986de84a7e4e6048da5a91 SHA512 55717ed59f59347a9da3ad0d6b21e87623b4b4bacc446948530e50979148334ceccdb4707f9ce83eac205939dcbd35910108c239cc6220e23e8ca5485b515938
 MISC metadata.xml 2930 BLAKE2B 3b97d562cb49d2a1a431c5b05d1cc24bf87cef2690aedc953274ec78c82bf3e4e9a5fbada45dc7df6ad71ac1b69fd40a055936ed039a8472812ac889a99cba2f SHA512 a4e29b9ac8c96cd4412fbfc854298e310fb80cfff7aeac81bc423a8990bb5c0cdbf274a9f8db2eaafa83830f9be727b7877881647802d8d7ba3eab5b6c395658
diff --git a/net-ftp/proftpd/files/proftpd-1.3.6-mysql-8.patch b/net-ftp/proftpd/files/proftpd-1.3.6-mysql-8.patch
new file mode 100644
index 000000000000..4149a6540595
--- /dev/null
+++ b/net-ftp/proftpd/files/proftpd-1.3.6-mysql-8.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/692434
+https://github.com/proftpd/proftpd/issues/824
+--- a/contrib/mod_sql_mysql.c
++++ b/contrib/mod_sql_mysql.c
+@@ -132,6 +132,7 @@
+ #include "../contrib/mod_sql.h"
+ 
+ #include <mysql.h>
++#include <stdbool.h>
+ 
+ /* The my_make_scrambled_password{,_323} functions are not part of the public
+  * MySQL API and are not declared in any of the MySQL header files. But the
+@@ -495,7 +495,11 @@ MODRET cmd_open(cmd_rec *cmd) {
+    *  http://dev.mysql.com/doc/refman/5.0/en/auto-reconnect.html
+    */
+   if (!(pr_sql_opts & SQL_OPT_NO_RECONNECT)) {
++#if MYSQL_VERSION_ID >= 80000
++    bool reconnect = true;
++#else
+     my_bool reconnect = TRUE;
++#endif
+     mysql_options(conn->mysql, MYSQL_OPT_RECONNECT, &reconnect);
+   }
+ #endif
diff --git a/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild b/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild
index c3a8e165e6fd..9fef53a6a6ce 100644
--- a/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild
@@ -72,6 +72,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.3.6-use-trace.patch
 	"${FILESDIR}"/${PN}-1.3.6-sighup-crash.patch
 	"${FILESDIR}"/${PN}-1.3.6-mod_copy.patch
+	"${FILESDIR}"/${PN}-1.3.6-mysql-8.patch
 )
 
 RESTRICT=test # tests corrupt memory. need to be fixed upstream first