Date: Friday, March 8, 2013 @ 09:51:11 Author: mtorromeo Revision: 85882
upgpkg: percona-server 5.5.30_rel30.1-1 Updated to 5.5.30-rel30.1 Modified: percona-server/trunk/PKGBUILD percona-server/trunk/mysqld-post.sh percona-server/trunk/mysqld.service percona-server/trunk/percona.install Deleted: percona-server/trunk/mysqld.rc -----------------+ PKGBUILD | 19 ++++--------- mysqld-post.sh | 4 ++ mysqld.rc | 77 ------------------------------------------------------ mysqld.service | 9 +----- percona.install | 17 +++++++++-- 5 files changed, 24 insertions(+), 102 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-03-08 08:16:17 UTC (rev 85881) +++ PKGBUILD 2013-03-08 08:51:11 UTC (rev 85882) @@ -2,12 +2,12 @@ # Maintainer: Massimiliano Torromeo <[email protected]> pkgname=percona-server -pkgver=5.5.29_rel30.0 +pkgver=5.5.30_rel30.1 pkgrel=1 pkgdesc="A backwards-compatible drop-in replacement for MySQL that provides improved performance, diagnostics and instrumentation" arch=('i686' 'x86_64') -depends=('mysql-clients' 'libaio') +depends=('mysql-clients' 'libaio' 'systemd-tools') conflicts=('mysql') provides=('mysql') optdepends=('perl-dbi' 'perl-dbd-mysql') @@ -19,8 +19,6 @@ backup=('etc/mysql/my.cnf') install=percona.install source=("http://www.percona.com/downloads/Percona-Server-${pkgver%.*_*}/Percona-Server-${pkgver/_rel/-}/source/Percona-Server-${pkgver/_/-}.tar.gz"; - 'mysqld.rc' - 'my.cnf' 'mysqld-post.sh' 'mysqld.service' 'mysqld-tmpfile.conf') @@ -79,8 +77,7 @@ cd "${srcdir}"/build make DESTDIR=${pkgdir} install - install -Dm644 "${srcdir}"/my.cnf "${pkgdir}"/etc/mysql/my.cnf - install -Dm755 "${srcdir}"/mysqld.rc "${pkgdir}"/etc/rc.d/mysqld + install -Dm644 "${pkgdir}"/usr/share/mysql/my-medium.cnf "${pkgdir}"/etc/mysql/my.cnf install -Dm755 "${srcdir}"/mysqld-post.sh "${pkgdir}"/usr/bin/mysqld-post install -Dm644 "${srcdir}"/mysqld-tmpfile.conf "${pkgdir}"/usr/lib/tmpfiles.d/mysqld.conf install -Dm644 "${srcdir}"/mysqld.service "${pkgdir}"/usr/lib/systemd/system/mysqld.service @@ -98,13 +95,9 @@ # not needed rm -r ${pkgdir}/usr/{data,mysql-test,sql-bench} rm "${pkgdir}"/usr/share/man/man1/mysql-test-run.pl.1 - - install -dm700 "${pkgdir}"/var/lib/mysql } -sha256sums=('9cbcb2ad2b66a352a154f2b89c779d79cceea4f6f5ff9ef62f8ae1512c0550a7' - 'e875fac56f69634b4f1720aec3b952fc63903414e9345af630e5fd74b5373eb4' - 'dd5dc155de468d4ab26971109861ae19b53574f28785bac5ff7b717fb65c0760' - '4894d39605950d86841ad982e619daa6c8d5d60ca30928d7dbb582e8cb3ade32' - 'ca10dec3cc162baede651980e675fd8094e55cb2403edffaa3d0865a6184553f' +sha256sums=('7309cf2645a1b45a17d6dbfda8c96b00e1186f3b9aba7f8692da14b52f98fb3b' + '82a241d9fa4032187a26597d044e94ba810b209b53a7ce14bb6eb92555993a48' + '9bc66470f3f80534c0bb62f9f8325ccf60b164f421f74ad74a963f065d7b1869' 'badf6a701d9dc6ea3b4ddca26cb0f42b6236432ccdbc14c64962147802594a60') Modified: mysqld-post.sh =================================================================== --- mysqld-post.sh 2013-03-08 08:16:17 UTC (rev 85881) +++ mysqld-post.sh 2013-03-08 08:51:11 UTC (rev 85882) @@ -1,6 +1,8 @@ #!/bin/sh + while true; do - response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break + response=$(/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1) && break echo "$response" | grep -q "mysqld is alive" && break + echo "$response" | grep -q "Access denied for user" && break sleep 1 done Deleted: mysqld.rc =================================================================== --- mysqld.rc 2013-03-08 08:16:17 UTC (rev 85881) +++ mysqld.rc 2013-03-08 08:51:11 UTC (rev 85882) @@ -1,77 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -getPID() { - echo $(pgrep -u mysql mysqld 2>/dev/null); -} - -case "$1" in - start) - stat_busy "Starting Percona Server" - [ ! -d /var/run/mysqld ] && install -d -g mysql -o mysql /var/run/mysqld &>/dev/null - if [ -z "$(getPID)" ]; then - /usr/bin/mysqld_safe --user=mysql &>/dev/null & - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - timeo=30 - while [ $timeo -gt 0 ]; do - response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break - echo "$response" | grep -q "mysqld is alive" && break - sleep 1 - let timeo=${timeo}-1 - done - if [ $timeo -eq 0 ]; then - stat_fail - exit 1 - else - echo $(getPID) > /var/run/mysqld/mysqld.pid - add_daemon mysqld - stat_done - fi - fi - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping Percona Server" - if [ ! -z "$(getPID)" ]; then - timeo=30 - kill $(getPID) &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - fi - while [ ! -z "$(getPID)" -a $timeo -gt 0 ]; do - sleep 1 - let timeo=${timeo}-1 - done - if [ -z "$(getPID)" ]; then - rm -f /var/run/mysqld/mysqld.pid &>/dev/null - rm_daemon mysqld - stat_done - else - stat_fail - exit 1 - fi - else - stat_fail - exit 1 - fi - ;; - - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 Modified: mysqld.service =================================================================== --- mysqld.service 2013-03-08 08:16:17 UTC (rev 85881) +++ mysqld.service 2013-03-08 08:51:11 UTC (rev 85882) @@ -6,15 +6,10 @@ User=mysql Group=mysql -ExecStart=/usr/bin/mysqld --pid-file=/var/run/mysqld/mysqld.pid -ExecStop=/bin/kill -15 $MAINPID -PIDFile=/var/run/mysqld/mysqld.pid -WorkingDirectory=/usr +ExecStart=/usr/bin/mysqld --pid-file=/run/mysqld/mysqld.pid +ExecStartPost=/usr/bin/mysqld-post -# We rely on systemd, not mysqld_safe, to restart mysqld if it dies Restart=always - -# Place temp files in a secure directory, not /tmp PrivateTmp=true [Install] Modified: percona.install =================================================================== --- percona.install 2013-03-08 08:16:17 UTC (rev 85881) +++ percona.install 2013-03-08 08:51:11 UTC (rev 85882) @@ -1,15 +1,24 @@ +if [[ $(command -v my_print_defaults >/dev/null 2>&1) ]]; then + datadir=$(my_print_defaults mysqld | sed -n "s/^--datadir=//p") +fi +[[ -z $datadir ]] && datadir=/var/lib/mysql + post_install(){ groupadd -g 89 mysql &>/dev/null - useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null - usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql - chown -R mysql:mysql var/lib/mysql &>/dev/null + useradd -u 89 -g mysql -d $datadir -s /bin/false mysql &>/dev/null + + if [[ ! -e $datadir ]]; then + install -dm700 $datadir + usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=$datadir + chown -R mysql:mysql $datadir &>/dev/null + fi usr/bin/systemd-tmpfiles --create mysqld.conf } post_upgrade(){ getent group mysql >/dev/null 2>&1 || groupadd -g 89 mysql &>/dev/null - getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null + getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d $datadir -s /bin/false mysql &>/dev/null if [ "$(vercmp $2 5.5)" -lt 0 ]; then echo " >> "
