[arch-commits] Commit in mariadb/repos (20 files)
Bartłomiej Piotrowski
bpiotrowski at nymeria.archlinux.org
Thu Jan 31 12:12:12 UTC 2013
Date: Thursday, January 31, 2013 @ 13:12:11
Author: bpiotrowski
Revision: 83403
archrelease: copy trunk to community-i686, community-x86_64
Added:
mariadb/repos/community-i686/PKGBUILD
(from rev 83402, mariadb/trunk/PKGBUILD)
mariadb/repos/community-i686/mariadb.install
(from rev 83402, mariadb/trunk/mariadb.install)
mariadb/repos/community-i686/rc.d
(from rev 83402, mariadb/trunk/rc.d)
mariadb/repos/community-i686/service
(from rev 83402, mariadb/trunk/service)
mariadb/repos/community-i686/tmpfiles.conf
(from rev 83402, mariadb/trunk/tmpfiles.conf)
mariadb/repos/community-x86_64/PKGBUILD
(from rev 83402, mariadb/trunk/PKGBUILD)
mariadb/repos/community-x86_64/mariadb.install
(from rev 83402, mariadb/trunk/mariadb.install)
mariadb/repos/community-x86_64/rc.d
(from rev 83402, mariadb/trunk/rc.d)
mariadb/repos/community-x86_64/service
(from rev 83402, mariadb/trunk/service)
mariadb/repos/community-x86_64/tmpfiles.conf
(from rev 83402, mariadb/trunk/tmpfiles.conf)
Deleted:
mariadb/repos/community-i686/PKGBUILD
mariadb/repos/community-i686/mariadb.install
mariadb/repos/community-i686/rc.d
mariadb/repos/community-i686/service
mariadb/repos/community-i686/tmpfiles.conf
mariadb/repos/community-x86_64/PKGBUILD
mariadb/repos/community-x86_64/mariadb.install
mariadb/repos/community-x86_64/rc.d
mariadb/repos/community-x86_64/service
mariadb/repos/community-x86_64/tmpfiles.conf
----------------------------------+
community-i686/PKGBUILD | 281 ++++++++++++++++++-------------------
community-i686/mariadb.install | 94 ++++++------
community-i686/rc.d | 154 ++++++++++----------
community-i686/service | 42 ++---
community-i686/tmpfiles.conf | 2
community-x86_64/PKGBUILD | 281 ++++++++++++++++++-------------------
community-x86_64/mariadb.install | 94 ++++++------
community-x86_64/rc.d | 154 ++++++++++----------
community-x86_64/service | 42 ++---
community-x86_64/tmpfiles.conf | 2
10 files changed, 572 insertions(+), 574 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2013-01-31 12:11:42 UTC (rev 83402)
+++ community-i686/PKGBUILD 2013-01-31 12:12:11 UTC (rev 83403)
@@ -1,141 +0,0 @@
-# $Id$
-# Maintainer: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
-
-pkgbase=mariadb
-pkgname=('libmariadbclient' 'mariadb-clients' 'mariadb')
-pkgver=5.5.28.a
-_pkgver=${pkgver/.a/a}
-pkgrel=2
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://mariadb.org/"
-makedepends=('cmake' 'openssl' 'zlib')
-options=('!libtool')
-source=(http://mirrors.supportex.net/$pkgbase/$pkgbase-$_pkgver/kvm-tarbake-jaunty-x86/$pkgbase-$_pkgver.tar.gz
- service rc.d tmpfiles.conf)
-md5sums=('a2d20a040ef1e49944a4ffe65ed7fefa'
- '9e7aa0fa646f48662df569259061fcef'
- '3bb5a9a96340feb0184bc057ee6e330b'
- '32f30449d3111714fe190931d08fdb8c')
-
-build() {
- cd $srcdir
- mkdir build
- cd build
-
- # CFLAGS/CXXFLAGS as suggested upstream
- CFLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \
- CXXFLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" \
-
- cmake ../${pkgbase}-${_pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DSYSCONFDIR=/etc/mysql \
- -DMYSQL_DATADIR=/var/lib/mysql \
- -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
- -DDEFAULT_CHARSET=utf8 \
- -DDEFAULT_COLLATION=utf8_general_ci \
- -DENABLED_LOCAL_INFILE=ON \
- -DINSTALL_INFODIR=share/mysql/docs \
- -DINSTALL_MANDIR=share/man \
- -DINSTALL_PLUGINDIR=/usr/lib/mysql/plugin \
- -DINSTALL_SCRIPTDIR=bin \
- -DINSTALL_INCLUDEDIR=include/mysql \
- -DINSTALL_DOCREADMEDIR=share/mysql \
- -DINSTALL_SUPPORTFILESDIR=share/mysql \
- -DINSTALL_MYSQLSHAREDIR=share/mysql \
- -DINSTALL_DOCDIR=share/mysql/docs \
- -DINSTALL_SHAREDIR=share/mysql \
- -DWITH_READLINE=ON \
- -DWITH_ZLIB=system \
- -DWITH_SSL=system \
- -DWITH_LIBWRAP=OFF \
- -DWITH_MYSQLD_LDFLAGS="${LDFLAGS}" \
- -DWITH_EXTRA_CHARSETS=complex \
- -DWITH_EMBEDDED_SERVER=ON \
- -DWITH_INNOBASE_STORAGE_ENGINE=1 \
- -DWITH_PARTITION_STORAGE_ENGINE=1 \
- -DWITH_PBXT_STORAGE_ENGINE=1 \
- -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
- -DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 \
- -DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 \
- -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
-
- make
-}
-
-package_libmariadbclient(){
- pkgdesc="MariaDB client libraries"
- depends=('openssl')
- conflicts=('libmysqlclient')
- provides=("libmysqlclient=${_pkgver}")
-
- cd "${srcdir}"/build
- for dir in include libmysql libmysqld libservices; do
- make -C ${dir} DESTDIR="${pkgdir}" install
- done
-
- install -d "${pkgdir}"/usr/bin
- install -m755 scripts/mysql_config "${pkgdir}"/usr/bin/
- install -d "${pkgdir}"/usr/share/man/man1
- for man in mysql_config mysql_client_test_embedded mysqltest_embedded; do
- install -m644 "${srcdir}"/${pkgbase}-${_pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1
- done
-}
-
-package_mariadb-clients() {
- pkgdesc="MariaDB client tools"
- depends=('libmariadbclient')
- conflicts=('mysql-clients')
- provides=("mysql-clients=${_pkgver}")
-
- cd "${srcdir}"/build
- make -C client DESTDIR="${pkgdir}" install
-
- # install man pages
- install -d "${pkgdir}"/usr/share/man/man1
- for man in mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap; do
- install -m644 "${srcdir}"/${pkgbase}-${_pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1
- done
-
- # provided by mariadb
- rm "${pkgdir}"/usr/bin/{mysql_{plugin,upgrade},mysqlbinlog,mysqltest}
-}
-
-package_mariadb() {
- pkgdesc="A fast SQL database server, drop-in replacement for MySQL"
- backup=('etc/mysql/my.cnf')
- install=mariadb.install
- depends=('mariadb-clients')
- conflicts=('mysql')
- provides=("mysql=${_pkgver}")
- optdepends=('perl-dbi' 'perl-dbd-mysql')
- options=('emptydirs')
-
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-
- install -Dm644 "${pkgdir}"/usr/share/mysql/my-medium.cnf "${pkgdir}"/etc/mysql/my.cnf
- install -Dm755 "${srcdir}"/rc.d "${pkgdir}"/etc/rc.d/mysqld
-
- install -Dm644 "${srcdir}"/service "${pkgdir}"/usr/lib/systemd/system/mysqld.service
- install -Dm644 "${srcdir}"/tmpfiles.conf "${pkgdir}"/usr/lib/tmpfiles.d/mysql.conf
-
- # provided by libmariadbclient
- rm "${pkgdir}"/usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}
- rm "${pkgdir}"/usr/lib/libmysql*
- rm -r "${pkgdir}"/usr/include/
- rm "${pkgdir}"/usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1
-
- # provided by mariadb-clients
- rm "${pkgdir}"/usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}
- rm "${pkgdir}"/usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1
-
- # 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
-}
-
-# vim:set ts=2 sw=2 et:
Copied: mariadb/repos/community-i686/PKGBUILD (from rev 83402, mariadb/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-01-31 12:12:11 UTC (rev 83403)
@@ -0,0 +1,140 @@
+# $Id$
+# Maintainer: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
+
+pkgbase=mariadb
+pkgname=('libmariadbclient' 'mariadb-clients' 'mariadb')
+pkgver=5.5.29
+pkgrel=1
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://mariadb.org/"
+makedepends=('cmake' 'openssl' 'zlib')
+options=('!libtool')
+source=(http://mirrors.supportex.net/$pkgbase/$pkgbase-$pkgver/kvm-tarbake-jaunty-x86/$pkgbase-$pkgver.tar.gz
+ service rc.d tmpfiles.conf)
+sha256sums=('b0e25b5451dbf8e8c8bf243bbd0aeb264db0da2caceafc7e2c9fad77b8d4be74'
+ 'd9f3d0a897e2e8d5d07c19898ed4c1a4a1c08dfe09f6854f90e79e055e48c02e'
+ 'a0bfe75c035fa32a10d04238932f5e7ad11829b7fbdb1b8f8997ee645ae1b924'
+ '08daa863ddd50aff0b608621ed26936919211e286440951dca5866141291004d')
+
+build() {
+ cd $srcdir
+ mkdir build
+ cd build
+
+ # CFLAGS/CXXFLAGS as suggested upstream
+ CFLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \
+ CXXFLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" \
+
+ cmake ../${pkgbase}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DSYSCONFDIR=/etc/mysql \
+ -DMYSQL_DATADIR=/var/lib/mysql \
+ -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
+ -DDEFAULT_CHARSET=utf8 \
+ -DDEFAULT_COLLATION=utf8_general_ci \
+ -DENABLED_LOCAL_INFILE=ON \
+ -DINSTALL_INFODIR=share/mysql/docs \
+ -DINSTALL_MANDIR=share/man \
+ -DINSTALL_PLUGINDIR=/usr/lib/mysql/plugin \
+ -DINSTALL_SCRIPTDIR=bin \
+ -DINSTALL_INCLUDEDIR=include/mysql \
+ -DINSTALL_DOCREADMEDIR=share/mysql \
+ -DINSTALL_SUPPORTFILESDIR=share/mysql \
+ -DINSTALL_MYSQLSHAREDIR=share/mysql \
+ -DINSTALL_DOCDIR=share/mysql/docs \
+ -DINSTALL_SHAREDIR=share/mysql \
+ -DWITH_READLINE=ON \
+ -DWITH_ZLIB=system \
+ -DWITH_SSL=system \
+ -DWITH_LIBWRAP=OFF \
+ -DWITH_MYSQLD_LDFLAGS="${LDFLAGS}" \
+ -DWITH_EXTRA_CHARSETS=complex \
+ -DWITH_EMBEDDED_SERVER=ON \
+ -DWITH_INNOBASE_STORAGE_ENGINE=1 \
+ -DWITH_PARTITION_STORAGE_ENGINE=1 \
+ -DWITH_PBXT_STORAGE_ENGINE=1 \
+ -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
+ -DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 \
+ -DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 \
+ -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
+
+ make
+}
+
+package_libmariadbclient(){
+ pkgdesc="MariaDB client libraries"
+ depends=('openssl')
+ conflicts=('libmysqlclient')
+ provides=("libmysqlclient=${pkgver}")
+
+ cd "${srcdir}"/build
+ for dir in include libmysql libmysqld libservices; do
+ make -C ${dir} DESTDIR="${pkgdir}" install
+ done
+
+ install -d "${pkgdir}"/usr/bin
+ install -m755 scripts/mysql_config "${pkgdir}"/usr/bin/
+ install -d "${pkgdir}"/usr/share/man/man1
+ for man in mysql_config mysql_client_test_embedded mysqltest_embedded; do
+ install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1
+ done
+}
+
+package_mariadb-clients() {
+ pkgdesc="MariaDB client tools"
+ depends=('libmariadbclient')
+ conflicts=('mysql-clients')
+ provides=("mysql-clients=${pkgver}")
+
+ cd "${srcdir}"/build
+ make -C client DESTDIR="${pkgdir}" install
+
+ # install man pages
+ install -d "${pkgdir}"/usr/share/man/man1
+ for man in mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap; do
+ install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1
+ done
+
+ # provided by mariadb
+ rm "${pkgdir}"/usr/bin/{mysql_{plugin,upgrade},mysqlbinlog,mysqltest}
+}
+
+package_mariadb() {
+ pkgdesc="A fast SQL database server, drop-in replacement for MySQL"
+ backup=('etc/mysql/my.cnf')
+ install=mariadb.install
+ depends=('mariadb-clients')
+ conflicts=('mysql')
+ provides=("mysql=${pkgver}")
+ optdepends=('perl-dbi' 'perl-dbd-mysql')
+ options=('emptydirs')
+
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+
+ install -Dm644 "${pkgdir}"/usr/share/mysql/my-medium.cnf "${pkgdir}"/etc/mysql/my.cnf
+ install -Dm755 "${srcdir}"/rc.d "${pkgdir}"/etc/rc.d/mysqld
+
+ install -Dm644 "${srcdir}"/service "${pkgdir}"/usr/lib/systemd/system/mysqld.service
+ install -Dm644 "${srcdir}"/tmpfiles.conf "${pkgdir}"/usr/lib/tmpfiles.d/mysql.conf
+
+ # provided by libmariadbclient
+ rm "${pkgdir}"/usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}
+ rm "${pkgdir}"/usr/lib/libmysql*
+ rm -r "${pkgdir}"/usr/include/
+ rm "${pkgdir}"/usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1
+
+ # provided by mariadb-clients
+ rm "${pkgdir}"/usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}
+ rm "${pkgdir}"/usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1
+
+ # 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
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-i686/mariadb.install
===================================================================
--- community-i686/mariadb.install 2013-01-31 12:11:42 UTC (rev 83402)
+++ community-i686/mariadb.install 2013-01-31 12:12:11 UTC (rev 83403)
@@ -1,47 +0,0 @@
-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
-
- if [[ ! -d run/mysqld ]]; then
- usr/bin/systemd-tmpfiles --create usr/lib/tmpfiles.d/mysql.conf
- fi
-}
-
-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
-
- if [[ ! -d run/mysqld ]]; then
- usr/bin/systemd-tmpfiles --create usr/lib/tmpfiles.d/mysql.conf
- fi
-
- if [[ "$(vercmp $2 5.5)" -lt 0 ]]; then
- echo ">>> Major version update. Consider restart the service, and"
- echo " then running mysql_upgrade after it."
- fi
-
- if [[ "$(vercmp $2 5.5.25-4)" -lt 0 ]] && [[ -d /data ]]; then
- for x in data/*; do
- cp -r $x var/lib/mysql/
- done
- rm -rf data
- fi
-
- if [[ "$(vercmp $2 5.5.25-5)" -lt 0 ]]; then
- echo ">>> mysql.service has been renamed to mysqld.service to keep"
- echo " consistency with MySQL package."
- fi
-}
-
-post_remove(){
- if getent passwd mysql >/dev/null 2>&1; then
- userdel mysql
- fi
- if getent group mysql >/dev/null 2>&1; then
- groupdel mysql
- fi
-}
-
-# vim:set ts=2 sw=2 et:
Copied: mariadb/repos/community-i686/mariadb.install (from rev 83402, mariadb/trunk/mariadb.install)
===================================================================
--- community-i686/mariadb.install (rev 0)
+++ community-i686/mariadb.install 2013-01-31 12:12:11 UTC (rev 83403)
@@ -0,0 +1,47 @@
+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
+
+ if [[ ! -d run/mysqld ]]; then
+ usr/bin/systemd-tmpfiles --create usr/lib/tmpfiles.d/mysql.conf
+ fi
+}
+
+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
+
+ if [[ ! -d run/mysqld ]]; then
+ usr/bin/systemd-tmpfiles --create usr/lib/tmpfiles.d/mysql.conf
+ fi
+
+ if [[ "$(vercmp $2 5.5)" -lt 0 ]]; then
+ echo ">>> Major version update. Consider restart the service, and"
+ echo " then running mysql_upgrade after it."
+ fi
+
+ if [[ "$(vercmp $2 5.5.25-4)" -lt 0 ]] && [[ -d /data ]]; then
+ for x in data/*; do
+ cp -r $x var/lib/mysql/
+ done
+ rm -rf data
+ fi
+
+ if [[ "$(vercmp $2 5.5.25-5)" -lt 0 ]]; then
+ echo ">>> mysql.service has been renamed to mysqld.service to keep"
+ echo " consistency with MySQL package."
+ fi
+}
+
+post_remove(){
+ if getent passwd mysql >/dev/null 2>&1; then
+ userdel mysql
+ fi
+ if getent group mysql >/dev/null 2>&1; then
+ groupdel mysql
+ fi
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-i686/rc.d
===================================================================
--- community-i686/rc.d 2013-01-31 12:11:42 UTC (rev 83402)
+++ community-i686/rc.d 2013-01-31 12:12:11 UTC (rev 83403)
@@ -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 MariaDB 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 MariaDB 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
Copied: mariadb/repos/community-i686/rc.d (from rev 83402, mariadb/trunk/rc.d)
===================================================================
--- community-i686/rc.d (rev 0)
+++ community-i686/rc.d 2013-01-31 12:12:11 UTC (rev 83403)
@@ -0,0 +1,77 @@
+#!/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 MariaDB 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 MariaDB 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
Deleted: community-i686/service
===================================================================
--- community-i686/service 2013-01-31 12:11:42 UTC (rev 83402)
+++ community-i686/service 2013-01-31 12:12:11 UTC (rev 83403)
@@ -1,21 +0,0 @@
-[Unit]
-Description=MariaDB database server
-After=syslog.target network.target
-
-[Service]
-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
-
-# 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]
-WantedBy=multi-user.target
Copied: mariadb/repos/community-i686/service (from rev 83402, mariadb/trunk/service)
===================================================================
--- community-i686/service (rev 0)
+++ community-i686/service 2013-01-31 12:12:11 UTC (rev 83403)
@@ -0,0 +1,21 @@
+[Unit]
+Description=MariaDB database server
+After=syslog.target network.target
+
+[Service]
+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
+
+# 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]
+WantedBy=multi-user.target
Deleted: community-i686/tmpfiles.conf
===================================================================
--- community-i686/tmpfiles.conf 2013-01-31 12:11:42 UTC (rev 83402)
+++ community-i686/tmpfiles.conf 2013-01-31 12:12:11 UTC (rev 83403)
@@ -1 +0,0 @@
-d /var/run/mysqld 0755 mysql mysql -
Copied: mariadb/repos/community-i686/tmpfiles.conf (from rev 83402, mariadb/trunk/tmpfiles.conf)
===================================================================
--- community-i686/tmpfiles.conf (rev 0)
+++ community-i686/tmpfiles.conf 2013-01-31 12:12:11 UTC (rev 83403)
@@ -0,0 +1 @@
+d /var/run/mysqld 0755 mysql mysql -
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2013-01-31 12:11:42 UTC (rev 83402)
+++ community-x86_64/PKGBUILD 2013-01-31 12:12:11 UTC (rev 83403)
@@ -1,141 +0,0 @@
-# $Id$
-# Maintainer: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
-
-pkgbase=mariadb
-pkgname=('libmariadbclient' 'mariadb-clients' 'mariadb')
-pkgver=5.5.28.a
-_pkgver=${pkgver/.a/a}
-pkgrel=2
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://mariadb.org/"
-makedepends=('cmake' 'openssl' 'zlib')
-options=('!libtool')
-source=(http://mirrors.supportex.net/$pkgbase/$pkgbase-$_pkgver/kvm-tarbake-jaunty-x86/$pkgbase-$_pkgver.tar.gz
- service rc.d tmpfiles.conf)
-md5sums=('a2d20a040ef1e49944a4ffe65ed7fefa'
- '9e7aa0fa646f48662df569259061fcef'
- '3bb5a9a96340feb0184bc057ee6e330b'
- '32f30449d3111714fe190931d08fdb8c')
-
-build() {
- cd $srcdir
- mkdir build
- cd build
-
- # CFLAGS/CXXFLAGS as suggested upstream
- CFLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \
- CXXFLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" \
-
- cmake ../${pkgbase}-${_pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DSYSCONFDIR=/etc/mysql \
- -DMYSQL_DATADIR=/var/lib/mysql \
- -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
- -DDEFAULT_CHARSET=utf8 \
- -DDEFAULT_COLLATION=utf8_general_ci \
- -DENABLED_LOCAL_INFILE=ON \
- -DINSTALL_INFODIR=share/mysql/docs \
- -DINSTALL_MANDIR=share/man \
- -DINSTALL_PLUGINDIR=/usr/lib/mysql/plugin \
- -DINSTALL_SCRIPTDIR=bin \
- -DINSTALL_INCLUDEDIR=include/mysql \
- -DINSTALL_DOCREADMEDIR=share/mysql \
- -DINSTALL_SUPPORTFILESDIR=share/mysql \
- -DINSTALL_MYSQLSHAREDIR=share/mysql \
- -DINSTALL_DOCDIR=share/mysql/docs \
- -DINSTALL_SHAREDIR=share/mysql \
- -DWITH_READLINE=ON \
- -DWITH_ZLIB=system \
- -DWITH_SSL=system \
- -DWITH_LIBWRAP=OFF \
- -DWITH_MYSQLD_LDFLAGS="${LDFLAGS}" \
- -DWITH_EXTRA_CHARSETS=complex \
- -DWITH_EMBEDDED_SERVER=ON \
- -DWITH_INNOBASE_STORAGE_ENGINE=1 \
- -DWITH_PARTITION_STORAGE_ENGINE=1 \
- -DWITH_PBXT_STORAGE_ENGINE=1 \
- -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
- -DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 \
- -DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 \
- -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
-
- make
-}
-
-package_libmariadbclient(){
- pkgdesc="MariaDB client libraries"
- depends=('openssl')
- conflicts=('libmysqlclient')
- provides=("libmysqlclient=${_pkgver}")
-
- cd "${srcdir}"/build
- for dir in include libmysql libmysqld libservices; do
- make -C ${dir} DESTDIR="${pkgdir}" install
- done
-
- install -d "${pkgdir}"/usr/bin
- install -m755 scripts/mysql_config "${pkgdir}"/usr/bin/
- install -d "${pkgdir}"/usr/share/man/man1
- for man in mysql_config mysql_client_test_embedded mysqltest_embedded; do
- install -m644 "${srcdir}"/${pkgbase}-${_pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1
- done
-}
-
-package_mariadb-clients() {
- pkgdesc="MariaDB client tools"
- depends=('libmariadbclient')
- conflicts=('mysql-clients')
- provides=("mysql-clients=${_pkgver}")
-
- cd "${srcdir}"/build
- make -C client DESTDIR="${pkgdir}" install
-
- # install man pages
- install -d "${pkgdir}"/usr/share/man/man1
- for man in mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap; do
- install -m644 "${srcdir}"/${pkgbase}-${_pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1
- done
-
- # provided by mariadb
- rm "${pkgdir}"/usr/bin/{mysql_{plugin,upgrade},mysqlbinlog,mysqltest}
-}
-
-package_mariadb() {
- pkgdesc="A fast SQL database server, drop-in replacement for MySQL"
- backup=('etc/mysql/my.cnf')
- install=mariadb.install
- depends=('mariadb-clients')
- conflicts=('mysql')
- provides=("mysql=${_pkgver}")
- optdepends=('perl-dbi' 'perl-dbd-mysql')
- options=('emptydirs')
-
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-
- install -Dm644 "${pkgdir}"/usr/share/mysql/my-medium.cnf "${pkgdir}"/etc/mysql/my.cnf
- install -Dm755 "${srcdir}"/rc.d "${pkgdir}"/etc/rc.d/mysqld
-
- install -Dm644 "${srcdir}"/service "${pkgdir}"/usr/lib/systemd/system/mysqld.service
- install -Dm644 "${srcdir}"/tmpfiles.conf "${pkgdir}"/usr/lib/tmpfiles.d/mysql.conf
-
- # provided by libmariadbclient
- rm "${pkgdir}"/usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}
- rm "${pkgdir}"/usr/lib/libmysql*
- rm -r "${pkgdir}"/usr/include/
- rm "${pkgdir}"/usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1
-
- # provided by mariadb-clients
- rm "${pkgdir}"/usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}
- rm "${pkgdir}"/usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1
-
- # 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
-}
-
-# vim:set ts=2 sw=2 et:
Copied: mariadb/repos/community-x86_64/PKGBUILD (from rev 83402, mariadb/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2013-01-31 12:12:11 UTC (rev 83403)
@@ -0,0 +1,140 @@
+# $Id$
+# Maintainer: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
+
+pkgbase=mariadb
+pkgname=('libmariadbclient' 'mariadb-clients' 'mariadb')
+pkgver=5.5.29
+pkgrel=1
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://mariadb.org/"
+makedepends=('cmake' 'openssl' 'zlib')
+options=('!libtool')
+source=(http://mirrors.supportex.net/$pkgbase/$pkgbase-$pkgver/kvm-tarbake-jaunty-x86/$pkgbase-$pkgver.tar.gz
+ service rc.d tmpfiles.conf)
+sha256sums=('b0e25b5451dbf8e8c8bf243bbd0aeb264db0da2caceafc7e2c9fad77b8d4be74'
+ 'd9f3d0a897e2e8d5d07c19898ed4c1a4a1c08dfe09f6854f90e79e055e48c02e'
+ 'a0bfe75c035fa32a10d04238932f5e7ad11829b7fbdb1b8f8997ee645ae1b924'
+ '08daa863ddd50aff0b608621ed26936919211e286440951dca5866141291004d')
+
+build() {
+ cd $srcdir
+ mkdir build
+ cd build
+
+ # CFLAGS/CXXFLAGS as suggested upstream
+ CFLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \
+ CXXFLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" \
+
+ cmake ../${pkgbase}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DSYSCONFDIR=/etc/mysql \
+ -DMYSQL_DATADIR=/var/lib/mysql \
+ -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
+ -DDEFAULT_CHARSET=utf8 \
+ -DDEFAULT_COLLATION=utf8_general_ci \
+ -DENABLED_LOCAL_INFILE=ON \
+ -DINSTALL_INFODIR=share/mysql/docs \
+ -DINSTALL_MANDIR=share/man \
+ -DINSTALL_PLUGINDIR=/usr/lib/mysql/plugin \
+ -DINSTALL_SCRIPTDIR=bin \
+ -DINSTALL_INCLUDEDIR=include/mysql \
+ -DINSTALL_DOCREADMEDIR=share/mysql \
+ -DINSTALL_SUPPORTFILESDIR=share/mysql \
+ -DINSTALL_MYSQLSHAREDIR=share/mysql \
+ -DINSTALL_DOCDIR=share/mysql/docs \
+ -DINSTALL_SHAREDIR=share/mysql \
+ -DWITH_READLINE=ON \
+ -DWITH_ZLIB=system \
+ -DWITH_SSL=system \
+ -DWITH_LIBWRAP=OFF \
+ -DWITH_MYSQLD_LDFLAGS="${LDFLAGS}" \
+ -DWITH_EXTRA_CHARSETS=complex \
+ -DWITH_EMBEDDED_SERVER=ON \
+ -DWITH_INNOBASE_STORAGE_ENGINE=1 \
+ -DWITH_PARTITION_STORAGE_ENGINE=1 \
+ -DWITH_PBXT_STORAGE_ENGINE=1 \
+ -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
+ -DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 \
+ -DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 \
+ -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
+
+ make
+}
+
+package_libmariadbclient(){
+ pkgdesc="MariaDB client libraries"
+ depends=('openssl')
+ conflicts=('libmysqlclient')
+ provides=("libmysqlclient=${pkgver}")
+
+ cd "${srcdir}"/build
+ for dir in include libmysql libmysqld libservices; do
+ make -C ${dir} DESTDIR="${pkgdir}" install
+ done
+
+ install -d "${pkgdir}"/usr/bin
+ install -m755 scripts/mysql_config "${pkgdir}"/usr/bin/
+ install -d "${pkgdir}"/usr/share/man/man1
+ for man in mysql_config mysql_client_test_embedded mysqltest_embedded; do
+ install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1
+ done
+}
+
+package_mariadb-clients() {
+ pkgdesc="MariaDB client tools"
+ depends=('libmariadbclient')
+ conflicts=('mysql-clients')
+ provides=("mysql-clients=${pkgver}")
+
+ cd "${srcdir}"/build
+ make -C client DESTDIR="${pkgdir}" install
+
+ # install man pages
+ install -d "${pkgdir}"/usr/share/man/man1
+ for man in mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap; do
+ install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1
+ done
+
+ # provided by mariadb
+ rm "${pkgdir}"/usr/bin/{mysql_{plugin,upgrade},mysqlbinlog,mysqltest}
+}
+
+package_mariadb() {
+ pkgdesc="A fast SQL database server, drop-in replacement for MySQL"
+ backup=('etc/mysql/my.cnf')
+ install=mariadb.install
+ depends=('mariadb-clients')
+ conflicts=('mysql')
+ provides=("mysql=${pkgver}")
+ optdepends=('perl-dbi' 'perl-dbd-mysql')
+ options=('emptydirs')
+
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+
+ install -Dm644 "${pkgdir}"/usr/share/mysql/my-medium.cnf "${pkgdir}"/etc/mysql/my.cnf
+ install -Dm755 "${srcdir}"/rc.d "${pkgdir}"/etc/rc.d/mysqld
+
+ install -Dm644 "${srcdir}"/service "${pkgdir}"/usr/lib/systemd/system/mysqld.service
+ install -Dm644 "${srcdir}"/tmpfiles.conf "${pkgdir}"/usr/lib/tmpfiles.d/mysql.conf
+
+ # provided by libmariadbclient
+ rm "${pkgdir}"/usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}
+ rm "${pkgdir}"/usr/lib/libmysql*
+ rm -r "${pkgdir}"/usr/include/
+ rm "${pkgdir}"/usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1
+
+ # provided by mariadb-clients
+ rm "${pkgdir}"/usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}
+ rm "${pkgdir}"/usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1
+
+ # 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
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-x86_64/mariadb.install
===================================================================
--- community-x86_64/mariadb.install 2013-01-31 12:11:42 UTC (rev 83402)
+++ community-x86_64/mariadb.install 2013-01-31 12:12:11 UTC (rev 83403)
@@ -1,47 +0,0 @@
-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
-
- if [[ ! -d run/mysqld ]]; then
- usr/bin/systemd-tmpfiles --create usr/lib/tmpfiles.d/mysql.conf
- fi
-}
-
-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
-
- if [[ ! -d run/mysqld ]]; then
- usr/bin/systemd-tmpfiles --create usr/lib/tmpfiles.d/mysql.conf
- fi
-
- if [[ "$(vercmp $2 5.5)" -lt 0 ]]; then
- echo ">>> Major version update. Consider restart the service, and"
- echo " then running mysql_upgrade after it."
- fi
-
- if [[ "$(vercmp $2 5.5.25-4)" -lt 0 ]] && [[ -d /data ]]; then
- for x in data/*; do
- cp -r $x var/lib/mysql/
- done
- rm -rf data
- fi
-
- if [[ "$(vercmp $2 5.5.25-5)" -lt 0 ]]; then
- echo ">>> mysql.service has been renamed to mysqld.service to keep"
- echo " consistency with MySQL package."
- fi
-}
-
-post_remove(){
- if getent passwd mysql >/dev/null 2>&1; then
- userdel mysql
- fi
- if getent group mysql >/dev/null 2>&1; then
- groupdel mysql
- fi
-}
-
-# vim:set ts=2 sw=2 et:
Copied: mariadb/repos/community-x86_64/mariadb.install (from rev 83402, mariadb/trunk/mariadb.install)
===================================================================
--- community-x86_64/mariadb.install (rev 0)
+++ community-x86_64/mariadb.install 2013-01-31 12:12:11 UTC (rev 83403)
@@ -0,0 +1,47 @@
+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
+
+ if [[ ! -d run/mysqld ]]; then
+ usr/bin/systemd-tmpfiles --create usr/lib/tmpfiles.d/mysql.conf
+ fi
+}
+
+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
+
+ if [[ ! -d run/mysqld ]]; then
+ usr/bin/systemd-tmpfiles --create usr/lib/tmpfiles.d/mysql.conf
+ fi
+
+ if [[ "$(vercmp $2 5.5)" -lt 0 ]]; then
+ echo ">>> Major version update. Consider restart the service, and"
+ echo " then running mysql_upgrade after it."
+ fi
+
+ if [[ "$(vercmp $2 5.5.25-4)" -lt 0 ]] && [[ -d /data ]]; then
+ for x in data/*; do
+ cp -r $x var/lib/mysql/
+ done
+ rm -rf data
+ fi
+
+ if [[ "$(vercmp $2 5.5.25-5)" -lt 0 ]]; then
+ echo ">>> mysql.service has been renamed to mysqld.service to keep"
+ echo " consistency with MySQL package."
+ fi
+}
+
+post_remove(){
+ if getent passwd mysql >/dev/null 2>&1; then
+ userdel mysql
+ fi
+ if getent group mysql >/dev/null 2>&1; then
+ groupdel mysql
+ fi
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-x86_64/rc.d
===================================================================
--- community-x86_64/rc.d 2013-01-31 12:11:42 UTC (rev 83402)
+++ community-x86_64/rc.d 2013-01-31 12:12:11 UTC (rev 83403)
@@ -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 MariaDB 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 MariaDB 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
Copied: mariadb/repos/community-x86_64/rc.d (from rev 83402, mariadb/trunk/rc.d)
===================================================================
--- community-x86_64/rc.d (rev 0)
+++ community-x86_64/rc.d 2013-01-31 12:12:11 UTC (rev 83403)
@@ -0,0 +1,77 @@
+#!/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 MariaDB 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 MariaDB 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
Deleted: community-x86_64/service
===================================================================
--- community-x86_64/service 2013-01-31 12:11:42 UTC (rev 83402)
+++ community-x86_64/service 2013-01-31 12:12:11 UTC (rev 83403)
@@ -1,21 +0,0 @@
-[Unit]
-Description=MariaDB database server
-After=syslog.target network.target
-
-[Service]
-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
-
-# 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]
-WantedBy=multi-user.target
Copied: mariadb/repos/community-x86_64/service (from rev 83402, mariadb/trunk/service)
===================================================================
--- community-x86_64/service (rev 0)
+++ community-x86_64/service 2013-01-31 12:12:11 UTC (rev 83403)
@@ -0,0 +1,21 @@
+[Unit]
+Description=MariaDB database server
+After=syslog.target network.target
+
+[Service]
+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
+
+# 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]
+WantedBy=multi-user.target
Deleted: community-x86_64/tmpfiles.conf
===================================================================
--- community-x86_64/tmpfiles.conf 2013-01-31 12:11:42 UTC (rev 83402)
+++ community-x86_64/tmpfiles.conf 2013-01-31 12:12:11 UTC (rev 83403)
@@ -1 +0,0 @@
-d /var/run/mysqld 0755 mysql mysql -
Copied: mariadb/repos/community-x86_64/tmpfiles.conf (from rev 83402, mariadb/trunk/tmpfiles.conf)
===================================================================
--- community-x86_64/tmpfiles.conf (rev 0)
+++ community-x86_64/tmpfiles.conf 2013-01-31 12:12:11 UTC (rev 83403)
@@ -0,0 +1 @@
+d /var/run/mysqld 0755 mysql mysql -
More information about the arch-commits
mailing list