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 D5F811382C5 for ; Thu, 29 Mar 2018 12:47:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 15DEAE0872; Thu, 29 Mar 2018 12:47:05 +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 E4847E0872 for ; Thu, 29 Mar 2018 12:46:59 +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 CD2C7335D0B for ; Thu, 29 Mar 2018 12:46:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DA99E260 for ; Thu, 29 Mar 2018 12:46:56 +0000 (UTC) From: "Brian Evans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Evans" Message-ID: <1522327596.bbb055a0129aadb278c78b3d096dadcae943c0ac.grknight@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/ X-VCS-Repository: proj/mysql X-VCS-Files: dev-db/mysql/mysql-5.7.21.ebuild X-VCS-Directories: dev-db/mysql/ X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: bbb055a0129aadb278c78b3d096dadcae943c0ac X-VCS-Branch: master Date: Thu, 29 Mar 2018 12:46:56 +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-Archives-Salt: a31ef95f-c793-4a59-9fe1-9217a4cfdec0 X-Archives-Hash: eb509cfb861c3ca9f48a04005e26fd47 commit: bbb055a0129aadb278c78b3d096dadcae943c0ac Author: Brian Evans gentoo org> AuthorDate: Thu Mar 29 12:46:36 2018 +0000 Commit: Brian Evans gentoo org> CommitDate: Thu Mar 29 12:46:36 2018 +0000 URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=bbb055a0 dev-db/mysql: Fix pkg_config for 5.7.21 Package-Manager: Portage-2.3.26, Repoman-2.3.7 Manifest-Sign-Key: D1F781EFF9F4A3B6 dev-db/mysql/mysql-5.7.21.ebuild | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/dev-db/mysql/mysql-5.7.21.ebuild b/dev-db/mysql/mysql-5.7.21.ebuild index 1d1eaac..681748a 100644 --- a/dev-db/mysql/mysql-5.7.21.ebuild +++ b/dev-db/mysql/mysql-5.7.21.ebuild @@ -791,8 +791,9 @@ pkg_config() { # http://dev.mysql.com/doc/mysql/en/time-zone-support.html "${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null - local cmd=( "${EROOT}usr/share/mysql/scripts/mysql_install_db" ) - [[ -f "${cmd}" ]] || cmd=( "${EROOT}usr/bin/mysql_install_db" ) + # --initialize-insecure will not set root password + # --initialize would set a random one in the log which we don't need as we set it ourselves + local cmd=( "${EROOT}usr/sbin/mysqld" "--initialize-insecure" "--init-file='${sqltmp}'" ) cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT}/${MY_DATADIR}" "--tmpdir=${ROOT}/${MYSQL_TMPDIR}" ) einfo "Command: ${cmd[*]}" su -s /bin/sh -c "${cmd[*]}" mysql \ @@ -811,6 +812,7 @@ pkg_config() { local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid" local mysqld="${EROOT}/usr/sbin/mysqld \ ${options} \ + $(use prefix || echo --user=mysql) \ --log-warnings=0 \ --basedir=${EROOT}/usr \ --datadir=${ROOT}/${MY_DATADIR} \ @@ -844,19 +846,6 @@ pkg_config() { -e "${sql}" eend $? - if [[ -n "${sqltmp}" ]] ; then - ebegin "Loading \"zoneinfo\", this step may require a few seconds" - "${EROOT}/usr/bin/mysql" \ - "--socket=${socket}" \ - -hlocalhost \ - -uroot \ - --password="${MYSQL_ROOT_PASSWORD}" \ - mysql < "${sqltmp}" - rc=$? - eend $? - [[ $rc -ne 0 ]] && ewarn "Failed to load zoneinfo!" - fi - # Stop the server and cleanup einfo "Stopping the server ..." kill $(< "${pidfile}" )