[arch-commits] Commit in mariadb/repos (20 files)

Evangelos Foutras foutrelis at archlinux.org
Sun Dec 6 11:44:47 UTC 2015


    Date: Sunday, December 6, 2015 @ 12:44:47
  Author: foutrelis
Revision: 252751

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  mariadb/repos/staging-i686/PKGBUILD
    (from rev 252749, mariadb/trunk/PKGBUILD)
  mariadb/repos/staging-i686/mariadb-post.sh
    (from rev 252749, mariadb/trunk/mariadb-post.sh)
  mariadb/repos/staging-i686/mariadb-tmpfile.conf
    (from rev 252749, mariadb/trunk/mariadb-tmpfile.conf)
  mariadb/repos/staging-i686/mariadb.install
    (from rev 252749, mariadb/trunk/mariadb.install)
  mariadb/repos/staging-i686/mariadb.service
    (from rev 252749, mariadb/trunk/mariadb.service)
  mariadb/repos/staging-x86_64/PKGBUILD
    (from rev 252749, mariadb/trunk/PKGBUILD)
  mariadb/repos/staging-x86_64/mariadb-post.sh
    (from rev 252749, mariadb/trunk/mariadb-post.sh)
  mariadb/repos/staging-x86_64/mariadb-tmpfile.conf
    (from rev 252749, mariadb/trunk/mariadb-tmpfile.conf)
  mariadb/repos/staging-x86_64/mariadb.install
    (from rev 252749, mariadb/trunk/mariadb.install)
  mariadb/repos/staging-x86_64/mariadb.service
    (from rev 252749, mariadb/trunk/mariadb.service)
Deleted:
  mariadb/repos/staging-i686/PKGBUILD
  mariadb/repos/staging-i686/mariadb-post.sh
  mariadb/repos/staging-i686/mariadb-tmpfile.conf
  mariadb/repos/staging-i686/mariadb.install
  mariadb/repos/staging-i686/mariadb.service
  mariadb/repos/staging-x86_64/PKGBUILD
  mariadb/repos/staging-x86_64/mariadb-post.sh
  mariadb/repos/staging-x86_64/mariadb-tmpfile.conf
  mariadb/repos/staging-x86_64/mariadb.install
  mariadb/repos/staging-x86_64/mariadb.service

-------------------------------------+
 /PKGBUILD                           |  316 ++++++++++++++++++++++++++++++++++
 /mariadb-post.sh                    |   16 +
 /mariadb-tmpfile.conf               |    2 
 /mariadb.install                    |   70 +++++++
 /mariadb.service                    |   32 +++
 staging-i686/PKGBUILD               |  158 -----------------
 staging-i686/mariadb-post.sh        |    8 
 staging-i686/mariadb-tmpfile.conf   |    1 
 staging-i686/mariadb.install        |   35 ---
 staging-i686/mariadb.service        |   16 -
 staging-x86_64/PKGBUILD             |  158 -----------------
 staging-x86_64/mariadb-post.sh      |    8 
 staging-x86_64/mariadb-tmpfile.conf |    1 
 staging-x86_64/mariadb.install      |   35 ---
 staging-x86_64/mariadb.service      |   16 -
 15 files changed, 436 insertions(+), 436 deletions(-)

