From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 4D4BA1389DE for ; Tue, 12 Feb 2013 22:47:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 32A75E011E; Tue, 12 Feb 2013 22:47:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5BA4EE04C2 for ; Tue, 12 Feb 2013 22:47:43 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6FD9533E644 for ; Tue, 12 Feb 2013 22:47:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 247EAE4073 for ; Tue, 12 Feb 2013 22:47:40 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1359579089.dead2aa64ee85df4f0a4344d43fc14caa35f23b0.robbat2@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: eclass/ X-VCS-Repository: proj/mysql X-VCS-Files: eclass/mysql-autotools.eclass eclass/mysql-cmake.eclass eclass/mysql-v2.eclass X-VCS-Directories: eclass/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: dead2aa64ee85df4f0a4344d43fc14caa35f23b0 X-VCS-Branch: master Date: Tue, 12 Feb 2013 22:47:40 +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: 0537e352-632b-4526-9cd3-f81c6bd7de77 X-Archives-Hash: c3805d47900041bc8153556a2c5f2099 commit: dead2aa64ee85df4f0a4344d43fc14caa35f23b0 Author: Brian Evans lavabit com> AuthorDate: Wed Jan 30 20:51:29 2013 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Wed Jan 30 20:51:29 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=dead2aa6 Add USE="pam" for bug 448598 --- eclass/mysql-autotools.eclass | 9 +++++++++ eclass/mysql-cmake.eclass | 5 +++++ eclass/mysql-v2.eclass | 17 +++++++++++++++++ 3 files changed, 31 insertions(+), 0 deletions(-) diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclass index c342b63..1ea254a 100644 --- a/eclass/mysql-autotools.eclass +++ b/eclass/mysql-autotools.eclass @@ -289,6 +289,15 @@ mysql-autotools_configure_51() { || plugins_dis="${plugins_dis} ${i}" done fi + + #Authentication plugins + if mysql_version_is_at_least "5.2.11" ; then + for i in pam ; do + use ${i} \ + && plugins_dyn="${plugins_dyn} auth_${i}" \ + || plugins_dis="${plugins_dis} auth_${i}" + done + fi fi if pbxt_available && [[ "${PBXT_NEWSTYLE}" == "1" ]]; then diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass index 06124b3..8673691 100644 --- a/eclass/mysql-cmake.eclass +++ b/eclass/mysql-cmake.eclass @@ -185,6 +185,11 @@ configure_cmake_standard() { $(cmake-utils_use_with sphinx SPHINX_STORAGE_ENGINE) $(cmake-utils_use_with extraengine FEDERATEDX_STORAGE_ENGINE) ) + + if ! use pam ; then + mycmakeargs+=( -DAUTH_PAM_DISABLED=1 ) + fi + fi } diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass index 4ce13a8..a3b1dc9 100644 --- a/eclass/mysql-v2.eclass +++ b/eclass/mysql-v2.eclass @@ -187,6 +187,10 @@ IUSE="${IUSE} +community profiling" && mysql_version_is_at_least "5.2.5" \ && IUSE="${IUSE} sphinx" +[[ ${PN} == "mariadb" ]] \ +&& mysql_version_is_at_least "5.2.10" \ +&& IUSE="${IUSE} pam" + if mysql_version_is_at_least "5.5"; then REQUIRED_USE="tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc )" IUSE="${IUSE} jemalloc tcmalloc" @@ -230,6 +234,10 @@ done && mysql_version_is_at_least "5.2.5" \ && DEPEND="${DEPEND} sphinx? ( app-misc/sphinx )" +[[ "${PN}" == "mariadb" ]] \ +&& mysql_version_is_at_least "5.2.10" \ +&& DEPEND="${DEPEND} !minimal? ( pam? ( virtual/pam ) )" + # Bug 441700 MariaDB >=5.3 include custom mytop [[ "${PN}" == "mariadb" ]] \ && mysql_version_is_at_least "5.3" \ @@ -484,6 +492,15 @@ mysql-v2_pkg_postinst() { && dodoc "${script}" done + if [ ${PN} == "mariadb" ] \ + && mysql_version_is_at_least "5.2.10" && use pam ; then + einfo + elog "This install includes the PAM authentication plugin." + elog "To activate and configure the PAM plugin, please read:" + elog "https://kb.askmonty.org/en/pam-authentication-plugin/" + einfo + fi + einfo elog "You might want to run:" elog "\"emerge --config =${CATEGORY}/${PF}\""