summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD4
-rw-r--r--mysql.install31
3 files changed, 19 insertions, 30 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 57c9dfcb665a..a547b84d61a2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Sun Nov 19 19:45:47 UTC 2017
+# Sun Feb 4 18:39:09 UTC 2018
pkgbase = mysql56
pkgdesc = Fast SQL database server, community edition v5.6
- pkgver = 5.6.38
+ pkgver = 5.6.39
pkgrel = 1
url = https://www.mysql.com/products/community/
arch = i686
@@ -14,12 +14,12 @@ pkgbase = mysql56
makedepends = libaio
makedepends = jemalloc
options = !libtool
- source = https://dev.mysql.com/get/Downloads/MySQL-5.6/mysql-5.6.38.tar.gz
+ source = https://dev.mysql.com/get/Downloads/MySQL-5.6/mysql-5.6.39.tar.gz
source = mysqld-post.sh
source = mysqld-tmpfile.conf
source = mysqld.service
source = mysql-srv_buf_size.patch
- sha256sums = 18f249752f6c64af6e39c5b99c89ee1c86d6eb7fac853707603453cf584c54f3
+ sha256sums = ab1814b03af77bf88dc381eff558ed2e73e19e8e5a4170a78ba3370cd5da434d
sha256sums = 368f9fd2454d80eb32abb8f29f703d1cf9553353fb9e1ae4529c4b851cb8c5dd
sha256sums = 2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd
sha256sums = 50212165bdb09855b97b15a917464ba34f82edf30a0c43f9a0c93a27071df556
@@ -31,7 +31,7 @@ pkgname = mysql56
depends = mysql-clients56
depends = libaio
depends = perl
- provides = mariadb=5.6.38
+ provides = mariadb=5.6.39
conflicts = mariadb
options = emptydirs
backup = etc/mysql/my.cnf
@@ -40,7 +40,7 @@ pkgname = libmysqlclient56
pkgdesc = MySQL client libraries, v5.6
depends = zlib
depends = bash
- provides = libmariadbclient=5.6.38
+ provides = libmariadbclient=5.6.39
conflicts = libmariadbclient
pkgname = mysql-clients56
@@ -48,6 +48,6 @@ pkgname = mysql-clients56
depends = libmysqlclient56
depends = jemalloc
depends = ncurses
- provides = mariadb-clients=5.6.38
+ provides = mariadb-clients=5.6.39
conflicts = mariadb-clients
diff --git a/PKGBUILD b/PKGBUILD
index 3d5add72bd21..f273f3e3d256 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
pkgname=('mysql56' 'libmysqlclient56' 'mysql-clients56')
_pkgname=mysql
pkgbase=mysql56
-pkgver=5.6.38
+pkgver=5.6.39
pkgrel=1
pkgdesc="Fast SQL database server, community edition v5.6"
arch=('i686' 'x86_64')
@@ -19,7 +19,7 @@ source=("https://dev.mysql.com/get/Downloads/MySQL-5.6/${_pkgname}-${pkgver}.tar
"mysqld-tmpfile.conf"
"mysqld.service"
"mysql-srv_buf_size.patch")
-sha256sums=('18f249752f6c64af6e39c5b99c89ee1c86d6eb7fac853707603453cf584c54f3'
+sha256sums=('ab1814b03af77bf88dc381eff558ed2e73e19e8e5a4170a78ba3370cd5da434d'
'368f9fd2454d80eb32abb8f29f703d1cf9553353fb9e1ae4529c4b851cb8c5dd'
'2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd'
'50212165bdb09855b97b15a917464ba34f82edf30a0c43f9a0c93a27071df556'
diff --git a/mysql.install b/mysql.install
index f420406cc0f8..f0764bb76330 100644
--- a/mysql.install
+++ b/mysql.install
@@ -1,30 +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(){
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
+ if [[ ! -e "/var/lib/mysql" ]]; then
+ install -dm700 "/var/lib/mysql"
+ chown -R mysql:mysql "/var/lib/mysql" &>/dev/null
fi
- usr/bin/systemd-tmpfiles --create mysqld.conf
-}
-
-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
+ /usr/bin/systemd-tmpfiles --create mysqld.conf
- if [ "$(vercmp $2 5.6)" -lt 0 ]; then
- echo " >> "
- echo " >> Major version update. Consider restart the service, and then running mysql_upgrade after it."
- echo " >> "
- fi
+ echo ":: You need to initialize the MySQL 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"
+ echo ":: Additionally you should secure your MySQL installation using"
+ echo " mysql_secure_installation command after starting the mysqld service"
}
post_remove(){