Deleted: staging-i686/PKGBUILD
===================================================================
--- staging-i686/PKGBUILD	2015-12-06 11:44:46 UTC (rev 252750)
+++ staging-i686/PKGBUILD	2015-12-06 11:44:47 UTC (rev 252751)
@@ -1,158 +0,0 @@
-# $Id$
-# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-
-pkgbase=mariadb
-pkgname=('libmariadbclient' 'mariadb-clients' 'mytop' 'mariadb')
-pkgver=10.1.9
-_pkgver=${pkgver/.a/a}
-pkgrel=3
-arch=('i686' 'x86_64')
-license=('GPL')
-url='http://mariadb.org/'
-makedepends=('cmake' 'openssl' 'zlib' 'libaio' 'libxml2' 'openssl' 'pcre'
-             'jemalloc' 'lz4' 'boost') source=(http://ftp.heanet.ie/mirrors/mariadb/mariadb-$pkgver/source/mariadb-$pkgver.tar.gz mariadb.service
-        mariadb-post.sh
-        mariadb-tmpfile.conf)
-md5sums=('71d0e2408a671e1125c1310ce657f688'
-         'd488fffa9f62f9949c4aa1bb6e6db692'
-         'b79e65a5aa536e6b5bc60988eb0b78a2'
-         '2fa6e456964d4ff5e6d4f9ff0126aed6')
-
-build() {
-  mkdir build
-  cd build
-
-  cmake ../$pkgbase-$_pkgver \
-    -DCMAKE_AR=/usr/bin/gcc-ar \
-    -DCMAKE_RANLIB=/usr/bin/gcc-ranlib \
-    -DBUILD_CONFIG=mysql_release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DSYSCONFDIR=/etc/mysql \
-    -DMYSQL_DATADIR=/var/lib/mysql \
-    -DMYSQL_UNIX_ADDR=/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=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_PCRE=system \
-    -DWITH_LIBWRAP=OFF \
-    -DWITH_JEMALLOC=ON \
-    -DCMAKE_EXE_LINKER_FLAGS='-ljemalloc' \
-    -DWITH_EXTRA_CHARSETS=complex \
-    -DWITH_EMBEDDED_SERVER=ON \
-    -DWITH_ARCHIVE_STORAGE_ENGINE=1 \
-    -DWITH_BLACKHOLE_STORAGE_ENGINE=1 \
-    -DWITH_INNOBASE_STORAGE_ENGINE=1 \
-    -DWITH_PARTITION_STORAGE_ENGINE=1 \
-    -DWITH_TOKUDB_STORAGE_ENGINE=1 \
-    -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
-    -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 \
-    -DWITHOUT_PBXT_STORAGE_ENGINE=1 \
-    -DCMAKE_C_FLAGS="-fPIC $CFLAGS -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer -fno-delete-null-pointer-checks" \
-    -DCMAKE_CXX_FLAGS="-fPIC $CXXFLAGS -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti -fno-delete-null-pointer-checks" \
-    -DWITH_MYSQLD_LDFLAGS="-pie ${LDFLAGS},-z,now"
-
-  make
-}
-
-package_libmariadbclient() {
-  pkgdesc='MariaDB client libraries'
-  depends=('openssl' 'libaio' 'zlib' 'pcre' 'lz4' 'lzo' 'xz')
-  conflicts=('libmysqlclient')
-  provides=("libmysqlclient=$pkgver")
-  options=('staticlibs')
-
-  cd build
-  for dir in include libmysql libmysqld libservices; do
-    make -C $dir DESTDIR="$pkgdir" install
-  done
-
-  install -Dm755 scripts/mysql_config "$pkgdir"/usr/bin/mysql_config
-  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
-
-  rm "$pkgdir"/usr/lib/libmysql{client,client_r,d}.a
-}
-
-package_mariadb-clients() {
-  pkgdesc='MariaDB client tools'
-  depends=('libmariadbclient' 'zlib' 'openssl' 'jemalloc')
-  conflicts=('mysql-clients')
-  provides=("mysql-clients=$pkgver")
-
-  cd 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_mytop() {
-  pkgdesc='Top clone for MariaDB'
-  depends=('perl' 'perl-dbd-mysql' 'perl-term-readkey')
-
-  cd build
-  install -Dm755 scripts/mytop "$pkgdir"/usr/bin/mytop
-}
-
-package_mariadb() {
-  pkgdesc='Fast SQL database server, drop-in replacement for MySQL'
-  backup=('etc/mysql/my.cnf')
-  install=mariadb.install
-  depends=('mariadb-clients' 'inetutils' 'libaio' 'libxml2' 'pcre' 'jemalloc'
-           'lz4' 'boost-libs' 'lzo')
-  optdepends=('perl-dbd-mysql: for mysqlhotcopy, mysql_convert_table_format and mysql_setpermission')
-  conflicts=('mysql')
-  provides=("mysql=$pkgver")
-  options=('emptydirs')
-
-  cd build
-  make DESTDIR="$pkgdir" install
-
-  install -Dm644 "$pkgdir"/usr/share/mysql/my-medium.cnf "$pkgdir"/etc/mysql/my.cnf
-  install -Dm755 ../mariadb-post.sh "$pkgdir"/usr/bin/mysqld-post
-  install -Dm644 ../mariadb.service "$pkgdir"/usr/lib/systemd/system/mysqld.service
-  install -Dm644 ../mariadb-tmpfile.conf "$pkgdir"/usr/lib/tmpfiles.d/mysql.conf
-
-  install -dm700 "$pkgdir"/var/lib/mysql
-  chown -R 89:89 "$pkgdir"/var/lib/mysql &>/dev/null
-
-  # provided by libmariadbclient
-  cd "$pkgdir"
-  rm usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}
-  rm usr/lib/libmysql*
-  rm -r usr/include/
-  rm usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1
-
-  # provided by mariadb-clients
-  rm usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}
-  rm usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1
-
-  # provided by mytop
-  rm usr/bin/mytop
-
-  # not needed
-  rm -r usr/{data,mysql-test,sql-bench}
-  rm usr/share/man/man1/mysql-test-run.pl.1
-}

