diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-04-25 11:37:10 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-04-25 11:37:10 +0100 |
| commit | 38423c67c8a23f6a1bc42038193182e2da3116eb (patch) | |
| tree | 04e2cf4bd43601b77daa79fe654e409187093c5e /net-ftp/proftpd/files/proftpd-1.3.6-mysql-8.patch | |
| parent | 623ee73d661e5ed8475cb264511f683407d87365 (diff) | |
gentoo resync : 25.04.2020
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.patch | 24 |
1 files changed, 0 insertions, 24 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 deleted file mode 100644 index 4149a6540595..000000000000 --- a/net-ftp/proftpd/files/proftpd-1.3.6-mysql-8.patch +++ /dev/null @@ -1,24 +0,0 @@ -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 |