From 3e56cc749fa08a886f0efe07211f4b1d8891c03d Mon Sep 17 00:00:00 2001 From: Francesco Riosa Date: Thu, 4 Jan 2007 20:11:44 +0000 Subject: [PATCH] fix bug #158769 Package-Manager: portage-2.1.2_rc4-r1 --- sys-apps/mysql/Manifest | 30 +-- sys-apps/mysql/files/digest-mysql-1 | 0 sys-apps/mysql/files/mysql.rc6 | 357 ---------------------------- sys-apps/mysql/mysql-1.ebuild | 28 --- 4 files changed, 15 insertions(+), 400 deletions(-) delete mode 100644 sys-apps/mysql/files/digest-mysql-1 delete mode 100644 sys-apps/mysql/files/mysql.rc6 delete mode 100644 sys-apps/mysql/mysql-1.ebuild diff --git a/sys-apps/mysql/Manifest b/sys-apps/mysql/Manifest index 7524eebe940a..7e268aa71f1d 100644 --- a/sys-apps/mysql/Manifest +++ b/sys-apps/mysql/Manifest @@ -18,10 +18,10 @@ AUX mysql.init 884 RMD160 c4a3aba8eb7a94752226097e76834c3e6c7d88a7 SHA1 92d07c3a MD5 4a1a52d9a29c9179ad75dbd3bceaff96 files/mysql.init 884 RMD160 c4a3aba8eb7a94752226097e76834c3e6c7d88a7 files/mysql.init 884 SHA256 527f38ebcd205f9584c1ccf1d1bf0cfa3edb7403791638c98f1013d64b7d286a files/mysql.init 884 -AUX mysql.rc6 10624 RMD160 2203620bad446e3417a954fbcdc53bb04b9c0793 SHA1 a6ee8ca78ae5e4ea0f97e3d1da367a4e36698c63 SHA256 aa28cd645af8ea4e0e9607ef6e416f6f859546cb9bb7151eae59873ac9cd541a -MD5 c9fbceb123078bd1d38d9270df0ad506 files/mysql.rc6 10624 -RMD160 2203620bad446e3417a954fbcdc53bb04b9c0793 files/mysql.rc6 10624 -SHA256 aa28cd645af8ea4e0e9607ef6e416f6f859546cb9bb7151eae59873ac9cd541a files/mysql.rc6 10624 +AUX mysql.rc6-r1 10645 RMD160 a7a7623ea9648d8ce832504e0045b68c40cf56e4 SHA1 ee7a3f2fed9239edb417eb59d32fa5d7683a44b7 SHA256 bfc10efb08d0df36e4fb5b3724fb6297ec647dd72442236712f36aa2720b2cdd +MD5 d76dc2db5750d31424c69778d1ff6c1e files/mysql.rc6-r1 10645 +RMD160 a7a7623ea9648d8ce832504e0045b68c40cf56e4 files/mysql.rc6-r1 10645 +SHA256 bfc10efb08d0df36e4fb5b3724fb6297ec647dd72442236712f36aa2720b2cdd files/mysql.rc6-r1 10645 AUX mysqlmanager.conf.d 1009 RMD160 b443dc0cd1cb7fb054fe7229a52b8d093e634652 SHA1 0d82531df24ba4f0d957176b6fa0076a1cae0356 SHA256 35353f585cc9d3f97bbcfe77224d183e0fedcf4134377b8bff4c278462577cc7 MD5 c94178cadec3be56c4e6c7ec9812cfcf files/mysqlmanager.conf.d 1009 RMD160 b443dc0cd1cb7fb054fe7229a52b8d093e634652 files/mysqlmanager.conf.d 1009 @@ -30,18 +30,18 @@ AUX mysqlmanager.rc6 6619 RMD160 219028d4d1447493f0b12bb03fec541216e325a2 SHA1 4 MD5 4351409bcefcc6d18f5444f9cb2f020e files/mysqlmanager.rc6 6619 RMD160 219028d4d1447493f0b12bb03fec541216e325a2 files/mysqlmanager.rc6 6619 SHA256 ff9836269bf7de042a96c4fddf696315376e6dfab559444ee21dd0744370e9b5 files/mysqlmanager.rc6 6619 -EBUILD mysql-1.ebuild 770 RMD160 8e6e738f7922623df6172da460e69abfa081ef2e SHA1 a9dd87ddb02fbae39b5334c22689b32069492221 SHA256 8e0057ee7701e0624c2241cb0838e9dd9fda0a36b60d478df8771f5210e9ab12 -MD5 044136a1cb815b9a47f7c659846e5e94 mysql-1.ebuild 770 -RMD160 8e6e738f7922623df6172da460e69abfa081ef2e mysql-1.ebuild 770 -SHA256 8e0057ee7701e0624c2241cb0838e9dd9fda0a36b60d478df8771f5210e9ab12 mysql-1.ebuild 770 -MISC ChangeLog 543 RMD160 f8ca1341b9d8b9150f5a8171643699c2fbaa36a2 SHA1 a00a050f00c25f7c9400882106de0c495361370c SHA256 29a207726429b08300c367d2b45bdea4e2290ae8a2bef28119f9f528446c6a95 -MD5 036965eed41d0717191cf11052111035 ChangeLog 543 -RMD160 f8ca1341b9d8b9150f5a8171643699c2fbaa36a2 ChangeLog 543 -SHA256 29a207726429b08300c367d2b45bdea4e2290ae8a2bef28119f9f528446c6a95 ChangeLog 543 +EBUILD mysql-1.1.ebuild 775 RMD160 87158a241cb260d8ed8e7dc9ed7b48b2395c0be8 SHA1 80791a8f66682cb2840ae78fe2d241a9af6ec299 SHA256 c540c0e4ba352d6743d30ba1255938fe4802265d8e771aa9a7a128b0826f3548 +MD5 d707cb72a617bd7e2601f049169ac587 mysql-1.1.ebuild 775 +RMD160 87158a241cb260d8ed8e7dc9ed7b48b2395c0be8 mysql-1.1.ebuild 775 +SHA256 c540c0e4ba352d6743d30ba1255938fe4802265d8e771aa9a7a128b0826f3548 mysql-1.1.ebuild 775 +MISC ChangeLog 714 RMD160 881405e5b3e983dd9e300b12d796ee20b230ea30 SHA1 d287177bf0b446f037b21230dc964e252a7f65bb SHA256 5939db9cab71c00e916df0833a0b1218356a1ed8aa22ac688dc782d2b0ad2ba5 +MD5 31d58466d8e9bfa071273458c56b0acf ChangeLog 714 +RMD160 881405e5b3e983dd9e300b12d796ee20b230ea30 ChangeLog 714 +SHA256 5939db9cab71c00e916df0833a0b1218356a1ed8aa22ac688dc782d2b0ad2ba5 ChangeLog 714 MISC metadata.xml 159 RMD160 a50a94af7706288c46f81d6c3da9b5f888050eee SHA1 5eb253a678d6faa0f1c6b3c5720a804ed8923566 SHA256 5cfd5aa0e8104c0326b5f4c9205a6449a94e0f6f6abfd2626f1e7a8fe77b98b7 MD5 f1c86d989c7ea2451931e7e2c3530f8c metadata.xml 159 RMD160 a50a94af7706288c46f81d6c3da9b5f888050eee metadata.xml 159 SHA256 5cfd5aa0e8104c0326b5f4c9205a6449a94e0f6f6abfd2626f1e7a8fe77b98b7 metadata.xml 159 -MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mysql-1 0 -RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-mysql-1 0 -SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-mysql-1 0 +MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mysql-1.1 0 +RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-mysql-1.1 0 +SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-mysql-1.1 0 diff --git a/sys-apps/mysql/files/digest-mysql-1 b/sys-apps/mysql/files/digest-mysql-1 deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/sys-apps/mysql/files/mysql.rc6 b/sys-apps/mysql/files/mysql.rc6 deleted file mode 100644 index 4150a1c528f1..000000000000 --- a/sys-apps/mysql/files/mysql.rc6 +++ /dev/null @@ -1,357 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/mysql/files/mysql.rc6,v 1.1 2007/01/02 10:21:12 vivo Exp $ - -# external binaries used: which, sed, tac - -# int in_list(char * elem, char * list) -function in_list() { - local elem=${1:-"none"} - local list=${2:-","} - - [[ "${list}" == "${list/,${elem},/}" ]] \ - && return 1 \ - || return 0 -} - -function wdebug() { - if [[ "${DEBUG}" -ge "${1}" ]] ; then - shift - echo "dbg: ${@}" - fi -} - -depend() { - use dns net localmount netmount nfsmount -} - -do_escape() { - # Ihatethisreallyverymuch - #echo "$1" | sed -e "s|'| |" -e "s|=|='|" -e "s|$|'|" - echo "$1" -} - -# int get_slot_config(srv_slot=0, srv_num) -get_slot_config() { - wdebug 4 ">>> get_slot_config()" - - local srv srv_slot srv_num - srv_slot="${1:-"0"}" - srv_num="${2}" - MY_SUFFIX="-${srv_slot}" - # srv=array(0 => [srv_slot], 1 => [srv_num] ) - srv=( ${srv_slot} ${srv_num} ) - - local tmp_eval="mysql_slot_${srv_slot}${srv_num:+"_"}${srv_num}[@]" - local conf_d_parameters="${!tmp_eval}" - if [[ "${srv_slot}" == "0" ]] ; then - MY_SUFFIX='' - # try some other default for the default server - [[ -z "${conf_d_parameters[@]}" ]] && conf_d_parameters=${mysql_slot[@]} - fi - [[ -z "${conf_d_parameters[@]}" ]] && conf_d_parameters=( ) - basedir="" datadir="" pidfile="" socket="" - CHROOT="" NICE="" STARTUPTIMEOUT=5 STOPTIMEOUT=120 - - wdebug 3 "srv ${srv[@]}" - wdebug 3 "srv_slot ${srv_slot}" - wdebug 3 "srv_num ${srv_num}" - wdebug 3 "tmp_eval ${tmp_eval}" - wdebug 3 "conf_d_parameters ${conf_d_parameters[@]}" - wdebug 3 "MY_SUFFIX ${MY_SUFFIX}" - - local tmp_eval="mysql_slot_${srv_slot}${srv_num:+"_"}${srv_num}[@]" - local conf_d_parameters="${!tmp_eval}" - # collations need to be defined *after* the character sets, - # so we will duplicate them - local collations="" - [[ ${conf_d_parameters[*]} == '()' ]] && conf_d_parameters='' - - MY_CNF="/etc/mysql${MY_SUFFIX}/my.cnf" - # summa of unmanaged parameters - # some parameters may be present multiple times - unmanagedparams="" - - # grab the parameters from conf.d/mysql definition - for my_default in ${conf_d_parameters[*]} ; do - case "${my_default}" in - nice=*) - NICE="${my_default#nice=}" - nice -n $NICE ls /tmp &>/dev/null || NICE="" - ;; - mycnf=*) MY_CNF="${my_default#mycnf=}" ;; - startup_timeout=*) - STARTUPTIMEOUT="${my_default#startup_timeout=}" ;; - basedir=*) basedir="${my_default#basedir=}" ;; - datadir=*) datadir="${my_default#datadir=}" ;; - pid-file=*) pidfile="${my_default#pid-file=}" ;; - socket=*) socket="${my_default#socket=}" ;; - *collation*=) - collations="${collations} --$( do_escape "${my_default}" )" - ;; - *=*) - # list of parameters we already have - # prepend "--" because my_print_defaults do it - unmanagedparams="${unmanagedparams} --$( do_escape "${my_default}" )" - ;; - *) - unmanagedparams="${unmanagedparams} --${my_default}" - ;; - esac - done - - if [[ ! -r "${MY_CNF}" ]] ; then - ewarn "Cannot access ${MY_CNF} !" - MY_CNF="" - my_defaults="" - else - local my_print_defaults="$(which my_print_defaults${MY_SUFFIX} 2>/dev/null)" - if [[ ! -x "${my_print_defaults}" ]] ; then - eerror "my_print_defaults NOT found or not executable" - my_defaults="" - else - my_defaults=$( ${my_print_defaults} \ - --loose-verbose \ - --config-file="${MY_CNF}" \ - mysqld server ) - fi - fi - - # grab needed parameters from my.cnf, don't override the ones from - # conf.d/mysql - for my_default in ${my_defaults} ; do - case "${my_default}" in - --basedir=*) - [[ -z "${basedir}" ]] && basedir="${my_default#--basedir=}" ;; - --datadir=*) - [[ -z "${datadir}" ]] && datadir="${my_default#--datadir=}" ;; - --pid-file=*) - [[ -z "${pidfile}" ]] && pidfile="${my_default#--pid-file=}" ;; - --socket=*) - [[ -z "${socket}" ]] && socket="${my_default#--socket=}" ;; - --*collation*=) - # the order is inversed because we want the conf.d ones overriden - collations="$( do_escape "${my_default}" ) ${collations}" - ;; - esac - done - - # some parameters - basedir="${basedir:-"/usr"}" - datadir="${datadir:-"/var/lib/mysql${MY_SUFFIX}"}" - pidfile="${pidfile:-"/var/run/mysqld/mysqld${MY_SUFFIX}.pid"}" - socket="${socket:-"/var/run/mysqld/mysqld${MY_SUFFIX}.sock"}" - unmanagedparams="${unmanagedparams} ${collations}" - - wdebug 3 "chroot dir => ${CHROOT}" - wdebug 3 "niceness => ${NICE}" - wdebug 3 "basedir => ${basedir}" - wdebug 3 "datadir => ${datadir}" - wdebug 3 "pidfile => ${pidfile}" - wdebug 3 "socket => ${socket}" - wdebug 3 "Unamanged => ${unmanagedparams}" - - # extension for sleep tenth of seconds, not very portable so check it before - if sleep 0.01 ; then - STARTUPTIMEOUT=$(( STARTUPTIMEOUT * 10 )) - STOPTIMEOUT=$(( STOPTIMEOUT * 10 )) - TIMEUNIT=0.1 - else - TIMEUNIT=1 - fi - - # push these out to the script - export MY_SUFFIX NICE MY_CNF pidfile datadir basedir socket CHROOT - export unmanagedparams STARTUPTIMEOUT STOPTIMEOUT TIMEUNIT - wdebug 4 "<<< get_slot_config() ok" - return 0 -} - -checkconfig() { - wdebug 4 ">>> checkconfig(\"${1}\")" - local datadir="${1}" pidfile="${2}" socket="${3}" - - if [[ -n "${NOCHECK}" ]] ; then - rm -f "${pidfile}" "${socket}" - return 0 - fi - - if [[ ! -d "${datadir}" ]] ; then - eerror "MySQL datadir is empty or invalid" - eerror "Please check your my.cnf : ${MY_CNF}" - wdebug 4 "<<< checkconfig() KO" - return 1 - fi - - if [[ ! -d "${datadir}/mysql" ]] ; then - eerror "You don't appear to have the mysql database installed yet." - eerror "Please run /usr/bin/mysql_install_db to have this done..." - wdebug 4 "<<< checkconfig() KO" - return 1 - fi - - if [[ -f "${pidfile}" ]] ; then - kill -15 $(< ${pidfile}) 2>/dev/null - if [[ $? -eq 0 ]] ; then - # the process exist, we have a problem - eerror "\"${pidfile}\" is still present and the process is running." - eerror "Please stop it \"kill $(< ${pidfile})\" maybe ?" - wdebug 4 "<<< checkconfig() KO" - return 1 - else - rm -f "${pidfile}" - fi - fi - - if [[ -S "${socket}" ]] ; then - ewarn "Strange, the socket file already exist in \"${socket}\"" - ewarn "it will be removed now and re-created by the MySQL server" - ewarn "BUT please make your checks." - rm -f "${socket}" - fi - - wdebug 4 "<<< checkconfig() ok" - return 0 -} - -start() { - wdebug 4 ">>> start()" - - MYSQL_GLOB_PID_FILE=${MYSQL_GLOB_PID_FILE:-"/var/run/svc-started-${SVCNAME/mysql/mysqld}"} - # servers are defined in /etc/conf.d/mysql - local serverlist=${!mysql_slot_*} - # provide default for empty conf.d/mysql - if [[ -z "${serverlist}" ]] ; then - serverlist=0 - export mysql_slot_0=( ) - fi - local retstatus timeout - local globretstatus=1 - local srv_slot srv_num - # server MUST NOT share same location for these - local pidfilelist=',' datadirlist=',' socketlist=',' - local ssd_thing=1 - local mysqld_thing tmpnice - - ebegin "Starting ${myservice}" - # try to start each server - for srv in ${serverlist[*]} ; do - - srv_slot="${srv#mysql_slot_}" - if [[ "${srv_slot}" == "${srv_slot#*_}" ]] ; then - srv_num='' - else - srv_num="${srv_slot#*_}" - fi - srv_slot="${srv_slot%%_*}" - - retstatus=0 - get_slot_config "${srv_slot}" "${srv_num}" || retstatus=1 - - # checks - if ! checkconfig "${datadir}" "${pidfile}" "${socket}" ; then - retstatus=2 ; continue - fi - if in_list "${pidfile}" "${pidfilelist}" ; then - eerror "Sorry, won't start with same pid-file: ${pidfile}" - retstatus=3 ; continue - fi - if in_list "${datadir}" "${datadirlist}" ; then - eerror "Sorry, won't start with same datadir: ${datadir}" - retstatus=4 ; continue - fi - if in_list "${socket}" "${socketlist}" ; then - eerror "Sorry, won't start with same socket: ${socket}" - retstatus=5 ; continue - fi - - einfo "Starting ${myservice} (${MY_CNF})" - - mysqld_thing="${MY_CNF:+"--defaults-file="}${MY_CNF}" - mysqld_thing="${mysqld_thing} ${unmanagedparams}" - mysqld_thing="${mysqld_thing} --basedir=${basedir}" - mysqld_thing="${mysqld_thing} --datadir=${datadir}" - mysqld_thing="${mysqld_thing} --pid-file=${pidfile}" - mysqld_thing="${mysqld_thing} --socket=${socket}" - - wdebug 2 "starting mysqld with: ${mysqld_thing}" - - if [[ ${ssd_thing} -eq 1 ]] ; then - tmpnice="${NICE:+"--nicelevel "}${NICE}" - start-stop-daemon --quiet ${DEBUG/*/"--verbose"} --start \ - --background ${tmpnice} --pidfile ${pidfile} \ - --exec ${basedir}/sbin/mysqld${MY_SUFFIX} -- ${mysqld_thing} - retstatus=$? - else - tmpnice="${NICE:+"nice -n "}${NICE}" - ${tmpnice} ${basedir}/sbin/mysqld${MY_SUFFIX} ${mysqld_thing} & - retstatus=0 - fi - - # only the first run is done by start-stop-daemon - ssd_thing="" - - # wait for socket creation - wdebug 1 - while ! [[ -S "${socket}" || "${STARTUPTIMEOUT}" -lt 1 || "${retstatus}" -ne 0 ]] ; do - STARTUPTIMEOUT=$(( STARTUPTIMEOUT - 1 )) - [[ ${DEBUG} -ge 1 ]] && echo -n "${STARTUPTIMEOUT}," - sleep ${TIMEUNIT} - done - wdebug 1 "" - if [[ ! -S "${socket}" ]] ; then - eerror "MySQL${MY_SUFFIX} NOT started (${retstatus})" - retstatus=1 - else - globretstatus=0 - pidfilelist="${pidfilelist}${pidfile}," - datadirlist="${datadirlist}${datadir}," - socketlist="${socketlist}${socket}," - echo "${srv_slot}${srv_num:+"_"}${srv_num}=${pidfile}" >> "${MYSQL_GLOB_PID_FILE}" - fi - done - # successfull if at least one mysqld started - wdebug 4 "<<< start()" - eend $globretstatus -} - -stop() { - get_slot_config &> /dev/null - MYSQL_GLOB_PID_FILE=${MYSQL_GLOB_PID_FILE:-"/var/run/svc-started-${SVCNAME/mysql/mysqld}"} - local runwhat pidfile shutdown_elem - local PID cnt timeout=${STOPTIMEOUT:-"120"} - local retstatus=0 - local shutdown_list="$(< "${MYSQL_GLOB_PID_FILE}" )" - - ebegin "Stopping ${myservice}" - wdebug 5 "MYSQL_GLOB_PID_FILE: ${MYSQL_GLOB_PID_FILE}" - wdebug 5 "shutdown_list: ${shutdown_list}" - for shutdown_elem in ${shutdown_list} ; do - runwhat=${shutdown_elem%%=*} - pidfile=${shutdown_elem#*=} - timeout=${STOPTIMEOUT:-"120"} - PID=$(< "${pidfile}" ) - wdebug 3 "runwhat ${runwhat}" - wdebug 3 "pidfile ${pidfile}" - wdebug 3 "timeout ${timeout}" - wdebug 3 "PID ${PID}" - - einfo "Stopping mysqld (${runwhat})" - - start-stop-daemon --quiet ${DEBUG/*/"--verbose"} --stop --pidfile "${pidfile}" & - wdebug 1 "" - while [[ -n "$PID" ]] \ - && $( ps -Ao pid | grep -q "^ *$PID$" ) \ - && [[ "${timeout}" -ge 1 ]] - do - timeout=$(($timeout - 1)) - [[ ${DEBUG} -ge 1 ]] && echo -n "$(( $STOPTIMEOUT - $timeout ))," - sleep ${TIMEUNIT} - done - [[ "${timeout}" -lt 1 ]] && retstatus=1 - done - sleep ${TIMEUNIT} - [[ "$retstatus" -eq 0 ]] && rm -f "$MYSQL_GLOB_PID_FILE" - eend ${retstatus} -} diff --git a/sys-apps/mysql/mysql-1.ebuild b/sys-apps/mysql/mysql-1.ebuild deleted file mode 100644 index d157f1ed6c8c..000000000000 --- a/sys-apps/mysql/mysql-1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/mysql/mysql-1.ebuild,v 1.2 2007/01/02 10:27:24 vivo Exp $ - -DESCRIPTION="Install gentoo related MySQL stuff" -HOMEPAGE="http://www.gentoo.org" -SRC_URI="" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" -IUSE="" - -DEPEND="" -RDEPEND="" - -src_install() { - insinto "/etc/conf.d" - newins "${FILESDIR}/mysql.conf.d" "mysql" - newins "${FILESDIR}/mysqlmanager.conf.d" "mysqlmanager" - - exeinto /etc/init.d - newexe "${FILESDIR}/mysql.rc6" "mysql" - newexe "${FILESDIR}/mysqlmanager.rc6" "mysqlmanager" - - insinto /etc/logrotate.d - newins "${FILESDIR}/logrotate.mysql" "mysql" -} -- 2.26.2