[arch-commits] Commit in percona-server/trunk (PKGBUILD percona.install)

[Massimiliano Torromeo]

    Date: Tuesday, February 23, 2016 @ 23:58:23
  Author: mtorromeo
Revision: 163244

upgpkg: percona-server 5.7.10_3-1

Updated to 5.7.10

Modified:
  percona-server/trunk/PKGBUILD
  percona-server/trunk/percona.install

-----------------+
 PKGBUILD        |   16 +++++++++-------
 percona.install |   24 +++++++++---------------
 2 files changed, 18 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-02-23 21:30:14 UTC (rev 163243)
+++ PKGBUILD	2016-02-23 22:58:23 UTC (rev 163244)
@@ -10,7 +10,7 @@
 pkgrel=1
 arch=('i686' 'x86_64')
 # valgrind necessary for bug https://bugs.launchpad.net/percona-server/+bug/1494283
-makedepends=('cmake' 'openssl' 'zlib' 'libaio' 'systemd-tools' 'valgrind')
+makedepends=('cmake' 'openssl' 'zlib' 'libaio' 'systemd-tools' 'valgrind' 'pam')
 license=('GPL' 'AGPL')
 url="http://www.percona.com/software/percona-server/"
 source=("http://www.percona.com/downloads/Percona-Server-${pkgver%.*_*}/Percona-Server-$_pkgver/source/tarball/percona-server-$_pkgver.tar.gz"
@@ -78,7 +78,7 @@
 
 package_libperconaserverclient() {
 	pkgdesc='Percona Server client libraries'
-	depends=('openssl')
+	depends=('openssl' 'libaio')
 
 	cd build
 	for dir in include libmysql libmysqld libservices; do
@@ -94,7 +94,7 @@
 
 package_percona-server-clients() {
 	pkgdesc='Percona Server client tools'
-	depends=('libperconaserverclient' 'zlib')
+	depends=('libperconaserverclient' 'zlib' 'openssl')
 	conflicts=('mysql-clients')
 	provides=("mysql-clients=$_myver" "mariadb-clients=$_myver")
 
@@ -108,7 +108,7 @@
 	done
 
 	# provided by percona-server
-	rm "$pkgdir"/usr/bin/{mysql_{plugin,upgrade},mysqlbinlog,mysqltest,mysql_config_editor}
+	rm "$pkgdir"/usr/bin/mysql{_plugin,_upgrade,binlog,test,_config_editor,_install_db,_secure_installation,_ssl_rsa_setup}
 }
 
 package_percona-server() {
@@ -115,7 +115,7 @@
 	pkgdesc='Drop-in replacement for MySQL that provides improved performance, diagnostics, instrumentation and TokuDB storage engine'
 	backup=('etc/mysql/my.cnf')
 	install=percona.install
-	depends=('percona-server-clients' 'libaio' 'systemd-tools' 'pam')
+	depends=('libaio' 'systemd-tools' 'pam')
 	optdepends=('perl-dbd-mysql')
 	conflicts=('mysql')
 	provides=("mysql=$_myver" "mariadb=$_myver")
@@ -128,6 +128,8 @@
 	install -Dm644 ../mysql-user.conf "$pkgdir"/usr/lib/sysusers.d/mysql.conf
 
   cd "$pkgdir"
+  mv usr/usr/lib/* usr/lib
+  rm -rf usr/usr
 
 	# Move documentation
 	install -dm755 usr/share/doc
@@ -146,8 +148,8 @@
 	rm usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1
 
 	# provided by percona-server-clients
-	rm usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}
-	rm usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1
+	rm usr/bin/mysql{,admin,check,dump,import,show,slap,pump}
+	rm usr/share/man/man1/mysql{,admin,check,dump,import,show,slap,pump}.1
 
 	# deprecated/unused
 	rm usr/bin/replace

Modified: percona.install
===================================================================
--- percona.install	2016-02-23 21:30:14 UTC (rev 163243)
+++ percona.install	2016-02-23 22:58:23 UTC (rev 163244)
@@ -1,25 +1,19 @@
-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(){
+post_install() {
   systemd-sysusers mysql.conf
+  systemd-tmpfiles --create mysql.conf
 
-  if [[ ! -e $datadir ]]; then
-    install -dm700 $datadir
-    mysql_install_db --user=mysql --basedir=/usr --datadir=$datadir
-  fi
-
-  systemd-tmpfiles --create mysql.conf
+  echo " >> "
+  echo " >> A temporary password is generated on first start and logged in journald."
+  echo " >> Use 'journalctl -au mysqld | grep "\""temporary password"\""' to retrieve it."
+  echo " >> "
 }
 
-post_upgrade(){
+post_upgrade() {
   systemd-sysusers mysql.conf
 
-  if [ "$(vercmp $2 5.6)" -lt 0 ]; then
+  if [ "$(vercmp $2 5.7)" -lt 0 ]; then
     echo " >> "
-    echo " >> Major version update. Consider restart the service, and then running mysql_upgrade after it."
+    echo " >> Major version update. Consider restart the service, running mysql_upgrade and restart it again after it."
     echo " >> "
   fi
 }