diff options
author | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2018-04-12 22:47:57 +0300 |
---|---|---|
committer | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2018-04-12 22:47:57 +0300 |
commit | 374f208096b0c70e796a1f0b90e8c9456d76040c (patch) | |
tree | 68b1c97bd006a2245b5b28cad75e961f977d2702 /main/mariadb | |
parent | b38f73904652e46dfe430e72626bf43f7900eaa6 (diff) | |
download | aports-374f208096b0c70e796a1f0b90e8c9456d76040c.tar.bz2 aports-374f208096b0c70e796a1f0b90e8c9456d76040c.tar.xz |
main/mariadb: fix conflict
Diffstat (limited to 'main/mariadb')
-rw-r--r-- | main/mariadb/APKBUILD | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/main/mariadb/APKBUILD b/main/mariadb/APKBUILD index 4abf2f90bd..bfae35fd2e 100644 --- a/main/mariadb/APKBUILD +++ b/main/mariadb/APKBUILD @@ -6,7 +6,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mariadb pkgver=10.2.14 -pkgrel=1 +pkgrel=2 pkgdesc="A fast SQL database server" url="http://www.mariadb.org" pkgusers="mysql" @@ -171,6 +171,7 @@ package() { "$pkgdir"/usr/include/mysql/mysqld_error.h \ "$pkgdir"/usr/lib/$pkgname/plugin/dialog.so \ "$pkgdir"/usr/lib/$pkgname/plugin/mysql_clear_password.so \ + "$pkgdir"/usr/lib/$pkgname/plugin/sha256_password.so \ "$pkgdir"/usr/lib/libmysqlclient.so \ "$pkgdir"/usr/lib/libmysqlclient_r.so \ "$pkgdir"/usr/lib/libmariadb.so* |