From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A5672138334 for ; Mon, 19 Aug 2019 07:44:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ACA0CE0882; Mon, 19 Aug 2019 07:44:01 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 925ECE0882 for ; Mon, 19 Aug 2019 07:44:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 62CEC349E18 for ; Mon, 19 Aug 2019 07:44:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E205E4D3 for ; Mon, 19 Aug 2019 07:43:58 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1566200629.43eb094f5dfa9abe3c8860eb7f4e1aae7f18dea5.slyfox@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/files/, net-ftp/proftpd/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-ftp/proftpd/files/proftpd-1.3.6-mysql-8.patch net-ftp/proftpd/proftpd-1.3.6-r5.ebuild X-VCS-Directories: net-ftp/proftpd/ net-ftp/proftpd/files/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: 43eb094f5dfa9abe3c8860eb7f4e1aae7f18dea5 X-VCS-Branch: master Date: Mon, 19 Aug 2019 07:43:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 537498eb-db15-4c4d-b0ee-b89637f722b4 X-Archives-Hash: e641ab60e124523540d3de092e3c16cb commit: 43eb094f5dfa9abe3c8860eb7f4e1aae7f18dea5 Author: Sergei Trofimovich gentoo org> AuthorDate: Mon Aug 19 07:43:33 2019 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Mon Aug 19 07:43:49 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43eb094f net-ftp/proftpd: tweak for mysql-8, bug #692434 mysql-8 dropped my_bool in favoud or bool from . 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 gentoo.org> net-ftp/proftpd/files/proftpd-1.3.6-mysql-8.patch | 24 +++++++++++++++++++++++ net-ftp/proftpd/proftpd-1.3.6-r5.ebuild | 1 + 2 files changed, 25 insertions(+) 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 00000000000..4149a654059 --- /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 ++#include + + /* 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 c3a8e165e6f..9fef53a6a6c 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