diff options
author | Muflone | 2016-02-06 20:09:02 +0100 |
---|---|---|
committer | Muflone | 2016-02-06 20:09:02 +0100 |
commit | 2de4c0899c523be9cd35e106a6b33faa8eb07d37 (patch) | |
tree | 0bf542d36046630107c17af1a4d51e9de142bd35 | |
parent | b522c943427d175a37df57197bc0cd8e6bda4262 (diff) | |
download | aur-2de4c0899c523be9cd35e106a6b33faa8eb07d37.tar.gz |
Updated pkgbase mysql 5.7.10-2
-rw-r--r-- | .SRCINFO | 7 | ||||
-rw-r--r-- | PKGBUILD | 10 | ||||
-rw-r--r-- | mysql.install | 12 |
3 files changed, 17 insertions, 12 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Sun Dec 20 18:32:57 UTC 2015 +# Sat Feb 6 19:07:58 UTC 2016 pkgbase = mysql pkgdesc = Fast SQL database server, community edition pkgver = 5.7.10 - pkgrel = 1 + pkgrel = 2 url = https://www.mysql.com/products/community/ arch = i686 arch = x86_64 @@ -14,13 +14,14 @@ pkgbase = mysql makedepends = systemd-tools makedepends = libaio makedepends = jemalloc - makedepends = boost options = !libtool source = https://dev.mysql.com/get/Downloads/MySQL-5.7/mysql-5.7.10.tar.gz + source = http://sourceforge.net/projects/boost/files/boost/1.59.0/boost_1_59_0.tar.gz source = mysqld-post.sh source = mysqld-tmpfile.conf source = mysqld.service sha256sums = 1ea1644884d086a23eafd8ccb04d517fbd43da3a6a06036f23c5c3a111e25c74 + sha256sums = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac sha256sums = 368f9fd2454d80eb32abb8f29f703d1cf9553353fb9e1ae4529c4b851cb8c5dd sha256sums = 2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd sha256sums = 50212165bdb09855b97b15a917464ba34f82edf30a0c43f9a0c93a27071df556 @@ -6,18 +6,21 @@ pkgname=('mysql' 'libmysqlclient' 'mysql-clients') pkgbase=mysql pkgver=5.7.10 -pkgrel=1 +pkgrel=2 pkgdesc="Fast SQL database server, community edition" arch=('i686' 'x86_64') -makedepends=('openssl' 'zlib' 'cmake' 'systemd-tools' 'libaio' 'jemalloc' 'boost') +makedepends=('openssl' 'zlib' 'cmake' 'systemd-tools' 'libaio' 'jemalloc') +_boost_ver=1.59.0 license=('GPL') url="https://www.mysql.com/products/community/" options=('!libtool') source=("https://dev.mysql.com/get/Downloads/MySQL-5.7/${pkgbase}-${pkgver}.tar.gz" + "http://sourceforge.net/projects/boost/files/boost/${_boost_ver}/boost_${_boost_ver//./_}.tar.gz" "mysqld-post.sh" "mysqld-tmpfile.conf" "mysqld.service") sha256sums=('1ea1644884d086a23eafd8ccb04d517fbd43da3a6a06036f23c5c3a111e25c74' + '47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac' '368f9fd2454d80eb32abb8f29f703d1cf9553353fb9e1ae4529c4b851cb8c5dd' '2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd' '50212165bdb09855b97b15a917464ba34f82edf30a0c43f9a0c93a27071df556') @@ -62,7 +65,8 @@ build() { -DWITHOUT_FEDERATED_STORAGE_ENGINE=ON \ -DCMAKE_C_FLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer -fno-delete-null-pointer-checks" \ -DCMAKE_CXX_FLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-delete-null-pointer-checks" \ - -DWITH_MYSQLD_LDFLAGS="-pie ${LDFLAGS},-z,now" + -DWITH_MYSQLD_LDFLAGS="-pie ${LDFLAGS},-z,now" \ + -DWITH_BOOST="../boost_${_boost_ver//./_}" make } diff --git a/mysql.install b/mysql.install index f420406cc0f8..8565ac76650f 100644 --- a/mysql.install +++ b/mysql.install @@ -1,15 +1,15 @@ 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 +[[ -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 "${datadir}" -s /bin/false mysql &>/dev/null - if [[ ! -e $datadir ]]; then - install -dm700 $datadir - usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=$datadir + 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 fi @@ -18,7 +18,7 @@ post_install(){ 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 + getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d "${datadir}" -s /bin/false mysql &>/dev/null if [ "$(vercmp $2 5.6)" -lt 0 ]; then echo " >> " |