diff --git a/extra/mariadb/PKGBUILD b/extra/mariadb/PKGBUILD index 1f60bc9e1..8e15cdda1 100644 --- a/extra/mariadb/PKGBUILD +++ b/extra/mariadb/PKGBUILD @@ -6,18 +6,19 @@ pkgbase=mariadb pkgname=('libmariadbclient' 'mariadb-clients' 'mytop' 'mariadb') -pkgver=10.0.17 +pkgver=10.0.18 _pkgver=${pkgver/.a/a} -pkgrel=2 +pkgrel=1 arch=('i686' 'x86_64') license=('GPL') url='http://mariadb.org/' -makedepends=('cmake' 'openssl' 'zlib' 'libaio' 'libxml2' 'openssl' 'pcre' 'jemalloc') +makedepends=('cmake' 'openssl' 'zlib' 'libaio' 'libxml2' 'openssl' 'pcre' + 'jemalloc' 'lz4') source=(https://downloads.mariadb.org/interstitial/mariadb-$pkgver/source/mariadb-$pkgver.tar.gz mariadb.service mariadb-post.sh mariadb-tmpfile.conf) -md5sums=('3101d1e79c1b04699cde10780f959625' +md5sums=('eab4f9303883d33558c0059af9e30aa4' 'd488fffa9f62f9949c4aa1bb6e6db692' 'b79e65a5aa536e6b5bc60988eb0b78a2' '2fa6e456964d4ff5e6d4f9ff0126aed6') @@ -130,7 +131,8 @@ 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') + depends=('mariadb-clients' 'inetutils' 'libaio' 'libxml2' 'pcre' 'jemalloc' + 'lz4') optdepends=('perl-dbd-mysql: for mysqlhotcopy, mysql_convert_table_format and mysql_setpermission') conflicts=('mysql') provides=("mysql=$pkgver") @@ -144,6 +146,9 @@ package_mariadb() { 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 var/lib/mysql + chown -R 89:89 var/lib/mysql &>/dev/null + # provided by libmariadbclient cd "$pkgdir" rm usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded} diff --git a/extra/mariadb/mariadb.install b/extra/mariadb/mariadb.install index 25799e623..64f95f0b9 100644 --- a/extra/mariadb/mariadb.install +++ b/extra/mariadb/mariadb.install @@ -2,11 +2,6 @@ post_install(){ groupadd -g 89 mysql &>/dev/null useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null - if [[ ! -e var/lib/mysql ]]; then - install -dm700 var/lib/mysql - chown -R mysql:mysql var/lib/mysql &>/dev/null - fi - 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" @@ -36,13 +31,3 @@ post_upgrade(){ 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 -}