mysq: update to 5.5

1 files changed, 94 insertions, 70 deletions

diff --git a/abs/core/mysql/PKGBUILD b/abs/core/mysql/PKGBUILD
index 3ce1aeb..5d9cbb7 100644..100755
--- a/abs/core/mysql/PKGBUILD
+++ b/abs/core/mysql/PKGBUILD
@@ -1,109 +1,133 @@
-# $Id: PKGBUILD 88432 2010-08-23 17:32:08Z pierre $
+# $Id: PKGBUILD 167246 2012-09-29 09:32:53Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
 
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
-pkgver=5.1.59
+pkgver=5.5.28
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
-url="http://www.mysql.com/"
-makedepends=('tcp_wrappers' 'zlib' 'perl' 'openssl' 'libtool' 'patch')
+url="https://www.mysql.com/products/community/"
+makedepends=('cmake' 'openssl' 'zlib')
 options=('!libtool')
-source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.1/${pkgbase}-${pkgver}.tar.gz"
-        'mysqld'
-        'my.cnf'
-        'skip-abi-check.patch')
+source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz"
+        'mysqld.rc' 'my.cnf' 'mysqld-post.sh' 'mysqld-tmpfile.conf' 'mysqld.service')
 
 build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  patch -Np0 -i "${srcdir}/skip-abi-check.patch"
+  mkdir build
+  cd build
+
   # CFLAGS/CXXFLAGS as suggested upstream
