| 1 |
commit: 6c3bfb7d9ec707b161bddb53bde5a24f411e0923 |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Nov 4 21:31:17 2015 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Nov 4 21:31:17 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c3bfb7d |
| 7 |
|
| 8 |
mysql-multilib.eclass: Several small fixes from the mysql overlay |
| 9 |
|
| 10 |
Remove the deprecated cluster and community IUSE |
| 11 |
Fix an old URL in post install instructions |
| 12 |
Trigger galera initial install instructions by the galera IUSE |
| 13 |
Restrict tests when libressl is in use |
| 14 |
Fix the initial pkg_config password wrt bug 564198 |
| 15 |
Consolidate the duplicate ewarn messages about client libs into a single einfo |
| 16 |
wrt bug 563640 |
| 17 |
|
| 18 |
Signed-off-by: Brian Evans <grknight <AT> gentoo.org> |
| 19 |
|
| 20 |
eclass/mysql-multilib.eclass | 29 ++++++++++++++++------------- |
| 21 |
1 file changed, 16 insertions(+), 13 deletions(-) |
| 22 |
|
| 23 |
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass |
| 24 |
index 066b489..def53ae 100644 |
| 25 |
--- a/eclass/mysql-multilib.eclass |
| 26 |
+++ b/eclass/mysql-multilib.eclass |
| 27 |
@@ -192,7 +192,7 @@ fi |
| 28 |
LICENSE="GPL-2" |
| 29 |
SLOT="0/${SUBSLOT:-0}" |
| 30 |
|
| 31 |
-IUSE="+community cluster debug embedded extraengine jemalloc latin1 libressl +openssl |
| 32 |
+IUSE="debug embedded extraengine jemalloc latin1 libressl +openssl |
| 33 |
+perl profiling selinux systemtap static static-libs tcmalloc test yassl" |
| 34 |
|
| 35 |
REQUIRED_USE="^^ ( yassl openssl libressl )" |
| 36 |
@@ -213,6 +213,9 @@ REQUIRED_USE="^^ ( yassl openssl libressl )" |
| 37 |
# IUSE="bindist ${IUSE}" |
| 38 |
#fi |
| 39 |
|
| 40 |
+# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests |
| 41 |
+RESTRICT="libressl? ( test )" |
| 42 |
+ |
| 43 |
if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then |
| 44 |
IUSE="bindist ${IUSE}" |
| 45 |
RESTRICT="${RESTRICT} !bindist? ( bindist )" |
| 46 |
@@ -507,9 +510,6 @@ mysql-multilib_pkg_pretend() { |
| 47 |
die |
| 48 |
fi |
| 49 |
fi |
| 50 |
- if use_if_iuse cluster && [[ "${PN}" != "mysql-cluster" ]]; then |
| 51 |
- die "NDB Cluster support has been removed from all packages except mysql-cluster" |
| 52 |
- fi |
| 53 |
} |
| 54 |
|
| 55 |
# @FUNCTION: mysql-multilib_pkg_setup |
| 56 |
@@ -605,7 +605,7 @@ multilib_src_configure() { |
| 57 |
|
| 58 |
if ! multilib_is_native_abi && in_iuse client-libs ; then |
| 59 |
if ! use client-libs ; then |
| 60 |
- ewarn "Skipping multilib build due to client-libs USE disabled" |
| 61 |
+ einfo "Skipping multilib build due to client-libs USE disabled" |
| 62 |
return 0 |
| 63 |
fi |
| 64 |
fi |
| 65 |
@@ -740,7 +740,6 @@ mysql-multilib_src_compile() { |
| 66 |
multilib_src_compile() { |
| 67 |
if ! multilib_is_native_abi && in_iuse client-libs ; then |
| 68 |
if ! use client-libs ; then |
| 69 |
- ewarn "Skipping multilib build due to client-libs USE disabled" |
| 70 |
return 0 |
| 71 |
fi |
| 72 |
fi |
| 73 |
@@ -770,7 +769,6 @@ multilib_src_install() { |
| 74 |
|
| 75 |
if ! multilib_is_native_abi && in_iuse client-libs ; then |
| 76 |
if ! use client-libs ; then |
| 77 |
- ewarn "Skipping multilib build due to client-libs USE disabled" |
| 78 |
return 0 |
| 79 |
fi |
| 80 |
fi |
| 81 |
@@ -870,7 +868,7 @@ mysql-multilib_pkg_postinst() { |
| 82 |
einfo |
| 83 |
elog "This install includes the PAM authentication plugin." |
| 84 |
elog "To activate and configure the PAM plugin, please read:" |
| 85 |
- elog "https://kb.askmonty.org/en/pam-authentication-plugin/" |
| 86 |
+ elog "https://mariadb.com/kb/en/mariadb/pam-authentication-plugin/" |
| 87 |
einfo |
| 88 |
fi |
| 89 |
fi |
| 90 |
@@ -886,7 +884,7 @@ mysql-multilib_pkg_postinst() { |
| 91 |
elog "mysql_upgrade tool." |
| 92 |
einfo |
| 93 |
|
| 94 |
- if [[ ${PN} == "mariadb-galera" ]] ; then |
| 95 |
+ if [[ ${PN} == "mariadb-galera" ]] || use_if_iuse galera ; then |
| 96 |
einfo |
| 97 |
elog "Be sure to edit the my.cnf file to activate your cluster settings." |
| 98 |
elog "This should be done after running \"emerge --config =${CATEGORY}/${PF}\"" |
| 99 |
@@ -913,9 +911,10 @@ mysql-multilib_getopt() { |
| 100 |
# Use my_print_defaults to extract specific config options |
| 101 |
mysql-multilib_getoptval() { |
| 102 |
local mypd="${EROOT}"/usr/bin/my_print_defaults |
| 103 |
- section="$1" |
| 104 |
- flag="--${2}=" |
| 105 |
- "${mypd}" $section | sed -n "/^${flag}/s,${flag},,gp" |
| 106 |
+ local section="$1" |
| 107 |
+ local flag="--${2}=" |
| 108 |
+ local extra_options="${3}" |
| 109 |
+ "${mypd}" $extra_options $section | sed -n "/^${flag}/s,${flag},,gp" |
| 110 |
} |
| 111 |
|
| 112 |
# @FUNCTION: mysql-multilib_pkg_config |
| 113 |
@@ -976,6 +975,10 @@ mysql-multilib_pkg_config() { |
| 114 |
|
| 115 |
if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then |
| 116 |
MYSQL_ROOT_PASSWORD="$(mysql-multilib_getoptval 'client mysql' password)" |
| 117 |
+ # Sometimes --show is required to display passwords in some implementations of my_print_defaults |
| 118 |
+ if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]]; then |
| 119 |
+ MYSQL_ROOT_PASSWORD="$(mysql-multilib_getoptval 'client mysql' password --show)" |
| 120 |
+ fi |
| 121 |
fi |
| 122 |
MYSQL_TMPDIR="$(mysql-multilib_getoptval mysqld tmpdir)" |
| 123 |
# These are dir+prefix |
| 124 |
@@ -1039,7 +1042,7 @@ mysql-multilib_pkg_config() { |
| 125 |
help_tables="${TMPDIR}/fill_help_tables.sql" |
| 126 |
|
| 127 |
# Figure out which options we need to disable to do the setup |
| 128 |
- helpfile="${TMPDIR}/mysqld-help" |
| 129 |
+ local helpfile="${TMPDIR}/mysqld-help" |
| 130 |
${EROOT}/usr/sbin/mysqld --verbose --help >"${helpfile}" 2>/dev/null |
| 131 |
for opt in grant-tables host-cache name-resolve networking slave-start \ |
| 132 |
federated ssl log-bin relay-log slow-query-log external-locking \ |
Archives