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

Bartłomiej Piotrowski bpiotrowski at archlinux.org
Tue Nov 25 22:46:20 UTC 2014


    Date: Tuesday, November 25, 2014 @ 23:46:19
  Author: bpiotrowski
Revision: 227103

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

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

-------------------------------------+
 testing-i686/PKGBUILD               |  160 ++++++++++++++++++++++++++++++++++
 testing-i686/mariadb-post.sh        |    8 +
 testing-i686/mariadb-tmpfile.conf   |    1 
 testing-i686/mariadb.install        |   49 ++++++++++
 testing-i686/mariadb.service        |   16 +++
 testing-x86_64/PKGBUILD             |  160 ++++++++++++++++++++++++++++++++++
 testing-x86_64/mariadb-post.sh      |    8 +
 testing-x86_64/mariadb-tmpfile.conf |    1 
 testing-x86_64/mariadb.install      |   49 ++++++++++
 testing-x86_64/mariadb.service      |   16 +++
 10 files changed, 468 insertions(+)

Copied: mariadb/repos/testing-i686/PKGBUILD (from rev 227102, mariadb/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD	                        (rev 0)
+++ testing-i686/PKGBUILD	2014-11-25 22:46:19 UTC (rev 227103)
@@ -0,0 +1,160 @@
+# $Id$
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+
+pkgbase=mariadb
+pkgname=('libmariadbclient' 'mariadb-clients' 'mytop' 'mariadb')
+pkgver=10.0.15
+_pkgver=${pkgver/.a/a}
+pkgrel=1
+arch=('i686' 'x86_64')
+license=('GPL')
+url='http://mariadb.org/'
+makedepends=('cmake' 'openssl' 'zlib' 'libaio' 'libxml2' 'openssl' 'pcre' 'jemalloc')
+source=(https://downloads.mariadb.org/interstitial/mariadb-$pkgver/source/mariadb-$pkgver.tar.gz
+        mariadb.service
+        mariadb-post.sh
+        mariadb-tmpfile.conf)
+md5sums=('07e2ca1ad684c2dc5cb260717c4db41d'
+         'd488fffa9f62f9949c4aa1bb6e6db692'
+         'b79e65a5aa536e6b5bc60988eb0b78a2'
+         '2fa6e456964d4ff5e6d4f9ff0126aed6')
+
+prepare() {
+  sed -i 's/_SVID_SOURCE/_DEFAULT_SOURCE/' \
+    $pkgbase-$pkgver/storage/tokudb/ft-index/cmake_modules/TokuSetupCompiler.cmake
+}
+
+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')
+  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')
+  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
+
+  # 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/testing-i686/mariadb-post.sh (from rev 227102, mariadb/trunk/mariadb-post.sh)
===================================================================
--- testing-i686/mariadb-post.sh	                        (rev 0)
+++ testing-i686/mariadb-post.sh	2014-11-25 22:46:19 UTC (rev 227103)
@@ -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

Copied: mariadb/repos/testing-i686/mariadb-tmpfile.conf (from rev 227102, mariadb/trunk/mariadb-tmpfile.conf)
===================================================================
--- testing-i686/mariadb-tmpfile.conf	                        (rev 0)
+++ testing-i686/mariadb-tmpfile.conf	2014-11-25 22:46:19 UTC (rev 227103)
@@ -0,0 +1 @@
+d /run/mysqld 0755 mysql mysql -

Copied: mariadb/repos/testing-i686/mariadb.install (from rev 227102, mariadb/trunk/mariadb.install)
===================================================================
--- testing-i686/mariadb.install	                        (rev 0)
+++ testing-i686/mariadb.install	2014-11-25 22:46:19 UTC (rev 227103)
@@ -0,0 +1,49 @@
+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 $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 var/lib/mysql &>/dev/null
+  fi
+
+  usr/bin/systemd-tmpfiles --create mysql.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 $datadir -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 $datadir/
+    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
+}
+
+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
+}

Copied: mariadb/repos/testing-i686/mariadb.service (from rev 227102, mariadb/trunk/mariadb.service)
===================================================================
--- testing-i686/mariadb.service	                        (rev 0)
+++ testing-i686/mariadb.service	2014-11-25 22:46:19 UTC (rev 227103)
@@ -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

Copied: mariadb/repos/testing-x86_64/PKGBUILD (from rev 227102, mariadb/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2014-11-25 22:46:19 UTC (rev 227103)
@@ -0,0 +1,160 @@
+# $Id$
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+
+pkgbase=mariadb
+pkgname=('libmariadbclient' 'mariadb-clients' 'mytop' 'mariadb')
+pkgver=10.0.15
+_pkgver=${pkgver/.a/a}
+pkgrel=1
+arch=('i686' 'x86_64')
+license=('GPL')
+url='http://mariadb.org/'
+makedepends=('cmake' 'openssl' 'zlib' 'libaio' 'libxml2' 'openssl' 'pcre' 'jemalloc')
+source=(https://downloads.mariadb.org/interstitial/mariadb-$pkgver/source/mariadb-$pkgver.tar.gz
+        mariadb.service
+        mariadb-post.sh
+        mariadb-tmpfile.conf)
+md5sums=('07e2ca1ad684c2dc5cb260717c4db41d'
+         'd488fffa9f62f9949c4aa1bb6e6db692'
+         'b79e65a5aa536e6b5bc60988eb0b78a2'
+         '2fa6e456964d4ff5e6d4f9ff0126aed6')
+
+prepare() {
+  sed -i 's/_SVID_SOURCE/_DEFAULT_SOURCE/' \
+    $pkgbase-$pkgver/storage/tokudb/ft-index/cmake_modules/TokuSetupCompiler.cmake
+}
+
+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')
+  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')
+  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
+
+  # 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/testing-x86_64/mariadb-post.sh (from rev 227102, mariadb/trunk/mariadb-post.sh)
===================================================================
--- testing-x86_64/mariadb-post.sh	                        (rev 0)
+++ testing-x86_64/mariadb-post.sh	2014-11-25 22:46:19 UTC (rev 227103)
@@ -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

Copied: mariadb/repos/testing-x86_64/mariadb-tmpfile.conf (from rev 227102, mariadb/trunk/mariadb-tmpfile.conf)
===================================================================
--- testing-x86_64/mariadb-tmpfile.conf	                        (rev 0)
+++ testing-x86_64/mariadb-tmpfile.conf	2014-11-25 22:46:19 UTC (rev 227103)
@@ -0,0 +1 @@
+d /run/mysqld 0755 mysql mysql -

Copied: mariadb/repos/testing-x86_64/mariadb.install (from rev 227102, mariadb/trunk/mariadb.install)
===================================================================
--- testing-x86_64/mariadb.install	                        (rev 0)
+++ testing-x86_64/mariadb.install	2014-11-25 22:46:19 UTC (rev 227103)
@@ -0,0 +1,49 @@
+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 $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 var/lib/mysql &>/dev/null
+  fi
+
+  usr/bin/systemd-tmpfiles --create mysql.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 $datadir -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 $datadir/
+    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
+}
+
+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
+}

Copied: mariadb/repos/testing-x86_64/mariadb.service (from rev 227102, mariadb/trunk/mariadb.service)
===================================================================
--- testing-x86_64/mariadb.service	                        (rev 0)
+++ testing-x86_64/mariadb.service	2014-11-25 22:46:19 UTC (rev 227103)
@@ -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