[arch-commits] Commit in percona-server/trunk (3 files)
Massimiliano Torromeo
mtorromeo at archlinux.org
Wed Dec 16 10:26:14 UTC 2020
Date: Wednesday, December 16, 2020 @ 10:26:13
Author: mtorromeo
Revision: 776442
upgpkg: percona-server 8.0.22_13-1
Added:
percona-server/trunk/mysqlrouter-user.conf
Modified:
percona-server/trunk/PKGBUILD
percona-server/trunk/mysql-user.conf
-----------------------+
PKGBUILD | 73 +++++++++++++++++++++++++++++++-----------------
mysql-user.conf | 2 -
mysqlrouter-user.conf | 1
3 files changed, 50 insertions(+), 26 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-12-16 10:25:11 UTC (rev 776441)
+++ PKGBUILD 2020-12-16 10:26:13 UTC (rev 776442)
@@ -2,8 +2,8 @@
pkgbase=percona-server
pkgname=('libperconaserverclient' 'percona-server-clients' 'percona-server')
-pkgver=8.0.21_12
-_boost_ver=1.72.0
+pkgver=8.0.22_13
+_boost_ver=1.73.0
_pkgver=${pkgver/_/-}
_myver=${pkgver/_rel*}
pkgrel=1
@@ -12,15 +12,18 @@
license=('GPL')
url="https://www.percona.com/software/mysql-database/percona-server"
source=("https://www.percona.com/downloads/Percona-Server-${pkgver%.*_*}/Percona-Server-$_pkgver/source/tarball/percona-server-$_pkgver.tar.gz"
-# "https://dl.bintray.com/boostorg/release/$_boost_ver/source/boost_${_boost_ver//./_}.tar.gz"
+ "https://dl.bintray.com/boostorg/release/$_boost_ver/source/boost_${_boost_ver//./_}.tar.gz"
'my.cnf'
'mysql-user.conf'
+ 'mysqlrouter-user.conf'
'build-hostname.patch'
'no-werror.patch'
'rocksdb-make.patch')
-sha256sums=('2dcf0ea54776ba587c6a1813d91e3f4155f285c71032049acc84089049d26dd3'
+sha256sums=('614249dc7790e82cabf22fdb20492be7ec5b8e98550f662204a17e0e8797cc9a'
+ '9995e192e68528793755692917f9eb6422f3052a53c5e13ba278a228af6c7acf'
'b467b04d6d06152b2abc33f2a6de63fef0fc922dd5119d2ee1d07d3c1a489731'
- 'e638a2657085f15b6728f43c1fd6aa551b27608fbf6b435e33afd3606a0cfb0e'
+ '5d7710fe88ec6d298175a309c0b776142397b119c468830b2865980292ed5da6'
+ '4ca7ffdcb2d1716d4f31e4c7dd314e5d76e64f13fdc67c5d81c53650b793f5e0'
'1537fdbb92dd1c135c1eb9f4d10c44fd02e652db66c933d731990a1196f1397c'
'2343a191c452b91caa458b03b0c1ef3f5afb0e7031816c68467af5c6a6ffe253'
'2ff495d271f99c4d0dba89e8ccde7e6b9789a4ea6b55034de9b9217b47e32c03')
@@ -33,10 +36,17 @@
patch -p1 -i "$srcdir"/no-werror.patch
patch -p1 -i "$srcdir"/rocksdb-make.patch
+ sed -r -e s@/var/run/mysqlrouter@/run/mysqlrouter@ \
+ -e s at lib64/mysql at lib/mysql@ \
+ -i cmake/install_layout.cmake
+
for svcfile in mysqld{,@}.service.in; do
- echo StateDirectory=mysql mysql-files >> scripts/systemd/$svcfile
- echo RuntimeDirectory=mysqld >> scripts/systemd/$svcfile
+ sed '/^PrivateTmp=/ a StateDirectory=mysql mysql-files\nRuntimeDirectory=mysqld' \
+ -i scripts/systemd/$svcfile
done
+
+ sed '/^PrivateTmp=/ a StateDirectory=mysqlrouter\nRuntimeDirectory=mysqlrouter' \
+ -i scripts/systemd/mysqlrouter.service.in
}
build() {
@@ -46,7 +56,9 @@
cmake ../$pkgbase-$_pkgver \
-Wno-dev \
+ -DCMAKE_BUILD_TYPE=Release \
-DBUILD_CONFIG=mysql_release \
+ -DFEATURE_SET=community \
-DREPRODUCIBLE_BUILD=ON \
-DCMAKE_INSTALL_PREFIX=/usr \
-DSYSCONFDIR=/etc/mysql \
@@ -55,12 +67,15 @@
-DDEFAULT_CHARSET=utf8mb4 \
-DDEFAULT_COLLATION=utf8mb4_general_ci \
-DENABLED_LOCAL_INFILE=ON \
+ -DINSTALL_LAYOUT=RPM \
+ -DINSTALL_SBINDIR=bin \
+ -DINSTALL_LIBDIR=lib \
+ -DINSTALL_PLUGINDIR=lib/perconaserver/plugin \
+ -DINSTALL_INCLUDEDIR=include/perconaserver \
-DINSTALL_INFODIR=share/doc/percona-server \
-DINSTALL_DOCREADMEDIR=share/doc/percona-server \
-DINSTALL_DOCDIR=share/doc/percona-server \
-DINSTALL_MANDIR=share/man \
- -DINSTALL_PLUGINDIR=lib/perconaserver/plugin \
- -DINSTALL_INCLUDEDIR=include/perconaserver \
-DINSTALL_SUPPORTFILESDIR=share/mysql \
-DINSTALL_MYSQLSHAREDIR=share/mysql \
-DINSTALL_STATIC_LIBRARIES=OFF \
@@ -90,9 +105,9 @@
-DTOKUDB_BACKUP_PLUGIN_VERSION=$_pkgver \
-DWITH_SYSTEMD=1 \
-DCMAKE_EXE_LINKER_FLAGS='-ljemalloc' \
- -DWITH_BOOST=system \
- -DWITH_NUMA=ON
- # -DWITH_BOOST="../boost_${_boost_ver//./_}"
+ -DWITH_NUMA=ON \
+ -DWITH_BOOST="../boost_${_boost_ver//./_}"
+ # -DWITH_BOOST=system
make
}
@@ -99,7 +114,8 @@
package_libperconaserverclient() {
pkgdesc='Percona Server client libraries'
- depends=('zlib' 'openssl')
+ depends=('zlib' 'zstd' 'openssl')
+ optdepends=('libsasl: authentication_ldap_sasl_client plugin')
cd build
for dir in include libmysql libservices; do
@@ -106,11 +122,11 @@
make -C $dir DESTDIR="$pkgdir" install
done
- # Conflicting files with mariadb-libs
- rm -rf "$pkgdir"/usr/lib/{libmysqld.so.*,libmysqlclient{,_r}.so*,perconaserver}
+ rm -vrf "$pkgdir"/usr/lib/perconaserver/plugin/debug
install -Dm755 scripts/mysql_config "$pkgdir"/usr/bin/perconaserver_config
install -Dm644 "$srcdir"/$pkgbase-$_pkgver/man/mysql_config.1 "$pkgdir"/usr/share/man/man1/perconaserver_config.1
+ sed s@/lib64@/lib@ -i "$pkgdir"/usr/bin/perconaserver_config
install -D -m0644 scripts/perconaserverclient.pc "$pkgdir"/usr/lib/pkgconfig/perconaserverclient.pc
install -D -m0644 "$srcdir"/$pkgbase-$_pkgver/support-files/mysql.m4 "$pkgdir"/usr/share/aclocal/perconaserverclient.m4
@@ -118,7 +134,7 @@
package_percona-server-clients() {
pkgdesc='Percona Server client tools'
- depends=('libperconaserverclient' 'zlib' 'lz4' 'jemalloc' 'readline')
+ depends=('libperconaserverclient' 'zlib' 'zstd' 'lz4' 'openssl' 'jemalloc' 'readline')
conflicts=('mysql-clients')
provides=("mysql-clients=$_myver" "mariadb-clients=$_myver")
@@ -137,7 +153,7 @@
package_percona-server() {
pkgdesc='Drop-in replacement for MySQL that provides improved performance, diagnostics, instrumentation and MyRocks storage engine'
- backup=('etc/mysql/my.cnf')
+ backup=('etc/mysql/my.cnf' 'etc/mysqlrouter/mysqlrouter.conf')
depends=('libaio' 'systemd-tools' 'pam' 'jemalloc' 'numactl' 'lz4' 'zstd' 'openssl' 'libtirpc' 'curl' 'boost-libs')
optdepends=('perl-dbd-mysql')
conflicts=('mysql')
@@ -147,18 +163,24 @@
cd build
make DESTDIR="$pkgdir" install
- install -Dm644 ../my.cnf "$pkgdir"/etc/mysql/my.cnf
- install -Dm644 ../mysql-user.conf "$pkgdir"/usr/lib/sysusers.d/mysql.conf
+ cd "$pkgdir"
+ install -Dm644 "$srcdir"/my.cnf etc/mysql/my.cnf
+ install -Dm644 "$srcdir"/mysql-user.conf usr/lib/sysusers.d/mysql.conf
- cd "$pkgdir"
+ install -dm755 etc/mysqlrouter
+ sed -e 's:@ROUTER_RUNTIMEDIR@:/run/mysqlrouter:' \
+ -e 's:^logging_folder.*:logging_folder =:' \
+ "$srcdir"/$pkgbase-$_pkgver/packaging/rpm-common/mysqlrouter.conf.in \
+ > etc/mysqlrouter/mysqlrouter.conf
+ install -Dm644 "$srcdir"/mysqlrouter-user.conf usr/lib/sysusers.d/mysqlrouter.conf
+
chmod 755 usr
- mv usr/usr/lib/* usr/lib
- rm -rf usr/{usr,data,run,lib/perconaserver/plugin/debug,lib/tmpfiles.d/mysql.conf}
+ rm -vrf usr/{cmake,lib/perconaserver/plugin/debug,lib/tmpfiles.d/mysql{,router}.conf}
# Move documentation
if [ -f usr/PATENTS ]; then
mv usr/{PATENTS,README.md} usr/share/doc/$pkgname/
- rm usr/COPYING.* usr/{LICENSE,README}.router
+ rm usr/COPYING.*
fi
# provided by libperconaserverclient
@@ -170,9 +192,10 @@
# provided by percona-server-clients
rm usr/bin/mysql{,admin,check,dump,import,show,slap,pump,binlog,test,_upgrade}
+ rm usr/lib/perconaserver/plugin/authentication_*_client.so
rm usr/share/man/man1/mysql{,admin,check,dump,import,show,slap,pump,binlog,_upgrade}.1
# not needed
- rm -r usr/mysql-test
- rm usr/share/doc/percona-server/{INFO_*,mysql.info,*-test}
+ rm -r usr/share/mysql-test
+ rm usr/share/doc/percona-server/mysql.info
}
Modified: mysql-user.conf
===================================================================
--- mysql-user.conf 2020-12-16 10:25:11 UTC (rev 776441)
+++ mysql-user.conf 2020-12-16 10:26:13 UTC (rev 776442)
@@ -1 +1 @@
-u mysql 89 "MySQL user"
+u mysql 89 "MySQL user" /var/lib/mysql
Added: mysqlrouter-user.conf
===================================================================
--- mysqlrouter-user.conf (rev 0)
+++ mysqlrouter-user.conf 2020-12-16 10:26:13 UTC (rev 776442)
@@ -0,0 +1 @@
+u mysqlrouter - "Percona MySQL Router" /var/lib/mysqlrouter
More information about the arch-commits
mailing list