diff options
| -rw-r--r-- | main/mariadb/APKBUILD | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/main/mariadb/APKBUILD b/main/mariadb/APKBUILD index 8ed8efc11f3..e599b0bb524 100644 --- a/main/mariadb/APKBUILD +++ b/main/mariadb/APKBUILD @@ -15,14 +15,16 @@ arch="all" license="GPL-2.0" depends="$pkgname-common" checkdepends="perl" +_mytopdeps="perl perl-dbi perl-dbd-mysql perl-getopt-long perl-socket perl-term-readkey" depends_dev="libressl-dev zlib-dev mariadb-connector-c-dev" makedepends="$depends_dev bison cmake curl-dev libaio-dev libarchive-dev libevent-dev - libxml2-dev ncurses-dev pcre-dev readline-dev xz-dev linux-headers" + libxml2-dev ncurses-dev pcre-dev readline-dev xz-dev linux-headers + $_mytopdeps" install="$pkgname.pre-install" subpackages="$pkgname-static $pkgname-test:mytest $pkgname-embedded-dev:_embedded_dev $pkgname-doc $pkgname-dev $pkgname-common $pkgname-openrc - $pkgname-client $pkgname-bench $pkgname-backup $pkgname-embedded $pkgname-server-utils:_server_utils + $pkgname-client $pkgname-bench $pkgname-backup $pkgname-embedded $pkgname-mytop mysql mysql-client:_compat_client mysql-bench:_compat_bench" source="https://downloads.mariadb.org/interstitial/mariadb-$pkgver/source/mariadb-$pkgver.tar.gz $pkgname.initd @@ -51,7 +53,7 @@ builddir="$srcdir/$pkgname-$pkgver" # - CVE-2018-2761 # - CVE-2018-2781 # - CVE-2018-2771 -# - CVE-2018-2813 +# - CVE-2018-2813 # 10.1.22-r0: # - CVE-2017-3313 # - CVE-2017-3302 @@ -162,8 +164,6 @@ package() { ln -s ../../../../bin/my_safe_process \ "$pkgdir"/usr/mysql-test/lib/My/SafeProcess/my_safe_process - # mytop should be shipped in separate package - rm "$pkgdir"/usr/bin/mytop # remove files provided by mariadb-connector-c rm \ @@ -290,6 +290,13 @@ _embedded_dev() { mv "$pkgdir"/usr/lib/libmysqld.so "$subpkgdir"/usr/lib/ } +mytop() { + pkgdesc="Command line tool used for monitoring MariaDB performance" + depends="$_mytopdeps" + mkdir -p "$subpkgdir"/usr/bin/ + mv "$pkgdir"/usr/bin/mytop "$subpkgdir"/usr/bin/ +} + _server_utils() { pkgdesc="Non-essential server utilities for MariaDB/MySQL applications" depends="perl $pkgname-common=$pkgver-r$pkgrel" |