commit: 5929f97adf99d702bb2f0c415616f824a22caeb7 Author: Brian Evans <grknight <AT> gentoo <DOT> org> AuthorDate: Tue Aug 11 17:11:28 2015 +0000 Commit: Brian Evans <grknight <AT> gentoo <DOT> org> CommitDate: Tue Aug 11 17:11:28 2015 +0000 URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=5929f97a
dev-db/myodbc Add patch from bug 548912 Package-Manager: portage-2.2.20 Manifest-Sign-Key: D1F781EFF9F4A3B6 dev-db/myodbc/ChangeLog | 4 ++++ dev-db/myodbc/files/5.2.7-my_malloc.patch | 18 ++++++++++++++++++ dev-db/myodbc/myodbc-5.2.7-r2.ebuild | 5 +++-- 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dev-db/myodbc/ChangeLog b/dev-db/myodbc/ChangeLog index 4a81ef1..8bc0aea 100644 --- a/dev-db/myodbc/ChangeLog +++ b/dev-db/myodbc/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Id$ + 11 Aug 2015; Brian Evans <[email protected]> +files/5.2.7-my_malloc.patch, + myodbc-5.2.7-r2.ebuild: + dev-db/myodbc Add patch from bug 548912 + 17 May 2015; Brian Evans <[email protected]> -files/5.2.7-cxxlinkage.patch, -files/myodbc-5.1.6-qt4-includedir.patch, -myodbc-5.1.6.ebuild, -myodbc-5.2.7.ebuild: diff --git a/dev-db/myodbc/files/5.2.7-my_malloc.patch b/dev-db/myodbc/files/5.2.7-my_malloc.patch new file mode 100644 index 0000000..bc6c65e --- /dev/null +++ b/dev-db/myodbc/files/5.2.7-my_malloc.patch @@ -0,0 +1,18 @@ +diff -Brau a/util/odbcinstw.c b/util/odbcinstw.c +--- a/util/odbcinstw.c 2014-04-23 21:54:40.000000000 +0200 ++++ b/util/odbcinstw.c 2015-05-08 15:29:09.400568356 +0200 +@@ -68,13 +68,7 @@ + + if (lpszRetBuffer && cbRetBuffer) + { +- ret= malloc(cbRetBuffer + 1); +- /* +- We cannot rely on getting correct results from the next call of +- SQLGetPrivateProfileString. So, taking precautions against unititialized +- values in the allocated buffer. +- */ +- memset(ret, 0, cbRetBuffer + 1); ++ ret= my_malloc(cbRetBuffer + 1, MYF(MY_ZEROFILL)); + } + else + ret= NULL; diff --git a/dev-db/myodbc/myodbc-5.2.7-r2.ebuild b/dev-db/myodbc/myodbc-5.2.7-r2.ebuild index cf7133d..65b99da 100644 --- a/dev-db/myodbc/myodbc-5.2.7-r2.ebuild +++ b/dev-db/myodbc/myodbc-5.2.7-r2.ebuild @@ -44,8 +44,9 @@ src_prepare() { # Patch document path so it doesn't install files to /usr epatch "${FILESDIR}/cmake-doc-path.patch" \ - "${FILESDIR}/${PVR}-cxxlinkage.patch" \ - "${FILESDIR}/${PV}-mariadb-dynamic-array.patch" + "${FILESDIR}/${PV}-r1-cxxlinkage.patch" \ + "${FILESDIR}/${PV}-mariadb-dynamic-array.patch" \ + "${FILESDIR}/${PV}-my_malloc.patch" } multilib_src_configure() {
