From 24bf4eaa8a5925832af43d10e2916a0eabce8eee Mon Sep 17 00:00:00 2001
From: Nicolás Reynolds <fauno@endefensadelsl.org>
Date: Thu, 4 Jun 2015 18:45:48 -0300
Subject: mariadb-galera: upgrade

---
 pcr/mariadb-galera/PKGBUILD        | 31 ++++++++++++++++---------------
 pcr/mariadb-galera/mariadb.install | 30 +++++++-----------------------
 2 files changed, 23 insertions(+), 38 deletions(-)

(limited to 'pcr')

diff --git a/pcr/mariadb-galera/PKGBUILD b/pcr/mariadb-galera/PKGBUILD
index b569fa01a..db811db47 100644
--- a/pcr/mariadb-galera/PKGBUILD
+++ b/pcr/mariadb-galera/PKGBUILD
@@ -1,24 +1,29 @@
-# $Id$
+# $Id: PKGBUILD 238754 2015-05-09 12:28:18Z bpiotrowski $
 # Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 
 pkgbase=mariadb-galera
 #pkgname=('libmariadbclient' 'mariadb-clients' 'mytop' 'mariadb-galera')
 pkgname='mariadb-galera'
-pkgver=10.0.16
+pkgver=10.0.19
 _pkgver=${pkgver/.a/a}
 pkgrel=1
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 license=('GPL')
 url='https://mariadb.com/kb/en/galera/'
 makedepends=('cmake' 'openssl' 'zlib' 'libaio' 'libxml2' 'openssl' 'pcre' 'jemalloc' 'galera')
-source=(http://ftp.wa.co.za/pub/mariadb/${pkgbase}-${pkgver}/source/${pkgbase}-${pkgver}.tar.gz
+source=(https://downloads.mariadb.org/interstitial/${pkgbase}-$pkgver/source/${pkgbase}-$pkgver.tar.gz
         mariadb.service
         mariadb-post.sh
         mariadb-tmpfile.conf)
+sha512sums=('9acba0d851c8bdfe0b28e3ec3dc9a21a41c8f283322d73a3c05ac10b9e9400302b9e6fe47d0d5ef73307254af715bc3ed144acaa325ce6c78841ddd14ee754c7'
+            'adab89d2978a9cc249ac56ce62cf4d23b98c0d693fe9f770912e44aef6425624552d8b51b5df226dfe325a6cc8f97f985b4dfd0b961abf08b1b6515b6a470aa2'
+            'e20bd243d7d35bcefa802ea222b73b9451cb393fb17bdd2ba3ed2294853e54e06f176f6b6bf16a12f9dcb72b08499a3611712c99064ccbfd6b85b727b69e8ef6'
+            '04e7a1b4b1007d8c0a15285408834bf6a9b59fbce55e34fbc52857a90091c0b67c89d032e0ae8a6f990e726bad5a7f53106dff7ba41e09e5ba2ff343d00e486f')
 
 prepare() {
-  sed -i 's/_SVID_SOURCE/_DEFAULT_SOURCE/' \
-    mariadb-$pkgver/storage/tokudb/ft-index/cmake_modules/TokuSetupCompiler.cmake
+  :
+#  sed -i 's/_SVID_SOURCE/_DEFAULT_SOURCE/' \
+#    mariadb-$pkgver/storage/tokudb/ft-index/cmake_modules/TokuSetupCompiler.cmake
 }
 
 build() {
@@ -123,7 +128,8 @@ package_mariadb-galera() {
   pkgdesc='Fast SQL database server, drop-in replacement for MySQL with Galera replication'
   backup=('etc/mysql/my.cnf')
   install=mariadb.install
-  depends=('mariadb-clients' 'inetutils' 'libaio' 'libxml2' 'pcre' 'galera' 'jemalloc')
+  depends=('mariadb-clients' 'inetutils' 'libaio' 'libxml2' 'pcre' 'galera' 'jemalloc'
+           'lz4')
   optdepends=('perl-dbd-mysql: for mysqlhotcopy, mysql_convert_table_format and mysql_setpermission')
   conflicts=('mysql' 'mariadb')
   provides=("mysql=$pkgver" "mariadb=$pkgver")
@@ -137,6 +143,9 @@ package_mariadb-galera() {
   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 -f usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}
@@ -155,11 +164,3 @@ package_mariadb-galera() {
   rm -f -r usr/{data,mysql-test,sql-bench}
   rm -f usr/share/man/man1/mysql-test-run.pl.1
 }
-md5sums=('eaf628a5d4edba6a3e84c66403ebdde9'
-         'd488fffa9f62f9949c4aa1bb6e6db692'
-         'b79e65a5aa536e6b5bc60988eb0b78a2'
-         '2fa6e456964d4ff5e6d4f9ff0126aed6')
-md5sums=('b3110fd96e44c5ced9f71251e2f19e0b'
-         'd488fffa9f62f9949c4aa1bb6e6db692'
-         'b79e65a5aa536e6b5bc60988eb0b78a2'
-         '2fa6e456964d4ff5e6d4f9ff0126aed6')
diff --git a/pcr/mariadb-galera/mariadb.install b/pcr/mariadb-galera/mariadb.install
index 68bcc14e4..1ca233beb 100644
--- a/pcr/mariadb-galera/mariadb.install
+++ b/pcr/mariadb-galera/mariadb.install
@@ -1,17 +1,10 @@
-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
+  useradd -u 89 -g mysql -d /var/lib/mysql -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
+  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"
 
   usr/bin/systemd-tmpfiles --create mysql.conf
 
@@ -23,11 +16,12 @@ https://mariadb.com/kb/en/mariadb/documentation/replication/galera/getting-start
 
 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
+  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 $datadir/
+      cp -r $x var/lib/mysql
     done
     rm -rf data
   fi
@@ -42,13 +36,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
-}
-- 
cgit v1.2.3-54-g00ecf