summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO20
-rw-r--r--PKGBUILD4
-rw-r--r--mysql.install31
3 files changed, 22 insertions, 33 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5d469f5e3f31..6f9532e6b172 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Sun Nov 19 19:28:56 UTC 2017
+# Sun Feb 4 18:55:03 UTC 2018
pkgbase = mysql55
pkgdesc = Fast SQL database server, community edition v5.5
- pkgver = 5.5.58
+ pkgver = 5.5.59
pkgrel = 1
url = https://www.mysql.com/products/community/
arch = i686
@@ -13,11 +13,11 @@ pkgbase = mysql55
makedepends = systemd-tools
makedepends = libaio
options = !libtool
- source = https://dev.mysql.com/get/Downloads/MySQL-5.5/mysql-5.5.58.tar.gz
+ source = https://dev.mysql.com/get/Downloads/MySQL-5.5/mysql-5.5.59.tar.gz
source = mysqld-post.sh
source = mysqld-tmpfile.conf
source = mysqld.service
- sha256sums = 9b6912faf261555c8975db24a987f63f36aaa28052a301e85538346ace0009b9
+ sha256sums = ee920177c9dec770c30b673a21143d5e92a67e8207f9b720d41d51cda05d8513
sha256sums = 368f9fd2454d80eb32abb8f29f703d1cf9553353fb9e1ae4529c4b851cb8c5dd
sha256sums = 2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd
sha256sums = 50212165bdb09855b97b15a917464ba34f82edf30a0c43f9a0c93a27071df556
@@ -28,8 +28,8 @@ pkgname = mysql55
depends = mysql-clients55
depends = libaio
depends = perl
- provides = mariadb=5.5.58
- provides = mysql=5.5.58
+ provides = mariadb=5.5.59
+ provides = mysql=5.5.59
conflicts = mariadb
options = emptydirs
backup = etc/mysql/my.cnf
@@ -38,15 +38,15 @@ pkgname = libmysqlclient55
pkgdesc = MySQL client libraries, v5.5
depends = zlib
depends = bash
- provides = libmariadbclient=5.5.58
- provides = libmysqlclient=5.5.58
+ provides = libmariadbclient=5.5.59
+ provides = libmysqlclient=5.5.59
conflicts = libmariadbclient
pkgname = mysql-clients55
pkgdesc = MySQL client tools, v5.5
depends = libmysqlclient55
depends = ncurses
- provides = mariadb-clients=5.5.58
- provides = mysql-clients=5.5.58
+ provides = mariadb-clients=5.5.59
+ provides = mysql-clients=5.5.59
conflicts = mariadb-clients
diff --git a/PKGBUILD b/PKGBUILD
index 9fd2f9cd2412..7c426b15fb65 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
pkgname=('mysql55' 'libmysqlclient55' 'mysql-clients55')
_pkgname=mysql
pkgbase=mysql55
-pkgver=5.5.58
+pkgver=5.5.59
pkgrel=1
pkgdesc="Fast SQL database server, community edition v5.5"
arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@ source=("https://dev.mysql.com/get/Downloads/MySQL-5.5/${_pkgname}-${pkgver}.tar
"mysqld-post.sh"
"mysqld-tmpfile.conf"
"mysqld.service")
-sha256sums=('9b6912faf261555c8975db24a987f63f36aaa28052a301e85538346ace0009b9'
+sha256sums=('ee920177c9dec770c30b673a21143d5e92a67e8207f9b720d41d51cda05d8513'
'368f9fd2454d80eb32abb8f29f703d1cf9553353fb9e1ae4529c4b851cb8c5dd'
'2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd'
'50212165bdb09855b97b15a917464ba34f82edf30a0c43f9a0c93a27071df556')
diff --git a/mysql.install b/mysql.install
index 907e98656dd7..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.5)" -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(){