Copied: mariadb/repos/staging-i686/PKGBUILD (from rev 252749, mariadb/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD	                        (rev 0)
+++ staging-i686/PKGBUILD	2015-12-06 11:44:47 UTC (rev 252751)
@@ -0,0 +1,158 @@
+# $Id$
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+
+pkgbase=mariadb
+pkgname=('libmariadbclient' 'mariadb-clients' 'mytop' 'mariadb')
+pkgver=10.1.9
+_pkgver=${pkgver/.a/a}
+pkgrel=4
+arch=('i686' 'x86_64')
+license=('GPL')
+url='http://mariadb.org/'
+makedepends=('cmake' 'openssl' 'zlib' 'libaio' 'libxml2' 'openssl' 'pcre'
+             'jemalloc' 'lz4' 'boost') source=(http://ftp.heanet.ie/mirrors/mariadb/mariadb-$pkgver/source/mariadb-$pkgver.tar.gz mariadb.service
+        mariadb-post.sh
+        mariadb-tmpfile.conf)
+md5sums=('71d0e2408a671e1125c1310ce657f688'
+         'd488fffa9f62f9949c4aa1bb6e6db692'
+         'b79e65a5aa536e6b5bc60988eb0b78a2'
+         '2fa6e456964d4ff5e6d4f9ff0126aed6')
+
+build() {
+  mkdir build
+  cd build
+
+  cmake ../$pkgbase-$_pkgver \
+    -DCMAKE_AR=/usr/bin/gcc-ar \
+    -DCMAKE_RANLIB=/usr/bin/gcc-ranlib \
+    -DBUILD_CONFIG=mysql_release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DSYSCONFDIR=/etc/mysql \
+    -DMYSQL_DATADIR=/var/lib/mysql \
+    -DMYSQL_UNIX_ADDR=/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=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_PCRE=system \
+    -DWITH_LIBWRAP=OFF \
+    -DWITH_JEMALLOC=ON \
+    -DCMAKE_EXE_LINKER_FLAGS='-ljemalloc' \
+    -DWITH_EXTRA_CHARSETS=complex \
+    -DWITH_EMBEDDED_SERVER=ON \
+    -DWITH_ARCHIVE_STORAGE_ENGINE=1 \
+    -DWITH_BLACKHOLE_STORAGE_ENGINE=1 \
+    -DWITH_INNOBASE_STORAGE_ENGINE=1 \
+    -DWITH_PARTITION_STORAGE_ENGINE=1 \
+    -DWITH_TOKUDB_STORAGE_ENGINE=1 \
+    -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
+    -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 \
+    -DWITHOUT_PBXT_STORAGE_ENGINE=1 \
+    -DCMAKE_C_FLAGS="-fPIC $CFLAGS -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer -fno-delete-null-pointer-checks" \
+    -DCMAKE_CXX_FLAGS="-fPIC $CXXFLAGS -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti -fno-delete-null-pointer-checks" \
+    -DWITH_MYSQLD_LDFLAGS="-pie ${LDFLAGS},-z,now"
+
+  make
+}
+
+package_libmariadbclient() {
+  pkgdesc='MariaDB client libraries'
+  depends=('openssl' 'libaio' 'zlib' 'pcre' 'lz4' 'lzo' 'xz')
+  conflicts=('libmysqlclient')
+  provides=("libmysqlclient=$pkgver")
+  options=('staticlibs')
+
+  cd build
+  for dir in include libmysql libmysqld libservices; do
+    make -C $dir DESTDIR="$pkgdir" install
+  done
+
+  install -Dm755 scripts/mysql_config "$pkgdir"/usr/bin/mysql_config
+  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
+
+  rm "$pkgdir"/usr/lib/libmysql{client,client_r,d}.a
+}
+
+package_mariadb-clients() {
+  pkgdesc='MariaDB client tools'
+  depends=('libmariadbclient' 'zlib' 'openssl' 'jemalloc')
+  conflicts=('mysql-clients')
+  provides=("mysql-clients=$pkgver")
+
+  cd 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_mytop() {
+  pkgdesc='Top clone for MariaDB'
+  depends=('perl' 'perl-dbd-mysql' 'perl-term-readkey')
+
+  cd build
+  install -Dm755 scripts/mytop "$pkgdir"/usr/bin/mytop
+}
+
+package_mariadb() {
+  pkgdesc='Fast SQL database server, drop-in replacement for MySQL'
+  backup=('etc/mysql/my.cnf')
+  install=mariadb.install
+  depends=('mariadb-clients' 'inetutils' 'libaio' 'libxml2' 'pcre' 'jemalloc'
+           'lz4' 'boost-libs' 'lzo')
+  optdepends=('perl-dbd-mysql: for mysqlhotcopy, mysql_convert_table_format and mysql_setpermission')
+  conflicts=('mysql')
+  provides=("mysql=$pkgver")
+  options=('emptydirs')
+
+  cd build
+  make DESTDIR="$pkgdir" install
+
+  install -Dm644 "$pkgdir"/usr/share/mysql/my-medium.cnf "$pkgdir"/etc/mysql/my.cnf
+  install -Dm755 ../mariadb-post.sh "$pkgdir"/usr/bin/mysqld-post
+  install -Dm644 ../mariadb.service "$pkgdir"/usr/lib/systemd/system/mysqld.service
+  install -Dm644 ../mariadb-tmpfile.conf "$pkgdir"/usr/lib/tmpfiles.d/mysql.conf
+
+  install -dm700 "$pkgdir"/var/lib/mysql
+  chown -R 89:89 "$pkgdir"/var/lib/mysql &>/dev/null
+
+  # provided by libmariadbclient
+  cd "$pkgdir"
+  rm usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}
+  rm usr/lib/libmysql*
+  rm -r usr/include/
+  rm usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1
+
+  # provided by mariadb-clients
+  rm usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}
+  rm usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1
+
+  # provided by mytop
+  rm usr/bin/mytop
+
+  # not needed
+  rm -r usr/{data,mysql-test,sql-bench}
+  rm usr/share/man/man1/mysql-test-run.pl.1
+}

