diff options
| -rw-r--r-- | .SRCINFO | 15 | ||||
| -rw-r--r-- | PKGBUILD | 6 | ||||
| -rw-r--r-- | mysql.install | 31 |
3 files changed, 20 insertions, 32 deletions
@@ -1,11 +1,10 @@ # Generated by mksrcinfo v8 -# Sun Nov 19 20:17:00 UTC 2017 +# Sun Feb 4 15:46:36 UTC 2018 pkgbase = mysql pkgdesc = Fast SQL database server, community edition - pkgver = 5.7.20 + pkgver = 5.7.21 pkgrel = 1 url = https://www.mysql.com/products/community/ - arch = i686 arch = x86_64 license = GPL makedepends = openssl @@ -15,7 +14,7 @@ pkgbase = mysql makedepends = libaio makedepends = jemalloc options = !libtool - source = https://dev.mysql.com/get/Downloads/MySQL-5.7/mysql-5.7.20.tar.gz + source = https://dev.mysql.com/get/Downloads/MySQL-5.7/mysql-5.7.21.tar.gz source = http://sourceforge.net/projects/boost/files/boost/1.59.0/boost_1_59_0.tar.gz source = bug_83814_my_aes_openssl.patch::https://bugs.mysql.com/file.php?id=25081&bug_id=83814 source = bug_83814_viosslfactories.patch::https://bugs.mysql.com/file.php?id=25082&bug_id=83814 @@ -25,7 +24,7 @@ pkgbase = mysql source = mysqld-tmpfile.conf source = mysqld.service source = my-default.cnf - sha256sums = 5397549bb7c238f396c123db2df4cad2191b11adf8986de7fe63bff8e2786487 + sha256sums = fa205079c27a39c24f3485e7498dd0906a6e0b379b4f99ebc0ec38a9ec5b09b7 sha256sums = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac sha256sums = 1353162f5ae6e3dd4b0b8660738adbbc36c6d514d65331c013d9c45359665c52 sha256sums = ca49f11ed70d4673d14df700caff4380ae27b81d4d10c7a49297d5b56f0eb288 @@ -44,7 +43,7 @@ pkgname = mysql depends = zlib depends = jemalloc depends = libaio - provides = mariadb=5.7.20 + provides = mariadb=5.7.21 conflicts = mariadb options = emptydirs backup = etc/mysql/my.cnf @@ -53,7 +52,7 @@ pkgname = libmysqlclient pkgdesc = MySQL client libraries depends = libsasl depends = zlib - provides = libmariadbclient=5.7.20 + provides = libmariadbclient=5.7.21 conflicts = libmariadbclient pkgname = mysql-clients @@ -62,6 +61,6 @@ pkgname = mysql-clients depends = zlib depends = openssl depends = jemalloc - provides = mariadb-clients=5.7.20 + provides = mariadb-clients=5.7.21 conflicts = mariadb-clients @@ -5,10 +5,10 @@ pkgname=('mysql' 'libmysqlclient' 'mysql-clients') pkgbase=mysql -pkgver=5.7.20 +pkgver=5.7.21 pkgrel=1 pkgdesc="Fast SQL database server, community edition" -arch=('i686' 'x86_64') +arch=('x86_64') makedepends=('openssl' 'zlib' 'cmake' 'systemd-tools' 'libaio' 'jemalloc') _boost_ver=1.59.0 license=('GPL') @@ -24,7 +24,7 @@ source=("https://dev.mysql.com/get/Downloads/MySQL-5.7/${pkgbase}-${pkgver}.tar. "mysqld-tmpfile.conf" "mysqld.service" "my-default.cnf") -sha256sums=('5397549bb7c238f396c123db2df4cad2191b11adf8986de7fe63bff8e2786487' +sha256sums=('fa205079c27a39c24f3485e7498dd0906a6e0b379b4f99ebc0ec38a9ec5b09b7' '47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac' '1353162f5ae6e3dd4b0b8660738adbbc36c6d514d65331c013d9c45359665c52' 'ca49f11ed70d4673d14df700caff4380ae27b81d4d10c7a49297d5b56f0eb288' diff --git a/mysql.install b/mysql.install index 8565ac76650f..c534f40cfafb 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/mysqld --initialize-insecure --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 mysqld --initialize command, e.g.:" + echo " mysqld --initialize --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(){ |