summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMuflone2015-11-02 00:28:55 +0100
committerMuflone2015-11-02 00:28:55 +0100
commit9d9c0e0ef4e35a96940e0ec3ff4e8b3b85e17239 (patch)
treea8471d23fd097f91dfb03730cc3a42fc1b124e11
parentb39cca1b69b11697113132a8030080e14886d72e (diff)
downloadaur-9d9c0e0ef4e35a96940e0ec3ff4e8b3b85e17239.tar.gz
Updated pkgbase mysql 5.7.9-1
-rw-r--r--.SRCINFO18
-rw-r--r--PKGBUILD31
-rw-r--r--mysql-srv_buf_size.patch20
3 files changed, 23 insertions, 46 deletions
diff --git a/.SRCINFO b/.SRCINFO
index bb071fcd19a..be345c96ca4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = mysql
pkgdesc = Fast SQL database server, community edition
- pkgver = 5.6.26
+ pkgver = 5.7.9
pkgrel = 1
url = https://www.mysql.com/products/community/
arch = i686
@@ -12,24 +12,25 @@ pkgbase = mysql
makedepends = systemd-tools
makedepends = libaio
makedepends = jemalloc
+ makedepends = boost
options = !libtool
- source = https://dev.mysql.com/get/Downloads/MySQL-5.6/mysql-5.6.26.tar.gz
+ source = https://dev.mysql.com/get/Downloads/MySQL-5.7/mysql-5.7.9.tar.gz
source = mysqld-post.sh
source = mysqld-tmpfile.conf
source = mysqld.service
- source = mysql-srv_buf_size.patch
- sha256sums = b44c6ce5f95172c56c73edfa8b710b39242ec7af0ab182c040208c41866e5070
+ sha256sums = 315342f5bee1179548cecad2d776cd7758092fd2854024e60a3a5007feba34e0
sha256sums = 368f9fd2454d80eb32abb8f29f703d1cf9553353fb9e1ae4529c4b851cb8c5dd
sha256sums = 2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd
sha256sums = 50212165bdb09855b97b15a917464ba34f82edf30a0c43f9a0c93a27071df556
- sha256sums = bfa3ba5546d470e1c1d32246f687f0faa8c225913a648262fbcae6b2296cb57f
pkgname = mysql
pkgdesc = Fast SQL database server, community edition
install = mysql.install
depends = mysql-clients
depends = libaio
- provides = mariadb=5.6.26
+ depends = jemalloc
+ depends = openssl
+ provides = mariadb=5.7.9
conflicts = mariadb
options = emptydirs
backup = etc/mysql/my.cnf
@@ -37,13 +38,14 @@ pkgname = mysql
pkgname = libmysqlclient
pkgdesc = MySQL client libraries
depends = openssl
- provides = libmariadbclient=5.6.26
+ provides = libmariadbclient=5.7.9
conflicts = libmariadbclient
pkgname = mysql-clients
pkgdesc = MySQL client tools
depends = libmysqlclient
depends = jemalloc
- provides = mariadb-clients=5.6.26
+ depends = openssl
+ provides = mariadb-clients=5.7.9
conflicts = mariadb-clients
diff --git a/PKGBUILD b/PKGBUILD
index 3601f975996..551bf7a8cbd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,29 +5,22 @@
pkgname=('mysql' 'libmysqlclient' 'mysql-clients')
pkgbase=mysql
-pkgver=5.6.26
+pkgver=5.7.9
pkgrel=1
pkgdesc="Fast SQL database server, community edition"
arch=('i686' 'x86_64')
-makedepends=('openssl' 'zlib' 'cmake' 'systemd-tools' 'libaio' 'jemalloc')
+makedepends=('openssl' 'zlib' 'cmake' 'systemd-tools' 'libaio' 'jemalloc' 'boost')
license=('GPL')
url="https://www.mysql.com/products/community/"
options=('!libtool')
-source=("https://dev.mysql.com/get/Downloads/MySQL-5.6/${pkgbase}-${pkgver}.tar.gz"
+source=("https://dev.mysql.com/get/Downloads/MySQL-5.7/${pkgbase}-${pkgver}.tar.gz"
"mysqld-post.sh"
"mysqld-tmpfile.conf"
- "mysqld.service"
- "mysql-srv_buf_size.patch")
-sha256sums=('b44c6ce5f95172c56c73edfa8b710b39242ec7af0ab182c040208c41866e5070'
+ "mysqld.service")
+sha256sums=('315342f5bee1179548cecad2d776cd7758092fd2854024e60a3a5007feba34e0'
'368f9fd2454d80eb32abb8f29f703d1cf9553353fb9e1ae4529c4b851cb8c5dd'
'2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd'
- '50212165bdb09855b97b15a917464ba34f82edf30a0c43f9a0c93a27071df556'
- 'bfa3ba5546d470e1c1d32246f687f0faa8c225913a648262fbcae6b2296cb57f')
-
-prepare() {
- cd "${pkgbase}-${pkgver}"
- patch -p0 -i "../mysql-srv_buf_size.patch"
-}
+ '50212165bdb09855b97b15a917464ba34f82edf30a0c43f9a0c93a27071df556')
build() {
rm -rf build
@@ -68,7 +61,7 @@ build() {
-DWITHOUT_EXAMPLE_STORAGE_ENGINE=ON \
-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-rtti -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"
make
}
@@ -96,7 +89,7 @@ package_libmysqlclient(){
package_mysql-clients(){
pkgdesc="MySQL client tools"
- depends=('libmysqlclient' 'jemalloc')
+ depends=('libmysqlclient' 'jemalloc' 'openssl')
conflicts=('mariadb-clients')
provides=("mariadb-clients=${pkgver}")
@@ -115,6 +108,9 @@ package_mysql-clients(){
rm "${pkgdir}/usr/bin/mysql_upgrade"
rm "${pkgdir}/usr/bin/mysql_config_editor"
rm "${pkgdir}/usr/bin/mysqlbinlog"
+ rm "${pkgdir}/usr/bin/mysql_install_db"
+ rm "${pkgdir}/usr/bin/mysql_secure_installation"
+ rm "${pkgdir}/usr/bin/mysql_ssl_rsa_setup"
rm "${pkgdir}/usr/bin/mysqltest"
}
@@ -122,7 +118,7 @@ package_mysql(){
pkgdesc="Fast SQL database server, community edition"
backup=('etc/mysql/my.cnf')
install="${pkgbase}.install"
- depends=('mysql-clients' 'libaio')
+ depends=('mysql-clients' 'libaio' 'jemalloc' 'openssl')
conflicts=('mariadb')
provides=("mariadb=${pkgver}")
options=('emptydirs')
@@ -152,6 +148,7 @@ package_mysql(){
rm "${pkgdir}/usr/bin/mysqlcheck"
rm "${pkgdir}/usr/bin/mysqldump"
rm "${pkgdir}/usr/bin/mysqlimport"
+ rm "${pkgdir}/usr/bin/mysqlpump"
rm "${pkgdir}/usr/bin/mysqlshow"
rm "${pkgdir}/usr/bin/mysqlslap"
rm "${pkgdir}/usr/share/man/man1/mysql.1"
@@ -163,9 +160,7 @@ package_mysql(){
rm "${pkgdir}/usr/share/man/man1/mysqlslap.1"
# not needed
- rm -r "${pkgdir}/usr/data"
rm -r "${pkgdir}/usr/mysql-test"
- rm -r "${pkgdir}/usr/sql-bench"
rm "${pkgdir}/usr/share/man/man1/mysql-test-run.pl.1"
}
diff --git a/mysql-srv_buf_size.patch b/mysql-srv_buf_size.patch
deleted file mode 100644
index 12212fcc345..00000000000
--- a/mysql-srv_buf_size.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- storage/innobase/row/row0log.cc.orig 2013-07-10 16:17:27.000000000 +0000
-+++ storage/innobase/row/row0log.cc 2013-08-21 12:48:22.216656556 +0000
-@@ -2364,7 +2364,7 @@ all_done:
- and be ignored when the operation is unsupported. */
- fallocate(index->online_log->fd,
- FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE,
-- ofs, srv_buf_size);
-+ ofs, srv_sort_buf_size);
- #endif /* FALLOC_FL_PUNCH_HOLE */
-
- next_mrec = index->online_log->head.block;
-@@ -3153,7 +3153,7 @@ all_done:
- and be ignored when the operation is unsupported. */
- fallocate(index->online_log->fd,
- FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE,
-- ofs, srv_buf_size);
-+ ofs, srv_sort_buf_size);
- #endif /* FALLOC_FL_PUNCH_HOLE */
-
- next_mrec = index->online_log->head.block;