Deleted: staging-i686/mariadb-post.sh
===================================================================
--- staging-i686/mariadb-post.sh	2015-12-06 11:44:46 UTC (rev 252750)
+++ staging-i686/mariadb-post.sh	2015-12-06 11:44:47 UTC (rev 252751)
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-while true; do
-    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

Copied: mariadb/repos/staging-i686/mariadb-post.sh (from rev 252749, mariadb/trunk/mariadb-post.sh)
===================================================================
--- staging-i686/mariadb-post.sh	                        (rev 0)
+++ staging-i686/mariadb-post.sh	2015-12-06 11:44:47 UTC (rev 252751)
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+while true; do
+    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: staging-i686/mariadb-tmpfile.conf
===================================================================
--- staging-i686/mariadb-tmpfile.conf	2015-12-06 11:44:46 UTC (rev 252750)
+++ staging-i686/mariadb-tmpfile.conf	2015-12-06 11:44:47 UTC (rev 252751)
@@ -1 +0,0 @@
-d /run/mysqld 0755 mysql mysql -

Copied: mariadb/repos/staging-i686/mariadb-tmpfile.conf (from rev 252749, mariadb/trunk/mariadb-tmpfile.conf)
===================================================================
--- staging-i686/mariadb-tmpfile.conf	                        (rev 0)
+++ staging-i686/mariadb-tmpfile.conf	2015-12-06 11:44:47 UTC (rev 252751)
@@ -0,0 +1 @@
+d /run/mysqld 0755 mysql mysql -

