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 97910138359 for ; Wed, 19 Aug 2020 10:37:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D8BD3E0821; Wed, 19 Aug 2020 10:37:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 BEE9CE0821 for ; Wed, 19 Aug 2020 10:37:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 6DD7A34E3F9 for ; Wed, 19 Aug 2020 10:37:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DE0759C for ; Wed, 19 Aug 2020 10:37:37 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1597833424.381aa46351b1d3d78dd3af10dd0bdc6c844ff70a.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-connector-c/, dev-db/mysql-connector-c/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/mysql-connector-c/files/mysql-connector-c-8.0.21-survive-malformed-charset-files.patch dev-db/mysql-connector-c/mysql-connector-c-8.0.21-r1.ebuild dev-db/mysql-connector-c/mysql-connector-c-8.0.21.ebuild X-VCS-Directories: dev-db/mysql-connector-c/files/ dev-db/mysql-connector-c/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 381aa46351b1d3d78dd3af10dd0bdc6c844ff70a X-VCS-Branch: master Date: Wed, 19 Aug 2020 10:37:37 +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: 2744c901-0620-4957-b71f-c01069d7b513 X-Archives-Hash: 8af6e2c831088b1710cb22e835d3348b commit: 381aa46351b1d3d78dd3af10dd0bdc6c844ff70a Author: Thomas Deutschmann gentoo org> AuthorDate: Wed Aug 19 10:35:35 2020 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Wed Aug 19 10:37:04 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=381aa463 dev-db/mysql-connector-c: survive malformed charset files Bug: https://bugs.gentoo.org/737002 Package-Manager: Portage-3.0.3, Repoman-3.0.0 Signed-off-by: Thomas Deutschmann gentoo.org> ...ctor-c-8.0.21-survive-malformed-charset-files.patch | 18 ++++++++++++++++++ ....0.21.ebuild => mysql-connector-c-8.0.21-r1.ebuild} | 1 + 2 files changed, 19 insertions(+) diff --git a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.21-survive-malformed-charset-files.patch b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.21-survive-malformed-charset-files.patch new file mode 100644 index 00000000000..72799f009c8 --- /dev/null +++ b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.21-survive-malformed-charset-files.patch @@ -0,0 +1,18 @@ +Description: don't crash on malformed charset files +Origin: https://bugs.launchpad.net/ubuntu/+source/mysql-8.0/+bug/1877504/comments/19 +Bug: https://bugs.launchpad.net/ubuntu/+source/mysql-8.0/+bug/1884809 +Bug: https://bugs.gentoo.org/737002 +Forwarded: workaround, not needed + +--- a/mysys/charset.cc ++++ b/mysys/charset.cc +@@ -922,7 +922,7 @@ size_t escape_quotes_for_mysql(CHARSET_I + + void charset_uninit() { + for (CHARSET_INFO *cs : all_charsets) { +- if (cs && cs->coll->uninit) { ++ if (cs && cs->coll && cs->coll->uninit) { + cs->coll->uninit(cs); + } + } + diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.21.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-8.0.21-r1.ebuild similarity index 97% rename from dev-db/mysql-connector-c/mysql-connector-c-8.0.21.ebuild rename to dev-db/mysql-connector-c/mysql-connector-c-8.0.21-r1.ebuild index c6e4dad56ed..2cd9add1964 100644 --- a/dev-db/mysql-connector-c/mysql-connector-c-8.0.21.ebuild +++ b/dev-db/mysql-connector-c/mysql-connector-c-8.0.21-r1.ebuild @@ -44,6 +44,7 @@ PATCHES=( "${FILESDIR}"/${PN}-8.0.18-always-build-decompress-utilities.patch "${FILESDIR}"/${PN}-8.0.19-do-not-install-comp_err.patch "${FILESDIR}"/${PN}-8.0.21-libressl.patch + "${FILESDIR}"/${PN}-8.0.21-survive-malformed-charset-files.patch ) src_prepare() {