-  CFLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \
-  CXXFLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" \
-  ./configure --prefix=/usr \
-    --libexecdir=/usr/sbin \
-    --localstatedir=/var \
-    --sysconfdir=/etc/mysql \
-    --without-docs \
-    --without-readline \
-    --with-ssl \
-    --with-libwrap \
-    --with-charset=utf8 \
-    --with-collation=utf8_general_ci \
-    --with-extra-charsets=complex \
-    --with-embedded-server \
-    --with-unix-socket-path=/var/run/mysqld/mysqld.sock \
-    --enable-local-infile \
-    --with-plugins=partition,ftexample,archive,blackhole,federated,heap,innobase,innodb_plugin,ndbcluster
-  make || return 1
+
+  cmake ../${pkgbase}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=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_MYSQLD_LDFLAGS="${LDFLAGS}" \
+    -DWITH_EXTRA_CHARSETS=complex \
+    -DWITH_EMBEDDED_SERVER=ON \
+    -DWITH_INNOBASE_STORAGE_ENGINE=1 \
+    -DWITH_PARTITION_STORAGE_ENGINE=1 \
+    -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
+    -DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 \
+    -DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 \
+    -DWITHOUT_FEDERATED_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"
+
+  make
 }
 
 package_libmysqlclient(){
   pkgdesc="MySQL client libraries"
-  depends=('openssl' 'zlib' 'gcc-libs' 'tcp_wrappers')
-  
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  for dir in include libmysql libmysql_r libmysqld; do
+  depends=('openssl')
+
+  cd build
+  for dir in include libmysql libmysqld libservices; do
     make -C ${dir} DESTDIR="${pkgdir}" install
   done
-  install -m644 include/*.h "${pkgdir}/usr/include/mysql/"
-
-  install -d "${pkgdir}/usr/bin"
-  install -m755 scripts/mysql_config "${pkgdir}/usr/bin/"
-  
-  # create library symlinks in /usr/lib
-  ln -sf mysql/libmysqlclient.so.16 ${pkgdir}/usr/lib/libmysqlclient.so.16
-  ln -sf libmysqlclient.so.16 ${pkgdir}/usr/lib/libmysqlclient.so
-  ln -sf libmysqlclient.so.16 ${pkgdir}/usr/lib/libmysqlclient.so.1
-  ln -sf mysql/libmysqlclient_r.so.16  ${pkgdir}/usr/lib/libmysqlclient_r.so.16
-  ln -sf libmysqlclient_r.so.16 ${pkgdir}/usr/lib/libmysqlclient_r.so
-  ln -sf libmysqlclient_r.so.16 ${pkgdir}/usr/lib/libmysqlclient_r.so.1
+
+  install -d "${pkgdir}"/usr/bin
+  install -m755 scripts/mysql_config "${pkgdir}"/usr/bin/
+  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_mysql-clients(){
   pkgdesc="MySQL client tools"
   depends=('libmysqlclient')
-  
-  cd "${srcdir}/${pkgbase}-${pkgver}/client"
-  make DESTDIR="${pkgdir}" install
 
-  # provided by libmysqlclient
-  rm -rf "${pkgdir}/usr/lib/"
+  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 mysql
-  rm -f "${pkgdir}"/usr/bin/{mysql_upgrade,mysqlbinlog,mysqltest}
+  rm "${pkgdir}"/usr/bin/{mysql_{plugin,upgrade},mysqlbinlog,mysqltest}
 }
 
 package_mysql(){
   pkgdesc="A fast SQL database server"
-  backup=('etc/my.cnf' 'etc/mysql/my.cnf')
+  backup=('etc/mysql/my.cnf')
   install=mysql.install
-  depends=('mysql-clients')
-  optdepends=('perl-dbi' 'perl-dbd-mysql')
+  depends=('mysql-clients' 'systemd-tools')
+  options=('emptydirs')
 
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR=${pkgdir} install
+  cd build
+  make DESTDIR="${pkgdir}" install
 
-  install -Dm644 ${srcdir}/my.cnf ${pkgdir}/etc/mysql/my.cnf
-  install -Dm755 ${srcdir}/mysqld ${pkgdir}/etc/rc.d/mysqld
+  install -Dm644 "${srcdir}"/my.cnf "${pkgdir}"/etc/mysql/my.cnf
+  install -Dm755 "${srcdir}"/mysqld.rc "${pkgdir}"/etc/rc.d/mysqld
+  install -Dm755 "${srcdir}"/mysqld-post.sh "${pkgdir}"/usr/bin/mysqld-post
+  install -Dm644 "${srcdir}"/mysqld-tmpfile.conf "${pkgdir}"/usr/lib/tmpfiles.d/mysqld.conf
+  install -d "${pkgdir}"/usr/lib/systemd/system
+  install -Dm644 "${srcdir}"/mysqld.service "${pkgdir}"/usr/lib/systemd/system/
 
   # provided by libmysqlclient
-  rm -f ${pkgdir}/usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}
-  rm -f ${pkgdir}/usr/lib/mysql/libmysqlclient*
-  rm -f ${pkgdir}/usr/lib/mysql/libmysqld.a
-  rm -f ${pkgdir}/usr/include/mysql/*.h
-  
+  rm "${pkgdir}"/usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}
+  rm "${pkgdir}"/usr/lib/libmysql*
+  rm -r "${pkgdir}"/usr/include/
+  rm "${pkgdir}"/usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1
+
   # provided by mysql-clients
-  rm -f ${pkgdir}/usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}
+  rm "${pkgdir}"/usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}
+  rm "${pkgdir}"/usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1
 
   # not needed
-  rm -rf ${pkgdir}/usr/{mysql-test,sql-bench}
-  rm -f ${pkgdir}/usr/lib/mysql/plugin/*.a
+  rm -r "${pkgdir}"/usr/{data,mysql-test,sql-bench}
+  rm "${pkgdir}"/usr/share/man/man1/mysql-test-run.pl.1
+
+  install -dm700 "${pkgdir}"/var/lib/mysql
 }
-md5sums=('1e89816164692f44f768024db4bc05f6'
-         '2234207625baa29b2ff7d7b4f088abce'
-         'd60099985e68e36b156423fca6b50924'
-         'a97e574945e19de3908575b956241026')
+md5sums=('da8ddb3d00e6e159153d2444360f52a8'
+         'e7eb2faeab755cbb2fe03542bf328da9'
+         '698827c2380bd5f831f2b8160cee4cae'
+         '6ea6ceb360d09a774e87335ee098ddd5'
+         '2fa6e456964d4ff5e6d4f9ff0126aed6'
+         'a0e1460c276a50a9666c331de83271f2')