Deleted: staging-i686/mariadb.install
===================================================================
--- staging-i686/mariadb.install	2015-12-06 11:44:46 UTC (rev 252750)
+++ staging-i686/mariadb.install	2015-12-06 11:44:47 UTC (rev 252751)
@@ -1,35 +0,0 @@
-post_install(){
-  groupadd -g 89 mysql &>/dev/null
-  useradd -u 89 -g 89 -d /var/lib/mysql -s /bin/false mysql &>/dev/null
-
-  echo ":: You need to initialize the MariaDB data directory prior to starting"
-  echo "   the service. This can be done with mysql_install_db command, e.g.:"
-  echo "   mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql"
-
-  if hash systemd-tmpfiles &> /dev/null; then
-    systemd-tmpfiles --create 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 [[ "$(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
-
-  if [[ "$(vercmp $2 10.0)" -lt 0 ]]; then
-    echo ":: Major version update. Consider restarting mysqld.service and"
-    echo "   running mysql_upgrade afterwards."
-  fi
-}

Copied: mariadb/repos/staging-i686/mariadb.install (from rev 252749, mariadb/trunk/mariadb.install)
===================================================================
--- staging-i686/mariadb.install	                        (rev 0)
+++ staging-i686/mariadb.install	2015-12-06 11:44:47 UTC (rev 252751)
@@ -0,0 +1,35 @@
+post_install(){
+  groupadd -g 89 mysql &>/dev/null
+  useradd -u 89 -g 89 -d /var/lib/mysql -s /bin/false mysql &>/dev/null
+
+  echo ":: You need to initialize the MariaDB data directory prior to starting"
+  echo "   the service. This can be done with mysql_install_db command, e.g.:"
+  echo "   mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql"
+
+  if hash systemd-tmpfiles &> /dev/null; then
+    systemd-tmpfiles --create 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 [[ "$(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
+
+  if [[ "$(vercmp $2 10.0)" -lt 0 ]]; then
+    echo ":: Major version update. Consider restarting mysqld.service and"
+    echo "   running mysql_upgrade afterwards."
+  fi
+}

Deleted: staging-i686/mariadb.service
===================================================================
--- staging-i686/mariadb.service	2015-12-06 11:44:46 UTC (rev 252750)
+++ staging-i686/mariadb.service	2015-12-06 11:44:47 UTC (rev 252751)
@@ -1,16 +0,0 @@
-[Unit]
-Description=MariaDB database server
-After=syslog.target
-
-[Service]
-User=mysql
-Group=mysql
-
-ExecStart=/usr/bin/mysqld --pid-file=/run/mysqld/mysqld.pid 
-ExecStartPost=/usr/bin/mysqld-post
-
-Restart=always
-PrivateTmp=true
-
-[Install]
-WantedBy=multi-user.target

Copied: mariadb/repos/staging-i686/mariadb.service (from rev 252749, mariadb/trunk/mariadb.service)
===================================================================
--- staging-i686/mariadb.service	                        (rev 0)
+++ staging-i686/mariadb.service	2015-12-06 11:44:47 UTC (rev 252751)
@@ -0,0 +1,16 @@
+[Unit]
+Description=MariaDB database server
+After=syslog.target
+
+[Service]
+User=mysql
+Group=mysql
+
+ExecStart=/usr/bin/mysqld --pid-file=/run/mysqld/mysqld.pid 
+ExecStartPost=/usr/bin/mysqld-post
+
+Restart=always
+PrivateTmp=true
+
+[Install]
+WantedBy=multi-user.target

Deleted: staging-x86_64/PKGBUILD
===================================================================
--- staging-x86_64/PKGBUILD	2015-12-06 11:44:46 UTC (rev 252750)
+++ staging-x86_64/PKGBUILD	2015-12-06 11:44:47 UTC (rev 252751)
@@ -1,158 +0,0 @@
-# $Id$
-# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-
-pkgbase=mariadb
-pkgname=('libmariadbclient' 'mariadb-clients' 'mytop' 'mariadb')
-pkgver=10.1.9
-_pkgver=${pkgver/.a/a}
-pkgrel=3
-arch=('i686' 'x86_64')
-license=('GPL')
-url='http://mariadb.org/'
-makedepends=('cmake' 'openssl' 'zlib' 'libaio' 'libxml2' 'openssl' 'pcre'
-             'jemalloc' 'lz4' 'boost') source=(http://ftp.heanet.ie/mirrors/mariadb/mariadb-$pkgver/source/mariadb-$pkgver.tar.gz mariadb.service
-        mariadb-post.sh
-        mariadb-tmpfile.conf)
-md5sums=('71d0e2408a671e1125c1310ce657f688'
-         'd488fffa9f62f9949c4aa1bb6e6db692'
-         'b79e65a5aa536e6b5bc60988eb0b78a2'
-         '2fa6e456964d4ff5e6d4f9ff0126aed6')
-
-build() {
-  mkdir build
-  cd build
-
-  cmake ../$pkgbase-$_pkgver \
-    -DCMAKE_AR=/usr/bin/gcc-ar \
-    -DCMAKE_RANLIB=/usr/bin/gcc-ranlib \
-    -DBUILD_CONFIG=mysql_release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DSYSCONFDIR=/etc/mysql \
-    -DMYSQL_DATADIR=/var/lib/mysql \
-    -DMYSQL_UNIX_ADDR=/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=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_PCRE=system \
-    -DWITH_LIBWRAP=OFF \
-    -DWITH_JEMALLOC=ON \
-    -DCMAKE_EXE_LINKER_FLAGS='-ljemalloc' \
-    -DWITH_EXTRA_CHARSETS=complex \
-    -DWITH_EMBEDDED_SERVER=ON \
-    -DWITH_ARCHIVE_STORAGE_ENGINE=1 \
-    -DWITH_BLACKHOLE_STORAGE_ENGINE=1 \
-    -DWITH_INNOBASE_STORAGE_ENGINE=1 \
-    -DWITH_PARTITION_STORAGE_ENGINE=1 \
-    -DWITH_TOKUDB_STORAGE_ENGINE=1 \
-    -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
-    -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 \
-    -DWITHOUT_PBXT_STORAGE_ENGINE=1 \
-    -DCMAKE_C_FLAGS="-fPIC $CFLAGS -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer -fno-delete-null-pointer-checks" \
-    -DCMAKE_CXX_FLAGS="-fPIC $CXXFLAGS -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti -fno-delete-null-pointer-checks" \
-    -DWITH_MYSQLD_LDFLAGS="-pie ${LDFLAGS},-z,now"
-
-  make
-}
-
-package_libmariadbclient() {
-  pkgdesc='MariaDB client libraries'
-  depends=('openssl' 'libaio' 'zlib' 'pcre' 'lz4' 'lzo' 'xz')
-  conflicts=('libmysqlclient')
-  provides=("libmysqlclient=$pkgver")
-  options=('staticlibs')
-
-  cd build
-  for dir in include libmysql libmysqld libservices; do
-    make -C $dir DESTDIR="$pkgdir" install
-  done
-
-  install -Dm755 scripts/mysql_config "$pkgdir"/usr/bin/mysql_config
-  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
-
-  rm "$pkgdir"/usr/lib/libmysql{client,client_r,d}.a
-}
-
-package_mariadb-clients() {
-  pkgdesc='MariaDB client tools'
-  depends=('libmariadbclient' 'zlib' 'openssl' 'jemalloc')
-  conflicts=('mysql-clients')
-  provides=("mysql-clients=$pkgver")
-
-  cd 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_mytop() {
-  pkgdesc='Top clone for MariaDB'
-  depends=('perl' 'perl-dbd-mysql' 'perl-term-readkey')
-
-  cd build
-  install -Dm755 scripts/mytop "$pkgdir"/usr/bin/mytop
-}
-
-package_mariadb() {
-  pkgdesc='Fast SQL database server, drop-in replacement for MySQL'
-  backup=('etc/mysql/my.cnf')
-  install=mariadb.install
-  depends=('mariadb-clients' 'inetutils' 'libaio' 'libxml2' 'pcre' 'jemalloc'
-           'lz4' 'boost-libs' 'lzo')
-  optdepends=('perl-dbd-mysql: for mysqlhotcopy, mysql_convert_table_format and mysql_setpermission')
-  conflicts=('mysql')
-  provides=("mysql=$pkgver")
-  options=('emptydirs')
-
-  cd build
-  make DESTDIR="$pkgdir" install
-
-  install -Dm644 "$pkgdir"/usr/share/mysql/my-medium.cnf "$pkgdir"/etc/mysql/my.cnf
-  install -Dm755 ../mariadb-post.sh "$pkgdir"/usr/bin/mysqld-post
-  install -Dm644 ../mariadb.service "$pkgdir"/usr/lib/systemd/system/mysqld.service
-  install -Dm644 ../mariadb-tmpfile.conf "$pkgdir"/usr/lib/tmpfiles.d/mysql.conf
-
-  install -dm700 "$pkgdir"/var/lib/mysql
-  chown -R 89:89 "$pkgdir"/var/lib/mysql &>/dev/null
-
-  # provided by libmariadbclient
-  cd "$pkgdir"
-  rm usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}
-  rm usr/lib/libmysql*
-  rm -r usr/include/
-  rm usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1
-
-  # provided by mariadb-clients
-  rm usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}
-  rm usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1
-
-  # provided by mytop
-  rm usr/bin/mytop
-
-  # not needed
-  rm -r usr/{data,mysql-test,sql-bench}
-  rm usr/share/man/man1/mysql-test-run.pl.1
-}

Copied: mariadb/repos/staging-x86_64/PKGBUILD (from rev 252749, mariadb/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2015-12-06 11:44:47 UTC (rev 252751)
@@ -0,0 +1,158 @@
+# $Id$
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+
+pkgbase=mariadb
+pkgname=('libmariadbclient' 'mariadb-clients' 'mytop' 'mariadb')
+pkgver=10.1.9
+_pkgver=${pkgver/.a/a}
+pkgrel=4
+arch=('i686' 'x86_64')
+license=('GPL')
+url='http://mariadb.org/'
+makedepends=('cmake' 'openssl' 'zlib' 'libaio' 'libxml2' 'openssl' 'pcre'
+             'jemalloc' 'lz4' 'boost') source=(http://ftp.heanet.ie/mirrors/mariadb/mariadb-$pkgver/source/mariadb-$pkgver.tar.gz mariadb.service
+        mariadb-post.sh
+        mariadb-tmpfile.conf)
+md5sums=('71d0e2408a671e1125c1310ce657f688'
+         'd488fffa9f62f9949c4aa1bb6e6db692'
+         'b79e65a5aa536e6b5bc60988eb0b78a2'
+         '2fa6e456964d4ff5e6d4f9ff0126aed6')
+
+build() {
+  mkdir build
+  cd build
+
+  cmake ../$pkgbase-$_pkgver \
+    -DCMAKE_AR=/usr/bin/gcc-ar \
+    -DCMAKE_RANLIB=/usr/bin/gcc-ranlib \
+    -DBUILD_CONFIG=mysql_release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DSYSCONFDIR=/etc/mysql \
+    -DMYSQL_DATADIR=/var/lib/mysql \
+    -DMYSQL_UNIX_ADDR=/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=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_PCRE=system \
+    -DWITH_LIBWRAP=OFF \
+    -DWITH_JEMALLOC=ON \
+    -DCMAKE_EXE_LINKER_FLAGS='-ljemalloc' \
+    -DWITH_EXTRA_CHARSETS=complex \
+    -DWITH_EMBEDDED_SERVER=ON \
+    -DWITH_ARCHIVE_STORAGE_ENGINE=1 \
+    -DWITH_BLACKHOLE_STORAGE_ENGINE=1 \
+    -DWITH_INNOBASE_STORAGE_ENGINE=1 \
+    -DWITH_PARTITION_STORAGE_ENGINE=1 \
+    -DWITH_TOKUDB_STORAGE_ENGINE=1 \
+    -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
+    -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 \
+    -DWITHOUT_PBXT_STORAGE_ENGINE=1 \
+    -DCMAKE_C_FLAGS="-fPIC $CFLAGS -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer -fno-delete-null-pointer-checks" \
+    -DCMAKE_CXX_FLAGS="-fPIC $CXXFLAGS -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti -fno-delete-null-pointer-checks" \
+    -DWITH_MYSQLD_LDFLAGS="-pie ${LDFLAGS},-z,now"
+
+  make
+}
+
+package_libmariadbclient() {
+  pkgdesc='MariaDB client libraries'
+  depends=('openssl' 'libaio' 'zlib' 'pcre' 'lz4' 'lzo' 'xz')
+  conflicts=('libmysqlclient')
+  provides=("libmysqlclient=$pkgver")
+  options=('staticlibs')
+
+  cd build
+  for dir in include libmysql libmysqld libservices; do
+    make -C $dir DESTDIR="$pkgdir" install
+  done
+
+  install -Dm755 scripts/mysql_config "$pkgdir"/usr/bin/mysql_config
+  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
+
+  rm "$pkgdir"/usr/lib/libmysql{client,client_r,d}.a
+}
+
+package_mariadb-clients() {
+  pkgdesc='MariaDB client tools'
+  depends=('libmariadbclient' 'zlib' 'openssl' 'jemalloc')
+  conflicts=('mysql-clients')
+  provides=("mysql-clients=$pkgver")
+
+  cd 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_mytop() {
+  pkgdesc='Top clone for MariaDB'
+  depends=('perl' 'perl-dbd-mysql' 'perl-term-readkey')
+
+  cd build
+  install -Dm755 scripts/mytop "$pkgdir"/usr/bin/mytop
+}
+
+package_mariadb() {
+  pkgdesc='Fast SQL database server, drop-in replacement for MySQL'
+  backup=('etc/mysql/my.cnf')
+  install=mariadb.install
+  depends=('mariadb-clients' 'inetutils' 'libaio' 'libxml2' 'pcre' 'jemalloc'
+           'lz4' 'boost-libs' 'lzo')
+  optdepends=('perl-dbd-mysql: for mysqlhotcopy, mysql_convert_table_format and mysql_setpermission')
+  conflicts=('mysql')
+  provides=("mysql=$pkgver")
+  options=('emptydirs')
+
+  cd build
+  make DESTDIR="$pkgdir" install
+
+  install -Dm644 "$pkgdir"/usr/share/mysql/my-medium.cnf "$pkgdir"/etc/mysql/my.cnf
+  install -Dm755 ../mariadb-post.sh "$pkgdir"/usr/bin/mysqld-post
+  install -Dm644 ../mariadb.service "$pkgdir"/usr/lib/systemd/system/mysqld.service
+  install -Dm644 ../mariadb-tmpfile.conf "$pkgdir"/usr/lib/tmpfiles.d/mysql.conf
+
+  install -dm700 "$pkgdir"/var/lib/mysql
+  chown -R 89:89 "$pkgdir"/var/lib/mysql &>/dev/null
+
+  # provided by libmariadbclient
+  cd "$pkgdir"
+  rm usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}
+  rm usr/lib/libmysql*
+  rm -r usr/include/
+  rm usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1
+
+  # provided by mariadb-clients
+  rm usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}
+  rm usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1
+
+  # provided by mytop
+  rm usr/bin/mytop
+
+  # not needed
+  rm -r usr/{data,mysql-test,sql-bench}
+  rm usr/share/man/man1/mysql-test-run.pl.1
+}

Deleted: staging-x86_64/mariadb-post.sh
===================================================================
--- staging-x86_64/mariadb-post.sh	2015-12-06 11:44:46 UTC (rev 252750)
+++ staging-x86_64/mariadb-post.sh	2015-12-06 11:44:47 UTC (rev 252751)
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-while true; do
-    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

Copied: mariadb/repos/staging-x86_64/mariadb-post.sh (from rev 252749, mariadb/trunk/mariadb-post.sh)
===================================================================
--- staging-x86_64/mariadb-post.sh	                        (rev 0)
+++ staging-x86_64/mariadb-post.sh	2015-12-06 11:44:47 UTC (rev 252751)
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+while true; do
+    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: staging-x86_64/mariadb-tmpfile.conf
===================================================================
--- staging-x86_64/mariadb-tmpfile.conf	2015-12-06 11:44:46 UTC (rev 252750)
+++ staging-x86_64/mariadb-tmpfile.conf	2015-12-06 11:44:47 UTC (rev 252751)
@@ -1 +0,0 @@
-d /run/mysqld 0755 mysql mysql -

Copied: mariadb/repos/staging-x86_64/mariadb-tmpfile.conf (from rev 252749, mariadb/trunk/mariadb-tmpfile.conf)
===================================================================
--- staging-x86_64/mariadb-tmpfile.conf	                        (rev 0)
+++ staging-x86_64/mariadb-tmpfile.conf	2015-12-06 11:44:47 UTC (rev 252751)
@@ -0,0 +1 @@
+d /run/mysqld 0755 mysql mysql -

Deleted: staging-x86_64/mariadb.install
===================================================================
--- staging-x86_64/mariadb.install	2015-12-06 11:44:46 UTC (rev 252750)
+++ staging-x86_64/mariadb.install	2015-12-06 11:44:47 UTC (rev 252751)
@@ -1,35 +0,0 @@
-post_install(){
-  groupadd -g 89 mysql &>/dev/null
-  useradd -u 89 -g 89 -d /var/lib/mysql -s /bin/false mysql &>/dev/null
-
-  echo ":: You need to initialize the MariaDB data directory prior to starting"
-  echo "   the service. This can be done with mysql_install_db command, e.g.:"
-  echo "   mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql"
-
-  if hash systemd-tmpfiles &> /dev/null; then
-    systemd-tmpfiles --create 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 [[ "$(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
-
-  if [[ "$(vercmp $2 10.0)" -lt 0 ]]; then
-    echo ":: Major version update. Consider restarting mysqld.service and"
-    echo "   running mysql_upgrade afterwards."
-  fi
-}

Copied: mariadb/repos/staging-x86_64/mariadb.install (from rev 252749, mariadb/trunk/mariadb.install)
===================================================================
--- staging-x86_64/mariadb.install	                        (rev 0)
+++ staging-x86_64/mariadb.install	2015-12-06 11:44:47 UTC (rev 252751)
@@ -0,0 +1,35 @@
+post_install(){
+  groupadd -g 89 mysql &>/dev/null
+  useradd -u 89 -g 89 -d /var/lib/mysql -s /bin/false mysql &>/dev/null
+
+  echo ":: You need to initialize the MariaDB data directory prior to starting"
+  echo "   the service. This can be done with mysql_install_db command, e.g.:"
+  echo "   mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql"
+
+  if hash systemd-tmpfiles &> /dev/null; then
+    systemd-tmpfiles --create 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 [[ "$(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
+
+  if [[ "$(vercmp $2 10.0)" -lt 0 ]]; then
+    echo ":: Major version update. Consider restarting mysqld.service and"
+    echo "   running mysql_upgrade afterwards."
+  fi
+}

Deleted: staging-x86_64/mariadb.service
===================================================================
--- staging-x86_64/mariadb.service	2015-12-06 11:44:46 UTC (rev 252750)
+++ staging-x86_64/mariadb.service	2015-12-06 11:44:47 UTC (rev 252751)
@@ -1,16 +0,0 @@
-[Unit]
-Description=MariaDB database server
-After=syslog.target
-
-[Service]
-User=mysql
-Group=mysql
-
-ExecStart=/usr/bin/mysqld --pid-file=/run/mysqld/mysqld.pid 
-ExecStartPost=/usr/bin/mysqld-post
-
-Restart=always
-PrivateTmp=true
-
-[Install]
-WantedBy=multi-user.target

Copied: mariadb/repos/staging-x86_64/mariadb.service (from rev 252749, mariadb/trunk/mariadb.service)
===================================================================
--- staging-x86_64/mariadb.service	                        (rev 0)
+++ staging-x86_64/mariadb.service	2015-12-06 11:44:47 UTC (rev 252751)
@@ -0,0 +1,16 @@
+[Unit]
+Description=MariaDB database server
+After=syslog.target
+
+[Service]
+User=mysql
+Group=mysql
+
+ExecStart=/usr/bin/mysqld --pid-file=/run/mysqld/mysqld.pid 
+ExecStartPost=/usr/bin/mysqld-post
+
+Restart=always
+PrivateTmp=true
+
+[Install]
+WantedBy=multi-user.target



More information about the arch-commits mailing list