Sun Jul 13 03:22:17 UTC 2014

3 files changed, 24 insertions, 167 deletions

diff --git a/extra/mariadb/PKGBUILD b/extra/mariadb/PKGBUILD
index ffbf3cca0..dcf8ca5a1 100644
--- a/extra/mariadb/PKGBUILD
+++ b/extra/mariadb/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 215306 2014-06-19 13:34:46Z bpiotrowski $
+# $Id: PKGBUILD 216837 2014-07-12 14:49:30Z bpiotrowski $
 # Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 
 pkgbase=mariadb
 pkgname=('libmariadbclient' 'mariadb-clients' 'mytop' 'mariadb')
-pkgver=5.5.38
+pkgver=10.0.12
 _pkgver=${pkgver/.a/a}
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
 url='http://mariadb.org/'
-makedepends=('cmake' 'openssl' 'zlib' 'libaio')
-source=(http://mariadb.kisiek.net/mariadb-$pkgver/source/mariadb-$pkgver.tar.gz
+makedepends=('cmake' 'openssl' 'zlib' 'libaio' 'libxml2' 'openssl' 'pcre')
+source=(https://downloads.mariadb.org/interstitial/mariadb-$pkgver/source/mariadb-$pkgver.tar.gz
         mariadb.service
         mariadb-post.sh
         mariadb-tmpfile.conf)
-md5sums=('fa9ba00b084b95a45fab70860c412f10'
+md5sums=('6e9a7c075526f8f2f83ad8e0933bab2f'
          'd488fffa9f62f9949c4aa1bb6e6db692'
          'b79e65a5aa536e6b5bc60988eb0b78a2'
          '2fa6e456964d4ff5e6d4f9ff0126aed6')
@@ -45,6 +45,7 @@ build() {
     -DWITH_READLINE=ON \
     -DWITH_ZLIB=system \
     -DWITH_SSL=system \
+    -DWITH_PCRE=system \
     -DWITH_LIBWRAP=OFF \
     -DWITH_EXTRA_CHARSETS=complex \
     -DWITH_EMBEDDED_SERVER=ON \
@@ -52,21 +53,21 @@ build() {
     -DWITH_BLACKHOLE_STORAGE_ENGINE=1 \
     -DWITH_INNOBASE_STORAGE_ENGINE=1 \
     -DWITH_PARTITION_STORAGE_ENGINE=1 \
-    -DWITHOUT_TOKUDB_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" \
-    -DCMAKE_CXX_FLAGS="-fPIC $CXXFLAGS -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" \
+    -DWITHOUT_TOKUDB=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="$LDFLAGS"
 
-
   make
 }
 
 package_libmariadbclient() {
   pkgdesc='MariaDB client libraries'
-  depends=('openssl' 'libaio' 'zlib')
+  depends=('openssl' 'libaio' 'zlib' 'pcre')
   conflicts=('libmysqlclient')
   provides=("libmysqlclient=$pkgver")
   options=('staticlibs')
@@ -81,11 +82,13 @@ package_libmariadbclient() {
   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')
+  depends=('libmariadbclient' 'zlib' 'openssl')
   conflicts=('mysql-clients')
   provides=("mysql-clients=$pkgver")
 
@@ -105,7 +108,7 @@ package_mariadb-clients() {
 
 package_mytop() {
   pkgdesc='Top clone for MariaDB'
-  depends=('perl-dbd-mysql' 'perl-term-readkey')
+  depends=('perl' 'perl-dbd-mysql' 'perl-term-readkey')
 
   cd build
   install -Dm755 scripts/mytop "$pkgdir"/usr/bin/mytop
@@ -115,7 +118,7 @@ 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')
+  depends=('mariadb-clients' 'inetutils' 'libaio' 'libxml2' 'pcre')
   conflicts=('mysql')
   provides=("mysql=$pkgver")
   options=('emptydirs')
diff --git a/extra/mariadb/PKGBUILD.10 b/extra/mariadb/PKGBUILD.10
deleted file mode 100644
index aed0859e3..000000000
--- a/extra/mariadb/PKGBUILD.10
+++ /dev/null
@@ -1,148 +0,0 @@
-# $Id: PKGBUILD 206433 2014-02-26 06:33:34Z bpiotrowski $
-# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
-
-pkgbase=mariadb
-pkgname=('libmariadbclient' 'mariadb-clients' 'mytop' 'mariadb')
-pkgver=10.0.9
-_pkgver=${pkgver/.a/a}
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('GPL')
-url='http://mariadb.org/'
-makedepends=('cmake' 'openssl' 'zlib' 'libaio' 'libxml2' 'openssl')
-source=(http://mirrors.supportex.net/$pkgbase/$pkgbase-$_pkgver/kvm-tarbake-jaunty-x86/$pkgbase-$_pkgver.tar.gz
-        mariadb.service
-        mariadb-post.sh
-        mariadb-tmpfile.conf)
-md5sums=('36363eaaeace9e81a64ac94d9d53bffe'
-         'd488fffa9f62f9949c4aa1bb6e6db692'
-         'b79e65a5aa536e6b5bc60988eb0b78a2'
-         '2fa6e456964d4ff5e6d4f9ff0126aed6')
-
-build() {
-  mkdir build
-  cd build
-
-  cmake ../$pkgbase-$_pkgver \
-    -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_LIBWRAP=OFF \
-    -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" \
-    -DCMAKE_CXX_FLAGS="-fPIC $CXXFLAGS -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" \
-    -DWITH_MYSQLD_LDFLAGS="$LDFLAGS"
-
-
-  make
-}
-
-package_libmariadbclient() {
-  pkgdesc='MariaDB client libraries'
-  depends=('openssl' 'libaio' 'zlib')
-  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
-}
-
-package_mariadb-clients() {
-  pkgdesc='MariaDB client tools'
-  depends=('libmariadbclient' 'zlib' 'openssl')
-  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')
-  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
-}
diff --git a/extra/mariadb/mariadb.install b/extra/mariadb/mariadb.install
index 7d3c2ce5c..595bc4c4d 100644
--- a/extra/mariadb/mariadb.install
+++ b/extra/mariadb/mariadb.install
@@ -14,9 +14,6 @@ post_install(){
   fi
 
   usr/bin/systemd-tmpfiles --create mysql.conf
-
-  echo ">> If you are migrating from MySQL, don't forget to run 'mysql_upgrade'"
-  echo "     after mysqld.service restart." 
 }
 
 post_upgrade(){
@@ -31,16 +28,21 @@ post_upgrade(){
   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." 
+    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