summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-ftp/proftpd/files/proftpd-1.3.6-mysql-8.patch')
-rw-r--r--net-ftp/proftpd/files/proftpd-1.3.6-mysql-8.patch24
1 files changed, 24 insertions, 0 deletions
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