net-ftp/proftpd: tweak for mysql-8, bug #692434

mysql-8 dropped my_bool in favoud or bool from <stdbool.h>.

Bug: https://bugs.mysql.com/bug.php?id=85131
Bug: https://github.com/proftpd/proftpd/issues/824
Reported-by: Toralf Förster
Closes: https://bugs.gentoo.org/692434
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
This commit is contained in:
Sergei Trofimovich
2019-08-19 08:43:33 +01:00
parent fdb745604c
commit 43eb094f5d
2 changed files with 25 additions and 0 deletions

View File

@@ -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

View File

@@ -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