From 374f208096b0c70e796a1f0b90e8c9456d76040c Mon Sep 17 00:00:00 2001
From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
Date: Thu, 12 Apr 2018 22:47:57 +0300
Subject: main/mariadb: fix conflict

---
 main/mariadb/APKBUILD | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'main/mariadb/APKBUILD')

diff --git a/main/mariadb/APKBUILD b/main/mariadb/APKBUILD
index 4abf2f90bdc..bfae35fd2ef 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*
-- 
cgit v1.2.3